[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 866e69f18d495eb2e8e93423bc28fa923cc46fce
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 00:59:35 2010 +0000

    2010-03-02  Darin Fisher  <darin at chromium.org>
    
            Fix chromium build bustage.
    
            * page/Page.cpp:
            (WebCore::Page::privateBrowsingStateChanged): PluginView methods may
            not be called in the Chromium port.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de450ad..ada70c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-02  Darin Fisher  <darin at chromium.org>
+
+        Fix chromium build bustage.
+
+        * page/Page.cpp:
+        (WebCore::Page::privateBrowsingStateChanged): PluginView methods may
+        not be called in the Chromium port.
+
 2010-03-02  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Darin Adler and Adam Roben.
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 6321855..b5e1a06 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -778,6 +778,7 @@ 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
@@ -803,6 +804,7 @@ void Page::privateBrowsingStateChanged()
 
     for (size_t i = 0; i < pluginViews.size(); i++)
         pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
+#endif
 }
 
 void Page::pluginAllowedRunTimeChanged()

-- 
WebKit Debian packaging