Attachment 184551 Details for Bug 87149 – Patch

[patch] Patch

bug-87149-20130124121218.patch (text/plain), 45.98 KB, created by Tony Chang on 2013-01-24 12:15:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Chang

Created: 2013-01-24 12:15:26 PST

Size: 45.98 KB

patch

obsolete

>Subversion Revision: 140694
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 1259235d0071e9aac029d1f4262f131a4773eeed..3a5282a146b719256499170b87f77c610ae6577c 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,13 @@
>+2013-01-24  Tony Chang  <tony@chromium.org>
>+
>+        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=87149
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
>+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add setFrameFlatteningEnabled to the list of overridable values.
>+
> 2013-01-24  Christophe Dumez  <christophe.dumez@intel.com>
> 
>         [EFL][WK2] Use C API inside ewk_favicon_database
>diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
>index 89560b7e3efa70b79899f2906850195867b93a4b..1e798d635c159a639b55bf4f91a1a1db88bb1eb1 100644
>--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
>+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
>@@ -204,6 +204,7 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
>     macro(WebKitCanvasUsesAcceleratedDrawing, CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing) \
>     macro(WebKitCSSCustomFilterEnabled, CSSCustomFilterEnabled, cssCustomFilterEnabled) \
>     macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
>+    macro(WebKitFrameFlatteningEnabled, FrameFlatteningEnabled, frameFlatteningEnabled) \
>     macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
>     macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \
>     macro(WebKitLoadSiteIconsKey, LoadsSiteIconsIgnoringImageLoadingSetting, loadsSiteIconsIgnoringImageLoadingPreference) \
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 085fa1f61b41a699b0f74f75e4a2f728eaa6ad64..b2dff3670c5833b3388ace98dc8354a41fc3c9cc 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,42 @@
>+2013-01-24  Tony Chang  <tony@chromium.org>
>+
>+        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=87149
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove testRunner.setFrameFlatteningEnabled from DRT and WTR. WebKit API
>+        methods are left because there may be users of it. Add a test for Apple Mac
>+        to ensure that the API for the preference still works using overridePreference.
>+
>+        * DumpRenderTree/TestRunner.cpp:
>+        (TestRunner::staticFunctions):
>+        * DumpRenderTree/TestRunner.h:
>+        (TestRunner):
>+        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
>+        (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
>+        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
>+        * DumpRenderTree/efl/TestRunnerEfl.cpp:
>+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
>+        (resetDefaultsToConsistentValues):
>+        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
>+        * DumpRenderTree/mac/DumpRenderTree.mm:
>+        (resetDefaultsToConsistentValues):
>+        * DumpRenderTree/mac/TestRunnerMac.mm:
>+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
>+        (WebCore::WebPage::resetSettings):
>+        * DumpRenderTree/qt/TestRunnerQt.cpp:
>+        * DumpRenderTree/qt/TestRunnerQt.h:
>+        (TestRunner):
>+        * DumpRenderTree/win/DumpRenderTree.cpp:
>+        (resetDefaultsToConsistentValues):
>+        * DumpRenderTree/win/TestRunnerWin.cpp:
>+        * DumpRenderTree/wx/TestRunnerWx.cpp:
>+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
>+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
>+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
>+        (TestRunner):
>+
> 2013-01-24  Tim 'mithro' Ansell  <mithro@mithis.com>
> 
>         Adding "has-landed" command to webkit-patch which compares a
>diff --git a/Tools/DumpRenderTree/TestRunner.cpp b/Tools/DumpRenderTree/TestRunner.cpp
>index ec64c0fc89652fdbb85376f546eb78e6012d2689..030aa16a3e8a17dbd51b426b64bcc73fbd9ffa84 100644
>--- a/Tools/DumpRenderTree/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/TestRunner.cpp
>@@ -1299,18 +1299,6 @@ static JSValueRef setPrintingCallback(JSContextRef context, JSObjectRef function
> }
> 
> 
>-static JSValueRef setFrameFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
>-{
>-    // Has mac & windows implementation
>-    if (argumentCount < 1)
>-        return JSValueMakeUndefined(context);
>-
>-    TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
>-    controller->setFrameFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
>-
>-    return JSValueMakeUndefined(context);
>-}
>-
> static JSValueRef setAllowUniversalAccessFromFileURLsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
> {
>     // Has mac & windows implementation
>@@ -2276,7 +2264,6 @@ JSStaticFunction* TestRunner::staticFunctions()
>         { "setDefersLoading", setDefersLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setUseDeferredFrameLoading", setUseDeferredFrameLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setDomainRelaxationForbiddenForURLScheme", setDomainRelaxationForbiddenForURLSchemeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>-        { "setFrameFlatteningEnabled", setFrameFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setGeolocationPermission", setGeolocationPermissionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setHandlesAuthenticationChallenges", setHandlesAuthenticationChallengesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setIconDatabaseEnabled", setIconDatabaseEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>diff --git a/Tools/DumpRenderTree/TestRunner.h b/Tools/DumpRenderTree/TestRunner.h
>index 6795cae9f1c899b1acfb6113a8d92d685c7ca1db..2d27156cb809da22c425f39214b2099a25c41be4 100644
>--- a/Tools/DumpRenderTree/TestRunner.h
>+++ b/Tools/DumpRenderTree/TestRunner.h
>@@ -116,7 +116,6 @@ public:
>     void setValueForUser(JSContextRef, JSValueRef nodeObject, JSStringRef value);
>     void setViewModeMediaFeature(JSStringRef);
>     void setXSSAuditorEnabled(bool flag);
>-    void setFrameFlatteningEnabled(bool);
>     void setSpatialNavigationEnabled(bool);
>     void setScrollbarPolicy(JSStringRef orientation, JSStringRef policy);
>     void startSpeechInput(JSContextRef inputElement);
>diff --git a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
>index e4bfe3879d6eca202f5e95c1a414d6db2b13deb9..71652dcd1238a1364372b0983580bc02d2838105 100644
>--- a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
>+++ b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
>@@ -319,7 +319,6 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const String& url, cons
>     settings->setSansSerifFontFamily("Arial");
>     settings->setStandardFontFamily("Times");
>     settings->setXSSAuditorEnabled(false);
>-    settings->setFrameFlatteningEnabled(false);
>     settings->setMaximumPagesInCache(0);
>     settings->setPluginsEnabled(true);
> 
>diff --git a/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp b/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>index 2b1cef6285bc7ebee272bc3d1507b60fddf476a5..5c1394a481c79628ee1ab41f23a3be7262bfe9d5 100644
>--- a/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>+++ b/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>@@ -523,11 +523,6 @@ bool TestRunner::callShouldCloseOnWebView()
>     return false;
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enable)
>-{
>-    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setFrameFlatteningEnabled(enable);
>-}
>-
> void TestRunner::setSpatialNavigationEnabled(bool enable)
> {
>     notImplemented();
>diff --git a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>index 17faf48b57041c161691bbd9331719c9034d3360..730c562be28ab20d3962ae6162fd0aa835d15cda 100644
>--- a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>+++ b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>@@ -323,11 +323,6 @@ void TestRunner::setXSSAuditorEnabled(bool flag)
>     ewk_view_setting_enable_xss_auditor_set(browser->mainView(), flag);
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool flag)
>-{
>-    ewk_view_setting_enable_frame_flattening_set(browser->mainView(), flag);
>-}
>-
> void TestRunner::setSpatialNavigationEnabled(bool flag)
> {
>     ewk_view_setting_spatial_navigation_set(browser->mainView(), flag);
>diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>index fadc3ec76010af96a0ad34fa063e8af909eef905..11b8092394cd914b9275fd4373f532255bae6bb9 100644
>--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>@@ -445,7 +445,6 @@ static void resetDefaultsToConsistentValues()
>                  "html5-local-storage-database-path", localStoragePath.get(),
>                  "enable-xss-auditor", FALSE,
>                  "enable-spatial-navigation", FALSE,
>-                 "enable-frame-flattening", FALSE,
>                  "javascript-can-access-clipboard", TRUE,
>                  "javascript-can-open-windows-automatically", TRUE,
>                  "enable-offline-web-application-cache", TRUE,
>diff --git a/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp b/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>index e54bfef3b556ee4005fd44a4f617b6853d7ac526..46388d58d54ec908e14df4000c561c9dd81ffa7b 100644
>--- a/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>+++ b/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>@@ -387,15 +387,6 @@ void TestRunner::setXSSAuditorEnabled(bool flag)
>     g_object_set(G_OBJECT(settings), "enable-xss-auditor", flag, NULL);
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool flag)
>-{
>-    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
>-    ASSERT(view);
>-
>-    WebKitWebSettings* settings = webkit_web_view_get_settings(view);
>-    g_object_set(G_OBJECT(settings), "enable-frame-flattening", flag, NULL);
>-}
>-
> void TestRunner::setSpatialNavigationEnabled(bool flag)
> {
>     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>index 803ad159d185f8b7771e6e9553a6b77450bfde85..4361b30a4582fd49cf870c0307b99b143478e69c 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>@@ -662,7 +662,6 @@ static void resetDefaultsToConsistentValues()
>     [preferences setJavaScriptExperimentsEnabled:YES];
>     [preferences setLoadsImagesAutomatically:YES];
>     [preferences setLoadsSiteIconsIgnoringImageLoadingPreference:NO];
>-    [preferences setFrameFlatteningEnabled:NO];
>     [preferences setSpatialNavigationEnabled:NO];
>     if (persistentUserStyleSheetLocation) {
>         [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];
>diff --git a/Tools/DumpRenderTree/mac/TestRunnerMac.mm b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>index 5ea100b27f790440b5273c88c29c87db2ceede92..545d38a994b0f0723e504f8d8a627daa615f395e 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -554,11 +554,6 @@ void TestRunner::setXSSAuditorEnabled(bool enabled)
>     [[[mainFrame webView] preferences] setXSSAuditorEnabled:enabled];
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enabled)
>-{
>-    [[[mainFrame webView] preferences] setFrameFlatteningEnabled:enabled];
>-}
>-
> void TestRunner::setSpatialNavigationEnabled(bool enabled)
> {
>     [[[mainFrame webView] preferences] setSpatialNavigationEnabled:enabled];
>diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>index 2409b6ab78b11ef06fe940e518a45ce5331df935..b944b9971dc88cc3379b3052c44c1bba89075de2 100755
>--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>@@ -192,7 +192,6 @@ void WebPage::resetSettings()
> 
>     m_drt->testRunner()->setCaretBrowsingEnabled(false);
>     m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
>-    m_drt->testRunner()->setFrameFlatteningEnabled(false);
>     m_drt->testRunner()->setSmartInsertDeleteEnabled(true);
>     m_drt->testRunner()->setSelectTrailingWhitespaceEnabled(false);
>     m_drt->testRunner()->setDefersLoading(false);
>diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>index 4aa43040cee98d84c9b3bd48b3d6eaa786a92ece..0aeb6efd1c8a90f311755c357e3f3fccb3e7a75e 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>@@ -444,11 +444,6 @@ void TestRunner::evaluateInWebInspector(long callId, const QString& script)
>     DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script);
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enabled)
>-{
>-    DumpRenderTreeSupportQt::setFrameFlatteningEnabled(m_drt->pageAdapter(), enabled);
>-}
>-
> void TestRunner::goBack()
> {
>     DumpRenderTreeSupportQt::goBack(m_drt->pageAdapter());
>diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.h b/Tools/DumpRenderTree/qt/TestRunnerQt.h
>index 27194188eaf8185a9415a7ed562d644f64f0cf53..b1b3a1d1a23e2c560485be59015402e4df61a16d 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.h
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.h
>@@ -159,7 +159,6 @@ public Q_SLOTS:
>     void closeWebInspector();
>     void evaluateInWebInspector(long callId, const QString& script);
>     void removeAllVisitedLinks();
>-    void setFrameFlatteningEnabled(bool);
>     void setAllowUniversalAccessFromFileURLs(bool enable);
>     void setAllowFileAccessFromFileURLs(bool enable);
>     void setAppCacheMaximumSize(unsigned long long quota);
>diff --git a/Tools/DumpRenderTree/win/DumpRenderTree.cpp b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>index e9e84b848ae717f41ac96c4729dd29161a4cb2ea..5d19a4be26cdc3c79f2e1b28028becc223fec4e0 100644
>--- a/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>+++ b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>@@ -865,7 +865,6 @@ static void resetDefaultsToConsistentValues(IWebPreferences* preferences)
>         prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
>         prefsPrivate->setJavaScriptCanAccessClipboard(TRUE);
>         prefsPrivate->setXSSAuditorEnabled(FALSE);
>-        prefsPrivate->setFrameFlatteningEnabled(FALSE);
>         prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
>         prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
>     }
>diff --git a/Tools/DumpRenderTree/win/TestRunnerWin.cpp b/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>index 7516edb2f74e5d95afccf032443546b77cc64619..9d506aed05c266e5c13b2acfd5d28296cf2fe970 100644
>--- a/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>+++ b/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>@@ -476,23 +476,6 @@ void TestRunner::setXSSAuditorEnabled(bool enabled)
>     prefsPrivate->setXSSAuditorEnabled(enabled);
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enabled)
>-{
>-    COMPtr<IWebView> webView;
>-    if (FAILED(frame->webView(&webView)))
>-        return;
>-
>-    COMPtr<IWebPreferences> preferences;
>-    if (FAILED(webView->preferences(&preferences)))
>-        return;
>-
>-    COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
>-    if (!prefsPrivate)
>-        return;
>-
>-    prefsPrivate->setFrameFlatteningEnabled(enabled);
>-}
>-
> void TestRunner::setSpatialNavigationEnabled(bool enabled)
> {
>     // FIXME: Implement for SpatialNavigation layout tests.
>diff --git a/Tools/DumpRenderTree/wx/TestRunnerWx.cpp b/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>index f84652b418877cf22a9ef63fd583b1720c2e7212..18e861759383542667e55567cd60eeb25d7b4d75 100644
>--- a/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>+++ b/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>@@ -184,11 +184,6 @@ void TestRunner::setXSSAuditorEnabled(bool enabled)
>     // FIXME: implement
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enabled)
>-{
>-    // FIXME: implement
>-}
>-
> void TestRunner::setAllowUniversalAccessFromFileURLs(bool enabled)
> {
>     // FIXME: implement
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>index f2713c782cc92f41ecaf7ca1ffbf75159ed57338..82d2445ef1e6b9d43ffabaaf3eeb87559d4d53b4 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>@@ -56,7 +56,6 @@ interface TestRunner {
>     void setXSSAuditorEnabled(in boolean value);
>     void setAllowUniversalAccessFromFileURLs(in boolean value);
>     void setAllowFileAccessFromFileURLs(in boolean value);
>-    void setFrameFlatteningEnabled(in boolean value);
>     void setPluginsEnabled(in boolean value);
>     void setJavaScriptCanAccessClipboard(in boolean value);
>     void setPrivateBrowsingEnabled(in boolean value);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index b28d657954689bc920663d791a2d365e5d71ae95..688bcdd2f80f7640d3e4252cd44e3b92dfa4ec82 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>@@ -385,11 +385,6 @@ void TestRunner::setAllowFileAccessFromFileURLs(bool enabled)
>     WKBundleSetAllowFileAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
> }
> 
>-void TestRunner::setFrameFlatteningEnabled(bool enabled)
>-{
>-    WKBundleSetFrameFlatteningEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
>-}
>-
> void TestRunner::setPluginsEnabled(bool enabled)
> {
>     WKBundleSetPluginsEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>index 59ad12ee14bd71dbb0ec1f0061a491d640a65fc6..c2cfa206d0c15e23432e994f2fec11c1af4ab129 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>@@ -100,7 +100,6 @@ public:
>     void setXSSAuditorEnabled(bool);
>     void setAllowUniversalAccessFromFileURLs(bool);
>     void setAllowFileAccessFromFileURLs(bool);
>-    void setFrameFlatteningEnabled(bool);
>     void setPluginsEnabled(bool);
>     void setJavaScriptCanAccessClipboard(bool);
>     void setPrivateBrowsingEnabled(bool);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 4bee018028199d63c577b60f784450b030d443ca..5f740cf27aab1c4e55ae5c64ebbf4a8dc48fdfe2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,69 @@
>+2013-01-24  Tony Chang  <tony@chromium.org>
>+
>+        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=87149
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update tests to use internal.settings.setFrameFlatteningEnabled, which is automatically
>+        generated from Settings.in.
>+        Add a Mac only test that uses overridePreference to test the API.
>+
>+        * fast/frames/flattening/crash-svg-document.html:
>+        * fast/frames/flattening/frameset-flattening-advanced.html:
>+        * fast/frames/flattening/frameset-flattening-grid.html:
>+        * fast/frames/flattening/frameset-flattening-simple.html:
>+        * fast/frames/flattening/frameset-flattening-subframe-resize.html:
>+        * fast/frames/flattening/frameset-flattening-subframesets.html:
>+        * fast/frames/flattening/iframe-flattening-crash.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-height.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width.html:
>+        * fast/frames/flattening/iframe-flattening-nested.html:
>+        * fast/frames/flattening/iframe-flattening-offscreen.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view.html:
>+        * fast/frames/flattening/iframe-flattening-selection-crash.html:
>+        * fast/frames/flattening/iframe-flattening-simple.html:
>+        * fast/frames/flattening/iframe-tiny.html:
>+        * fast/spatial-navigation/snav-iframe-flattening-simple.html:
>+        * fast/text-autosizing/narrow-iframe-flattened.html:
>+        * http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
>+        * platform/chromium/TestExpectations: Chromium doesn't use frame flattening on mobile either.
>+        * plugins/frameset-with-plugin-frame.html:
>+        * fast/frames/flattening/crash-svg-document.html:
>+        * fast/frames/flattening/frameset-flattening-advanced.html:
>+        * fast/frames/flattening/frameset-flattening-grid.html:
>+        * fast/frames/flattening/frameset-flattening-simple.html:
>+        * fast/frames/flattening/frameset-flattening-subframe-resize.html:
>+        * fast/frames/flattening/frameset-flattening-subframesets.html:
>+        * fast/frames/flattening/iframe-flattening-crash.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-height.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
>+        * fast/frames/flattening/iframe-flattening-fixed-width.html:
>+        * fast/frames/flattening/iframe-flattening-nested.html:
>+        * fast/frames/flattening/iframe-flattening-offscreen.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
>+        * fast/frames/flattening/iframe-flattening-out-of-view.html:
>+        * fast/frames/flattening/iframe-flattening-selection-crash.html:
>+        * fast/frames/flattening/iframe-flattening-simple.html:
>+        * fast/frames/flattening/iframe-tiny.html:
>+        * fast/spatial-navigation/snav-iframe-flattening-simple.html:
>+        * fast/text-autosizing/narrow-iframe-flattened.html:
>+        * http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
>+        * platform/chromium/TestExpectations:
>+        * platform/mac/fast/frames/flattening/set-preference-expected.txt: Added.
>+        * platform/mac/fast/frames/flattening/set-preference.html: Added.
>+        * plugins/frameset-with-plugin-frame.html:
>+
> 2013-01-22  Robert Hogan  <robert@webkit.org>
> 
>         Inline Containing Only Collapsed Whitespace Not Getting a Linebox
>diff --git a/LayoutTests/fast/frames/flattening/crash-svg-document.html b/LayoutTests/fast/frames/flattening/crash-svg-document.html
>index e35e320976cd8ac12ef5709a4f85db1bc7f47bb6..8400e43daef6aa21feef14a8db2a083775383511 100644
>--- a/LayoutTests/fast/frames/flattening/crash-svg-document.html
>+++ b/LayoutTests/fast/frames/flattening/crash-svg-document.html
>@@ -1,8 +1,8 @@
> <body>
> <script>
> 
>-if (window.testRunner) {
>-    testRunner.setFrameFlatteningEnabled(true);
>+if (window.testRunner && window.internals) {
>+    internals.settings.setFrameFlatteningEnabled(true);
>     testRunner.dumpAsText();
> }
> 
>diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html b/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
>index 074c938fb9a03bf13211d2a982c1a006e96b2931..b8832adab2d23f14eb6fd204f7e2be8e011f79fc 100644
>--- a/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
>+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html b/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
>index e220943899af0875cf4c961a01fd6a0663100dc6..93462ff28f7321cc2629324753b737c31e53b21d 100644
>--- a/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
>+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>     function test()
>     {
>-        if (window.testRunner)
>-            testRunner.setFrameFlatteningEnabled(true);
>+        if (window.internals)
>+            internals.settings.setFrameFlatteningEnabled(true);
>         // Force synchronous layout.
>         document.body.offsetHeight;
>     }
>diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html b/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
>index 35dab791c8dcc2baba982aadb1a77142e6949c5d..59d57d47622e26bc1970ce8f75fe72fc7c73c64a 100644
>--- a/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
>+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
>@@ -1,9 +1,9 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
> 
>         function test()
>diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html b/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
>index 329da7b1276d10c712b2bfe9d360b8ee48a60ac7..ac33e01826fab1abe2623bac6ee7fd4235de8637 100644
>--- a/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
>+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
>@@ -1,9 +1,9 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
> 
>         function test()
>diff --git a/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html b/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
>index 8273ba7d14ad87ea418246be5be93fa1f6a7eb83..d66965396106f19530d3dae89ef3e8be92ed1e52 100644
>--- a/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
>+++ b/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html b/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
>index 02b0b9928acb6973aa78e450408d4b6bd4db3894..fc114daa64191a0508b51bdebaad88f9d88a30f9 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
>@@ -1,10 +1,10 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.dumpAsText();
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
>     </script>
> </head>
>@@ -20,7 +20,7 @@
>             if (window.testRunner)
>                 testRunner.notifyDone();
>             if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+                internals.settings.setFrameFlatteningEnabled(true);
>         }
>     </script>
>     <body onresize='test2();'>
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
>index cb62fd99777dfd2010be83fd11c52301ccd039e6..fb1a45ef5c19673162670fa4cbc5ffee35b46db9 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
>index 3d16d0a977182e49ff44f3aa9f093a759d638eed..10bfcef1880c1283d8b7692d21451ea2aac2144f 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
>@@ -4,9 +4,9 @@
> 
>         function test()
>         {
>-            if (window.testRunner) {
>+            if (window.testRunner && window.internals) {
>                 testRunner.dumpAsText();
>-                testRunner.setFrameFlatteningEnabled(true);
>+                internals.settings.setFrameFlatteningEnabled(true);
>             }
>         }
>     </script>
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
>index 99b95c83f46b9b0a1bdff4b391fbffd5441174fb..ce61bb3aebd6d70c2fc468a7553f44f9009c618c 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
>index aaf265f76447541aec83ab1a26dd9c6b29d95276..33bc1b85039e56f186e9cb0d5ff43399595fff5e 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
>@@ -4,9 +4,9 @@
> 
>         function test()
>         {
>-            if (window.testRunner) {
>+            if (window.testRunner && window.internals) {
>                 testRunner.dumpAsText();
>-                testRunner.setFrameFlatteningEnabled(true);
>+                internals.settings.setFrameFlatteningEnabled(true);
>             }
> 
>             // Force synchronous layout.
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
>index 13e9c8665251f8a93501315d0c0b7357c298d83d..0883c00cd8c642613604bd56cf034b8aa5d1ffa2 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
>@@ -1,9 +1,9 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
> 
>         function test()
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
>index beccf91b132c167edaee5858e8993571cfa007f3..3eef053b889211cd97e9d62547e26c1ecaadb7fc 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html b/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
>index 14a818a736e1485718e56b7f9dfe04e68cee458a..e3c12adc7d84a8000854ce3de03e038ad365a648 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
>@@ -9,8 +9,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html b/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
>index e811094d412316972fe19697dceaeecb470ddaf6..d0c8afb244d659eec8fe917cc13de7b3d0ced6cb 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
>index 092fd30c2c576169dd8a72ccd06644ef285f4b98..ef638b9f05888900f5529b6c77c4a7e8c4f48e58 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
>@@ -1,9 +1,9 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
> 
>         function test()
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
>index 900ab81d31aeb412920640c8fd9f61aaf82194b1..28aee6734e3d0ab9cafe52ec1abd228e050252e1 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
>@@ -1,9 +1,9 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
> 
>         function test()
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
>index c466a72294d7a51bb4392753fa53ce9fecc7f71f..4e80746b4489efcb64c0ef232e9f0fbaaf20de3b 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html b/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
>index 075181f6366ecc619d4c28cc65ce22869615dd58..c88a112ea1a34a251e978e10db6160956d7ea27c 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
>@@ -2,9 +2,9 @@
> <head>
>     <script type="text/javascript">
>         function test() {
>-            if (window.testRunner) {
>+            if (window.testRunner && window.internals) {
>                 testRunner.dumpAsText();
>-                testRunner.setFrameFlatteningEnabled(true);
>+                internals.settings.setFrameFlatteningEnabled(true);
>             }
> 
>             // Force synchronous layout.
>diff --git a/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html b/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
>index d873f59fe25d00238d165048702e2ae5c73114f4..271b87730b1b25429870b94fe8f8186c076582f7 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
>@@ -3,8 +3,8 @@
>     <script type="text/javascript">
>         function test()
>         {
>-            if (window.testRunner)
>-                testRunner.setFrameFlatteningEnabled(true);
>+            if (window.internals)
>+                internals.settings.setFrameFlatteningEnabled(true);
>             // Force synchronous layout.
>             document.body.offsetHeight;
>         }
>diff --git a/LayoutTests/fast/frames/flattening/iframe-tiny.html b/LayoutTests/fast/frames/flattening/iframe-tiny.html
>index de83ec7f724986993417f3127c72f21587c90d39..eb011eba6392019907345e3bc6a0018a0b253e72 100644
>--- a/LayoutTests/fast/frames/flattening/iframe-tiny.html
>+++ b/LayoutTests/fast/frames/flattening/iframe-tiny.html
>@@ -5,8 +5,8 @@
> <script>
> description("Test that frame flattening is not used for tiny frames. This test requires DRT or user agent with flattening enabled.");
> 
>-if (window.testRunner)
>-    testRunner.setFrameFlatteningEnabled(true);
>+if (window.internals)
>+    internals.settings.setFrameFlatteningEnabled(true);
> 
> function checkResult(frameName, expectedWidth, expectedHeight)
> {
>diff --git a/LayoutTests/fast/spatial-navigation/snav-iframe-flattening-simple.html b/LayoutTests/fast/spatial-navigation/snav-iframe-flattening-simple.html
>index 83335dac3a2b68250d79d34fafaedd1dfb6fa09f..9d11b2cb6de07b8994723c3cbfba4745fa750fed 100644
>--- a/LayoutTests/fast/spatial-navigation/snav-iframe-flattening-simple.html
>+++ b/LayoutTests/fast/spatial-navigation/snav-iframe-flattening-simple.html
>@@ -37,8 +37,8 @@
> 
>     function runTest()
>     {
>-      if (window.testRunner)
>-        testRunner.setFrameFlatteningEnabled(true);
>+      if (window.internals)
>+        internals.settings.setFrameFlatteningEnabled(true);
> 
>       // starting the test itself: get to a known place.
>       document.getElementById("start").focus();
>diff --git a/LayoutTests/fast/text-autosizing/narrow-iframe-flattened.html b/LayoutTests/fast/text-autosizing/narrow-iframe-flattened.html
>index 3f1cec4163e67c2186b282bafdce6e6ff38c3714..32a0f31b517a4dfc61d7ee04617f6f0ca41ac957 100644
>--- a/LayoutTests/fast/text-autosizing/narrow-iframe-flattened.html
>+++ b/LayoutTests/fast/text-autosizing/narrow-iframe-flattened.html
>@@ -14,8 +14,8 @@ if (window.internals) {
> } else if (window.console && console.warn) {
>     console.warn("This test depends on the Text Autosizing setting being true, so run it in DumpRenderTree, or manually enable Text Autosizing, and either use a mobile device with 320px device-width (like Nexus S or iPhone), or define HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP.");
> }
>-if (window.testRunner)
>-    testRunner.setFrameFlatteningEnabled(true);
>+if (window.internals)
>+    internals.settings.setFrameFlatteningEnabled(true);
> </script>
> 
> </head>
>diff --git a/LayoutTests/http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html b/LayoutTests/http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html
>index 8a219d54873b2f0b4bb5be4ed5e9c627c31cf983..ba9ddceda1d5dcb3f48470bfe1cce8298457fe08 100644
>--- a/LayoutTests/http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html
>+++ b/LayoutTests/http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html
>@@ -1,10 +1,10 @@
> <html>
> <head>
>     <script type="text/javascript">
>-        if (window.testRunner) {
>+        if (window.testRunner && window.internals) {
>             testRunner.waitUntilDone();
>             testRunner.dumpAsText();
>-            testRunner.setFrameFlatteningEnabled(true);
>+            internals.settings.setFrameFlatteningEnabled(true);
>         }
>     </script>
>     <style>body { background-color: green; }</style>
>diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
>index a3c8e514db66018a384ce1aeba70e2e3efd66e50..985507324b55184934bacfd4353715e7c21e926a 100644
>--- a/LayoutTests/platform/chromium/TestExpectations
>+++ b/LayoutTests/platform/chromium/TestExpectations
>@@ -814,7 +814,7 @@ fast/dom/Element/id-in-deletebutton.html [ WontFix ]
> fast/fast-mobile-scrolling/fixed-position-element.html [ WontFix ]
> fast/fast-mobile-scrolling/no-fixed-position-elements.html [ WontFix ]
> 
>-# Tests for frameset flattening. Relevant only on mobile browsers.
>+# Tests for frameset flattening which is not used by Chromium.
> fast/frames/flattening [ WontFix ]
> fast/text-autosizing/narrow-iframe-flattened.html [ WontFix ]
> http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html [ WontFix ]
>diff --git a/LayoutTests/platform/mac/fast/frames/flattening/set-preference-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/set-preference-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..bcaad0fa44b3338d6644bfba88f375388e6f2998
>--- /dev/null
>+++ b/LayoutTests/platform/mac/fast/frames/flattening/set-preference-expected.txt
>@@ -0,0 +1,7 @@
>+Test for iframe flattening. The flattening only works inside the DRT.
>+
>+This inner frame should be 400px in each direction and it must not be scrollable or have scrollbars.
>+
>+
>+
>+PASS
>diff --git a/LayoutTests/platform/mac/fast/frames/flattening/set-preference.html b/LayoutTests/platform/mac/fast/frames/flattening/set-preference.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..db3fec382597c22d01c3a19d17cf70165a693a74
>--- /dev/null
>+++ b/LayoutTests/platform/mac/fast/frames/flattening/set-preference.html
>@@ -0,0 +1,34 @@
>+<html>
>+<head>
>+<style>
>+iframe {
>+    width: 20%;
>+    height: 20%;
>+    border: 0;
>+}  
>+</style>
>+<script src="../../../../../resources/check-layout.js"></script>
>+<script type="text/javascript">
>+if (window.testRunner)
>+    testRunner.overridePreference("WebKitFrameFlatteningEnabled", "1");
>+
>+window.onload = function()
>+{
>+    document.body.offsetLeft;
>+    checkLayout('#test');
>+};
>+</script>
>+</head>
>+<body>
>+<style>body { background-color: green; }</style>
>+<p>Test for iframe flattening. The flattening only works inside the DRT.</p>
>+<p>This inner frame should be 400px in each direction and it must not be scrollable or have scrollbars.</p>
>+
>+<p id="test"><iframe data-expected-width=400 data-expected-height=400 src="data:text/html,
>+    <style>body { background-color: red; margin: 0; }</style>
>+    <body>
>+        <div style='width: 400px; height: 400px; background-color: green;'></div>
>+    </body>
>+"></p>
>+</body>
>+</html>
>diff --git a/LayoutTests/plugins/frameset-with-plugin-frame.html b/LayoutTests/plugins/frameset-with-plugin-frame.html
>index 375b47f836ee244e2eaebe03912c268b14c9b4f1..1f38e7a652f7a63c39fb5ce3ed4e34aca4dda86c 100644
>--- a/LayoutTests/plugins/frameset-with-plugin-frame.html
>+++ b/LayoutTests/plugins/frameset-with-plugin-frame.html
>@@ -1,9 +1,9 @@
> <html>
> <script type="text/javascript" charset="utf-8">
>-    if (window.testRunner) {
>+    if (window.testRunner && window.internals) {
>         testRunner.dumpAsText();
>         testRunner.waitUntilDone();
>-        testRunner.setFrameFlatteningEnabled(true);
>+        internals.settings.setFrameFlatteningEnabled(true);
>         testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>         testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 87149: 143355 | 143569 | 143599 | 144117 | 144607 | 183520 | 184003 | 184323 | 184324 | 184551 | 185013