[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 ad04fb2e54726f50b8469a2433d8d753354e42cc
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 00:43:47 2010 +0000

    ScriptDebugServer shouldn't care that Mac does not use PluginView for plug-ins.
    
    Rubber-stamped by Jon Honeycutt.
    
    * bindings/js/ScriptDebugServer.cpp:
    * plugins/PluginViewNone.cpp:
    (WebCore::PluginView::setJavaScriptPaused): Add an empty implementation of setJavaScriptPaused.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 64ea5ce..4dc1574 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Rubber-stamped by Jon Honeycutt.
 
+        ScriptDebugServer shouldn't care that Mac does not use PluginView for plug-ins.
+
+        * bindings/js/ScriptDebugServer.cpp:
+        * plugins/PluginViewNone.cpp:
+        (WebCore::PluginView::setJavaScriptPaused): Add an empty implementation of setJavaScriptPaused.
+
+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:
diff --git a/WebCore/bindings/js/ScriptDebugServer.cpp b/WebCore/bindings/js/ScriptDebugServer.cpp
index a31b973..5305da3 100644
--- a/WebCore/bindings/js/ScriptDebugServer.cpp
+++ b/WebCore/bindings/js/ScriptDebugServer.cpp
@@ -392,14 +392,6 @@ void ScriptDebugServer::setJavaScriptPaused(Frame* frame, bool paused)
     setJavaScriptPaused(frame->view(), paused);
 }
 
-#if PLATFORM(MAC)
-
-void ScriptDebugServer::setJavaScriptPaused(FrameView*, bool)
-{
-}
-
-#else
-
 void ScriptDebugServer::setJavaScriptPaused(FrameView* view, bool paused)
 {
     if (!view)
@@ -417,8 +409,6 @@ void ScriptDebugServer::setJavaScriptPaused(FrameView* view, bool paused)
     }
 }
 
-#endif
-
 void ScriptDebugServer::pauseIfNeeded(Page* page)
 {
     if (m_paused)
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index 5734017..16383cc 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -130,4 +130,8 @@ void PluginView::privateBrowsingStateChanged(bool)
 {
 }
 
+void PluginView::setJavaScriptPaused(bool)
+{
+}
+
 } // namespace WebCore

-- 
WebKit Debian packaging