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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 286d9aafac70bce4cc3cfee87613625bb3718ef5
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 00:36:40 2010 +0000

    Clean up the build fix r55437 by adding an empty implementation of privateBrowsingStateChanged in PluginViewNone.cpp
    
    Rubber-stamped by Jon Honeycutt.
    
    * page/Page.cpp:
    * plugins/PluginViewNone.cpp:
    (WebCore::PluginView::privateBrowsingStateChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e07492e..64ea5ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-03-02  Mark Rowe  <mrowe at apple.com>
 
+        Rubber-stamped by Jon Honeycutt.
+
+        Clean up the build fix r55437 by adding an empty implementation of privateBrowsingStateChanged in PluginViewNone.cpp
+
+        * page/Page.cpp:
+        * plugins/PluginViewNone.cpp:
+        (WebCore::PluginView::privateBrowsingStateChanged):
+
+2010-03-02  Mark Rowe  <mrowe at apple.com>
+
         Fix the Mac build.
 
         * page/Page.cpp:
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 5509166..6321855 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -776,15 +776,6 @@ InspectorTimelineAgent* Page::inspectorTimelineAgent() const
 }
 #endif
 
-#if PLATFORM(MAC)
-
-// FIXME: Page shouldn't have to know that the Mac plug-in implementation doesn't use PluginView.
-void Page::privateBrowsingStateChanged()
-{
-}
-
-#else
-
 void Page::privateBrowsingStateChanged()
 {
     bool privateBrowsingEnabled = m_settings->privateBrowsingEnabled();
@@ -814,8 +805,6 @@ void Page::privateBrowsingStateChanged()
         pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
 }
 
-#endif
-
 void Page::pluginAllowedRunTimeChanged()
 {
     if (m_pluginHalter)
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index ed5ad1b..5734017 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -126,4 +126,8 @@ void PluginView::keepAlive(NPP)
 }
 #endif
 
+void PluginView::privateBrowsingStateChanged(bool)
+{
+}
+
 } // namespace WebCore

-- 
WebKit Debian packaging