[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1706504dad5aa9d543120e5962fea053b7bac4e1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 17:14:06 2009 +0000

    2009-12-11  anton muhin  <antonm at chromium.org>
            Reviewed by Adam Barth.
    
            [v8] in Debug builds create an additional handle scope
            when doing debug build checks.
            https://bugs.webkit.org/show_bug.cgi?id=32335
    
            Should be covered by buildbots.
    
            * bindings/v8/V8DOMWrapper.h:
            (WebCore::V8DOMWrapper::convertDOMWrapperToNative):
            (WebCore::V8DOMWrapper::convertDOMWrapperToNode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0ed7eaa..cdc85c9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-11  anton muhin  <antonm at chromium.org>
+        Reviewed by Adam Barth.
+
+        [v8] in Debug builds create an additional handle scope
+        when doing debug build checks.
+        https://bugs.webkit.org/show_bug.cgi?id=32335
+
+        Should be covered by buildbots.
+
+        * bindings/v8/V8DOMWrapper.h:
+        (WebCore::V8DOMWrapper::convertDOMWrapperToNative):
+        (WebCore::V8DOMWrapper::convertDOMWrapperToNode):
+
 2009-12-11  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h
index eff3252..ce550cd 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.h
+++ b/WebCore/bindings/v8/V8DOMWrapper.h
@@ -126,15 +126,21 @@ namespace WebCore {
         template <class C>
         static C* convertDOMWrapperToNative(v8::Handle<v8::Object> object)
         {
+#ifndef NDEBUG
+            v8::HandleScope handleScope;
             ASSERT(maybeDOMWrapper(object));
+#endif
             return reinterpret_cast<C*>(object->GetPointerFromInternalField(V8Custom::kDOMWrapperObjectIndex));
         }
 
         template <class C>
         static C* convertDOMWrapperToNode(v8::Handle<v8::Object> object)
         {
+#ifndef NDEBUG
+            v8::HandleScope handleScope;
             ASSERT(maybeDOMWrapper(object));
             ASSERT(domWrapperType(object) == V8ClassIndex::NODE);
+#endif
             return convertDOMWrapperToNative<C>(object);
         }
 

-- 
WebKit Debian packaging