[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:51:23 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 14a82efeb3f8bf56cae6c16799c0e4a44b2568b5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 29 08:18:35 2009 +0000
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
[Qt] fix fast/dom/Window/window-onFocus.html
Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
window.onblur was getting dispatched twice from QtWebKit.
https://bugs.webkit.org/show_bug.cgi?id=32990
* Api/qwebpage.cpp:
(QWebPagePrivate::focusOutEvent):
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
[Qt] fix fast/dom/Window/window-onFocus.html
Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
window.onblur was getting dispatched twice from QtWebKit.
https://bugs.webkit.org/show_bug.cgi?id=32990
* platform/qt/Skipped:
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
[Qt] fix fast/dom/Window/window-onFocus.html
Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
window.onblur was getting dispatched twice from QtWebKit.
https://bugs.webkit.org/show_bug.cgi?id=32990
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::DumpRenderTree):
(WebCore::DumpRenderTree::switchFocus):
* DumpRenderTree/qt/DumpRenderTreeQt.h:
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::setWindowIsKey):
(LayoutTestController::setMainFrameIsFirstResponder):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b014f95..36b96b1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-29 Robert Hogan <robert at roberthogan.net>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] fix fast/dom/Window/window-onFocus.html
+
+ Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
+ window.onblur was getting dispatched twice from QtWebKit.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32990
+
+ * platform/qt/Skipped:
+
2009-12-28 Charles Wei <charles.wei at torchmobile.com.cn>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 583e8ff..4be858c 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -430,7 +430,6 @@ fast/dom/gc-10.html
fast/dom/isindex-002.html
fast/dom/object-embed-plugin-scripting.html
fast/dom/replaceChild.html
-fast/dom/Window/window-onFocus.html
fast/dynamic/layer-hit-test-crash.html
# seems to trigger some bugs/missing features in QTextCodec
fast/encoding/char-encoding.html
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 5c570cc..c3579e0 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1068,8 +1068,9 @@ void QWebPagePrivate::focusOutEvent(QFocusEvent*)
// and the focus frame. But don't tell the focus controller so that upon
// focusInEvent() we can re-activate the frame.
FocusController *focusController = page->focusController();
- focusController->setActive(false);
+ // Call setFocused first so that window.onblur doesn't get called twice
focusController->setFocused(false);
+ focusController->setActive(false);
}
void QWebPagePrivate::dragEnterEvent(QGraphicsSceneDragDropEvent* ev)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4029029..7370242 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-29 Robert Hogan <robert at roberthogan.net>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] fix fast/dom/Window/window-onFocus.html
+
+ Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
+ window.onblur was getting dispatched twice from QtWebKit.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32990
+
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::focusOutEvent):
+
2009-12-24 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Gustavo Noronha.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b8f9da..62268e3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2009-12-29 Robert Hogan <robert at roberthogan.net>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] fix fast/dom/Window/window-onFocus.html
+
+ Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
+ window.onblur was getting dispatched twice from QtWebKit.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32990
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::DumpRenderTree::DumpRenderTree):
+ (WebCore::DumpRenderTree::switchFocus):
+ * DumpRenderTree/qt/DumpRenderTreeQt.h:
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::setWindowIsKey):
+ (LayoutTestController::setMainFrameIsFirstResponder):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
2009-12-28 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Maciej Stachowiak.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 46b6bf1..4c4b5e9 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -318,7 +318,7 @@ DumpRenderTree::DumpRenderTree()
m_page = new WebPage(m_mainView, this);
m_mainView->setPage(m_page);
- // create out controllers. This has to be done before connectFrame,
+ // create our controllers. This has to be done before connectFrame,
// as it exports there to the JavaScript DOM window.
m_controller = new LayoutTestController(this);
connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
@@ -756,6 +756,12 @@ int DumpRenderTree::windowCount() const
return windows.count() + 1;
}
+void DumpRenderTree::switchFocus(bool focused)
+{
+ QFocusEvent event((focused) ? QEvent::FocusIn : QEvent::FocusOut, Qt::ActiveWindowFocusReason);
+ QApplication::sendEvent(m_mainView, &event);
+}
+
#if defined(Q_WS_X11)
void DumpRenderTree::initializeFonts()
{
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index 15052cf..caee52d 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -89,6 +89,8 @@ public:
QWebPage *createWindow();
int windowCount() const;
+ void switchFocus(bool focused);
+
WebPage *webPage() const { return m_page; }
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index b240003..40a06ae 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -287,6 +287,16 @@ void LayoutTestController::setPOSIXLocale(const QString& locale)
QLocale::setDefault(qlocale);
}
+void LayoutTestController::setWindowIsKey(bool isKey)
+{
+ m_drt->switchFocus(isKey);
+}
+
+void LayoutTestController::setMainFrameIsFirstResponder(bool isFirst)
+{
+ //FIXME: only need this for the moment: https://bugs.webkit.org/show_bug.cgi?id=32990
+}
+
bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(const QString& animationName,
double time,
const QString& elementId)
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index ca6892d..1913d7c 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -113,6 +113,8 @@ public slots:
void setPopupBlockingEnabled(bool enable);
void setPOSIXLocale(const QString& locale);
void resetLoadFinished() { m_loadFinished = false; }
+ void setWindowIsKey(bool isKey);
+ void setMainFrameIsFirstResponder(bool isFirst);
bool pauseAnimationAtTimeOnElementWithId(const QString& animationName, double time, const QString& elementId);
bool pauseTransitionAtTimeOnElementWithId(const QString& propertyName, double time, const QString& elementId);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list