[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ap at apple.com
ap at apple.com
Wed Dec 22 14:50:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3c333d80734c8b1e272f0544cefc98622b019d00
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 21 19:21:09 2010 +0000
Reviewed by John Sullivan.
https://bugs.webkit.org/show_bug.cgi?id=48083
<rdar://problem/8489082> Need WebKit2 API for private browsing
This just adds glue code for passing the preference from embedder to WebCore. The aspects of
private browsing that WebCore is responsible for do work, but cookies are not handled yet.
* Shared/WebPreferencesStore.cpp:
(WebKit::WebPreferencesStore::WebPreferencesStore):
(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetPrivateBrowsingEnabled):
(WKPreferencesGetPrivateBrowsingEnabled):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::setPrivateBrowsingEnabled):
(WebKit::WebPreferences::privateBrowsingEnabled):
* UIProcess/WebPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Do what it takes to pass a single boolean from WebKit2 to WebCore. And we aren't even syncing
the preference to user defaults yet.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70255 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 43707e8..aa47800 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,31 @@
+2010-10-21 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by John Sullivan.
+
+ https://bugs.webkit.org/show_bug.cgi?id=48083
+ <rdar://problem/8489082> Need WebKit2 API for private browsing
+
+ This just adds glue code for passing the preference from embedder to WebCore. The aspects of
+ private browsing that WebCore is responsible for do work, but cookies are not handled yet.
+
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::WebPreferencesStore):
+ (WebKit::WebPreferencesStore::encode):
+ (WebKit::WebPreferencesStore::decode):
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetPrivateBrowsingEnabled):
+ (WKPreferencesGetPrivateBrowsingEnabled):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::setPrivateBrowsingEnabled):
+ (WebKit::WebPreferences::privateBrowsingEnabled):
+ * UIProcess/WebPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ Do what it takes to pass a single boolean from WebKit2 to WebCore. And we aren't even syncing
+ the preference to user defaults yet.
+
2010-10-20 Adam Roben <aroben at apple.com>
Ask the UI client to close the page when the WKView receives a WM_CLOSE
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index e299a2e..b0b2ab7 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -43,6 +43,7 @@ WebPreferencesStore::WebPreferencesStore()
, acceleratedCompositingEnabled(true)
, compositingBordersVisible(false)
, compositingRepaintCountersVisible(false)
+ , privateBrowsingEnabled(false)
, fontSmoothingLevel(FontSmoothingLevelMedium)
, minimumFontSize(1)
, minimumLogicalFontSize(9)
@@ -75,6 +76,7 @@ void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(localStorageEnabled);
encoder->encode(xssAuditorEnabled);
encoder->encode(frameFlatteningEnabled);
+ encoder->encode(privateBrowsingEnabled);
encoder->encode(fontSmoothingLevel);
encoder->encode(minimumFontSize);
encoder->encode(minimumLogicalFontSize);
@@ -107,6 +109,8 @@ bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferenc
return false;
if (!decoder->decode(s.frameFlatteningEnabled))
return false;
+ if (!decoder->decode(s.privateBrowsingEnabled))
+ return false;
if (!decoder->decode(s.fontSmoothingLevel))
return false;
if (!decoder->decode(s.minimumFontSize))
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 47933dd..578c695 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -54,6 +54,8 @@ struct WebPreferencesStore {
bool compositingBordersVisible;
bool compositingRepaintCountersVisible;
+ bool privateBrowsingEnabled;
+
uint32_t fontSmoothingLevel;
uint32_t minimumFontSize;
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 34716e9..c89ecba 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -178,3 +178,13 @@ WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef)
{
return toCopiedAPI(toImpl(preferencesRef)->fantasyFontFamily());
}
+
+void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setPrivateBrowsingEnabled(enabled);
+}
+
+bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->privateBrowsingEnabled();
+}
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index a7e6386..f728473 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -87,6 +87,10 @@ WK_EXPORT WKStringRef WKPreferencesCopyCursiveFontFamily(WKPreferencesRef prefer
WK_EXPORT void WKPreferencesSetFantasyFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef);
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef);
+
#ifdef __cplusplus
}
#endif
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 7c9b9e7..e8169e3 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -130,6 +130,17 @@ bool WebPreferences::frameFlatteningEnabled() const
return m_store.frameFlatteningEnabled;
}
+void WebPreferences::setPrivateBrowsingEnabled(bool b)
+{
+ m_store.privateBrowsingEnabled = b;
+ update();
+}
+
+bool WebPreferences::privateBrowsingEnabled() const
+{
+ return m_store.privateBrowsingEnabled;
+}
+
void WebPreferences::setPluginsEnabled(bool b)
{
m_store.pluginsEnabled = b;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index b605316..85f4929 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -108,6 +108,9 @@ public:
void setCompositingRepaintCountersVisible(bool);
bool compositingRepaintCountersVisible() const;
+
+ void setPrivateBrowsingEnabled(bool);
+ bool privateBrowsingEnabled() const;
private:
WebPreferences();
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 492e270..6c074bf 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -719,6 +719,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
settings->setLocalStorageEnabled(store.localStorageEnabled);
settings->setXSSAuditorEnabled(store.xssAuditorEnabled);
settings->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
+ settings->setPrivateBrowsingEnabled(store.privateBrowsingEnabled);
settings->setMinimumFontSize(store.minimumFontSize);
settings->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
settings->setDefaultFontSize(store.defaultFontSize);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list