[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[japhet at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit cfcf3a038cc631c6dc3d49b815ff96aaaee7ef26
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 23:30:46 2010 +0000

    2010-02-10  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [V8] Handle the possibility that ScheduledAction::execute() may
            retrieve a null V8Proxy* even if not in a WorkerContext (e.g., if
            JS was disallowed).
    
            * bindings/v8/ScheduledAction.cpp:
            (WebCore::ScheduledAction::execute):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 069eec6..97b8878 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-10  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [V8] Handle the possibility that ScheduledAction::execute() may
+        retrieve a null V8Proxy* even if not in a WorkerContext (e.g., if
+        JS was disallowed).
+
+        * bindings/v8/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+
 2010-02-10  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/bindings/v8/ScheduledAction.cpp b/WebCore/bindings/v8/ScheduledAction.cpp
index 4f321cb..f511e2b 100644
--- a/WebCore/bindings/v8/ScheduledAction.cpp
+++ b/WebCore/bindings/v8/ScheduledAction.cpp
@@ -95,11 +95,11 @@ void ScheduledAction::execute(ScriptExecutionContext* context)
     if (proxy)
         execute(proxy);
 #if ENABLE(WORKERS)
-    else {
-        ASSERT(context->isWorkerContext());
+    else if (context->isWorkerContext())
         execute(static_cast<WorkerContext*>(context));
-    }
 #endif
+    // It's possible that Javascript is disabled and that we have neither a V8Proxy
+    // nor a WorkerContext.  Do nothing in that case.
 }
 
 void ScheduledAction::execute(V8Proxy* proxy)

-- 
WebKit Debian packaging