Changeset 175638 in webkit

Timestamp:

Nov 5, 2014 1:21:45 PM (10 years ago)

Author:

ap@apple.com

Message:

fast/dom/remove-body-during-body-replacement2.html fails on WK2
​https://bugs.webkit.org/show_bug.cgi?id=138334

Reviewed by Anders Carlsson.

Source/WebKit2:

Added an SPI to focus a frame.

• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:

(WKBundleFrameFocus):

• WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setViewState):

Tools:

Reset focus to main frame between tests. DumpRenderTree does this via -makeFirstResponder
calls, which works because each frame is an NSView in WK1. WK2 makes equivalent
-makeFirstResponder calls, which may or may not be needed for other reasons, but
it also needs to reset internal focus explicitly.

It's not clear if this is the right long-term fix or a workaround for a WebKit bug.
WebKit behavior appears wrong, but it matches Firefox.

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::resetAfterTest):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-05  Alexey Proskuryakov  <ap@apple.com>
+
+        fast/dom/remove-body-during-body-replacement2.html fails on WK2
+        https://bugs.webkit.org/show_bug.cgi?id=138334
+
+        Reviewed by Anders Carlsson.
+
+        Added an SPI to focus a frame.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFrameFocus):
+        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setViewState):
+
 2014-11-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

@@ -36 +36 @@
 #include "WebSecurityOrigin.h"
 #include <WebCore/Document.h>
+#include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/Page.h>
 
 using namespace WebCore;
@@ -271 +273 @@
     return toCopiedAPI(coreFrame->document()->securityOrigin());
 }
+
+void WKBundleFrameFocus(WKBundleFrameRef frameRef)
+{
+    Frame* coreFrame = toImpl(frameRef)->coreFrame();
+    if (!coreFrame)
+        return;
+
+    coreFrame->page()->focusController().setFocusedFrame(coreFrame);
+}

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h

@@ -55 +55 @@
 WK_EXPORT bool WKBundleFrameHandlesPageScaleGesture(WKBundleFrameRef frame);
 
+WK_EXPORT void WKBundleFrameFocus(WKBundleFrameRef frame);
+
 #ifdef __cplusplus
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-05  Alexey Proskuryakov  <ap@apple.com>
+
+        fast/dom/remove-body-during-body-replacement2.html fails on WK2
+        https://bugs.webkit.org/show_bug.cgi?id=138334
+
+        Reviewed by Anders Carlsson.
+
+        Reset focus to main frame between tests. DumpRenderTree does this via -makeFirstResponder
+        calls, which works because each frame is an NSView in WK1. WK2 makes equivalent
+        -makeFirstResponder calls, which may or may not be needed for other reasons, but
+        it also needs to reset internal focus explicitly.
+
+        It's not clear if this is the right long-term fix or a workaround for a WebKit bug.
+        WebKit behavior appears wrong, but it matches Firefox.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::resetAfterTest):
+
 2014-11-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -419 +419 @@
 {
     WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
+
+    // WebKit currently doesn't reset focus even when navigating to a new page. This may or may not be a bug
+    // (see <https://bugs.webkit.org/show_bug.cgi?id=138334>), however for tests, we want to start each one with a clean state.
+    WKBundleFrameFocus(frame);
+
     JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
     WebCoreTestSupport::resetInternalsObject(context);