[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 919110efe49d8cd89d93210c8053b62078d5a48c
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 05:13:19 2009 +0000

    Rubber-stamped by Mark Rowe.
    
    Moved a WebPluginHalterClient out of the WebCore namesapce.
    
    * WebCoreSupport/WebPluginHalterClient.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49152 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7ec594f..5d03b3d 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-05  Dan Bernstein  <mitz at apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        Moved a WebPluginHalterClient out of the WebCore namesapce.
+
+        * WebCoreSupport/WebPluginHalterClient.h:
+
 2009-10-05  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h b/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h
index 1402ddf..48c655d 100644
--- a/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h
+++ b/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h
@@ -25,20 +25,18 @@
 
 #import <WebCore/PluginHalterClient.h>
 
- at class WebView;
-
 namespace WebCore {
-    
     class Node;
+}
 
-    class WebPluginHalterClient : public WebCore::PluginHalterClient {
-    public:
-        WebPluginHalterClient(WebView *);
-        
-        virtual bool shouldHaltPlugin(Node*) const;
-        
-    private:
-        WebView *m_webView;
-    };
+ at class WebView;
+
+class WebPluginHalterClient : public WebCore::PluginHalterClient {
+public:
+    WebPluginHalterClient(WebView *);
+    
+    virtual bool shouldHaltPlugin(WebCore::Node*) const;
     
-} // namespace WebCore
+private:
+    WebView *m_webView;
+};

-- 
WebKit Debian packaging