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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cdc83d7a60a23d2f365d59028afaada3bad2e3c3
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 19 01:05:08 2010 +0000

    2010-09-18  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [Chromium] fast/dom/dataset-gc.html is failing
            https://bugs.webkit.org/show_bug.cgi?id=45426
    
            * platform/chromium/test_expectations.txt:
    2010-09-18  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [Chromium] fast/dom/dataset-gc.html is failing
            https://bugs.webkit.org/show_bug.cgi?id=45426
    
            * bindings/scripts/CodeGeneratorV8.pm:
            * bindings/v8/custom/V8DOMStringMapCustom.cpp:
            (WebCore::toV8):
            * dom/DOMStringMap.h:
            * dom/DatasetDOMStringMap.h:
            (WebCore::DatasetDOMStringMap::element):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ee8b74e..55350f9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-18  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [Chromium] fast/dom/dataset-gc.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=45426
+
+        * platform/chromium/test_expectations.txt:
+
 2010-09-18  Adam Barth  <abarth at webkit.org>
 
         Also update the snow-leopard result.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 55cb444..4608fe5 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2983,9 +2983,6 @@ BUGWK45193 LINUX : fast/text/decomposed-after-stacked-diacritics.html = TEXT
 BUGWK45209 WIN DEBUG SLOW : inspector/debugger-autocontinue-on-syntax-error.html = PASS
 BUGWK45209 WIN DEBUG SLOW : inspector/dom-breakpoints.html = PASS
 
-// Regressed in r66954
-BUGWK45432 WIN MAC LINUX : fast/dom/dataset-gc.html = TEXT
-
 BUGWK45438 : editing/spelling/spelling-backspace-between-lines.html = TEXT
 
 // WebKit r67068
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 43f2d19..11d9896 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-18  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [Chromium] fast/dom/dataset-gc.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=45426
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/custom/V8DOMStringMapCustom.cpp:
+        (WebCore::toV8):
+        * dom/DOMStringMap.h:
+        * dom/DatasetDOMStringMap.h:
+        (WebCore::DatasetDOMStringMap::element):
+
 2010-09-18  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index fde6995..f74f2b1 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -2508,6 +2508,7 @@ sub HasCustomToV8Implementation {
     # We generate a custom converter (but JSC doesn't) for the following:
     return 1 if $interfaceName eq "CSSStyleSheet";
     return 1 if $interfaceName eq "CanvasPixelArray";
+    return 1 if $interfaceName eq "DOMStringMap";
     return 1 if $interfaceName eq "DOMWindow";
     return 1 if $interfaceName eq "Element";
     return 1 if $interfaceName eq "HTMLDocument";
diff --git a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
index 7ca18ab..c8a975b 100644
--- a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
@@ -33,6 +33,7 @@
 
 #include "DOMStringMap.h"
 #include "V8Binding.h"
+#include "V8DOMWrapper.h"
 
 namespace WebCore {
 
@@ -93,4 +94,16 @@ v8::Handle<v8::Value> V8DOMStringMap::namedPropertySetter(v8::Local<v8::String>
     return value;
 }
 
+v8::Handle<v8::Value> toV8(DOMStringMap* impl)
+{
+    if (!impl)
+        return v8::Null();
+    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);
+    return wrapper;
+}
+
 } // namespace WebCore
diff --git a/WebCore/dom/DOMStringMap.h b/WebCore/dom/DOMStringMap.h
index e91d884..86a22b0 100644
--- a/WebCore/dom/DOMStringMap.h
+++ b/WebCore/dom/DOMStringMap.h
@@ -32,6 +32,7 @@
 
 namespace WebCore {
 
+class Element;
 typedef int ExceptionCode;
 
 class DOMStringMap : public Noncopyable {
@@ -47,6 +48,8 @@ public:
     virtual void setItem(const String& name, const String& value, ExceptionCode&) = 0;
     virtual void deleteItem(const String& name, ExceptionCode&) = 0;
 
+    virtual Element* element() = 0;
+
 protected:
     DOMStringMap()
     {
diff --git a/WebCore/dom/DatasetDOMStringMap.h b/WebCore/dom/DatasetDOMStringMap.h
index f82eaa5..632e365 100644
--- a/WebCore/dom/DatasetDOMStringMap.h
+++ b/WebCore/dom/DatasetDOMStringMap.h
@@ -49,6 +49,8 @@ public:
     virtual void setItem(const String& name, const String& value, ExceptionCode&);
     virtual void deleteItem(const String& name, ExceptionCode&);
 
+    virtual Element* element() { return m_element; }
+
 private:
     DatasetDOMStringMap(Element* element)
         : m_element(element)

-- 
WebKit Debian packaging