[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 74abd50969c45c5b72faaf37e50f82dc984b882a
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 00:47:03 2010 +0000

    2010-03-03  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Mark Rowe.
    
            Page should not care about Chromium plug-in implementation details
            https://bugs.webkit.org/show_bug.cgi?id=35623
    
            * WebCore.gypi: Compile PluginViewNone.cpp
            * page/Page.cpp:
            (WebCore::Page::privateBrowsingStateChanged): Remove conditional
            compilation for PLATFORM(CHROMIUM).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f3a7c46..8ff8eb5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-03  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Mark Rowe.
+
+        Page should not care about Chromium plug-in implementation details
+        https://bugs.webkit.org/show_bug.cgi?id=35623
+
+        * WebCore.gypi: Compile PluginViewNone.cpp
+        * page/Page.cpp:
+        (WebCore::Page::privateBrowsingStateChanged): Remove conditional
+        compilation for PLATFORM(CHROMIUM).
+
 2010-03-03  David Levin  <levin at chromium.org>
 
         No review, rolling out r55474.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 182e209..d50923d 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2916,6 +2916,7 @@
             'plugins/PluginStream.h',
             'plugins/PluginView.cpp',
             'plugins/PluginView.h',
+            'plugins/PluginViewNone.cpp',
             'plugins/npapi.cpp',
             'plugins/npfunctions.h',
             'rendering/style/BindingURI.cpp',
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index b9ca18c..1c02e6c 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -778,7 +778,6 @@ InspectorTimelineAgent* Page::inspectorTimelineAgent() const
 
 void Page::privateBrowsingStateChanged()
 {
-#if !PLATFORM(CHROMIUM)
     bool privateBrowsingEnabled = m_settings->privateBrowsingEnabled();
 
     // Collect the PluginViews in to a vector to ensure that action the plug-in takes
@@ -804,7 +803,6 @@ void Page::privateBrowsingStateChanged()
 
     for (size_t i = 0; i < pluginViews.size(); i++)
         pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
-#endif
 }
 
 void Page::pluginAllowedRunTimeChanged()

-- 
WebKit Debian packaging