Changeset 52611 in webkit

Timestamp:

Dec 29, 2009 12:18:35 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-29 Robert Hogan <​robert@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@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@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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-29  Robert Hogan  <robert@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@torchmobile.com.cn>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -431 +431 @@
 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

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1069 +1069 @@
     // focusInEvent() we can re-activate the frame.
     FocusController *focusController = page->focusController();
+    // Call setFocused first so that window.onblur doesn't get called twice
+    focusController->setFocused(false);
     focusController->setActive(false);
-    focusController->setFocused(false);
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-12-29  Robert Hogan  <robert@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@forwardbias.in>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-29  Robert Hogan  <robert@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@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -319 +319 @@
     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);
@@ -757 +757 @@
 }
 
+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()

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -89 +89 @@
     QWebPage *createWindow();
     int windowCount() const;
+
+    void switchFocus(bool focused);
 
     WebPage *webPage() const { return m_page; }

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -288 +288 @@
 } 
 
+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,

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -114 +114 @@
     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);