Changeset 60731 in webkit


Ignore:
Timestamp:
Jun 4, 2010 9:41:07 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-04 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Dirk Schulze.

Canvas createPattern(img, repetition) shouldn't throw INVALID_STATE_ERR when !img.complete
https://bugs.webkit.org/show_bug.cgi?id=40166

Spec link:
http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-createpattern

  • http/tests/misc/canvas-pattern-from-incremental-image-expected.txt: Updated baseline.
  • http/tests/misc/canvas-pattern-from-incremental-image.html: Fleshed out test.

2010-06-04 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Dirk Schulze.

Canvas createPattern(img, repetition) shouldn't throw INVALID_STATE_ERR when !img.complete
https://bugs.webkit.org/show_bug.cgi?id=40166

Spec link:
http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-createpattern

Test: http/tests/misc/canvas-pattern-from-incremental-image.html (updated)

  • html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::createPattern):
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r60727 r60731  
     12010-06-04  Andreas Kling  <andreas.kling@nokia.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Canvas createPattern(img, repetition) shouldn't throw INVALID_STATE_ERR when !img.complete
     6        https://bugs.webkit.org/show_bug.cgi?id=40166
     7
     8        Spec link:
     9        http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-createpattern
     10
     11        * http/tests/misc/canvas-pattern-from-incremental-image-expected.txt: Updated baseline.
     12        * http/tests/misc/canvas-pattern-from-incremental-image.html: Fleshed out test.
     13
    1142010-06-04  Chris Fleizach  <cfleizach@apple.com>
    215
  • trunk/LayoutTests/http/tests/misc/canvas-pattern-from-incremental-image-expected.txt

    r35733 r60731  
    1 PASS
     1Tests that incomplete (not fully loaded/decoded) images cannot be used to create a CanvasPattern.
     2
     3PASS - image is not complete
     4PASS - createPattern() failed for incomplete image
  • trunk/LayoutTests/http/tests/misc/canvas-pattern-from-incremental-image.html

    r35733 r60731  
     1Tests that incomplete (not fully loaded/decoded) images cannot be used to create a CanvasPattern.<br/><br/>
    12<script>
    23if (window.layoutTestController)
     
    1112try {
    1213    ptrn = ctx.createPattern(img, 'repeat');
    13     document.write("FAIL");
     14    if (!img.complete)
     15        document.write("PASS - image is not complete");
     16    else
     17        document.write("FAIL - image is complete");
     18    document.write("<br/>");
     19    if (!ptrn)
     20        document.write("PASS - createPattern() failed for incomplete image");
     21    else
     22        document.write("FAIL - createPattern() succeeded for incomplete image");
    1423} catch (e) {
    15     if (e.code == DOMException.INVALID_STATE_ERR) {
    16         document.write("PASS");
    17     } else {
    18         document.write("FAIL " + e);
    19     }
     24    document.write("FAIL - caught exception: " + e);
    2025}
    2126</script>
  • trunk/WebCore/ChangeLog

    r60730 r60731  
     12010-06-04  Andreas Kling  <andreas.kling@nokia.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Canvas createPattern(img, repetition) shouldn't throw INVALID_STATE_ERR when !img.complete
     6        https://bugs.webkit.org/show_bug.cgi?id=40166
     7
     8        Spec link:
     9        http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-createpattern
     10
     11        Test: http/tests/misc/canvas-pattern-from-incremental-image.html (updated)
     12
     13        * html/canvas/CanvasRenderingContext2D.cpp:
     14        (WebCore::CanvasRenderingContext2D::createPattern):
     15
    1162010-06-04  Anders Bakken  <agbakken@gmail.com>
    217
  • trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r59768 r60731  
    12661266        return 0;
    12671267
    1268     if (!image->complete()) {
    1269         ec = INVALID_STATE_ERR;
     1268    if (!image->complete())
    12701269        return 0;
    1271     }
    12721270
    12731271    CachedImage* cachedImage = image->cachedImage();
Note: See TracChangeset for help on using the changeset viewer.