<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189959] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189959">189959</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 18:58:40 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformWebViewh">trunk/Tools/WebKitTestRunner/PlatformWebView.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnereflPlatformWebViewEflcpp">trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkPlatformWebViewGtkcpp">trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm">trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacPlatformWebViewMacmm">trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/ChangeLog 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-09-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [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>
+
</ins><span class="cx"> [iOS WK2] When loading viewport tests, use the normal web page viewport configuration
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149321
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> void addChromeInputField();
</span><span class="cx"> void removeChromeInputField();
</span><span class="cx"> void makeWebViewFirstResponder();
</span><del>- void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
</del><ins>+ void setWindowIsKey(bool);
</ins><span class="cx"> bool windowIsKey() const { return m_windowIsKey; }
</span><span class="cx">
</span><span class="cx"> bool viewSupportsOptions(const TestOptions&) const;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnereflPlatformWebViewEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -82,6 +82,11 @@
</span><span class="cx"> ecore_evas_free(m_window);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+ m_windowIsKey = isKey;
+}
+
</ins><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Don't we need to resize the window too?
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -58,6 +58,11 @@
</span><span class="cx"> gtk_widget_destroy(m_window);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+ m_windowIsKey = isKey;
+}
+
</ins><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -55,9 +55,10 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> - (BOOL)isKeyWindow
</span><span class="cx"> {
</span><del>- return _platformWebView ? _platformWebView->windowIsKey() : YES;
</del><ins>+ return [super isKeyWindow] && (_platformWebView ? _platformWebView->windowIsKey() : YES);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setFrameOrigin:(CGPoint)point
</span><span class="lines">@@ -107,14 +108,27 @@
</span><span class="cx"> CGRect rect = CGRectMake(0, 0, TestController::viewWidth, TestController::viewHeight);
</span><span class="cx"> m_view = [[WKWebView alloc] initWithFrame:rect configuration:configuration];
</span><span class="cx">
</span><del>- CGRect windowRect = rect;
- m_window = [[WebKitTestRunnerWindow alloc] initWithFrame:windowRect];
</del><ins>+ m_window = [[WebKitTestRunnerWindow alloc] initWithFrame:rect];
</ins><span class="cx"> m_window.platformWebView = this;
</span><span class="cx">
</span><span class="cx"> [m_window addSubview:m_view];
</span><span class="cx"> [m_window makeKeyAndVisible];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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];
+}
+
</ins><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span><span class="lines">@@ -123,13 +137,6 @@
</span><span class="cx"> setWindowFrame(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PlatformWebView::~PlatformWebView()
-{
- m_window.platformWebView = 0;
- [m_view release];
- [m_window release];
-}
-
</del><span class="cx"> WKPageRef PlatformWebView::page()
</span><span class="cx"> {
</span><span class="cx"> return [m_view _pageForTesting];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (189958 => 189959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2015-09-18 01:58:37 UTC (rev 189958)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2015-09-18 01:58:40 UTC (rev 189959)
</span><span class="lines">@@ -145,6 +145,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+ m_windowIsKey = isKey;
+}
+
</ins><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span></span></pre>
</div>
</div>
</body>
</html>