Changeset 189959 in webkit

Timestamp:

Sep 17, 2015 6:58:40 PM (9 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] WTR fails to set the key window in the UIKit sense
​https://bugs.webkit.org/show_bug.cgi?id=149325

Reviewed by Tim Horton.

-[WebKitTestRunnerWindow isKeyWindow] just returned _platformWebView->windowIsKey().
This causes UIKit to bypass code that actually sets the key window, resulting in
[UIAppliation sharedApplication].keyWindow always being nil.

Fix by PlatformWebView::setWindowIsKey() actually call -makeKeyWindow, and having
-[WebKitTestRunnerWindow isKeyWindow] call super.

• WebKitTestRunner/PlatformWebView.h:

(WTR::PlatformWebView::setWindowIsKey): Deleted.

• WebKitTestRunner/efl/PlatformWebViewEfl.cpp:

(WTR::PlatformWebView::setWindowIsKey):

• WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:

(WTR::PlatformWebView::setWindowIsKey):

• WebKitTestRunner/ios/PlatformWebViewIOS.mm:

(-[WebKitTestRunnerWindow isKeyWindow]):
(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::~PlatformWebView):
(WTR::PlatformWebView::setWindowIsKey):

• WebKitTestRunner/mac/PlatformWebViewMac.mm:

(WTR::PlatformWebView::setWindowIsKey):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/PlatformWebView.h (modified) (1 diff)
• WebKitTestRunner/efl/PlatformWebViewEfl.cpp (modified) (1 diff)
• WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (modified) (1 diff)
• WebKitTestRunner/ios/PlatformWebViewIOS.mm (modified) (3 diffs)
• WebKitTestRunner/mac/PlatformWebViewMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] WTR fails to set the key window in the UIKit sense
+        https://bugs.webkit.org/show_bug.cgi?id=149325
+
+        Reviewed by Tim Horton.
+
+        -[WebKitTestRunnerWindow isKeyWindow] just returned _platformWebView->windowIsKey().
+        This causes UIKit to bypass code that actually sets the key window, resulting in
+        [UIAppliation sharedApplication].keyWindow always being nil.
+
+        Fix by PlatformWebView::setWindowIsKey() actually call -makeKeyWindow, and having
+        -[WebKitTestRunnerWindow isKeyWindow] call super.
+
+        * WebKitTestRunner/PlatformWebView.h:
+        (WTR::PlatformWebView::setWindowIsKey): Deleted.
+        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+        (WTR::PlatformWebView::setWindowIsKey):
+        * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+        (WTR::PlatformWebView::setWindowIsKey):
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        (-[WebKitTestRunnerWindow isKeyWindow]):
+        (WTR::PlatformWebView::PlatformWebView):
+        (WTR::PlatformWebView::~PlatformWebView):
+        (WTR::PlatformWebView::setWindowIsKey):
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        (WTR::PlatformWebView::setWindowIsKey):
+
 2015-09-17  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/WebKitTestRunner/PlatformWebView.h

@@ -78 +78 @@
     void removeChromeInputField();
     void makeWebViewFirstResponder();
-    void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
+    void setWindowIsKey(bool);
     bool windowIsKey() const { return m_windowIsKey; }
 

trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

@@ -83 +83 @@
 }
 
+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+    m_windowIsKey = isKey;
+}
+
 void PlatformWebView::resizeTo(unsigned width, unsigned height)
 {

trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp

@@ -57 +57 @@
 {
     gtk_widget_destroy(m_window);
+}
+
+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+    m_windowIsKey = isKey;
 }
 

trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm

@@ -56 +56 @@
     return self;
 }
+
 - (BOOL)isKeyWindow
 {
-    return _platformWebView ? _platformWebView->windowIsKey() : YES;
+    return [super isKeyWindow] && (_platformWebView ? _platformWebView->windowIsKey() : YES);
 }
 
@@ -108 +109 @@
     m_view = [[WKWebView alloc] initWithFrame:rect configuration:configuration];
 
-    CGRect windowRect = rect;
-    m_window = [[WebKitTestRunnerWindow alloc] initWithFrame:windowRect];
+    m_window = [[WebKitTestRunnerWindow alloc] initWithFrame:rect];
     m_window.platformWebView = this;
 
     [m_window addSubview:m_view];
     [m_window makeKeyAndVisible];
+}
+
+PlatformWebView::~PlatformWebView()
+{
+    m_window.platformWebView = nil;
+    [m_view release];
+    [m_window release];
+}
+
+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+    m_windowIsKey = isKey;
+    if (isKey)
+        [m_window makeKeyWindow];
 }
 
@@ -122 +136 @@
     frame.size.height = height;
     setWindowFrame(frame);
-}
-
-PlatformWebView::~PlatformWebView()
-{
-    m_window.platformWebView = 0;
-    [m_view release];
-    [m_window release];
 }
 

trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm

@@ -146 +146 @@
 }
 
+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+    m_windowIsKey = isKey;
+}
+
 void PlatformWebView::resizeTo(unsigned width, unsigned height)
 {