<!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>[188548] 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/188548">188548</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 15:49:42 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify how PlatformWebViews are created when view options change
https://bugs.webkit.org/show_bug.cgi?id=148093
Reviewed by Sam Weinig.
Instead of letting each port dictate when the PlatformWebView should be recreated we now do the following:
TestController::ensureViewSupportsOptionsForTest gets the view options for a test by calling
TestController::viewOptionsForTest, which returns a filled in ViewOptions struct for a given test. It also allows
ports to add/override settings by calling TestController::updatePlatformSpecificViewOptionsForTest.
If the current PlatformWebView doesn't support the given view options, delete the web view and create a new one.
Also, get rid of the first call to TestController::createWebViewWithOptions in TestController::initialize and
always rely on TestController::ensureViewSupportsOptionsForTest creating a PlatformWebView for us.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::ensureViewSupportsOptionsForTest):
(WTR::shouldUseFixedLayout):
(WTR::TestController::viewOptionsForTest):
(WTR::TestController::updateWebViewSizeForTest):
(WTR::TestController::updateWindowScaleForTest):
(WTR::TestController::configureViewForTest):
(WTR::TestController::initialize): Deleted.
(WTR::TestController::ensureViewSupportsOptions): Deleted.
(WTR::TestController::updateLayoutTypeForTest): Deleted.
(WTR::TestController::platformConfigureViewForTest): Deleted.
(WTR::TestController::platformResetPreferencesToConsistentValues): Deleted.
(WTR::TestController::run): Deleted.
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/efl/TestControllerEfl.cpp:
(WTR::shouldUseFixedLayout):
(WTR::TestController::updatePlatformSpecificViewOptionsForTest):
(WTR::TestController::platformConfigureViewForTest):
(WTR::TestController::platformResetPreferencesToConsistentValues):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::updatePlatformSpecificViewOptionsForTest):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::updatePlatformSpecificViewOptionsForTest):
(WTR::TestController::platformConfigureViewForTest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnereflTestControllerEflcpp">trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/ChangeLog 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-08-17 Anders Carlsson <andersca@apple.com>
+
+ Simplify how PlatformWebViews are created when view options change
+ https://bugs.webkit.org/show_bug.cgi?id=148093
+
+ Reviewed by Sam Weinig.
+
+ Instead of letting each port dictate when the PlatformWebView should be recreated we now do the following:
+
+ TestController::ensureViewSupportsOptionsForTest gets the view options for a test by calling
+ TestController::viewOptionsForTest, which returns a filled in ViewOptions struct for a given test. It also allows
+ ports to add/override settings by calling TestController::updatePlatformSpecificViewOptionsForTest.
+
+ If the current PlatformWebView doesn't support the given view options, delete the web view and create a new one.
+
+ Also, get rid of the first call to TestController::createWebViewWithOptions in TestController::initialize and
+ always rely on TestController::ensureViewSupportsOptionsForTest creating a PlatformWebView for us.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::ensureViewSupportsOptionsForTest):
+ (WTR::shouldUseFixedLayout):
+ (WTR::TestController::viewOptionsForTest):
+ (WTR::TestController::updateWebViewSizeForTest):
+ (WTR::TestController::updateWindowScaleForTest):
+ (WTR::TestController::configureViewForTest):
+ (WTR::TestController::initialize): Deleted.
+ (WTR::TestController::ensureViewSupportsOptions): Deleted.
+ (WTR::TestController::updateLayoutTypeForTest): Deleted.
+ (WTR::TestController::platformConfigureViewForTest): Deleted.
+ (WTR::TestController::platformResetPreferencesToConsistentValues): Deleted.
+ (WTR::TestController::run): Deleted.
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/efl/TestControllerEfl.cpp:
+ (WTR::shouldUseFixedLayout):
+ (WTR::TestController::updatePlatformSpecificViewOptionsForTest):
+ (WTR::TestController::platformConfigureViewForTest):
+ (WTR::TestController::platformResetPreferencesToConsistentValues):
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::updatePlatformSpecificViewOptionsForTest):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::updatePlatformSpecificViewOptionsForTest):
+ (WTR::TestController::platformConfigureViewForTest):
+
</ins><span class="cx"> 2015-08-17 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> API::PageConfiguration's sessionID needs to be set whenever the API::WebsiteDataStore is set
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -432,12 +432,6 @@
</span><span class="cx">
</span><span class="cx"> // Some preferences (notably mock scroll bars setting) currently cannot be re-applied to an existing view, so we need to set them now.
</span><span class="cx"> resetPreferencesToConsistentValues();
</span><del>-
- ViewOptions viewOptions;
- viewOptions.useRemoteLayerTree = m_shouldUseRemoteLayerTree;
- viewOptions.shouldShowWebView = m_shouldShowWebView;
-
- createWebViewWithOptions(viewOptions);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::createWebViewWithOptions(const ViewOptions& options)
</span><span class="lines">@@ -543,18 +537,25 @@
</span><span class="cx"> m_mainWebView->changeWindowScaleIfNeeded(1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::ensureViewSupportsOptions(const ViewOptions& options)
</del><ins>+void TestController::ensureViewSupportsOptionsForTest(const TestInvocation& test)
</ins><span class="cx"> {
</span><del>- if (m_mainWebView && !m_mainWebView->viewSupportsOptions(options)) {
- WKPageSetPageUIClient(m_mainWebView->page(), 0);
- WKPageSetPageNavigationClient(m_mainWebView->page(), 0);
</del><ins>+ auto viewOptions = viewOptionsForTest(test);
+
+ if (m_mainWebView) {
+ if (m_mainWebView->viewSupportsOptions(viewOptions))
+ return;
+
+ WKPageSetPageUIClient(m_mainWebView->page(), nullptr);
+ WKPageSetPageNavigationClient(m_mainWebView->page(), nullptr);
</ins><span class="cx"> WKPageClose(m_mainWebView->page());
</span><del>-
- m_mainWebView = nullptr;
</del><span class="cx">
</span><del>- createWebViewWithOptions(options);
- resetStateToConsistentValues();
</del><ins>+ m_mainWebView = nullptr;
</ins><span class="cx"> }
</span><ins>+
+ createWebViewWithOptions(viewOptions);
+
+ if (!resetStateToConsistentValues())
+ TestInvocation::dumpWebProcessUnresponsiveness("<unknown> - TestController::run - Failed to reset state to consistent values\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::resetPreferencesToConsistentValues()
</span><span class="lines">@@ -747,67 +748,54 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::updateWebViewSizeForTest(const TestInvocation& test)
-{
- bool isSVGW3CTest = test.urlContains("svg/W3C-SVG-1.1") || test.urlContains("svg\\W3C-SVG-1.1");
-
- unsigned width = viewWidth;
- unsigned height = viewHeight;
- if (isSVGW3CTest) {
- width = w3cSVGViewWidth;
- height = w3cSVGViewHeight;
- }
-
- mainWebView()->resizeTo(width, height);
-}
-
-void TestController::updateWindowScaleForTest(PlatformWebView* view, const TestInvocation& test)
-{
- bool needsHighDPIWindow = test.urlContains("/hidpi-");
- view->changeWindowScaleIfNeeded(needsHighDPIWindow ? 2 : 1);
-}
-
-// FIXME: move into relevant platformConfigureViewForTest()?
</del><span class="cx"> static bool shouldUseFixedLayout(const TestInvocation& test)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><del>- if (test.urlContains("device-adapt/") || test.urlContains("device-adapt\\"))
- return true;
</del><ins>+ if (test.urlContains("device-adapt/") || test.urlContains("device-adapt\\"))
+ return true;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS) && PLATFORM(EFL)
- if (test.urlContains("sticky/") || test.urlContains("sticky\\"))
- return true;
-#endif
</del><span class="cx"> return false;
</span><del>-
- UNUSED_PARAM(test);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::updateLayoutTypeForTest(const TestInvocation& test)
</del><ins>+ViewOptions TestController::viewOptionsForTest(const TestInvocation& test) const
</ins><span class="cx"> {
</span><span class="cx"> ViewOptions viewOptions;
</span><span class="cx">
</span><ins>+ viewOptions.useRemoteLayerTree = m_shouldUseRemoteLayerTree;
+ viewOptions.shouldShowWebView = m_shouldShowWebView;
</ins><span class="cx"> viewOptions.useFixedLayout = shouldUseFixedLayout(test);
</span><span class="cx">
</span><del>- ensureViewSupportsOptions(viewOptions);
</del><ins>+ updatePlatformSpecificViewOptionsForTest(viewOptions, test);
+
+ return viewOptions;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA) && !PLATFORM(GTK)
-void TestController::platformConfigureViewForTest(const TestInvocation&)
</del><ins>+void TestController::updateWebViewSizeForTest(const TestInvocation& test)
</ins><span class="cx"> {
</span><ins>+ bool isSVGW3CTest = test.urlContains("svg/W3C-SVG-1.1") || test.urlContains("svg\\W3C-SVG-1.1");
+
+ unsigned width = viewWidth;
+ unsigned height = viewHeight;
+ if (isSVGW3CTest) {
+ width = w3cSVGViewWidth;
+ height = w3cSVGViewHeight;
+ }
+
+ mainWebView()->resizeTo(width, height);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::platformResetPreferencesToConsistentValues()
</del><ins>+void TestController::updateWindowScaleForTest(PlatformWebView* view, const TestInvocation& test)
</ins><span class="cx"> {
</span><ins>+ bool needsHighDPIWindow = test.urlContains("/hidpi-");
+ view->changeWindowScaleIfNeeded(needsHighDPIWindow ? 2 : 1);
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void TestController::configureViewForTest(const TestInvocation& test)
</span><span class="cx"> {
</span><ins>+ ensureViewSupportsOptionsForTest(test);
</ins><span class="cx"> updateWebViewSizeForTest(test);
</span><span class="cx"> updateWindowScaleForTest(mainWebView(), test);
</span><del>- updateLayoutTypeForTest(test);
</del><span class="cx">
</span><span class="cx"> platformConfigureViewForTest(test);
</span><span class="cx"> }
</span><span class="lines">@@ -935,11 +923,6 @@
</span><span class="cx">
</span><span class="cx"> void TestController::run()
</span><span class="cx"> {
</span><del>- if (!resetStateToConsistentValues()) {
- TestInvocation::dumpWebProcessUnresponsiveness("<unknown> - TestController::run - Failed to reset state to consistent values\n");
- return;
- }
-
</del><span class="cx"> if (m_usingServerMode)
</span><span class="cx"> runTestingServerLoop();
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx">
</span><span class="cx"> EventSenderProxy* eventSenderProxy() { return m_eventSenderProxy.get(); }
</span><span class="cx">
</span><del>- void ensureViewSupportsOptions(const ViewOptions&);
</del><span class="cx"> bool shouldUseRemoteLayerTree() const { return m_shouldUseRemoteLayerTree; }
</span><span class="cx">
</span><span class="cx"> // Runs the run loop until `done` is true or the timeout elapses.
</span><span class="lines">@@ -142,9 +141,12 @@
</span><span class="cx"> void initializeInjectedBundlePath();
</span><span class="cx"> void initializeTestPluginDirectory();
</span><span class="cx">
</span><ins>+ void ensureViewSupportsOptionsForTest(const TestInvocation&);
+ ViewOptions viewOptionsForTest(const TestInvocation&) const;
+ void updatePlatformSpecificViewOptionsForTest(ViewOptions&, const TestInvocation&) const;
+
</ins><span class="cx"> void updateWebViewSizeForTest(const TestInvocation&);
</span><span class="cx"> void updateWindowScaleForTest(PlatformWebView*, const TestInvocation&);
</span><del>- void updateLayoutTypeForTest(const TestInvocation&);
</del><span class="cx">
</span><span class="cx"> void decidePolicyForGeolocationPermissionRequestIfPossible();
</span><span class="cx"> void decidePolicyForUserMediaPermissionRequestIfPossible();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnereflTestControllerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "TestController.h"
</span><span class="cx">
</span><span class="cx"> #include "PlatformWebView.h"
</span><ins>+#include "TestInvocation.h"
</ins><span class="cx"> #include <Ecore.h>
</span><span class="cx"> #include <Evas.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="lines">@@ -132,4 +133,26 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldUseFixedLayout(const TestInvocation& test)
+{
+#if USE(COORDINATED_GRAPHICS)
+ if (test.urlContains("sticky/") || test.urlContains("sticky\\"))
+ return true;
+#endif
+ return false;
+}
+
+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions& viewOptions, const TestInvocation& test) const
+{
+ viewOptions.useFixedLayout = shouldUseFixedLayout(test);
+}
+
+void TestController::platformConfigureViewForTest(const TestInvocation&)
+{
+}
+
+void TestController::platformResetPreferencesToConsistentValues()
+{
+}
+
</ins><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -98,6 +98,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions&, const TestInvocation&) const
+{
+}
+
</ins><span class="cx"> void TestController::platformRunUntil(bool& done, double timeout)
</span><span class="cx"> {
</span><span class="cx"> NSDate *endDate = (timeout > 0) ? [NSDate dateWithTimeIntervalSinceNow:timeout] : [NSDate distantFuture];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (188547 => 188548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-08-17 22:27:56 UTC (rev 188547)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-08-17 22:49:42 UTC (rev 188548)
</span><span class="lines">@@ -96,16 +96,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::platformConfigureViewForTest(const TestInvocation& test)
</del><ins>+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions& viewOptions, const TestInvocation& test) const
</ins><span class="cx"> {
</span><del>- ViewOptions viewOptions;
-
</del><span class="cx"> viewOptions.useThreadedScrolling = shouldUseThreadedScrolling(test);
</span><span class="cx"> viewOptions.useRemoteLayerTree = shouldUseRemoteLayerTree();
</span><span class="cx"> viewOptions.shouldShowWebView = shouldShowWebView();
</span><ins>+}
</ins><span class="cx">
</span><del>- ensureViewSupportsOptions(viewOptions);
-
</del><ins>+void TestController::platformConfigureViewForTest(const TestInvocation& test)
+{
</ins><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> if (!test.urlContains("contentextensions/"))
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>