[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 fdb9e97cca849e00b49dcf15c3e42ef41e2dcf7f
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 19:22:57 2010 +0000

    2010-02-19  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [V8] Fix Worker crash regression in r54972
    
            https://bugs.webkit.org/show_bug.cgi?id=35166
    
            * bindings/v8/V8DOMWrapper.cpp:
            (WebCore::V8DOMWrapper::instantiateV8Object): Properly unwrap global objects when inside a WorkerContext.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1ca1174..1369388 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-19  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [V8] Fix Worker crash regression in r54972
+
+        https://bugs.webkit.org/show_bug.cgi?id=35166
+
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::instantiateV8Object): Properly unwrap global objects when inside a WorkerContext.
+
 2010-02-19  Steve Block  <steveblock at google.com>
 
         Not reviewed. Reverts r55020 which causes crashes in Chromium LayoutTests
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 0f982d5..6bf6a2c 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -295,7 +295,7 @@ v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, V8ClassI
             if (globalObjectPrototypeIsDOMWindow(globalPrototype))
                 proxy = V8Proxy::retrieve(V8DOMWindow::toNative(globalPrototype)->frame());
             else
-                workerContext = V8WorkerContext::toNative(globalPrototype);
+                workerContext = V8WorkerContext::toNative(lookupDOMWrapper(V8WorkerContext::GetTemplate(), context->Global()));
         }
     }
 

-- 
WebKit Debian packaging