[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jianli at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit e1b7eaa588f4b9c015c9ef91f4c1bf7a2d997f66
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 23:03:27 2010 +0000

    WebCore: Add BlobConstructor to DOMWindow.
    https://bugs.webkit.org/show_bug.cgi?id=33982
    
    Reviewed by Darin Adler.
    
    * page/DOMWindow.idl:
    
    LayoutTests: Updated the affected tests due to adding BlobConstructor to DOMWindow.
    https://bugs.webkit.org/show_bug.cgi?id=33982
    
    Reviewed by Darin Adler.
    
    * fast/dom/Window/window-properties-expected.txt:
    * fast/dom/prototype-inheritance-2-expected.txt:
    * fast/dom/prototype-inheritance-expected.txt:
    * fast/js/global-constructors-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7fffce2..c924656 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Darin Adler.
 
+        Updated the affected tests due to adding BlobConstructor to DOMWindow.
+        https://bugs.webkit.org/show_bug.cgi?id=33982
+
+        * fast/dom/Window/window-properties-expected.txt:
+        * fast/dom/prototype-inheritance-2-expected.txt:
+        * fast/dom/prototype-inheritance-expected.txt:
+        * fast/js/global-constructors-expected.txt:
+
+2010-01-22  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Adler.
+
         Add test for new attributes introduced in File and Blob interfaces.
         https://bugs.webkit.org/show_bug.cgi?id=33980
 
diff --git a/LayoutTests/fast/dom/Window/window-properties-expected.txt b/LayoutTests/fast/dom/Window/window-properties-expected.txt
index e2267b6..1a92ee3 100644
--- a/LayoutTests/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-expected.txt
@@ -149,6 +149,8 @@ window.BeforeLoadEvent.prototype.initBeforeLoadEvent [function]
 window.BeforeLoadEvent.prototype.initEvent [function]
 window.BeforeLoadEvent.prototype.preventDefault [function]
 window.BeforeLoadEvent.prototype.stopPropagation [function]
+window.Blob [object BlobConstructor]
+window.Blob.prototype [object BlobPrototype]
 window.CDATASection [object CDATASectionConstructor]
 window.CDATASection.prototype [object CDATASectionPrototype]
 window.CDATASection.prototype.ATTRIBUTE_NODE [number]
@@ -897,7 +899,7 @@ window.EventSource.prototype.close [function]
 window.EventSource.prototype.dispatchEvent [function]
 window.EventSource.prototype.removeEventListener [function]
 window.File [object FileConstructor]
-window.File.prototype [object FilePrototype]
+window.File.prototype [printed above as window.Blob.prototype]
 window.FileList [object FileListConstructor]
 window.FileList.prototype [object FileListPrototype]
 window.FileList.prototype.item [function]
diff --git a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
index c8027aa..dc349aa 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
@@ -204,6 +204,7 @@ PASS WebKitCSSKeyframesRuleConstructor from inner.document.getElementById("dummy
 PASS WebKitCSSKeyframesRulePrototype from inner.document.getElementById("dummyStyle").sheet.cssRules.5.__proto__
 PASS XSLTProcessorConsructor from inner.document.forms.testForm.0.ownerDocument.defaultView.XSLTProcessor
 Never found Audio
+Never found Blob
 Never found CDATASection
 Never found CSSPageRule
 Never found CSSRule
diff --git a/LayoutTests/fast/dom/prototype-inheritance-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
index 5ecc171..e4d4d17 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
@@ -9,6 +9,8 @@ PASS inner.Audio.isInner is true
 PASS inner.Audio.constructor.isInner is true
 PASS inner.BeforeLoadEvent.isInner is true
 PASS inner.BeforeLoadEvent.constructor.isInner is true
+PASS inner.Blob.isInner is true
+PASS inner.Blob.constructor.isInner is true
 PASS inner.CDATASection.isInner is true
 PASS inner.CDATASection.constructor.isInner is true
 PASS inner.CSSCharsetRule.isInner is true
diff --git a/LayoutTests/fast/js/global-constructors-expected.txt b/LayoutTests/fast/js/global-constructors-expected.txt
index ea545b5..87b5cac 100644
--- a/LayoutTests/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/fast/js/global-constructors-expected.txt
@@ -6,6 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS Attr.toString() is '[object AttrConstructor]'
 PASS Audio.toString() is '[object AudioConstructor]'
 PASS BeforeLoadEvent.toString() is '[object BeforeLoadEventConstructor]'
+PASS Blob.toString() is '[object BlobConstructor]'
 PASS CDATASection.toString() is '[object CDATASectionConstructor]'
 PASS CSSCharsetRule.toString() is '[object CSSCharsetRuleConstructor]'
 PASS CSSFontFaceRule.toString() is '[object CSSFontFaceRuleConstructor]'
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 36b8115..fcb9367 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-22  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add BlobConstructor to DOMWindow.
+        https://bugs.webkit.org/show_bug.cgi?id=33982
+
+        * page/DOMWindow.idl:
+
 2010-01-22  Brian Weinstein  <bweinstein at apple.com>
 
         Rubber-stamped by Adam Roben.
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index fdb8243..dcd090e 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -477,6 +477,7 @@ module window {
 
         attribute FileConstructor File;
         attribute FileListConstructor FileList;
+        attribute BlobConstructor Blob;
 
         attribute NodeFilterConstructor NodeFilter;
         attribute RangeConstructor Range;

-- 
WebKit Debian packaging