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

[ukai at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4795c620f9242e5a0e16cc905199f8287a91dcc9
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 02:45:24 2010 +0000

    Unreviewed build fix.
    remove wrong assertion
    
    * websockets/WorkerThreadableWebSocketChannel.cpp:
    (WebCore::WorkerThreadableWebSocketChannel::Bridge::Bridge):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52893 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8f4c35..16324be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-01-06  Fumitoshi Ukai  <ukai at chromium.org>
 
+        Unreviewed build fix.
+        remove wrong assertion
+
+        * websockets/WorkerThreadableWebSocketChannel.cpp:
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::Bridge):
+
+2010-01-06  Fumitoshi Ukai  <ukai at chromium.org>
+
         Reviewed by David Levin.
 
         Add WebSocket feature in Worker
diff --git a/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp b/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
index b15c151..6f45b53 100644
--- a/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
+++ b/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
@@ -226,7 +226,6 @@ WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketC
     , m_taskMode(taskMode)
     , m_peer(0)
 {
-    ASSERT(context->isWorkerContext());
     ASSERT(m_workerClientWrapper.get());
     setMethodNotCompleted();
     m_loaderProxy.postTaskToLoader(createCallbackTask(&Bridge::mainThreadCreateWebSocketChannel, this, m_workerClientWrapper, m_taskMode, url, protocol));

-- 
WebKit Debian packaging