Changeset 129959 in webkit

Timestamp:

Sep 28, 2012, 4:14:53 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/12398537> WebKit2 lacks API for disabling document.cookie like -[WebView _setCookieEnabled:]
​https://bugs.webkit.org/show_bug.cgi?id=97939

Reviewed by Sam Weinig.

• Shared/WebPreferencesStore.h:

(WebKit): Defined CookieEnabled key with a default value of true.

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetCookieEnabled): Added this setter.
(WKPreferencesGetCookieEnabled): Added this getter.

• UIProcess/API/C/WKPreferencesPrivate.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences): Added a call to Settings::setCookieEnabled to push the
preference into Settings.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPreferencesStore.h (modified) (1 diff)
• UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• UIProcess/API/C/WKPreferencesPrivate.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-28  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12398537> WebKit2 lacks API for disabling document.cookie like -[WebView _setCookieEnabled:]
+        https://bugs.webkit.org/show_bug.cgi?id=97939
+
+        Reviewed by Sam Weinig.
+
+        * Shared/WebPreferencesStore.h:
+        (WebKit): Defined CookieEnabled key with a default value of true.
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetCookieEnabled): Added this setter.
+        (WKPreferencesGetCookieEnabled): Added this getter.
+        * UIProcess/API/C/WKPreferencesPrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences): Added a call to Settings::setCookieEnabled to push the
+        preference into Settings.
+
 2012-09-28  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -136 +136 @@
     macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
     macro(ScreenFontSubstitutionEnabled, screenFontSubstitutionEnabled, Bool, bool, DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED) \
+    macro(CookieEnabled, cookieEnabled, Bool, bool, true) \
     \
 

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -299 +299 @@
 }
 
+void WKPreferencesSetCookieEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+    toImpl(preferencesRef)->setCookieEnabled(enabled);
+}
+
+bool WKPreferencesGetCookieEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->cookieEnabled();
+}
+
 void WKPreferencesSetEditableLinkBehavior(WKPreferencesRef preferencesRef, WKEditableLinkBehavior wkBehavior)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

@@ -220 +220 @@
 WK_EXPORT bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef preferences);
 
+// Defaults to true
+WK_EXPORT void WKPreferencesSetCookieEnabled(WKPreferencesRef preferences, bool enabled);
+WK_EXPORT bool WKPreferencesGetCookieEnabled(WKPreferencesRef preferences);
+
 WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef);
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2130 +2130 @@
     settings->setShouldRespectImageOrientation(store.getBoolValueForKey(WebPreferencesKey::shouldRespectImageOrientationKey()));
     settings->setStorageBlockingPolicy(static_cast<SecurityOrigin::StorageBlockingPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey())));
+    settings->setCookieEnabled(store.getBoolValueForKey(WebPreferencesKey::cookieEnabledKey()));
 
     settings->setDiagnosticLoggingEnabled(store.getBoolValueForKey(WebPreferencesKey::diagnosticLoggingEnabledKey()));