Changeset 88896 in webkit


Ignore:
Timestamp:
Jun 14, 2011 7:40:25 PM (13 years ago)
Author:
jchaffraix@webkit.org
Message:

2011-06-14 Julien Chaffraix <jchaffraix@webkit.org>

Reviewed by James Robinson.

Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48293

And

Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48303

  • canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt: Added a trailing line.
  • fast/canvas/canvas-composite-alpha.html: Updated now that we clear what is outside the source.
  • platform/chromium/test_expectations.txt:
  • platform/gtk/Skipped:
  • platform/mac/Skipped:
  • platform/qt/Skipped: Update platform skipped lists.

2011-06-14 Julien Chaffraix <jchaffraix@webkit.org>

Reviewed by James Robinson.

Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48293

And

Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48303

  • html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::shouldDisplayTransparencyElsewhere): Added CompositeDestinationIn as this is the only one that needs a specific treatment.
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r88894 r88896  
     12011-06-14  Julien Chaffraix  <jchaffraix@webkit.org>
     2
     3        Reviewed by James Robinson.
     4
     5        Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
     6        https://bugs.webkit.org/show_bug.cgi?id=48293
     7
     8        And
     9
     10        Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
     11        https://bugs.webkit.org/show_bug.cgi?id=48303
     12
     13        * canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt:
     14        Added a trailing line.
     15
     16        * fast/canvas/canvas-composite-alpha.html:
     17        Updated now that we clear what is outside the source.
     18
     19        * platform/chromium/test_expectations.txt:
     20        * platform/gtk/Skipped:
     21        * platform/mac/Skipped:
     22        * platform/qt/Skipped:
     23        Update platform skipped lists.
     24
    1252011-06-14  Ryosuke Niwa  <rniwa@webkit.org>
    226
  • trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt

    r71481 r88896  
    11Passed
     2
  • trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html

    r87307 r88896  
    118118          ],
    119119          [
    120               { source: [0, 0, 0, 0], composition: [0, 255, 0, 255], destination: [0, 255, 0, 255] },
    121               { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 0, 0, 0] },
    122               { source: [0, 0, 0, 0], composition: [0, 255, 0, 1], destination: [0, 255, 0, 1] },
    123               { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [255, 0, 0, 255] },
    124               { source: [0, 0, 0, 0], composition: [255, 0, 0, 1], destination: [255, 0, 0, 255] },
    125               { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 255, 0, 255] },
    126               { source: [0, 0, 0, 0], composition: [0, 255, 0, 64], destination: [0, 255, 0, 127] },
    127               { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 255, 0, 127] },
    128               { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 255, 0, 255] },
    129               { source: [0, 0, 0, 0], composition: [0, 126, 0, 127], destination: [0, 126, 0, 127] },
    130               { source: [0, 0, 0, 0], composition: [0, 128, 0, 127], destination: [0, 127, 0, 255] },
    131               { source: [0, 0, 0, 0], composition: [255, 0, 0, 32], destination: [255, 0, 0, 63] },
    132               { source: [0, 0, 0, 0], composition: [255, 95, 0, 8], destination: [255, 64, 0, 63] },
    133               { source: [0, 0, 0, 0], composition: [0, 255, 0, 96], destination: [0, 255, 0, 127] },
    134               { source: [0, 0, 0, 0], composition: [0, 255, 255, 96], destination: [0, 255, 255, 127] }
     120              { source: [0, 0, 0, 0], composition: [0, 255, 0, 255], destination: [0, 0, 0, 0] },
     121              { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 0, 0, 0] },
     122              { source: [0, 0, 0, 0], composition: [0, 255, 0, 1], destination: [0, 0, 0, 0] },
     123              { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 0, 0, 0] },
     124              { source: [0, 0, 0, 0], composition: [255, 0, 0, 1], destination: [0, 0, 0, 0] },
     125              { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 0, 0, 0] },
     126              { source: [0, 0, 0, 0], composition: [0, 255, 0, 64], destination: [0, 0, 0, 0] },
     127              { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 0, 0, 0] },
     128              { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 0, 0, 0] },
     129              { source: [0, 0, 0, 0], composition: [0, 126, 0, 127], destination: [0, 0, 0, 0] },
     130              { source: [0, 0, 0, 0], composition: [0, 128, 0, 127], destination: [0, 0, 0, 0] },
     131              { source: [0, 0, 0, 0], composition: [255, 0, 0, 32], destination: [0, 0, 0, 0] },
     132              { source: [0, 0, 0, 0], composition: [255, 95, 0, 8], destination: [0, 0, 0, 0] },
     133              { source: [0, 0, 0, 0], composition: [0, 255, 0, 96], destination: [0, 0, 0, 0] },
     134              { source: [0, 0, 0, 0], composition: [0, 255, 255, 96], destination: [0, 0, 0, 0] }
    135135          ],
    136136          [
  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r88888 r88896  
    19841984BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.copy.html = TEXT
    19851985BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html = TEXT
    1986 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html = TEXT
    19871986BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.copy.html = TEXT
    19881987BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html = TEXT
     
    19921991BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.copy.html = TEXT
    19931992BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html = TEXT
    1994 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html = TEXT
    19951993BUGWK45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT
    19961994BUGWK45991 : canvas/philip/tests/2d.text.draw.baseline.bottom.html = TEXT
  • trunk/LayoutTests/platform/gtk/Skipped

    r88786 r88896  
    10951095canvas/philip/tests/2d.composite.uncovered.fill.copy.html
    10961096canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
    1097 canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
    10981097canvas/philip/tests/2d.composite.uncovered.image.copy.html
    10991098canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
     
    11031102canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
    11041103canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
    1105 canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
    11061104canvas/philip/tests/2d.drawImage.broken.html
    11071105canvas/philip/tests/2d.imageData.create1.type.html
  • trunk/LayoutTests/platform/mac/Skipped

    r88511 r88896  
    156156canvas/philip/tests/2d.composite.uncovered.fill.copy.html
    157157canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
    158 canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
    159158canvas/philip/tests/2d.composite.uncovered.image.copy.html
    160159canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
     
    164163canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
    165164canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
    166 canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
    167165canvas/philip/tests/2d.imageData.object.round.html
    168166canvas/philip/tests/2d.imageData.object.wrap.html
  • trunk/LayoutTests/platform/qt/Skipped

    r88888 r88896  
    18431843canvas/philip/tests/2d.composite.uncovered.fill.copy.html
    18441844canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
    1845 canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
    18461845canvas/philip/tests/2d.composite.uncovered.image.copy.html
    18471846canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
     
    18511850canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
    18521851canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
    1853 canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
    18541852canvas/philip/tests/2d.drawImage.broken.html
    18551853canvas/philip/tests/2d.gradient.radial.cone.behind.html
  • trunk/Source/WebCore/ChangeLog

    r88895 r88896  
     12011-06-14  Julien Chaffraix  <jchaffraix@webkit.org>
     2
     3        Reviewed by James Robinson.
     4
     5        Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
     6        https://bugs.webkit.org/show_bug.cgi?id=48293
     7
     8        And
     9
     10        Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
     11        https://bugs.webkit.org/show_bug.cgi?id=48303
     12
     13        * html/canvas/CanvasRenderingContext2D.cpp:
     14        (WebCore::CanvasRenderingContext2D::shouldDisplayTransparencyElsewhere): Added CompositeDestinationIn
     15        as this is the only one that needs a specific treatment.
     16
    1172011-06-14  Naoki Takano  <takano.naoki@gmail.com>
    218
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r88260 r88896  
    15091509{
    15101510    // See 4.8.11.1.3 Compositing
    1511     // CompositeSourceAtop is not listed here as the platforms already implement the specification's behavior.
    1512     return state().m_globalComposite == CompositeSourceIn || state().m_globalComposite == CompositeSourceOut;
     1511    // CompositeSourceAtop and CompositeDestinationOut are not listed here as the platforms already
     1512    // implement the specification's behavior.
     1513    return state().m_globalComposite == CompositeSourceIn || state().m_globalComposite == CompositeSourceOut
     1514           || state().m_globalComposite == CompositeDestinationIn;
    15131515}
    15141516
Note: See TracChangeset for help on using the changeset viewer.