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

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0fd56b306b7c716381f61088157890f729802e1a
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 08:30:58 2010 +0000

    2010-01-15  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Darin Adler.
    
            Allow custom memory allocation control for Peer class
            https://bugs.webkit.org/show_bug.cgi?id=33670
    
            Inherits the following class from Noncopyable because it is
            instantiated by 'new' and no need to be copyable:
    
            class name - instantiated at: WebCore/'location'
            class Peer - websockets/WebSocketChannelClient.h:38
    
            * websockets/WorkerThreadableWebSocketChannel.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1734fbb..0bf58f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-01-15  Zoltan Horvath  <zoltan at webkit.org>
 
+        Reviewed by Darin Adler.
+
+        Allow custom memory allocation control for Peer class
+        https://bugs.webkit.org/show_bug.cgi?id=33670
+
+        Inherits the following class from Noncopyable because it is 
+        instantiated by 'new' and no need to be copyable:
+
+        class name - instantiated at: WebCore/'location'
+        class Peer - websockets/WebSocketChannelClient.h:38
+
+        * websockets/WorkerThreadableWebSocketChannel.h:
+
+2010-01-15  Zoltan Horvath  <zoltan at webkit.org>
+
         Reviewed by Oliver Hunt.
 
         [Qt] Allow custom memory allocation control for GraphicsContextPlatformPrivate class
diff --git a/WebCore/websockets/WorkerThreadableWebSocketChannel.h b/WebCore/websockets/WorkerThreadableWebSocketChannel.h
index 35bebc3..cf193ca 100644
--- a/WebCore/websockets/WorkerThreadableWebSocketChannel.h
+++ b/WebCore/websockets/WorkerThreadableWebSocketChannel.h
@@ -75,7 +75,7 @@ protected:
 private:
     // Generated by the bridge.  The Peer and its bridge should have identical
     // lifetimes.
-    class Peer : public WebSocketChannelClient {
+    class Peer : public WebSocketChannelClient, public Noncopyable {
     public:
         static Peer* create(RefPtr<ThreadSafeShared<ThreadableWebSocketChannelClientWrapper> > clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
         {

-- 
WebKit Debian packaging