Log Message
Patch by Mustafizur Rahaman <[email protected]> on 2011-07-11 Reviewed by James Robinson.
Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html https://bugs.webkit.org/show_bug.cgi?id=48292 and Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html https://bugs.webkit.org/show_bug.cgi?id=48302 Source/WebCore: * html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::shouldDisplayTransparencyElsewhere): Added CompositeDestinationAtop to draw transparency elsewhere for destination-atop LayoutTests: * canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt: Added a trailing line * fast/canvas/canvas-composite-alpha.html: Rebaselined for destination-atop test case * platform/chromium/test_expectations.txt: Removed passing test case * platform/gtk/Skipped: Ditto * platform/mac/Skipped: Ditto * platform/qt/Skipped: Ditto
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt
- trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html
- trunk/LayoutTests/platform/chromium/test_expectations.txt
- trunk/LayoutTests/platform/gtk/Skipped
- trunk/LayoutTests/platform/mac/Skipped
- trunk/LayoutTests/platform/qt/Skipped
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (90722 => 90723)
--- trunk/LayoutTests/ChangeLog 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/ChangeLog 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1,3 +1,23 @@
+2011-07-11 Mustafizur Rahaman <[email protected]>
+
+ Reviewed by James Robinson.
+
+ Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
+ https://bugs.webkit.org/show_bug.cgi?id=48292
+
+ and
+
+ Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
+ https://bugs.webkit.org/show_bug.cgi?id=48302
+
+ * canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt: Added
+ a trailing line
+ * fast/canvas/canvas-composite-alpha.html: Rebaselined for destination-atop test case
+ * platform/chromium/test_expectations.txt: Removed passing test case
+ * platform/gtk/Skipped: Ditto
+ * platform/mac/Skipped: Ditto
+ * platform/qt/Skipped: Ditto
+
2011-07-11 James Robinson <[email protected]>
[chromium] Update win/linux pixel expectations for r90701 (part 9/??).
Modified: trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt (90722 => 90723)
--- trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop-expected.txt 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1 +1,2 @@
Passed
+
Modified: trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html (90722 => 90723)
--- trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html 2011-07-11 07:06:26 UTC (rev 90723)
@@ -151,21 +151,21 @@
{ source: [0, 0, 0, 0], composition: [0, 255, 255, 32], destination: [0, 255, 255, 127] }
],
[
- { source: [255, 0, 0, 255], composition: [0, 255, 0, 255], destination: [0, 255, 0, 255] },
+ { source: [255, 0, 0, 255], composition: [0, 255, 0, 255], destination: [0,0,0,0] },
{ source: [255, 0, 0, 255], composition: [255, 0, 0, 255], destination: [0, 0, 0, 0] },
- { source: [255, 0, 0, 255], composition: [254, 1, 0, 255], destination: [0, 255, 0, 1] },
- { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [255, 0, 0, 255] },
- { source: [0, 255, 0, 1], composition: [255, 0, 0, 1], destination: [255, 0, 0, 255] },
- { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 255, 0, 255] },
- { source: [255, 0, 0, 127], composition: [126, 126, 0, 127], destination: [0, 255, 0, 127] },
- { source: [255, 0, 0, 255], composition: [128, 127, 0, 255], destination: [0, 255, 0, 127] },
- { source: [255, 0, 0, 127], composition: [0, 255, 0, 127], destination: [0, 255, 0, 255] },
- { source: [127, 0, 0, 255], composition: [63, 63, 0, 255], destination: [0, 126, 0, 127] },
- { source: [126, 0, 0, 127], composition: [0, 126, 0, 127], destination: [0, 127, 0, 255] },
- { source: [255, 0, 0, 127], composition: [255, 0, 0, 127], destination: [255, 0, 0, 63] },
- { source: [255, 127, 0, 32], composition: [255, 111, 0, 32], destination: [255, 64, 0, 63] },
- { source: [255, 0, 0, 191], composition: [126, 126, 0, 191], destination: [0, 255, 0, 127] },
- { source: [255, 0, 255, 191], composition: [126, 126, 255, 191], destination: [0, 255, 255, 127] }
+ { source: [255, 0, 0, 255], composition: [254, 1, 0, 255], destination: [0,0,0,0] },
+ { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0,0,0,0] },
+ { source: [0, 255, 0, 1], composition: [255, 0, 0, 1], destination: [0,0,0,0] },
+ { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0,0,0,0] },
+ { source: [255, 0, 0, 127], composition: [126, 126, 0, 127], destination: [0,0,0,0] },
+ { source: [255, 0, 0, 255], composition: [128, 127, 0, 255], destination: [0,0,0,0] },
+ { source: [255, 0, 0, 127], composition: [0, 255, 0, 127], destination: [0,0,0,0] },
+ { source: [127, 0, 0, 255], composition: [63, 63, 0, 255], destination: [0,0,0,0] },
+ { source: [126, 0, 0, 127], composition: [0, 126, 0, 127], destination: [0,0,0,0] },
+ { source: [255, 0, 0, 127], composition: [255, 0, 0, 127], destination: [0,0,0,0] },
+ { source: [255, 127, 0, 32], composition: [255, 111, 0, 32], destination: [0,0,0,0] },
+ { source: [255, 0, 0, 191], composition: [126, 126, 0, 191], destination: [0,0,0,0] },
+ { source: [255, 0, 255, 191], composition: [126, 126, 255, 191], destination: [0,0,0,0] }
],
[
{ source: [255, 0, 0, 255], composition: [255, 255, 0, 255], destination: [0, 255, 0, 255] },
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (90722 => 90723)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1959,14 +1959,12 @@
BUGWK48288 : canvas/philip/tests/2d.composite.operation.clear.html = TEXT
BUGWK48289 : canvas/philip/tests/2d.composite.operation.darker.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.copy.html = TEXT
-BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.copy.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.destination-in.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.source-in.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.image.source-out.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.copy.html = TEXT
-BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html = TEXT
BUGWK45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT
BUGWK45991 : canvas/philip/tests/2d.text.draw.baseline.bottom.html = TEXT
BUGWK45991 : canvas/philip/tests/2d.text.draw.baseline.hanging.html = TEXT
Modified: trunk/LayoutTests/platform/gtk/Skipped (90722 => 90723)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1078,14 +1078,12 @@
canvas/philip/tests/2d.composite.operation.clear.html
canvas/philip/tests/2d.composite.operation.darker.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
-canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.copy.html
canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.destination-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-out.html
canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
-canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
canvas/philip/tests/2d.drawImage.broken.html
canvas/philip/tests/2d.imageData.create1.type.html
canvas/philip/tests/2d.imageData.create2.type.html
Modified: trunk/LayoutTests/platform/mac/Skipped (90722 => 90723)
--- trunk/LayoutTests/platform/mac/Skipped 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/platform/mac/Skipped 2011-07-11 07:06:26 UTC (rev 90723)
@@ -154,14 +154,12 @@
# effort out to change the spec to the webkit canvas model.
canvas/philip/tests/2d.composite.operation.darker.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
-canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.copy.html
canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.destination-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-out.html
canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
-canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
canvas/philip/tests/2d.imageData.object.round.html
canvas/philip/tests/2d.imageData.object.wrap.html
Modified: trunk/LayoutTests/platform/qt/Skipped (90722 => 90723)
--- trunk/LayoutTests/platform/qt/Skipped 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1858,14 +1858,12 @@
canvas/philip/tests/2d.composite.operation.clear.html
canvas/philip/tests/2d.composite.operation.darker.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
-canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.copy.html
canvas/philip/tests/2d.composite.uncovered.image.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.image.destination-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-in.html
canvas/philip/tests/2d.composite.uncovered.image.source-out.html
canvas/philip/tests/2d.composite.uncovered.pattern.copy.html
-canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
canvas/philip/tests/2d.drawImage.broken.html
canvas/philip/tests/2d.gradient.radial.cone.behind.html
canvas/philip/tests/2d.gradient.radial.cone.beside.html
Modified: trunk/Source/WebCore/ChangeLog (90722 => 90723)
--- trunk/Source/WebCore/ChangeLog 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/Source/WebCore/ChangeLog 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1,3 +1,19 @@
+2011-07-11 Mustafizur Rahaman <[email protected]>
+
+ Reviewed by James Robinson.
+
+ Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
+ https://bugs.webkit.org/show_bug.cgi?id=48292
+
+ and
+
+ Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html
+ https://bugs.webkit.org/show_bug.cgi?id=48302
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::shouldDisplayTransparencyElsewhere): Added CompositeDestinationAtop
+ to draw transparency elsewhere for destination-atop
+
2011-07-08 Mikhail Naganov <[email protected]>
Web Inspector: [Chromium] Get rid of flickering "Please wait" message in Heap profiler.
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (90722 => 90723)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2011-07-11 07:03:24 UTC (rev 90722)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2011-07-11 07:06:26 UTC (rev 90723)
@@ -1515,7 +1515,7 @@
// CompositeSourceAtop and CompositeDestinationOut are not listed here as the platforms already
// implement the specification's behavior.
return state().m_globalComposite == CompositeSourceIn || state().m_globalComposite == CompositeSourceOut
- || state().m_globalComposite == CompositeDestinationIn;
+ || state().m_globalComposite == CompositeDestinationIn || state().m_globalComposite == CompositeDestinationAtop;
}
template<class T> void CanvasRenderingContext2D::displayTransparencyElsewhere(const T& area)
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
