WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch for EWS-2
convert-patch.txt (text/plain), 27.94 KB, created by
Gyuyoung Kim
on 2012-04-29 22:47:11 PDT
(
hide
)
Description:
Patch for EWS-2
Filename:
MIME Type:
Creator:
Gyuyoung Kim
Created:
2012-04-29 22:47:11 PDT
Size:
27.94 KB
patch
obsolete
>diff --git a/ChangeLog b/ChangeLog >index e6f3e0f..67567f1 100644 >--- a/ChangeLog >+++ b/ChangeLog >@@ -1,3 +1,12 @@ >+2012-04-29 Gyuyoung Kim <gyuyoung.kim@samsung.com> >+ >+ Convert setPrivateBrowsingEnabled to use InternalSettings interface. >+ https://bugs.webkit.org/show_bug.cgi?id=85034 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Source/autotools/symbols.filter: Add setPrivateBrowsingEnabled symbol filter. >+ > 2012-04-28 Yury Semikhatsky <yurys@chromium.org> > > Unreviewed. Gtk build fix after r115553. >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 70a80ee..52b4aea 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,26 @@ >+2012-04-29 Gyuyoung Kim <gyuyoung.kim@samsung.com> >+ >+ Convert setPrivateBrowsingEnabled to use InternalSettings interface. >+ https://bugs.webkit.org/show_bug.cgi?id=85034 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Call setPrivateBrowsingEnabled functions from internals, because it is able to work in the >+ cross-port way through the InternalSettings interface. >+ >+ * http/tests/security/cookies/resources/first-party-cookie-allow.xsl: >+ * http/tests/security/cookies/resources/third-party-cookie-blocking.xsl: >+ * http/tests/security/cookies/third-party-cookie-blocking-main-frame.html: >+ * http/tests/security/cookies/third-party-cookie-blocking-user-action.html: >+ * http/tests/security/cookies/third-party-cookie-blocking.html: >+ * http/tests/security/cross-frame-access-private-browsing.html: >+ * platform/win-wk2/Skipped: >+ * plugins/private-browsing-mode-2.html: >+ * plugins/private-browsing-mode.html: >+ * storage/domstorage/localstorage/private-browsing-affects-storage.html: >+ * storage/domstorage/sessionstorage/private-browsing-affects-storage.html: >+ * storage/private-browsing-noread-nowrite.html: >+ > 2012-04-29 Sam Weinig <sam@webkit.org> > > Add support for the Blob constructor (Part 2) >diff --git a/LayoutTests/http/tests/security/cookies/resources/first-party-cookie-allow.xsl b/LayoutTests/http/tests/security/cookies/resources/first-party-cookie-allow.xsl >index 361894a..d3023ff 100644 >--- a/LayoutTests/http/tests/security/cookies/resources/first-party-cookie-allow.xsl >+++ b/LayoutTests/http/tests/security/cookies/resources/first-party-cookie-allow.xsl >@@ -11,8 +11,8 @@ if (window.layoutTestController) { > > // Start with a clean state, as otherwise an expired cookie for this domain could affect behavior with CFNetwork. > // Can be removed once rdar://problem/10080130 is fixed. >- if (layoutTestController.setPrivateBrowsingEnabled) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (internals.settings.setPrivateBrowsingEnabled) >+ internals.settings.setPrivateBrowsingEnabled(true); > > layoutTestController.setAlwaysAcceptCookies(false); > } >diff --git a/LayoutTests/http/tests/security/cookies/resources/third-party-cookie-blocking.xsl b/LayoutTests/http/tests/security/cookies/resources/third-party-cookie-blocking.xsl >index a0ab05b..441e470 100644 >--- a/LayoutTests/http/tests/security/cookies/resources/third-party-cookie-blocking.xsl >+++ b/LayoutTests/http/tests/security/cookies/resources/third-party-cookie-blocking.xsl >@@ -11,8 +11,8 @@ if (window.layoutTestController) { > > // Start with a clean state, as otherwise an expired cookie for this domain could affect behavior with CFNetwork. > // Can be removed once rdar://problem/10080130 is fixed. >- if (layoutTestController.setPrivateBrowsingEnabled) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (internals.settings.setPrivateBrowsingEnabled) >+ internals.settings.setPrivateBrowsingEnabled(true); > > layoutTestController.setAlwaysAcceptCookies(false); > } >diff --git a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-main-frame.html b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-main-frame.html >index b19379e..fb60ef7 100644 >--- a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-main-frame.html >+++ b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-main-frame.html >@@ -9,8 +9,8 @@ if (window.layoutTestController) { > > // Start with a clean state, as otherwise an expired cookie for this domain could affect behavior with CFNetwork. > // Can be removed once <rdar://problem/10080130> is fixed. >- if (layoutTestController.setPrivateBrowsingEnabled) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (internals.settings.setPrivateBrowsingEnabled) >+ internals.settings.setPrivateBrowsingEnabled(true); > > layoutTestController.setAlwaysAcceptCookies(false); > } >diff --git a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-user-action.html b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-user-action.html >index 5142b57..c6645e3 100644 >--- a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-user-action.html >+++ b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-user-action.html >@@ -9,8 +9,8 @@ if (window.layoutTestController) { > > // Start with a clean state, as otherwise an expired cookie for this domain could affect behavior with CFNetwork. > // Can be removed once <rdar://problem/10080130> is fixed. >- if (layoutTestController.setPrivateBrowsingEnabled) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (internals.settings.setPrivateBrowsingEnabled) >+ internals.settings.setPrivateBrowsingEnabled(true); > > layoutTestController.setAlwaysAcceptCookies(false); > } >diff --git a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking.html b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking.html >index ff4890f..99479a9 100644 >--- a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking.html >+++ b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking.html >@@ -9,8 +9,8 @@ if (window.layoutTestController) { > > // Start with a clean state, as otherwise an expired cookie for this domain could affect behavior with CFNetwork. > // Can be removed once <rdar://problem/10080130> is fixed. >- if (layoutTestController.setPrivateBrowsingEnabled) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (internals.settings.setPrivateBrowsingEnabled) >+ internals.settings.setPrivateBrowsingEnabled(true); > > layoutTestController.setAlwaysAcceptCookies(false); > } >diff --git a/LayoutTests/http/tests/security/cross-frame-access-private-browsing.html b/LayoutTests/http/tests/security/cross-frame-access-private-browsing.html >index fc07749..068968a 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-private-browsing.html >+++ b/LayoutTests/http/tests/security/cross-frame-access-private-browsing.html >@@ -25,7 +25,7 @@ > > function runTest() { > var subFrame = window.frames[0]; >- layoutTestController.setPrivateBrowsingEnabled(true); >+ internals.settings.setPrivateBrowsingEnabled(true); > > try { > log("Attempting to violate the same-origin policy with private browsing enabled. If this succeeds the console should not log the violation."); >diff --git a/LayoutTests/platform/win-wk2/Skipped b/LayoutTests/platform/win-wk2/Skipped >index f970973..09979ef 100644 >--- a/LayoutTests/platform/win-wk2/Skipped >+++ b/LayoutTests/platform/win-wk2/Skipped >@@ -40,7 +40,7 @@ fast/dom/icon-url-property.html > fast/history/gesture-before-onload-form-submit.html > fast/history/gesture-before-onload-location-href.html > >-# WebKitTestRunner needs an implementation of layoutTestController.setPrivateBrowsingEnabled >+# WebKitTestRunner needs an implementation of internals.settings.setPrivateBrowsingEnabled > # <https://bugs.webkit.org/show_bug.cgi?id=42697> > plugins/private-browsing-mode-2.html > plugins/private-browsing-mode.html >diff --git a/LayoutTests/plugins/private-browsing-mode-2.html b/LayoutTests/plugins/private-browsing-mode-2.html >index 332218b..d5afd18 100644 >--- a/LayoutTests/plugins/private-browsing-mode-2.html >+++ b/LayoutTests/plugins/private-browsing-mode-2.html >@@ -20,7 +20,7 @@ function runTest() > shouldBe("plugin1.privateBrowsingEnabled", "false"); > > // Now enable private browsing >- layoutTestController.setPrivateBrowsingEnabled(true); >+ internals.settings.setPrivateBrowsingEnabled(true); > > shouldBe("plugin1.privateBrowsingEnabled", "true"); > >@@ -30,7 +30,7 @@ function runTest() > document.body.appendChild(plugin2); > > shouldBe("plugin2.privateBrowsingEnabled", "true"); >- layoutTestController.setPrivateBrowsingEnabled(false); >+ internals.settings.setPrivateBrowsingEnabled(false); > shouldBe("plugin1.privateBrowsingEnabled", "false"); > shouldBe("plugin2.privateBrowsingEnabled", "false"); > } >diff --git a/LayoutTests/plugins/private-browsing-mode.html b/LayoutTests/plugins/private-browsing-mode.html >index 30db0fe..e745357 100644 >--- a/LayoutTests/plugins/private-browsing-mode.html >+++ b/LayoutTests/plugins/private-browsing-mode.html >@@ -21,7 +21,7 @@ function runTest() > shouldBe("plugin1.cachedPrivateBrowsingEnabled", "false"); > > // Now enable private browsing >- layoutTestController.setPrivateBrowsingEnabled(true); >+ internals.settings.setPrivateBrowsingEnabled(true); > > shouldBe("plugin1.privateBrowsingEnabled", "true"); > shouldBe("plugin1.cachedPrivateBrowsingEnabled", "true"); >diff --git a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html >index b2e4720..089e6bc 100644 >--- a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html >+++ b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html >@@ -23,7 +23,7 @@ function runTest() > localStorage.clear(); > > localStorage.setItem("testItem", "InitialValue"); >- layoutTestController.setPrivateBrowsingEnabled(true); >+ internals.settings.setPrivateBrowsingEnabled(true); > log("Initial value of testItem is: " + localStorage.getItem("testItem")); > > try { >diff --git a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html >index 8dd7a6a..99bae7e 100644 >--- a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html >+++ b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html >@@ -23,7 +23,7 @@ function runTest() > } > > sessionStorage.setItem("testItem", "InitialValue"); >- layoutTestController.setPrivateBrowsingEnabled(true); >+ internals.settings.setPrivateBrowsingEnabled(true); > log("Initial value of testItem is: " + sessionStorage.getItem("testItem")); > > try { >diff --git a/LayoutTests/storage/private-browsing-noread-nowrite.html b/LayoutTests/storage/private-browsing-noread-nowrite.html >index b9b5882..6f3e1c6 100644 >--- a/LayoutTests/storage/private-browsing-noread-nowrite.html >+++ b/LayoutTests/storage/private-browsing-noread-nowrite.html >@@ -67,8 +67,8 @@ function runPrivateBrowsingTests() > { > completed = 0; > >- if (window.layoutTestController) >- layoutTestController.setPrivateBrowsingEnabled(true); >+ if (window.internals) >+ internals.settings.setPrivateBrowsingEnabled(true); > > for (i in privateBrowsingStatements) > theTransaction.executeSql(privateBrowsingStatements[i], [], privateBrowsingSuccessFunction, privateBrowsingErrorFunction); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index ba9ef7a..06063d6 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,39 @@ >+2012-04-29 Gyuyoung Kim <gyuyoung.kim@samsung.com> >+ >+ Convert setPrivateBrowsingEnabled to use InternalSettings interface. >+ https://bugs.webkit.org/show_bug.cgi?id=85034 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove setPrivateBrowsingEnabled functions, because it is able to work in the >+ cross-port way through the InternalSettings interface. >+ >+ * DumpRenderTree/LayoutTestController.cpp: >+ (LayoutTestController::staticFunctions): >+ * DumpRenderTree/LayoutTestController.h: >+ (LayoutTestController): >+ * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp: >+ * DumpRenderTree/chromium/LayoutTestController.cpp: >+ (LayoutTestController::LayoutTestController): >+ * DumpRenderTree/chromium/LayoutTestController.h: >+ (LayoutTestController): >+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp: >+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: >+ * DumpRenderTree/mac/DumpRenderTree.mm: >+ (resetDefaultsToConsistentValues): >+ * DumpRenderTree/mac/LayoutTestControllerMac.mm: >+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp: >+ * DumpRenderTree/qt/LayoutTestControllerQt.h: >+ (LayoutTestController): >+ * DumpRenderTree/win/DumpRenderTree.cpp: >+ (resetDefaultsToConsistentValues): >+ * DumpRenderTree/win/LayoutTestControllerWin.cpp: >+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp: >+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: >+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: >+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h: >+ (LayoutTestController): >+ > 2012-04-29 Sudarsana Nagineni <sudarsana.nagineni@linux.intel.com> > > [GTK] DRT needs an implementation of layoutTestController.setDomainRelaxationForbiddenForURLScheme >diff --git a/Tools/DumpRenderTree/LayoutTestController.cpp b/Tools/DumpRenderTree/LayoutTestController.cpp >index e0944e5..ae6a479 100644 >--- a/Tools/DumpRenderTree/LayoutTestController.cpp >+++ b/Tools/DumpRenderTree/LayoutTestController.cpp >@@ -1452,18 +1452,6 @@ static JSValueRef setPersistentUserStyleSheetLocationCallback(JSContextRef conte > return JSValueMakeUndefined(context); > } > >-static JSValueRef setPrivateBrowsingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) >-{ >- // Has mac & windows implementation >- if (argumentCount < 1) >- return JSValueMakeUndefined(context); >- >- LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); >- controller->setPrivateBrowsingEnabled(JSValueToBoolean(context, arguments[0])); >- >- return JSValueMakeUndefined(context); >-} >- > static JSValueRef setJavaScriptCanAccessClipboardCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) > { > // Has mac & windows implementation >@@ -2442,7 +2430,6 @@ JSStaticFunction* LayoutTestController::staticFunctions() > { "setPopupBlockingEnabled", setPopupBlockingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setPluginsEnabled", setPluginsEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setPrinting", setPrintingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, >- { "setPrivateBrowsingEnabled", setPrivateBrowsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setSelectTrailingWhitespaceEnabled", setSelectTrailingWhitespaceEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setSerializeHTTPLoads", setSerializeHTTPLoadsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setSmartInsertDeleteEnabled", setSmartInsertDeleteEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, >diff --git a/Tools/DumpRenderTree/LayoutTestController.h b/Tools/DumpRenderTree/LayoutTestController.h >index a11387d..454a3e8 100644 >--- a/Tools/DumpRenderTree/LayoutTestController.h >+++ b/Tools/DumpRenderTree/LayoutTestController.h >@@ -111,7 +111,6 @@ public: > void setPersistentUserStyleSheetLocation(JSStringRef path); > void setPluginsEnabled(bool flag); > void setPopupBlockingEnabled(bool flag); >- void setPrivateBrowsingEnabled(bool flag); > void setSelectTrailingWhitespaceEnabled(bool flag); > void setSmartInsertDeleteEnabled(bool flag); > void setTabKeyCyclesThroughElements(bool cycles); >diff --git a/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp b/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp >index a62755b..a31a7d9 100644 >--- a/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp >+++ b/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp >@@ -257,12 +257,6 @@ void LayoutTestController::setPopupBlockingEnabled(bool flag) > BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setJavaScriptOpenWindowsAutomatically(!flag); > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool flag) >-{ >- UNUSED_PARAM(flag); >- notImplemented(); >-} >- > void LayoutTestController::setXSSAuditorEnabled(bool flag) > { > BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setXSSAuditorEnabled(flag); >diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp >index 7378183..4406228 100644 >--- a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp >+++ b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp >@@ -239,7 +239,6 @@ LayoutTestController::LayoutTestController(TestShell* shell) > bindMethod("setApplicationCacheOriginQuota", &LayoutTestController::setApplicationCacheOriginQuota); > bindMethod("setCallCloseOnWebViews", &LayoutTestController::setCallCloseOnWebViews); > bindMethod("setMainFrameIsFirstResponder", &LayoutTestController::setMainFrameIsFirstResponder); >- bindMethod("setPrivateBrowsingEnabled", &LayoutTestController::setPrivateBrowsingEnabled); > bindMethod("setUseDashboardCompatibilityMode", &LayoutTestController::setUseDashboardCompatibilityMode); > bindMethod("storeWebScriptObject", &LayoutTestController::storeWebScriptObject); > bindMethod("deleteAllLocalStorage", &LayoutTestController::deleteAllLocalStorage); >@@ -1312,11 +1311,6 @@ void LayoutTestController::setCallCloseOnWebViews(const CppArgumentList& argumen > result->setNull(); > } > >-void LayoutTestController::setPrivateBrowsingEnabled(const CppArgumentList& arguments, CppVariant* result) >-{ >- result->setNull(); >-} >- > void LayoutTestController::setJavaScriptCanAccessClipboard(const CppArgumentList& arguments, CppVariant* result) > { > if (arguments.size() > 0 && arguments[0].isBool()) { >diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.h b/Tools/DumpRenderTree/chromium/LayoutTestController.h >index e8f87e6..aae5515 100644 >--- a/Tools/DumpRenderTree/chromium/LayoutTestController.h >+++ b/Tools/DumpRenderTree/chromium/LayoutTestController.h >@@ -279,7 +279,6 @@ public: > void addDisallowedURL(const CppArgumentList&, CppVariant*); > void callShouldCloseOnWebView(const CppArgumentList&, CppVariant*); > void setCallCloseOnWebViews(const CppArgumentList&, CppVariant*); >- void setPrivateBrowsingEnabled(const CppArgumentList&, CppVariant*); > > void setJavaScriptCanAccessClipboard(const CppArgumentList&, CppVariant*); > void setXSSAuditorEnabled(const CppArgumentList&, CppVariant*); >diff --git a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp >index 6c1dd73..3687f42 100644 >--- a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp >+++ b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp >@@ -327,11 +327,6 @@ int LayoutTestController::windowCount() > return browser->extraViews().size() + 1; // + 1 for the main view. > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool flag) >-{ >- ewk_view_setting_private_browsing_set(browser->mainView(), flag); >-} >- > void LayoutTestController::setJavaScriptCanAccessClipboard(bool) > { > notImplemented(); >diff --git a/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp >index aa2e3de..15d9cde 100644 >--- a/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp >+++ b/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp >@@ -387,15 +387,6 @@ int LayoutTestController::windowCount() > return g_slist_length(webViewList) + 1; > } > >-void LayoutTestController::setPrivateBrowsingEnabled(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-private-browsing", flag, NULL); >-} >- > void LayoutTestController::setJavaScriptCanAccessClipboard(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 2af68a8..703418e 100644 >--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm >+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm >@@ -633,7 +633,6 @@ static void resetDefaultsToConsistentValues() > [preferences setPlugInsEnabled:YES]; > [preferences setTextAreasAreResizable:YES]; > >- [preferences setPrivateBrowsingEnabled:NO]; > [preferences setAuthorAndUserStylesEnabled:YES]; > [preferences setJavaScriptCanOpenWindowsAutomatically:YES]; > [preferences setJavaScriptCanAccessClipboard:YES]; >diff --git a/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm >index cf08e54..be23d77 100644 >--- a/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm >+++ b/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm >@@ -580,11 +580,6 @@ void LayoutTestController::setMainFrameIsFirstResponder(bool flag) > [[[mainFrame webView] window] makeFirstResponder:firstResponder]; > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool privateBrowsingEnabled) >-{ >- [[[mainFrame webView] preferences] setPrivateBrowsingEnabled:privateBrowsingEnabled]; >-} >- > void LayoutTestController::setXSSAuditorEnabled(bool enabled) > { > [[[mainFrame webView] preferences] setXSSAuditorEnabled:enabled]; >diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp >index 0309d0a..52ed2ae 100644 >--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp >+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp >@@ -493,11 +493,6 @@ void LayoutTestController::setFixedContentsSize(int width, int height) > m_topLoadingFrame->page()->setPreferredContentsSize(QSize(width, height)); > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool enable) >-{ >- m_drt->webPage()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable); >-} >- > void LayoutTestController::setSpatialNavigationEnabled(bool enable) > { > m_drt->webPage()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, enable); >diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h >index ebd2279..6e70e19 100644 >--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h >+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h >@@ -162,7 +162,6 @@ public slots: > void setJavaScriptProfilingEnabled(bool enable); > void setValueForUser(const QWebElement&, const QString& value); > void setFixedContentsSize(int width, int height); >- void setPrivateBrowsingEnabled(bool enable); > void setSpatialNavigationEnabled(bool enabled); > void setPluginsEnabled(bool flag); > void setPopupBlockingEnabled(bool enable); >diff --git a/Tools/DumpRenderTree/win/DumpRenderTree.cpp b/Tools/DumpRenderTree/win/DumpRenderTree.cpp >index 196f4ea..0b90cb6 100644 >--- a/Tools/DumpRenderTree/win/DumpRenderTree.cpp >+++ b/Tools/DumpRenderTree/win/DumpRenderTree.cpp >@@ -835,7 +835,6 @@ static void resetDefaultsToConsistentValues(IWebPreferences* preferences) > preferences->setEditableLinkBehavior(WebKitEditableLinkOnlyLiveWithShiftKey); > preferences->setFontSmoothing(FontSmoothingTypeStandard); > preferences->setUsesPageCache(FALSE); >- preferences->setPrivateBrowsingEnabled(FALSE); > preferences->setJavaScriptCanOpenWindowsAutomatically(TRUE); > preferences->setJavaScriptEnabled(TRUE); > preferences->setTabsToLinks(FALSE); >diff --git a/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp >index ae7e09c..8a3ccf9 100644 >--- a/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp >+++ b/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp >@@ -474,19 +474,6 @@ void LayoutTestController::setMainFrameIsFirstResponder(bool flag) > // FIXME: Implement! > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool privateBrowsingEnabled) >-{ >- COMPtr<IWebView> webView; >- if (FAILED(frame->webView(&webView))) >- return; >- >- COMPtr<IWebPreferences> preferences; >- if (FAILED(webView->preferences(&preferences))) >- return; >- >- preferences->setPrivateBrowsingEnabled(privateBrowsingEnabled); >-} >- > void LayoutTestController::setXSSAuditorEnabled(bool enabled) > { > COMPtr<IWebView> webView; >diff --git a/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp >index 5a0fc72..e47a917 100644 >--- a/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp >+++ b/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp >@@ -172,11 +172,6 @@ int LayoutTestController::windowCount() > return 1; > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool privateBrowsingEnabled) >-{ >- // FIXME: implement >-} >- > void LayoutTestController::setJavaScriptCanAccessClipboard(bool enabled) > { > // FIXME: implement >diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl >index d8def4d..ee92c50 100644 >--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl >+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl >@@ -54,7 +54,6 @@ module WTR { > void setFrameFlatteningEnabled(in boolean value); > void setGeolocationPermission(in boolean value); > void setJavaScriptCanAccessClipboard(in boolean value); >- void setPrivateBrowsingEnabled(in boolean value); > void setPopupBlockingEnabled(in boolean value); > void setAuthorAndUserStylesEnabled(in boolean value); > void addOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains); >diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp >index 55bf9dd..6b9235c 100644 >--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp >+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp >@@ -385,11 +385,6 @@ void LayoutTestController::setJavaScriptCanAccessClipboard(bool enabled) > WKBundleSetJavaScriptCanAccessClipboard(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled); > } > >-void LayoutTestController::setPrivateBrowsingEnabled(bool enabled) >-{ >- WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled); >-} >- > void LayoutTestController::setPopupBlockingEnabled(bool enabled) > { > WKBundleSetPopupBlockingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled); >diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h >index b46da21..fa552bf 100644 >--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h >+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h >@@ -85,7 +85,6 @@ public: > void setFrameFlatteningEnabled(bool); > void setGeolocationPermission(bool); > void setJavaScriptCanAccessClipboard(bool); >- void setPrivateBrowsingEnabled(bool); > void setPopupBlockingEnabled(bool); > void setAuthorAndUserStylesEnabled(bool); > void setCustomPolicyDelegate(bool enabled, bool permissive = false);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=139420">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 85034
:
139158
|
139420
|
139575