<!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>[189958] 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/189958">189958</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 18:58:37 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] When loading viewport tests, use the normal web page viewport configuration
https://bugs.webkit.org/show_bug.cgi?id=149321
Reviewed by Tim Horton.
InjectedBundlePage::platformDidStartProvisionalLoadForFrame() unconditionally
enabled the "testing" viewport configuration, which disables page scaling.
If we're running viewport tests, we want the normal web page configuration.
Do that by passing a flag in the dictionary sent to InjectedBundle::beginTesting(),
based on whether the test is in a "viewport" directory.
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
(WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame): Deleted.
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::shouldLogFrameLoadDelegates):
(WTR::TestInvocation::shouldLogHistoryClientCallbacks):
(WTR::TestInvocation::shouldMakeViewportFlexible):
(WTR::TestInvocation::invoke):
* WebKitTestRunner/TestInvocation.h:
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformConfigureViewForTest):
(WTR::shouldMakeViewportFlexible): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm">trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationh">trunk/Tools/WebKitTestRunner/TestInvocation.h</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/ChangeLog 2015-09-18 01:58:37 UTC (rev 189958)
</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] When loading viewport tests, use the normal web page viewport configuration
+ https://bugs.webkit.org/show_bug.cgi?id=149321
+
+ Reviewed by Tim Horton.
+
+ InjectedBundlePage::platformDidStartProvisionalLoadForFrame() unconditionally
+ enabled the "testing" viewport configuration, which disables page scaling.
+
+ If we're running viewport tests, we want the normal web page configuration.
+ Do that by passing a flag in the dictionary sent to InjectedBundle::beginTesting(),
+ based on whether the test is in a "viewport" directory.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
+ (WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame): Deleted.
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::shouldLogFrameLoadDelegates):
+ (WTR::TestInvocation::shouldLogHistoryClientCallbacks):
+ (WTR::TestInvocation::shouldMakeViewportFlexible):
+ (WTR::TestInvocation::invoke):
+ * WebKitTestRunner/TestInvocation.h:
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+ (WTR::shouldMakeViewportFlexible): Deleted.
+
+2015-09-17 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Give iOS WebKitTestRunner a launch storyboard
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149314
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-09-18 01:58:37 UTC (rev 189958)
</span><span class="lines">@@ -283,6 +283,10 @@
</span><span class="cx">
</span><span class="cx"> WKBundlePageRemoveAllUserContent(page()->page());
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ WKBundlePageSetUseTestingViewportConfiguration(page()->page(), !booleanForKey(settings, "UseFlexibleViewport"));
+#endif
+
</ins><span class="cx"> m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
</span><span class="cx"> m_testRunner->setUserStyleSheetEnabled(false);
</span><span class="cx"> m_testRunner->setXSSAuditorEnabled(false);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2015-09-18 01:58:37 UTC (rev 189958)
</span><span class="lines">@@ -43,10 +43,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setCrashReportApplicationSpecificInformationToURL(InjectedBundle::singleton().testRunner()->testURL());
</span><del>-
-#if PLATFORM(IOS)
- WKBundlePageSetUseTestingViewportConfiguration(page(), true);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String InjectedBundlePage::platformResponseMimeType(WKURLResponseRef response)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2015-09-18 01:58:37 UTC (rev 189958)
</span><span class="lines">@@ -132,16 +132,21 @@
</span><span class="cx"> m_expectedPixelHash = expectedPixelHash;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool TestInvocation::shouldLogFrameLoadDelegates()
</del><ins>+bool TestInvocation::shouldLogFrameLoadDelegates() const
</ins><span class="cx"> {
</span><span class="cx"> return urlContains("loading/");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool TestInvocation::shouldLogHistoryClientCallbacks()
</del><ins>+bool TestInvocation::shouldLogHistoryClientCallbacks() const
</ins><span class="cx"> {
</span><span class="cx"> return urlContains("globalhistory/");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TestInvocation::shouldMakeViewportFlexible() const
+{
+ return urlContains("viewport/");
+}
+
</ins><span class="cx"> void TestInvocation::invoke()
</span><span class="cx"> {
</span><span class="cx"> TestController::singleton().configureViewForTest(*this);
</span><span class="lines">@@ -163,6 +168,10 @@
</span><span class="cx"> WKRetainPtr<WKBooleanRef> dumpFrameLoadDelegatesValue = adoptWK(WKBooleanCreate(shouldLogFrameLoadDelegates()));
</span><span class="cx"> WKDictionarySetItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
</span><span class="cx">
</span><ins>+ WKRetainPtr<WKStringRef> useFlexibleViewportKey = adoptWK(WKStringCreateWithUTF8CString("UseFlexibleViewport"));
+ WKRetainPtr<WKBooleanRef> useFlexibleViewportValue = adoptWK(WKBooleanCreate(shouldMakeViewportFlexible()));
+ WKDictionarySetItem(beginTestMessageBody.get(), useFlexibleViewportKey.get(), useFlexibleViewportValue.get());
+
</ins><span class="cx"> WKRetainPtr<WKStringRef> dumpPixelsKey = adoptWK(WKStringCreateWithUTF8CString("DumpPixels"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> dumpPixelsValue = adoptWK(WKBooleanCreate(m_dumpPixels));
</span><span class="cx"> WKDictionarySetItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.h (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.h 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.h 2015-09-18 01:58:37 UTC (rev 189958)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> void didEndSwipe();
</span><span class="cx"> void didRemoveSwipeSnapshot();
</span><span class="cx">
</span><ins>+ bool shouldMakeViewportFlexible() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> void dumpResults();
</span><span class="cx"> static void dump(const char* textToStdout, const char* textToStderr = 0, bool seenError = false);
</span><span class="lines">@@ -70,8 +72,8 @@
</span><span class="cx">
</span><span class="cx"> static void forceRepaintDoneCallback(WKErrorRef, void* context);
</span><span class="cx">
</span><del>- bool shouldLogFrameLoadDelegates();
- bool shouldLogHistoryClientCallbacks();
</del><ins>+ bool shouldLogFrameLoadDelegates() const;
+ bool shouldLogHistoryClientCallbacks() const;
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> m_url;
</span><span class="cx"> WTF::String m_urlString;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (189957 => 189958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2015-09-18 01:48:17 UTC (rev 189957)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2015-09-18 01:58:37 UTC (rev 189958)
</span><span class="lines">@@ -74,11 +74,6 @@
</span><span class="cx"> m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldMakeViewportFlexible(const TestInvocation& test)
-{
- return test.urlContains("viewport/");
-}
-
</del><span class="cx"> void TestController::platformResetPreferencesToConsistentValues()
</span><span class="cx"> {
</span><span class="cx"> WKPreferencesRef preferences = platformPreferences();
</span><span class="lines">@@ -93,12 +88,13 @@
</span><span class="cx">
</span><span class="cx"> void TestController::platformConfigureViewForTest(const TestInvocation& test)
</span><span class="cx"> {
</span><del>- if (shouldMakeViewportFlexible(test)) {
</del><ins>+ if (test.shouldMakeViewportFlexible()) {
</ins><span class="cx"> const unsigned phoneViewHeight = 480;
</span><span class="cx"> const unsigned phoneViewWidth = 320;
</span><span class="cx">
</span><span class="cx"> mainWebView()->resizeTo(phoneViewWidth, phoneViewHeight);
</span><del>- // FIXME: more viewport config to do here.
</del><ins>+ // We also pass data to InjectedBundle::beginTesting() to have it call
+ // WKBundlePageSetUseTestingViewportConfiguration(false).
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>