Unreviewed, rolling out r189530 and r189534.
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Sep 2015 07:02:28 +0000 (07:02 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Sep 2015 07:02:28 +0000 (07:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148996

Caused assertion failures on Yosemite (Requested by litherum
on #webkit).

Reverted changesets:

"[WKTR] Allow changing the WKContextConfiguration between
successive tests"
https://bugs.webkit.org/show_bug.cgi?id=148833
http://trac.webkit.org/changeset/189530

"[Cocoa] Fix the tests after r189530"
http://trac.webkit.org/changeset/189534

Patch by Commit Queue <commit-queue@webkit.org> on 2015-09-09

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
Tools/ChangeLog
Tools/WebKitTestRunner/PlatformWebView.h
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestController.h
Tools/WebKitTestRunner/ViewOptions.h [moved from Tools/WebKitTestRunner/TestOptions.h with 92% similarity]
Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp
Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
Tools/WebKitTestRunner/ios/TestControllerIOS.mm
Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
Tools/WebKitTestRunner/mac/TestControllerMac.mm

index 7b39935..ed7c1cd 100644 (file)
@@ -1,3 +1,21 @@
+2015-09-09  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r189530 and r189534.
+        https://bugs.webkit.org/show_bug.cgi?id=148996
+
+        Caused assertion failures on Yosemite (Requested by litherum
+        on #webkit).
+
+        Reverted changesets:
+
+        "[WKTR] Allow changing the WKContextConfiguration between
+        successive tests"
+        https://bugs.webkit.org/show_bug.cgi?id=148833
+        http://trac.webkit.org/changeset/189530
+
+        "[Cocoa] Fix the tests after r189530"
+        http://trac.webkit.org/changeset/189534
+
 2015-09-08  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Cocoa] Fix the tests after r189530
index 52c8beb..9688c4c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef PlatformWebView_h
 #define PlatformWebView_h
 
-#include "TestOptions.h"
+#include "ViewOptions.h"
 #include <WebKit/WKRetainPtr.h>
 
 #if PLATFORM(COCOA)
@@ -57,9 +57,9 @@ namespace WTR {
 class PlatformWebView {
 public:
 #if PLATFORM(COCOA)
-    PlatformWebView(WKWebViewConfiguration*, const TestOptions&);
+    PlatformWebView(WKWebViewConfiguration*, const ViewOptions&);
 #else
-    PlatformWebView(WKPageConfigurationRef, const TestOptions&);
+    PlatformWebView(WKPageConfigurationRef, const ViewOptions&);
 #endif
     ~PlatformWebView();
 
@@ -80,10 +80,10 @@ public:
     void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
     bool windowIsKey() const { return m_windowIsKey; }
 
-    bool viewSupportsOptions(const TestOptions&) const;
+    bool viewSupportsOptions(const ViewOptions&) const;
 
     WKRetainPtr<WKImageRef> windowSnapshotImage();
-    const TestOptions& options() const { return m_options; }
+    const ViewOptions& options() const { return m_options; }
 
     void changeWindowScaleIfNeeded(float newScale);
     void setNavigationGesturesEnabled(bool);
@@ -98,7 +98,7 @@ private:
     PlatformWKView m_view;
     PlatformWindow m_window;
     bool m_windowIsKey;
-    const TestOptions m_options;
+    const ViewOptions m_options;
 
 #if PLATFORM(EFL)
     bool m_usingFixedLayout;
index bec727f..a6460aa 100644 (file)
@@ -368,10 +368,7 @@ void TestController::initialize(int argc, const char* argv[])
 
     WKRetainPtr<WKStringRef> pageGroupIdentifier(AdoptWK, WKStringCreateWithUTF8CString("WebKitTestRunnerPageGroup"));
     m_pageGroup.adopt(WKPageGroupCreateWithIdentifier(pageGroupIdentifier.get()));
-}
 
-WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfiguration() const
-{
     auto configuration = adoptWK(WKContextConfigurationCreate());
     WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
     WKContextConfigurationSetFullySynchronousModeIsAllowedForTesting(configuration.get(), true);
@@ -388,12 +385,7 @@ WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfigurat
         WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
         WKContextConfigurationSetMediaKeysStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaKeys").get());
     }
-    return configuration;
-}
-
-WKRetainPtr<WKPageConfigurationRef> TestController::generatePageConfiguration(WKContextConfigurationRef configuration)
-{
-    m_context = platformAdjustContext(adoptWK(WKContextCreateWithConfiguration(configuration)).get(), configuration);
+    m_context = platformAdjustContext(adoptWK(WKContextCreateWithConfiguration(configuration.get())).get(), configuration.get());
 
     m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
 
@@ -453,24 +445,18 @@ WKRetainPtr<WKPageConfigurationRef> TestController::generatePageConfiguration(WK
     if (m_forceComplexText)
         WKContextSetAlwaysUsesComplexTextCodePath(m_context.get(), true);
 
-    auto pageConfiguration = adoptWK(WKPageConfigurationCreate());
-    WKPageConfigurationSetContext(pageConfiguration.get(), m_context.get());
-    WKPageConfigurationSetPageGroup(pageConfiguration.get(), m_pageGroup.get());
-    WKPageConfigurationSetUserContentController(pageConfiguration.get(), adoptWK(WKUserContentControllerCreate()).get());
-    return pageConfiguration;
-}
-
-void TestController::createWebViewWithOptions(const TestOptions& options)
-{
-    auto contextConfiguration = generateContextConfiguration();
-    // Modify contextConfiguration here.
-    auto configuration = generatePageConfiguration(contextConfiguration.get());
+    m_configuration = adoptWK(WKPageConfigurationCreate());
+    WKPageConfigurationSetContext(m_configuration.get(), m_context.get());
+    WKPageConfigurationSetPageGroup(m_configuration.get(), m_pageGroup.get());
+    WKPageConfigurationSetUserContentController(m_configuration.get(), adoptWK(WKUserContentControllerCreate()).get());
 
     // Some preferences (notably mock scroll bars setting) currently cannot be re-applied to an existing view, so we need to set them now.
-    // FIXME: Migrate these preferences to WKContextConfigurationRef.
     resetPreferencesToConsistentValues();
+}
 
-    platformCreateWebView(configuration.get(), options);
+void TestController::createWebViewWithOptions(const ViewOptions& options)
+{
+    platformCreateWebView(m_configuration.get(), options);
     WKPageUIClientV6 pageUIClient = {
         { 6, m_mainWebView.get() },
         0, // createNewPage_deprecatedForUseWithV0
@@ -578,10 +564,10 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
 
 void TestController::ensureViewSupportsOptionsForTest(const TestInvocation& test)
 {
-    auto options = testOptionsForTest(test);
+    auto viewOptions = viewOptionsForTest(test);
 
     if (m_mainWebView) {
-        if (m_mainWebView->viewSupportsOptions(options))
+        if (m_mainWebView->viewSupportsOptions(viewOptions))
             return;
 
         WKPageSetPageUIClient(m_mainWebView->page(), nullptr);
@@ -591,7 +577,7 @@ void TestController::ensureViewSupportsOptionsForTest(const TestInvocation& test
         m_mainWebView = nullptr;
     }
 
-    createWebViewWithOptions(options);
+    createWebViewWithOptions(viewOptions);
 
     if (!resetStateToConsistentValues())
         TestInvocation::dumpWebProcessUnresponsiveness("<unknown> - TestController::run - Failed to reset state to consistent values\n");
@@ -822,7 +808,7 @@ static std::string testPath(const WKURLRef url)
     return std::string();
 }
 
-static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const TestInvocation& test)
+static void updateViewOptionsFromTestHeader(ViewOptions& viewOptions, const TestInvocation& test)
 {
     std::string filename = testPath(test.url());
     if (filename.empty())
@@ -856,24 +842,24 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const Test
         }
         auto key = pairString.substr(pairStart, equalsLocation - pairStart);
         auto value = pairString.substr(equalsLocation + 1, pairEnd - (equalsLocation + 1));
-        // Options processing to modify testOptions goes here.
+        // Options processing to modify viewOptions goes here.
         pairStart = pairEnd + 1;
     }
 }
 
-TestOptions TestController::testOptionsForTest(const TestInvocation& test) const
+ViewOptions TestController::viewOptionsForTest(const TestInvocation& test) const
 {
-    TestOptions options;
+    ViewOptions viewOptions;
 
-    options.useRemoteLayerTree = m_shouldUseRemoteLayerTree;
-    options.shouldShowWebView = m_shouldShowWebView;
-    options.useFixedLayout = shouldUseFixedLayout(test);
+    viewOptions.useRemoteLayerTree = m_shouldUseRemoteLayerTree;
+    viewOptions.shouldShowWebView = m_shouldShowWebView;
+    viewOptions.useFixedLayout = shouldUseFixedLayout(test);
 
-    updateTestOptionsFromTestHeader(options, test);
+    updateViewOptionsFromTestHeader(viewOptions, test);
 
-    updatePlatformSpecificTestOptionsForTest(options, test);
+    updatePlatformSpecificViewOptionsForTest(viewOptions, test);
 
-    return options;
+    return viewOptions;
 }
 
 void TestController::updateWebViewSizeForTest(const TestInvocation& test)
@@ -1781,12 +1767,12 @@ void TestController::platformWillRunTest(const TestInvocation&)
 {
 }
 
-void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const TestOptions& options)
+void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
 {
     m_mainWebView = std::make_unique<PlatformWebView>(configuration, options);
 }
 
-PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef configuration, const TestOptions& options)
+PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef configuration, const ViewOptions& options)
 {
     return new PlatformWebView(configuration, options);
 }
index a6d9af5..22f89d8 100644 (file)
@@ -41,7 +41,7 @@ namespace WTR {
 class TestInvocation;
 class PlatformWebView;
 class EventSenderProxy;
-struct TestOptions;
+struct ViewOptions;
 
 // FIXME: Rename this TestRunner?
 class TestController {
@@ -62,8 +62,8 @@ public:
 
     bool verbose() const { return m_verbose; }
 
-    WKStringRef injectedBundlePath() const { return m_injectedBundlePath.get(); }
-    WKStringRef testPluginDirectory() const { return m_testPluginDirectory.get(); }
+    WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); }
+    WKStringRef testPluginDirectory() { return m_testPluginDirectory.get(); }
 
     PlatformWebView* mainWebView() { return m_mainWebView.get(); }
     WKContextRef context() { return m_context.get(); }
@@ -129,10 +129,8 @@ public:
     void setNavigationGesturesEnabled(bool value);
 
 private:
-    WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(WKContextConfigurationRef);
-    WKRetainPtr<WKContextConfigurationRef> generateContextConfiguration() const;
     void initialize(int argc, const char* argv[]);
-    void createWebViewWithOptions(const TestOptions&);
+    void createWebViewWithOptions(const ViewOptions&);
     void run();
 
     void runTestingServerLoop();
@@ -142,8 +140,8 @@ private:
     void platformDestroy();
     WKContextRef platformAdjustContext(WKContextRef, WKContextConfigurationRef);
     void platformInitializeContext();
-    void platformCreateWebView(WKPageConfigurationRef, const TestOptions&);
-    static PlatformWebView* platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions&);
+    void platformCreateWebView(WKPageConfigurationRef, const ViewOptions&);
+    static PlatformWebView* platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const ViewOptions&);
     void platformResetPreferencesToConsistentValues();
     void platformResetStateToConsistentValues();
 #if PLATFORM(COCOA)
@@ -158,8 +156,8 @@ private:
     void initializeTestPluginDirectory();
 
     void ensureViewSupportsOptionsForTest(const TestInvocation&);
-    TestOptions testOptionsForTest(const TestInvocation&) const;
-    void updatePlatformSpecificTestOptionsForTest(TestOptions&, const TestInvocation&) const;
+    ViewOptions viewOptionsForTest(const TestInvocation&) const;
+    void updatePlatformSpecificViewOptionsForTest(ViewOptions&, const TestInvocation&) const;
 
     void updateWebViewSizeForTest(const TestInvocation&);
     void updateWindowScaleForTest(PlatformWebView*, const TestInvocation&);
@@ -260,6 +258,7 @@ private:
     std::unique_ptr<PlatformWebView> m_mainWebView;
     WKRetainPtr<WKContextRef> m_context;
     WKRetainPtr<WKPageGroupRef> m_pageGroup;
+    WKRetainPtr<WKPageConfigurationRef> m_configuration;
 
     enum State {
         Initial,
similarity index 92%
rename from Tools/WebKitTestRunner/TestOptions.h
rename to Tools/WebKitTestRunner/ViewOptions.h
index eb801ce..f460af7 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TestOptions_h
-#define TestOptions_h
+#ifndef ViewOptions_h
+#define ViewOptions_h
 
 namespace WTR {
 
-struct TestOptions {
+struct ViewOptions {
     bool useThreadedScrolling { false };
     bool useRemoteLayerTree { false };
     bool shouldShowWebView { false };
+    bool useTiledDrawing { false };
 
     bool useFixedLayout { false };
 };
 
 }
 
-#endif // TestOptions_h
+#endif // ViewOptions_h
index e8ca5ba..15cbf1c 100644 (file)
                0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundlePageCocoa.mm; sourceTree = "<group>"; };
                0FEB90A21905BC6A000FDBF3 /* CrashReporterInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrashReporterInfo.h; path = cocoa/CrashReporterInfo.h; sourceTree = "<group>"; };
                0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CrashReporterInfo.mm; path = cocoa/CrashReporterInfo.mm; sourceTree = "<group>"; };
-               1A3326051B75396500F89F62 /* TestOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestOptions.h; sourceTree = "<group>"; };
+               1A3326051B75396500F89F62 /* ViewOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewOptions.h; sourceTree = "<group>"; };
                26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationProviderMock.cpp; sourceTree = "<group>"; };
                26D758E6160BECDD00268472 /* GeolocationProviderMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationProviderMock.h; sourceTree = "<group>"; };
                29210EA2144CAAA500835BB5 /* AccessibilityController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityController.cpp; sourceTree = "<group>"; };
                                BC79342F118F7F19005EA8E2 /* TestController.h */,
                                BCD7D2F711921278006DB7EE /* TestInvocation.cpp */,
                                BCD7D2F611921278006DB7EE /* TestInvocation.h */,
-                               1A3326051B75396500F89F62 /* TestOptions.h */,
+                               1A3326051B75396500F89F62 /* ViewOptions.h */,
                                BC251A1711D16774002EBC01 /* WebKitTestRunnerPrefix.h */,
                                3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */,
                                3110BE0F15BA011400D216AC /* WebNotificationProvider.h */,
index 2fbea24..e653b89 100644 (file)
@@ -50,8 +50,7 @@ static WKWebViewConfiguration *globalWebViewConfiguration;
 void initializeWebViewConfiguration(const char* libraryPath, WKStringRef injectedBundlePath, WKContextRef context, WKContextConfigurationRef contextConfiguration)
 {
 #if WK_API_ENABLED
-    if (globalWebViewConfiguration)
-        [globalWebViewConfiguration release];
+    ASSERT(!globalWebViewConfiguration);
     globalWebViewConfiguration = [[WKWebViewConfiguration alloc] init];
 
     globalWebViewConfiguration.processPool = [[WKProcessPool alloc] _initWithConfiguration:(_WKProcessPoolConfiguration *)contextConfiguration];
@@ -75,12 +74,12 @@ WKPreferencesRef TestController::platformPreferences()
 #endif
 }
 
-void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOptions& options)
+void TestController::platformCreateWebView(WKPageConfigurationRef, const ViewOptions& options)
 {
     m_mainWebView = std::make_unique<PlatformWebView>(globalWebViewConfiguration, options);
 }
 
-PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions& options)
+PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const ViewOptions& options)
 {
 #if WK_API_ENABLED
     WKWebViewConfiguration *newConfiguration = [[globalWebViewConfiguration copy] autorelease];
index b222d60..d136aa5 100644 (file)
@@ -53,7 +53,7 @@ static Ecore_Evas* initEcoreEvas()
     return ecoreEvas;
 }
 
-PlatformWebView::PlatformWebView(WKPageConfigurationRef configuration, const TestOptions& options)
+PlatformWebView::PlatformWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
     : m_options(options)
 {
     WKRetainPtr<WKStringRef> useFixedLayoutKey(AdoptWK, WKStringCreateWithUTF8CString("UseFixedLayout"));
@@ -144,7 +144,7 @@ WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
     return adoptWK(WKViewCreateSnapshot(EWKViewGetWKView(m_view)));
 }
 
-bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
+bool PlatformWebView::viewSupportsOptions(const ViewOptions& options) const
 {
     if (m_options.useFixedLayout != options.useFixedLayout)
         return false;
index aaae88b..26741f5 100644 (file)
@@ -148,9 +148,9 @@ static bool shouldUseFixedLayout(const TestInvocation& test)
     return false;
 }
 
-void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions& testOptions, const TestInvocation& test) const
+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions& viewOptions, const TestInvocation& test) const
 {
-    testOptions.useFixedLayout = shouldUseFixedLayout(test);
+    viewOptions.useFixedLayout = shouldUseFixedLayout(test);
 }
 
 void TestController::platformConfigureViewForTest(const TestInvocation&)
index ff18f84..ad9b027 100644 (file)
@@ -36,7 +36,7 @@
 
 namespace WTR {
 
-PlatformWebView::PlatformWebView(WKPageConfigurationRef configuration, const TestOptions& options)
+PlatformWebView::PlatformWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
     : m_view(WKViewCreate(configuration))
     , m_window(gtk_window_new(GTK_WINDOW_POPUP))
     , m_windowIsKey(true)
@@ -142,7 +142,7 @@ void PlatformWebView::didInitializeClients()
 {
 }
 
-bool PlatformWebView::viewSupportsOptions(const TestOptions&) const
+bool PlatformWebView::viewSupportsOptions(const ViewOptions&) const
 {
     return true;
 }
index 0a7f8a9..d81ab5c 100644 (file)
@@ -128,7 +128,7 @@ void TestController::platformResetPreferencesToConsistentValues()
     m_mainWebView->dismissAllPopupMenus();
 }
 
-void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions&, const TestInvocation&) const
+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions&, const TestInvocation&) const
 {
 }
 
index 6a1f47a..2e9c511 100644 (file)
 
 namespace WTR {
 
-PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const TestOptions& options)
+PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const ViewOptions& options)
     : m_windowIsKey(true)
     , m_options(options)
 {
@@ -202,7 +202,7 @@ WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
     return nullptr;
 }
 
-bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
+bool PlatformWebView::viewSupportsOptions(const ViewOptions& options) const
 {
     return true;
 }
index f6a1d3c..167161e 100644 (file)
@@ -102,7 +102,7 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
     }
 }
 
-void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions&, const TestInvocation&) const
+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions&, const TestInvocation&) const
 {
 }
 
index e974dda..81a20cc 100644 (file)
@@ -114,7 +114,7 @@ enum {
 
 namespace WTR {
 
-PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const TestOptions& options)
+PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const ViewOptions& options)
     : m_windowIsKey(true)
     , m_options(options)
 {
@@ -240,7 +240,7 @@ WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
     return adoptWK(WKImageCreateFromCGImage(windowSnapshotImage.get(), 0));
 }
 
-bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
+bool PlatformWebView::viewSupportsOptions(const ViewOptions& options) const
 {
     if (m_options.useThreadedScrolling != options.useThreadedScrolling)
         return false;
index af393b2..8380a9f 100644 (file)
@@ -95,11 +95,11 @@ void TestController::platformResetStateToConsistentValues()
     }
 }
 
-void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions& options, const TestInvocation& test) const
+void TestController::updatePlatformSpecificViewOptionsForTest(ViewOptions& viewOptions, const TestInvocation& test) const
 {
-    options.useThreadedScrolling = shouldUseThreadedScrolling(test);
-    options.useRemoteLayerTree = shouldUseRemoteLayerTree();
-    options.shouldShowWebView = shouldShowWebView();
+    viewOptions.useThreadedScrolling = shouldUseThreadedScrolling(test);
+    viewOptions.useRemoteLayerTree = shouldUseRemoteLayerTree();
+    viewOptions.shouldShowWebView = shouldShowWebView();
 }
 
 void TestController::platformConfigureViewForTest(const TestInvocation& test)