[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[arv at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8b1c692ac312066b5d35b067ab6d95171aab317b
Author: arv at chromium.org <arv at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 19:11:06 2010 +0000

    2010-09-22  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [Chromium] Fix memory model for dataset
            https://bugs.webkit.org/show_bug.cgi?id=46280
    
            This is covered by existing tests.
    
            * bindings/v8/custom/V8DOMStringMapCustom.cpp:
            (WebCore::toV8):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 717030f..18f2f56 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [Chromium] Fix memory model for dataset
+        https://bugs.webkit.org/show_bug.cgi?id=46280
+
+        This is covered by existing tests.
+
+        * bindings/v8/custom/V8DOMStringMapCustom.cpp:
+        (WebCore::toV8):
+
 2010-09-22  Abhishek Arya  <inferno at chromium.org>
 
         Reviewed by Dave Hyatt.
diff --git a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
index c8a975b..71ff357 100644
--- a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
@@ -34,6 +34,7 @@
 #include "DOMStringMap.h"
 #include "V8Binding.h"
 #include "V8DOMWrapper.h"
+#include "V8Element.h"
 
 namespace WebCore {
 
@@ -101,8 +102,11 @@ v8::Handle<v8::Value> toV8(DOMStringMap* impl)
     v8::Handle<v8::Object> wrapper = V8DOMStringMap::wrap(impl);
     // Add a hidden reference from the element to the DOMStringMap.
     Element* element = impl->element();
-    if (!wrapper.IsEmpty() && element)
-        V8DOMWrapper::setHiddenWindowReference(element->document()->frame(), wrapper);
+    if (!wrapper.IsEmpty() && element) {
+        v8::Handle<v8::Value> elementValue = toV8(element);
+        if (!elementValue.IsEmpty() && elementValue->IsObject())
+            V8DOMWrapper::setHiddenReference(elementValue.As<v8::Object>(), wrapper);
+    }
     return wrapper;
 }
 

-- 
WebKit Debian packaging