[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[japhet at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit e2854defadcd655f07a7d6a4974e2a009b67a514
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 22:25:52 2009 +0000

    2009-09-28  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Adam Barth.
    
            Change the V8 bindings' handling of window.toString(),
            so we return [object DOMWindow] (like JSC), not [object global].
    
            https://bugs.webkit.org/show_bug.cgi?id=29742
    
            This will fix a couple of Chromium port test failures and enable us to
            use the default expectations for a bunch more.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ecea376..66403a4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2009-09-28  Nate Chapin  <japhet at chromium.org>
 
+        Reviewed by Adam Barth.
+
+        Change the V8 bindings' handling of window.toString(),
+        so we return [object DOMWindow] (like JSC), not [object global].
+
+        https://bugs.webkit.org/show_bug.cgi?id=29742
+
+        This will fix a couple of Chromium port test failures and enable us to
+        use the default expectations for a bunch more.
+
+        * bindings/v8/custom/V8DOMWindowCustom.cpp: Use the DOMWindow wrapper instead
+        of the global object wrapper when it's available in the DOMWindow toString callback.
+
+2009-09-28  Nate Chapin  <japhet at chromium.org>
+
         Rubber stamped by David Levin.
 
         Chromium build fix, add back in #include of V8Proxy.h in V8WebKitPointConstructor.cpp.
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index ff45d6e..952a5a0 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -368,7 +368,10 @@ CALLBACK_FUNC_DECL(DOMWindowBtoa)
 CALLBACK_FUNC_DECL(DOMWindowToString)
 {
     INC_STATS("DOM.DOMWindow.toString()");
-    return args.This()->ObjectProtoToString();
+    v8::Handle<v8::Object> domWrapper = V8DOMWrapper::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, args.This());
+    if (domWrapper.IsEmpty())
+        return args.This()->ObjectProtoToString();
+    return domWrapper->ObjectProtoToString();
 }
 
 CALLBACK_FUNC_DECL(DOMWindowNOP)

-- 
WebKit Debian packaging