Changeset 55433 in webkit

Timestamp:

Mar 2, 2010 3:13:57 PM (14 years ago)

Author:

mrowe@apple.com

Message:

Bug 35576: WebKit should tell plug-in instances when private browsing state changes
<​http://webkit.org/b/35576>

Reviewed by Darin Adler.

WebCore:

Notify plug-in instances when the private browsing state changes to match the behavior of the
Mac plug-in code.

• page/Page.cpp:

(WebCore::Page::privateBrowsingStateChanged): Walk the frame tree and notify each PluginView that
the private browsing state has changed.

• page/Page.h:
• page/Settings.cpp:

(WebCore::Settings::setPrivateBrowsingEnabled): Notify the page that the private browsing state
has changed.

• plugins/PluginView.cpp:

(WebCore::PluginView::privateBrowsingStateChanged): Notify the plug-in instance of the new private
browsing state.

• plugins/PluginView.h:

WebKitTools:

TestNetscapePlugin is another bit of plug-in code where copy-paste was heavily used
when porting. Update the Windows and UNIX implementations of NPP_New and NPP_SetValue
to provide the expected behavior related to NPNVprivateModeBool. Hopefully this code
duplication can be cleaned up in the future.

• DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:

(webkit_test_plugin_new_instance):
(webkit_test_plugin_set_value):

• DumpRenderTree/win/TestNetscapePlugin/main.cpp:

(NPP_New):
(NPP_SetValue):

LayoutTests:

• platform/win/Skipped: Remove plugins/private-browsing-mode.html now that it passes.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/plugins/PluginView.cpp (modified) (1 diff)
• WebCore/plugins/PluginView.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (modified) (3 diffs)
• WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-02  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Bug 35576: WebKit should tell plug-in instances when private browsing state changes
+        <http://webkit.org/b/35576>
+
+        * platform/win/Skipped: Remove plugins/private-browsing-mode.html now that it passes.
+
 2010-03-02  Mark Rowe  <mrowe@apple.com>
 

trunk/LayoutTests/platform/win/Skipped

@@ -672 +672 @@
 fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
 
-# <https://bugs.webkit.org/show_bug.cgi?id=30348>
-plugins/private-browsing-mode.html
-
 # Skip these two failures I introduced this morning while I explore them.
 http/tests/globalhistory/history-delegate-basic-visited-links.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-02  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Bug 35576: WebKit should tell plug-in instances when private browsing state changes
+        <http://webkit.org/b/35576>
+
+        Notify plug-in instances when the private browsing state changes to match the behavior of the
+        Mac plug-in code.
+
+        * page/Page.cpp:
+        (WebCore::Page::privateBrowsingStateChanged): Walk the frame tree and notify each PluginView that
+        the private browsing state has changed.
+        * page/Page.h:
+        * page/Settings.cpp:
+        (WebCore::Settings::setPrivateBrowsingEnabled): Notify the page that the private browsing state
+        has changed.
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::privateBrowsingStateChanged): Notify the plug-in instance of the new private
+        browsing state.
+        * plugins/PluginView.h:
+
 2010-03-02  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/page/Page.cpp

@@ -53 +53 @@
 #include "PluginData.h"
 #include "PluginHalter.h"
+#include "PluginView.h"
 #include "ProgressTracker.h"
 #include "RenderWidget.h"
@@ -776 +777 @@
 #endif
 
+void Page::privateBrowsingStateChanged()
+{
+    bool privateBrowsingEnabled = m_settings->privateBrowsingEnabled();
+
+    // Collect the PluginViews in to a vector to ensure that action the plug-in takes
+    // from below privateBrowsingStateChanged does not affect their lifetime.
+
+    Vector<RefPtr<PluginView>, 32> pluginViews;
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        FrameView* view = frame->view();
+        if (!view)
+            return;
+
+        const HashSet<RefPtr<Widget> >* children = view->children();
+        ASSERT(children);
+
+        HashSet<RefPtr<Widget> >::const_iterator end = children->end();
+        for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(); it != end; ++it) {
+            Widget* widget = (*it).get();
+            if (!widget->isPluginView())
+                continue;
+            pluginViews.append(static_cast<PluginView*>(widget));
+        }
+    }
+
+    for (size_t i = 0; i < pluginViews.size(); i++)
+        pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
+}
+
 void Page::pluginAllowedRunTimeChanged()
 {

trunk/WebCore/page/Page.h

@@ -198 +198 @@
         const String& userStyleSheet() const;
 
+        void privateBrowsingStateChanged();
+
         void didStartPlugin(HaltablePlugin*);
         void didStopPlugin(HaltablePlugin*);

trunk/WebCore/page/Settings.cpp

@@ -278 +278 @@
 void Settings::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
 {
+    if (m_privateBrowsingEnabled == privateBrowsingEnabled)
+        return;
+
     m_privateBrowsingEnabled = privateBrowsingEnabled;
+    m_page->privateBrowsingStateChanged();
 }
 

trunk/WebCore/plugins/PluginView.cpp

@@ -1374 +1374 @@
 }
 
+void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)
+{
+    NPP_SetValueProcPtr setValue = m_plugin->pluginFuncs()->setvalue;
+    if (!setValue)
+        return;
+
+    PluginView::setCurrentPluginView(this);
+    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
+    setCallingPlugin(true);
+    NPBool value = privateBrowsingEnabled;
+    setValue(m_instance, NPNVprivateModeBool, &value);
+    setCallingPlugin(false);
+    PluginView::setCurrentPluginView(0);
+}
+
 } // namespace WebCore

trunk/WebCore/plugins/PluginView.h

@@ -157 +157 @@
         void setJavaScriptPaused(bool);
 
+        void privateBrowsingStateChanged(bool);
+
         void disconnectStream(PluginStream*);
         void streamDidFinishLoading(PluginStream* stream) { disconnectStream(stream); }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-02  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Bug 35576: WebKit should tell plug-in instances when private browsing state changes
+        <http://webkit.org/b/35576>
+
+        TestNetscapePlugin is another bit of plug-in code where copy-paste was heavily used
+        when porting.  Update the Windows and UNIX implementations of NPP_New and NPP_SetValue
+        to provide the expected behavior related to NPNVprivateModeBool.  Hopefully this code
+        duplication can be cleaned up in the future.
+
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_set_value):
+        * DumpRenderTree/win/TestNetscapePlugin/main.cpp:
+        (NPP_New):
+        (NPP_SetValue):
+
 2010-03-02  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

@@ -59 +59 @@
     if (browser->version >= 14) {
         PluginObject* obj = (PluginObject*)browser->createobject(instance, getPluginClass());
+        instance->pdata = obj;
 
         for (int i = 0; i < argc; i++) {
@@ -87 +88 @@
                 obj->testWindowOpen = TRUE;
         }
-        instance->pdata = obj;
+
+        browser->getvalue(instance, NPNVprivateModeBool, (void *)&obj->cachedPrivateBrowsingMode);
     }
 
@@ -283 +285 @@
 
 static NPError
-webkit_test_plugin_set_value(NPP /*instance*/, NPNVariable /*variable*/, void* /*value*/)
-{
-    return NPERR_NO_ERROR;
+webkit_test_plugin_set_value(NPP instance, NPNVariable variable, void* value)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+
+    switch (variable) {
+        case NPNVprivateModeBool:
+            obj->cachedPrivateBrowsingMode = *(NPBool*)value;
+            return NPERR_NO_ERROR;
+        default:
+            return NPERR_GENERIC_ERROR;
+    }
 }
 

trunk/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp

@@ -90 +90 @@
     if (browser->version >= 14) {
         PluginObject* obj = (PluginObject*)browser->createobject(instance, getPluginClass());
-        
+        instance->pdata = obj;
+
         for (int16 i = 0; i < argc; i++) {
             if (_stricmp(argn[i], "onstreamload") == 0 && !obj->onStreamLoad)
@@ -109 +110 @@
                 obj->testWindowOpen = TRUE;
         }
-        
-        instance->pdata = obj;
+
+        browser->getvalue(instance, NPNVprivateModeBool, (void *)&obj->cachedPrivateBrowsingMode);
     }
 
@@ -239 +240 @@
 NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value)
 {
-    return NPERR_GENERIC_ERROR;
-}
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+
+    switch (variable) {
+        case NPNVprivateModeBool:
+            obj->cachedPrivateBrowsingMode = *(NPBool*)value;
+            return NPERR_NO_ERROR;
+        default:
+            return NPERR_GENERIC_ERROR;
+    }
+}