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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ddbb3eda59873d1743aa9ab89b1f48fb22363b60
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 23:39:18 2010 +0000

    Fix the Mac build.
    
    * page/Page.cpp:
    (WebCore::Page::privateBrowsingStateChanged): Mac doesn't use WebCore's PluginView class
    for plug-ins, so provide an empty implementation of privateBrowsingStateChanged for Mac.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 45e5e43..e07492e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-02  Mark Rowe  <mrowe at apple.com>
+
+        Fix the Mac build.
+
+        * page/Page.cpp:
+        (WebCore::Page::privateBrowsingStateChanged): Mac doesn't use WebCore's PluginView class
+        for plug-ins, so provide an empty implementation of privateBrowsingStateChanged for Mac.
+
 2010-03-02  Andy Estes  <aestes at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 6321855..5509166 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -776,6 +776,15 @@ 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();
@@ -805,6 +814,8 @@ void Page::privateBrowsingStateChanged()
         pluginViews[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
 }
 
+#endif
+
 void Page::pluginAllowedRunTimeChanged()
 {
     if (m_pluginHalter)

-- 
WebKit Debian packaging