[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[girish at forwardbias.in]

The following commit has been merged in the debian/experimental branch:
commit cdbba57e8912d0ff681bcf43077c9a62bfebd834
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 04:11:05 2010 +0000

    Make PluginView inherit from PluginViewBase.
    
    Reviewed by Anders Carlsson.
    
    This change is a precursor to adding accelerated compositing support
    for NPAPI plugins.
    
    https://bugs.webkit.org/show_bug.cgi?id=47418
    
    * page/Page.cpp:
    (WebCore::Page::privateBrowsingStateChanged):
    * plugins/PluginView.h:
    * plugins/PluginViewBase.h:
    (WebCore::PluginViewBase::PluginViewBase):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93bda39..0f9d77c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-11  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Anders Carlsson.
+
+        Make PluginView inherit from PluginViewBase.
+
+        This change is a precursor to adding accelerated compositing support
+        for NPAPI plugins.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47418
+
+        * page/Page.cpp:
+        (WebCore::Page::privateBrowsingStateChanged):
+        * plugins/PluginView.h:
+        * plugins/PluginViewBase.h:
+        (WebCore::PluginViewBase::PluginViewBase):
+
 2010-10-12  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Jian Li.
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index e154968..e38657c 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -856,8 +856,6 @@ void Page::privateBrowsingStateChanged()
 
     // Collect the PluginViews in to a vector to ensure that action the plug-in takes
     // from below privateBrowsingStateChanged does not affect their lifetime.
-    // FIXME: When PluginViewBase and PluginView are merged we don't need this extra Vector.
-    Vector<RefPtr<PluginView>, 32> pluginViews;
     Vector<RefPtr<PluginViewBase>, 32> pluginViewBases;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         FrameView* view = frame->view();
@@ -870,15 +868,11 @@ void Page::privateBrowsingStateChanged()
         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())
-                pluginViews.append(static_cast<PluginView*>(widget));
             if (widget->isPluginViewBase())
                 pluginViewBases.append(static_cast<PluginViewBase*>(widget));
         }
     }
 
-    for (size_t i = 0; i < pluginViews.size(); ++i)
-        pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
     for (size_t i = 0; i < pluginViewBases.size(); ++i)
         pluginViewBases[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
 }
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 96dba68..e37dbdb 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -32,9 +32,9 @@
 #include "HaltablePlugin.h"
 #include "IntRect.h"
 #include "MediaCanStartListener.h"
+#include "PluginViewBase.h"
 #include "ResourceRequest.h"
 #include "Timer.h"
-#include "Widget.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
@@ -120,7 +120,7 @@ namespace WebCore {
         virtual void didFail(const ResourceError&) = 0;
     };
 
-    class PluginView : public Widget
+    class PluginView : public PluginViewBase
 #if ENABLE(NETSCAPE_PLUGIN_API)
                      , private PluginStreamClient
 #endif
diff --git a/WebCore/plugins/PluginViewBase.h b/WebCore/plugins/PluginViewBase.h
index 58ceffa..8dc667a 100644
--- a/WebCore/plugins/PluginViewBase.h
+++ b/WebCore/plugins/PluginViewBase.h
@@ -48,7 +48,7 @@ public:
     virtual void privateBrowsingStateChanged(bool) { }
 
 protected:
-    PluginViewBase(PlatformWidget widget) : Widget(widget) { }
+    PluginViewBase(PlatformWidget widget = 0) : Widget(widget) { }
     
 private:
     virtual bool isPluginViewBase() const { return true; }

-- 
WebKit Debian packaging