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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 567c8f2b0bcf008b3d50bf0e91bb034854db8efa
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 07:31:28 2010 +0000

    2010-01-05  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Adam Barth.
    
            Moving v8::HandleScope up above declaration of v8::Local to fix a
            Chromium startup crash.
    
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::setContextDebugId):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d5a8c0..1fff59c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-05  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Moving v8::HandleScope up above declaration of v8::Local to fix a
+        Chromium startup crash.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setContextDebugId):
+
 2010-01-05  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 44b7c52..c67e571 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -804,10 +804,10 @@ void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup)
 bool V8Proxy::setContextDebugId(int debugId)
 {
     ASSERT(debugId > 0);
+    v8::HandleScope scope;
     v8::Local<v8::Context> context = m_frame->script()->mainWorldWindowShell()->localHandleForContext();
     if (context.IsEmpty())
         return false;
-    v8::HandleScope scope;
     if (!context->GetData()->IsUndefined())
         return false;
 

-- 
WebKit Debian packaging