<!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>[209972] 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/209972">209972</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-12-18 00:11:48 -0800 (Sun, 18 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix iOS test results after <a href="http://trac.webkit.org/projects/webkit/changeset/209967">r209967</a>.
Subtracting out the status bar height was erroneously happening for all tests,
not just for flexible viewport tests.
Fix by plumbing WebViewSizingMode through resizeTo() and setWindowFrame().
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
* WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::setWindowFrame):
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::setWindowFrame):
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::setWindowFrame):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformConfigureViewForTest):
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::setWindowFrame):</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="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</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="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.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 (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/ChangeLog 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-12-17 Simon Fraser <simon.fraser@apple.com>
+
+ Fix iOS test results after r209967.
+
+ Subtracting out the status bar height was erroneously happening for all tests,
+ not just for flexible viewport tests.
+
+ Fix by plumbing WebViewSizingMode through resizeTo() and setWindowFrame().
+
+ * WebKitTestRunner/PlatformWebView.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+ (WTR::PlatformWebView::resizeTo):
+ (WTR::PlatformWebView::setWindowFrame):
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+ (WTR::PlatformWebView::resizeTo):
+ (WTR::PlatformWebView::setWindowFrame):
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+ (WTR::PlatformWebView::resizeTo):
+ (WTR::PlatformWebView::setWindowFrame):
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::resizeTo):
+ (WTR::PlatformWebView::setWindowFrame):
+
</ins><span class="cx"> 2016-12-17 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] bump EFL version to 1.18.4
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -67,11 +67,17 @@
</span><span class="cx"> PlatformWKView platformView() { return m_view; }
</span><span class="cx"> PlatformWindow platformWindow() { return m_window; }
</span><span class="cx"> static PlatformWindow keyWindow();
</span><del>- void resizeTo(unsigned width, unsigned height);
</del><ins>+
+ enum class WebViewSizingMode {
+ Default,
+ HeightRespectsStatusBar
+ };
+
+ void resizeTo(unsigned width, unsigned height, WebViewSizingMode = WebViewSizingMode::Default);
</ins><span class="cx"> void focus();
</span><span class="cx">
</span><span class="cx"> WKRect windowFrame();
</span><del>- void setWindowFrame(WKRect);
</del><ins>+ void setWindowFrame(WKRect, WebViewSizingMode = WebViewSizingMode::Default);
</ins><span class="cx">
</span><span class="cx"> void didInitializeClients();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> WKPageClearWheelEventTestTrigger(m_mainWebView->page());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL)
</span><del>- // EFL use a real window while other ports such as Qt don't.
</del><ins>+ // EFL uses a real window while other ports such as Qt don't.
</ins><span class="cx"> // In EFL, we need to resize the window to the original size after calls to window.resizeTo.
</span><span class="cx"> WKRect rect = m_mainWebView->windowFrame();
</span><span class="cx"> m_mainWebView->setWindowFrame(WKRectMake(rect.origin.x, rect.origin.y, TestController::viewWidth, TestController::viewHeight));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnereflPlatformWebViewEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> m_windowIsKey = isKey;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::resizeTo(unsigned width, unsigned height)
</del><ins>+void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Don't we need to resize the window too?
</span><span class="cx"> evas_object_resize(m_view, width, height);
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> return WKRectMake(x, y, width, height);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::setWindowFrame(WKRect frame)
</del><ins>+void PlatformWebView::setWindowFrame(WKRect frame, WebViewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> ecore_evas_move_resize(m_window, frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
</span><span class="cx"> evas_object_resize(m_view, frame.size.width, frame.size.height);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -64,12 +64,12 @@
</span><span class="cx"> m_windowIsKey = isKey;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::resizeTo(unsigned width, unsigned height)
</del><ins>+void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode sizingMode)
</ins><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span><span class="cx"> frame.size.width = width;
</span><span class="cx"> frame.size.height = height;
</span><del>- setWindowFrame(frame);
</del><ins>+ setWindowFrame(frame, sizingMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPageRef PlatformWebView::page()
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> return frame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::setWindowFrame(WKRect frame)
</del><ins>+void PlatformWebView::setWindowFrame(WKRect frame, WebViewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> gdk_window_move_resize(gtk_widget_get_window(GTK_WIDGET(m_window)),
</span><span class="cx"> frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -114,10 +114,10 @@
</span><span class="cx"> HeightRespectsStatusBar
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static CGRect viewRectForWindowRect(CGRect windowRect, WebViewSizingMode mode)
</del><ins>+static CGRect viewRectForWindowRect(CGRect windowRect, PlatformWebView::WebViewSizingMode mode)
</ins><span class="cx"> {
</span><span class="cx"> CGFloat statusBarBottom = CGRectGetMaxY([[UIApplication sharedApplication] statusBarFrame]);
</span><del>- return CGRectMake(windowRect.origin.x, windowRect.origin.y + statusBarBottom, windowRect.size.width, windowRect.size.height - (mode == WebViewSizingMode::HeightRespectsStatusBar ? statusBarBottom : 0));
</del><ins>+ return CGRectMake(windowRect.origin.x, windowRect.origin.y + statusBarBottom, windowRect.size.width, windowRect.size.height - (mode == PlatformWebView::WebViewSizingMode::HeightRespectsStatusBar ? statusBarBottom : 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const TestOptions& options)
</span><span class="lines">@@ -166,12 +166,12 @@
</span><span class="cx"> [m_window makeKeyWindow];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::resizeTo(unsigned width, unsigned height)
</del><ins>+void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode viewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span><span class="cx"> frame.size.width = width;
</span><span class="cx"> frame.size.height = height;
</span><del>- setWindowFrame(frame);
</del><ins>+ setWindowFrame(frame, viewSizingMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPageRef PlatformWebView::page()
</span><span class="lines">@@ -197,10 +197,10 @@
</span><span class="cx"> return wkFrame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::setWindowFrame(WKRect frame)
</del><ins>+void PlatformWebView::setWindowFrame(WKRect frame, WebViewSizingMode viewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> [m_window setFrame:CGRectMake(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height)];
</span><del>- [platformView() setFrame:viewRectForWindowRect(CGRectMake(0, 0, frame.size.width, frame.size.height), WebViewSizingMode::HeightRespectsStatusBar)];
</del><ins>+ [platformView() setFrame:viewRectForWindowRect(CGRectMake(0, 0, frame.size.width, frame.size.height), viewSizingMode)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::didInitializeClients()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (test.options().useFlexibleViewport) {
</span><span class="cx"> CGRect screenBounds = [UIScreen mainScreen].bounds;
</span><del>- mainWebView()->resizeTo(screenBounds.size.width, screenBounds.size.height);
</del><ins>+ mainWebView()->resizeTo(screenBounds.size.width, screenBounds.size.height, PlatformWebView::WebViewSizingMode::HeightRespectsStatusBar);
</ins><span class="cx"> // We also pass data to InjectedBundle::beginTesting() to have it call
</span><span class="cx"> // WKBundlePageSetUseTestingViewportConfiguration(false).
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (209971 => 209972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-12-18 08:11:45 UTC (rev 209971)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-12-18 08:11:48 UTC (rev 209972)
</span><span class="lines">@@ -164,12 +164,12 @@
</span><span class="cx"> m_windowIsKey = isKey;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::resizeTo(unsigned width, unsigned height)
</del><ins>+void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode sizingMode)
</ins><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span><span class="cx"> frame.size.width = width;
</span><span class="cx"> frame.size.height = height;
</span><del>- setWindowFrame(frame);
</del><ins>+ setWindowFrame(frame, sizingMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformWebView::~PlatformWebView()
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return wkFrame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformWebView::setWindowFrame(WKRect frame)
</del><ins>+void PlatformWebView::setWindowFrame(WKRect frame, WebViewSizingMode)
</ins><span class="cx"> {
</span><span class="cx"> [m_window setFrame:NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height) display:YES];
</span><span class="cx"> [platformView() setFrame:NSMakeRect(0, 0, frame.size.width, frame.size.height)];
</span></span></pre>
</div>
</div>
</body>
</html>