Diff
Modified: trunk/LayoutTests/ChangeLog (87347 => 87348)
--- trunk/LayoutTests/ChangeLog 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/LayoutTests/ChangeLog 2011-05-26 01:48:25 UTC (rev 87348)
@@ -1,3 +1,13 @@
+2011-05-25 Qi Zhang <[email protected]>
+
+ Reviewed by Simon Hausmann.
+
+ WebKitTestRunner needs layoutTestController.setPrivateBrowsingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=42697
+
+ * platform/mac-wk2/Skipped:
+ * platform/qt-wk2/Skipped:
+
2011-05-25 Adam Klein <[email protected]>
Unreviewed. Fix to previous update, mark drag-not-loaded-image crash as DEBUG-only.
Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (87347 => 87348)
--- trunk/LayoutTests/platform/mac-wk2/Skipped 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped 2011-05-26 01:48:25 UTC (rev 87348)
@@ -1382,12 +1382,6 @@
# <https://bugs.webkit.org/show_bug.cgi?id=42696>
security/set-form-autocomplete-attribute.html
-# WebKitTestRunner needs layoutTestController.setPrivateBrowsingEnabled
-# <https://bugs.webkit.org/show_bug.cgi?id=42697>
-storage/domstorage/localstorage/private-browsing-affects-storage.html
-storage/domstorage/sessionstorage/private-browsing-affects-storage.html
-storage/private-browsing-noread-nowrite.html
-
# WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
# <https://bugs.webkit.org/show_bug.cgi?id=42698>
http/tests/appcache/max-size.html
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (87347 => 87348)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2011-05-26 01:48:25 UTC (rev 87348)
@@ -1773,11 +1773,6 @@
# <https://bugs.webkit.org/show_bug.cgi?id=42696>
security/set-form-autocomplete-attribute.html
-# WebKitTestRunner needs layoutTestController.setPrivateBrowsingEnabled
-# <https://bugs.webkit.org/show_bug.cgi?id=42697>
-storage/domstorage/localstorage/private-browsing-affects-storage.html
-storage/domstorage/sessionstorage/private-browsing-affects-storage.html
-
# WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
# <https://bugs.webkit.org/show_bug.cgi?id=42698>
http/tests/appcache/max-size.html
@@ -2866,7 +2861,6 @@
sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.17_String.prototype.toLocaleLowerCase/S15.5.4.17_A7.html
sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.7_String.prototype.indexOf/S15.5.4.7_A7.html
sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.8_String.prototype.lastIndexOf/S15.5.4.8_A7.html
-storage/private-browsing-noread-nowrite.html
svg/animations/animate-calcMode-spline-by.html
svg/animations/animate-calcMode-spline-from-by.html
svg/animations/animate-calcMode-spline-from-to.html
Modified: trunk/Source/WebKit2/ChangeLog (87347 => 87348)
--- trunk/Source/WebKit2/ChangeLog 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-26 01:48:25 UTC (rev 87348)
@@ -1,3 +1,19 @@
+2011-05-25 Qi Zhang <[email protected]>
+
+ Reviewed by Simon Hausmann.
+
+ WebKitTestRunner needs layoutTestController.setPrivateBrowsingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=42697
+
+ Implemented layoutTestController.setPrivateBrowsingEnabled for WebKitTestRunner.
+
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetPrivateBrowsingEnabled):
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+
2011-05-25 Mark Rowe <[email protected]>
Reviewed by Sam Weinig.
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (87347 => 87348)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2011-05-26 01:48:25 UTC (rev 87348)
@@ -148,6 +148,11 @@
toImpl(bundleRef)->setJavaScriptCanAccessClipboard(toImpl(pageGroupRef), enabled);
}
+void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
+{
+ toImpl(bundleRef)->setPrivateBrowsingEnabled(toImpl(pageGroupRef), enabled);
+}
+
void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
{
toImpl(bundleRef)->addOriginAccessWhitelistEntry(toImpl(sourceOrigin)->string(), toImpl(destinationProtocol)->string(), toImpl(destinationHost)->string(), allowDestinationSubdomains);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (87347 => 87348)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2011-05-26 01:48:25 UTC (rev 87348)
@@ -69,6 +69,7 @@
WK_EXPORT void WKBundleSetAllowFileAccessFromFileURLs(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleSetFrameFlatteningEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleSetJavaScriptCanAccessClipboard(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
+WK_EXPORT void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleClearAllDatabases(WKBundleRef bundle);
WK_EXPORT void WKBundleSetDatabaseQuota(WKBundleRef bundle, uint64_t);
WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (87347 => 87348)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2011-05-26 01:48:25 UTC (rev 87348)
@@ -143,6 +143,13 @@
(*iter)->settings()->setJavaScriptCanAccessClipboard(enabled);
}
+void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
+{
+ const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
+ for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
+ (*iter)->settings()->setPrivateBrowsingEnabled(enabled);
+}
+
void InjectedBundle::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
{
SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (87347 => 87348)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2011-05-26 01:48:25 UTC (rev 87348)
@@ -95,6 +95,7 @@
void setAllowFileAccessFromFileURLs(WebPageGroupProxy*, bool);
void setFrameFlatteningEnabled(WebPageGroupProxy*, bool);
void setJavaScriptCanAccessClipboard(WebPageGroupProxy*, bool);
+ void setPrivateBrowsingEnabled(WebPageGroupProxy*, bool);
void addOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
void removeOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
void resetOriginAccessWhitelists();
Modified: trunk/Tools/ChangeLog (87347 => 87348)
--- trunk/Tools/ChangeLog 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Tools/ChangeLog 2011-05-26 01:48:25 UTC (rev 87348)
@@ -1,3 +1,19 @@
+2011-05-25 Qi Zhang <[email protected]>
+
+ Reviewed by Simon Hausmann.
+
+ WebKitTestRunner needs layoutTestController.setPrivateBrowsingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=42697
+
+ Implemented layoutTestController.setPrivateBrowsingEnabled for WebKitTestRunner.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+ (WTR::LayoutTestController::setPrivateBrowsingEnabled):
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+
2011-05-25 Jon Honeycutt <[email protected]>
REGRESSION (WebKit2): Crash in Flash on USA Today photo gallery
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (87347 => 87348)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2011-05-26 01:48:25 UTC (rev 87348)
@@ -51,6 +51,7 @@
void setAllowFileAccessFromFileURLs(in boolean value);
void setFrameFlatteningEnabled(in boolean value);
void setJavaScriptCanAccessClipboard(in boolean value);
+ void setPrivateBrowsingEnabled(in boolean value);
void addOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);
void removeOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (87347 => 87348)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2011-05-26 01:48:25 UTC (rev 87348)
@@ -179,6 +179,7 @@
WKBundleRemoveAllVisitedLinks(m_bundle);
WKBundleSetAllowUniversalAccessFromFileURLs(m_bundle, m_pageGroup, true);
WKBundleSetJavaScriptCanAccessClipboard(m_bundle, m_pageGroup, true);
+ WKBundleSetPrivateBrowsingEnabled(m_bundle, m_pageGroup, false);
WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (87347 => 87348)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2011-05-26 01:48:25 UTC (rev 87348)
@@ -344,6 +344,11 @@
WKBundleSetJavaScriptCanAccessClipboard(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
+void LayoutTestController::setPrivateBrowsingEnabled(bool enabled)
+{
+ WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
+}
+
void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h (87347 => 87348)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2011-05-26 01:30:27 UTC (rev 87347)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2011-05-26 01:48:25 UTC (rev 87348)
@@ -80,6 +80,7 @@
void setAllowFileAccessFromFileURLs(bool);
void setFrameFlatteningEnabled(bool);
void setJavaScriptCanAccessClipboard(bool);
+ void setPrivateBrowsingEnabled(bool);
void addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
void removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
