From 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 18 Sep 2012 15:53:33 +0200 Subject: Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886) New snapshot with various build fixes --- Source/WebKit2/WebProcess/Plugins/PluginView.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Source/WebKit2/WebProcess/Plugins/PluginView.cpp') diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp index 8f50d8706..fc06486fd 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp +++ b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp @@ -570,13 +570,21 @@ JSObject* PluginView::scriptObject(JSGlobalObject* globalObject) #endif } -void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) +void PluginView::storageBlockingStateChanged() { // The plug-in can be null here if it failed to initialize. if (!m_isInitialized || !m_plugin) return; - if (!privateBrowsingEnabled && !frame()->document()->securityOrigin()->canAccessPluginStorage(frame()->tree()->top()->document()->securityOrigin())) + bool storageBlockingPolicy = !frame()->document()->securityOrigin()->canAccessPluginStorage(frame()->tree()->top()->document()->securityOrigin()); + + m_plugin->storageBlockingStateChanged(storageBlockingPolicy); +} + +void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) +{ + // The plug-in can be null here if it failed to initialize. + if (!m_isInitialized || !m_plugin) return; m_plugin->privateBrowsingStateChanged(privateBrowsingEnabled); -- cgit v1.2.1