Skip to content
Permalink
Browse files
2010-06-12 Andreas Kling <andreas.kling@nokia.com> 
        Reviewed by Darin Adler.

        Window object should have CanvasGradient and CanvasPattern
        https://bugs.webkit.org/show_bug.cgi?id=40394

        Unskipped 2 tests that are now working properly.

        * canvas/philip/tests/2d.gradient.object.return-expected.txt:
        * canvas/philip/tests/2d.pattern.basic.type-expected.txt:
        * fast/dom/Window/window-properties-expected.txt:
        * fast/dom/Window/window-property-descriptors-expected.txt:
        * fast/dom/dom-constructors-expected.txt:
        * fast/dom/prototype-inheritance-2-expected.txt:
        * fast/dom/prototype-inheritance-expected.txt:
        * fast/js/global-constructors-expected.txt:
        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
        * platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
        * platform/gtk/fast/dom/prototype-inheritance-expected.txt:
        * platform/gtk/fast/js/global-constructors-expected.txt:
        * platform/mac/Skipped:
        * platform/qt/Skipped:
        * platform/qt/fast/dom/Window/window-properties-expected.txt:
        * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
        * platform/qt/fast/dom/prototype-inheritance-expected.txt:
        * platform/qt/fast/js/global-constructors-expected.txt:
2010-06-12  Andreas Kling  <andreas.kling@nokia.com>

        Reviewed by Darin Adler.

        Window object should have CanvasGradient and CanvasPattern
        https://bugs.webkit.org/show_bug.cgi?id=40394

        This fixes the following tests:
        - canvas/philip/tests/2d.gradient.object.return.html
        - canvas/philip/tests/2d.pattern.basic.type.html

        * html/canvas/CanvasGradient.idl:
        * html/canvas/CanvasPattern.idl:
        * page/DOMWindow.idl:

Canonical link: https://commits.webkit.org/52084@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@61071 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
@eseidel
eseidel committed Jun 13, 2010
1 parent 70751ee commit 76b495962e09db7051fa275e2b6bc6f6b128c97e
Showing 23 changed files with 91 additions and 10 deletions.
28 LayoutTests/ChangeLog
View file
@@ -1,3 +1,31 @@
2010-06-12 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Darin Adler.

Window object should have CanvasGradient and CanvasPattern
https://bugs.webkit.org/show_bug.cgi?id=40394

Unskipped 2 tests that are now working properly.

* canvas/philip/tests/2d.gradient.object.return-expected.txt:
* canvas/philip/tests/2d.pattern.basic.type-expected.txt:
* fast/dom/Window/window-properties-expected.txt:
* fast/dom/Window/window-property-descriptors-expected.txt:
* fast/dom/dom-constructors-expected.txt:
* fast/dom/prototype-inheritance-2-expected.txt:
* fast/dom/prototype-inheritance-expected.txt:
* fast/js/global-constructors-expected.txt:
* platform/gtk/fast/dom/Window/window-properties-expected.txt:
* platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
* platform/gtk/fast/dom/prototype-inheritance-expected.txt:
* platform/gtk/fast/js/global-constructors-expected.txt:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/qt/fast/dom/Window/window-properties-expected.txt:
* platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
* platform/qt/fast/dom/prototype-inheritance-expected.txt:
* platform/qt/fast/js/global-constructors-expected.txt:

2010-06-12 Dan Bernstein <mitz@apple.com>

Reviewed by Oliver Hunt.
2 LayoutTests/canvas/philip/tests/2d.gradient.object.return-expected.txt
View file
@@ -3,4 +3,4 @@
createLinearGradient() and createRadialGradient() returns objects implementing CanvasGradient
References: 2d.gradient.linear.return 2d.gradient.radial.return
Actual output:
Aborted with exception: Result of expression 'window.CanvasGradient' [undefined] is not an object.
Passed
1 LayoutTests/canvas/philip/tests/2d.pattern.basic.type-expected.txt
View file
@@ -4,4 +4,3 @@ References: 2d.pattern.return
Actual output:
Passed


5 LayoutTests/fast/dom/Window/window-properties-expected.txt
View file
@@ -385,6 +385,11 @@ window.CSSVariablesDeclaration.prototype.removeVariable [function]
window.CSSVariablesDeclaration.prototype.setVariable [function]
window.CSSVariablesRule [object CSSVariablesRuleConstructor]
window.CSSVariablesRule.prototype [printed above as window.CSSRule.prototype]
window.CanvasGradient [object CanvasGradientConstructor]
window.CanvasGradient.prototype [object CanvasGradientPrototype]
window.CanvasGradient.prototype.addColorStop [function]
window.CanvasPattern [object CanvasPatternConstructor]
window.CanvasPattern.prototype [object CanvasPatternPrototype]
window.CanvasRenderingContext2D [object CanvasRenderingContext2DConstructor]
window.CanvasRenderingContext2D.prototype [object CanvasRenderingContext2DPrototype]
window.CanvasRenderingContext2D.prototype.arc [function]
2 LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt
View file
@@ -25,6 +25,8 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValueList') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesDeclaration') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesRule') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasRenderingContext2D') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CharacterData') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'ClientRect') is 'object'
4 LayoutTests/fast/dom/dom-constructors-expected.txt
View file
@@ -116,8 +116,8 @@ PASS TryAllocate('UIEvent') is 'exception'
PASS TryAllocate('WheelEvent') is 'exception'
PASS TryAllocate('XPathResult') is 'exception'
FAIL TryAllocate('BarInfo') should be exception. Was no constructor.
FAIL TryAllocate('CanvasGradient') should be exception. Was no constructor.
FAIL TryAllocate('CanvasPattern') should be exception. Was no constructor.
PASS TryAllocate('CanvasGradient') is 'exception'
PASS TryAllocate('CanvasPattern') is 'exception'
FAIL TryAllocate('Console') should be exception. Was no constructor.
FAIL TryAllocate('DOMSelection') should be exception. Was no constructor.
FAIL TryAllocate('DOMWindow') should be exception. Was no constructor.
2 LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
View file
@@ -48,6 +48,7 @@ PASS CSSValueListConstructor from inner.getComputedStyle(inner.document.body).ge
PASS CSSValueListPrototype from inner.getComputedStyle(inner.document.body).getPropertyCSSValue(-webkit-transition-timing-function).__proto__
PASS CSSValuePrototype from inner.getComputedStyle(inner.document.body).getPropertyCSSValue(background-clip).__proto__.__proto__
FAIL CanvasPattern from inner.document.getElementsByTagName("canvas")[0].getContext("2d").createPattern(inner.document.getElementsByTagName("img")[0], "")
FAIL CanvasPatternConstructor from inner.document.getElementsByTagName("canvas")[0].getContext("2d").createPattern(inner.document.getElementsByTagName("img")[0], "").constructor
FAIL CanvasPatternPrototype from inner.document.getElementsByTagName("canvas")[0].getContext("2d").createPattern(inner.document.getElementsByTagName("img")[0], "").__proto__
PASS CanvasRenderingContext2D from inner.document.getElementsByTagName("canvas")[0].getContext("2d")
PASS CanvasRenderingContext2DConstructor from inner.document.getElementsByTagName("canvas")[0].getContext("2d").constructor
@@ -214,6 +215,7 @@ Never found CDATASection
Never found CSSRule
Never found CSSVariablesDeclaration
Never found CSSVariablesRule
Never found CanvasGradient
Never found CharacterData
Never found Clipboard
Never found DOMParser
4 LayoutTests/fast/dom/prototype-inheritance-expected.txt
View file
@@ -43,6 +43,10 @@ PASS inner.CSSVariablesDeclaration.isInner is true
PASS inner.CSSVariablesDeclaration.constructor.isInner is true
PASS inner.CSSVariablesRule.isInner is true
PASS inner.CSSVariablesRule.constructor.isInner is true
PASS inner.CanvasGradient.isInner is true
PASS inner.CanvasGradient.constructor.isInner is true
PASS inner.CanvasPattern.isInner is true
PASS inner.CanvasPattern.constructor.isInner is true
PASS inner.CanvasRenderingContext2D.isInner is true
PASS inner.CanvasRenderingContext2D.constructor.isInner is true
PASS inner.CharacterData.isInner is true
2 LayoutTests/fast/js/global-constructors-expected.txt
View file
@@ -23,6 +23,8 @@ PASS CSSValue.toString() is '[object CSSValueConstructor]'
PASS CSSValueList.toString() is '[object CSSValueListConstructor]'
PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'
PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'
PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]'
PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]'
PASS CanvasRenderingContext2D.toString() is '[object CanvasRenderingContext2DConstructor]'
PASS CharacterData.toString() is '[object CharacterDataConstructor]'
PASS ClientRect.toString() is '[object ClientRectConstructor]'
5 LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
View file
@@ -356,6 +356,11 @@ window.CSSVariablesDeclaration.prototype.removeVariable [function]
window.CSSVariablesDeclaration.prototype.setVariable [function]
window.CSSVariablesRule [object CSSVariablesRuleConstructor]
window.CSSVariablesRule.prototype [printed above as window.CSSRule.prototype]
window.CanvasGradient [object CanvasGradientConstructor]
window.CanvasGradient.prototype [object CanvasGradientPrototype]
window.CanvasGradient.prototype.addColorStop [function]
window.CanvasPattern [object CanvasPatternConstructor]
window.CanvasPattern.prototype [object CanvasPatternPrototype]
window.CanvasRenderingContext2D [object CanvasRenderingContext2DConstructor]
window.CanvasRenderingContext2D.prototype [object CanvasRenderingContext2DPrototype]
window.CanvasRenderingContext2D.prototype.arc [function]
2 LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt
View file
@@ -25,6 +25,8 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValueList') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesDeclaration') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesRule') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasRenderingContext2D') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CharacterData') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'ClientRect') is 'object'
4 LayoutTests/platform/gtk/fast/dom/prototype-inheritance-expected.txt
View file
@@ -43,6 +43,10 @@ PASS inner.CSSVariablesDeclaration.isInner is true
PASS inner.CSSVariablesDeclaration.constructor.isInner is true
PASS inner.CSSVariablesRule.isInner is true
PASS inner.CSSVariablesRule.constructor.isInner is true
PASS inner.CanvasGradient.isInner is true
PASS inner.CanvasGradient.constructor.isInner is true
PASS inner.CanvasPattern.isInner is true
PASS inner.CanvasPattern.constructor.isInner is true
PASS inner.CanvasRenderingContext2D.isInner is true
PASS inner.CanvasRenderingContext2D.constructor.isInner is true
PASS inner.CharacterData.isInner is true
2 LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt
View file
@@ -23,6 +23,8 @@ PASS CSSValue.toString() is '[object CSSValueConstructor]'
PASS CSSValueList.toString() is '[object CSSValueListConstructor]'
PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'
PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'
PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]'
PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]'
PASS CanvasRenderingContext2D.toString() is '[object CanvasRenderingContext2DConstructor]'
PASS CharacterData.toString() is '[object CharacterDataConstructor]'
PASS ClientRect.toString() is '[object ClientRectConstructor]'
1 LayoutTests/platform/mac/Skipped
View file
@@ -240,7 +240,6 @@ canvas/philip/tests/2d.path.stroke.prune.arc.html
canvas/philip/tests/2d.path.stroke.prune.closed.html
canvas/philip/tests/2d.path.stroke.prune.curve.html
canvas/philip/tests/2d.path.stroke.prune.line.html
canvas/philip/tests/2d.pattern.basic.type.html
canvas/philip/tests/2d.pattern.image.broken.html
canvas/philip/tests/2d.pattern.image.incomplete.html
canvas/philip/tests/2d.pattern.image.null.html
1 LayoutTests/platform/qt/Skipped
View file
@@ -5300,7 +5300,6 @@ canvas/philip/tests/2d.path.rect.zero.4.html
canvas/philip/tests/2d.path.rect.zero.6.html
canvas/philip/tests/2d.path.stroke.prune.arc.html
canvas/philip/tests/2d.path.stroke.scale2.html
canvas/philip/tests/2d.pattern.basic.type.html
canvas/philip/tests/2d.pattern.image.broken.html
canvas/philip/tests/2d.pattern.image.incomplete.html
canvas/philip/tests/2d.pattern.image.null.html
5 LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
View file
@@ -385,6 +385,11 @@ window.CSSVariablesDeclaration.prototype.removeVariable [function]
window.CSSVariablesDeclaration.prototype.setVariable [function]
window.CSSVariablesRule [object CSSVariablesRuleConstructor]
window.CSSVariablesRule.prototype [printed above as window.CSSRule.prototype]
window.CanvasGradient [object CanvasGradientConstructor]
window.CanvasGradient.prototype [object CanvasGradientPrototype]
window.CanvasGradient.prototype.addColorStop [function]
window.CanvasPattern [object CanvasPatternConstructor]
window.CanvasPattern.prototype [object CanvasPatternPrototype]
window.CanvasRenderingContext2D [object CanvasRenderingContext2DConstructor]
window.CanvasRenderingContext2D.prototype [object CanvasRenderingContext2DPrototype]
window.CanvasRenderingContext2D.prototype.arc [function]
2 LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt
View file
@@ -25,6 +25,8 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValueList') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesDeclaration') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesRule') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasRenderingContext2D') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CharacterData') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'ClientRect') is 'object'
4 LayoutTests/platform/qt/fast/dom/prototype-inheritance-expected.txt
View file
@@ -43,6 +43,10 @@ PASS inner.CSSVariablesDeclaration.isInner is true
PASS inner.CSSVariablesDeclaration.constructor.isInner is true
PASS inner.CSSVariablesRule.isInner is true
PASS inner.CSSVariablesRule.constructor.isInner is true
PASS inner.CanvasGradient.isInner is true
PASS inner.CanvasGradient.constructor.isInner is true
PASS inner.CanvasPattern.isInner is true
PASS inner.CanvasPattern.constructor.isInner is true
PASS inner.CanvasRenderingContext2D.isInner is true
PASS inner.CanvasRenderingContext2D.constructor.isInner is true
PASS inner.CharacterData.isInner is true
2 LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
View file
@@ -23,6 +23,8 @@ PASS CSSValue.toString() is '[object CSSValueConstructor]'
PASS CSSValueList.toString() is '[object CSSValueListConstructor]'
PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'
PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'
PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]'
PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]'
PASS CanvasRenderingContext2D.toString() is '[object CanvasRenderingContext2DConstructor]'
PASS CharacterData.toString() is '[object CharacterDataConstructor]'
PASS ClientRect.toString() is '[object ClientRectConstructor]'
15 WebCore/ChangeLog
View file
@@ -1,3 +1,18 @@
2010-06-12 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Darin Adler.

Window object should have CanvasGradient and CanvasPattern
https://bugs.webkit.org/show_bug.cgi?id=40394

This fixes the following tests:
- canvas/philip/tests/2d.gradient.object.return.html
- canvas/philip/tests/2d.pattern.basic.type.html

* html/canvas/CanvasGradient.idl:
* html/canvas/CanvasPattern.idl:
* page/DOMWindow.idl:

2010-06-12 Dan Bernstein <mitz@apple.com>

Reviewed by Oliver Hunt.
3 WebCore/html/canvas/CanvasGradient.idl
View file
@@ -27,8 +27,7 @@ module html {

interface [
InterfaceUUID=bb1108ea-6b8c-4a08-894a-218628630cdb,
ImplementationUUID=a2942ae6-2731-4286-98cc-9d5e79e20de1,
OmitConstructor
ImplementationUUID=a2942ae6-2731-4286-98cc-9d5e79e20de1
] CanvasGradient {

void addColorStop(in float offset, in DOMString color)
3 WebCore/html/canvas/CanvasPattern.idl
View file
@@ -27,8 +27,7 @@ module html {

interface [
InterfaceUUID=c2131348-6d8c-47b5-86cc-d41aff34ce15,
ImplementationUUID=82f5d713-3d17-44dd-aa4a-7766fe345940,
OmitConstructor
ImplementationUUID=82f5d713-3d17-44dd-aa4a-7766fe345940
] CanvasPattern {

};
2 WebCore/page/DOMWindow.idl
View file
@@ -448,6 +448,8 @@ module window {
attribute [CustomGetter] HTMLImageElementConstructor Image; // Usable with new operator
attribute [CustomGetter] HTMLOptionElementConstructor Option; // Usable with new operator

attribute CanvasPatternConstructor CanvasPattern;
attribute CanvasGradientConstructor CanvasGradient;
attribute CanvasRenderingContext2DConstructor CanvasRenderingContext2D;
attribute ImageDataConstructor ImageData;
attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLRenderingContextConstructor WebGLRenderingContext;

0 comments on commit 76b4959

Please sign in to comment.