[webkit-changes] [139745] trunk

Tue, 15 Jan 2013 08:56:20 -0800

Title: [139745] trunk
Revision
139745
Author
[email protected]
Date
2013-01-15 08:57:55 -0800 (Tue, 15 Jan 2013)

Log Message

[Chromium] Incorrect opaque region tracking for PlatformContextSkia::drawRRect
https://bugs.webkit.org/show_bug.cgi?id=106898

Reviewed by Stephen White.

Source/WebCore:

Since drawRRect() doesn't cover the whole bounding rect, it needs to pass a didDrawBounded
notification down to the opaque region tracker (instead of didDrawRect as it currently
does).

Test: platform/chromium/compositing/rounded-corners.html

* platform/graphics/skia/PlatformContextSkia.h:
(WebCore::PlatformContextSkia::drawRRect):

Source/WebKit/chromium:

* tests/PlatformContextSkiaTest.cpp:
(WebCore::TEST):
(WebCore):

LayoutTests:

* platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.png: Added.
* platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.txt: Added.
* platform/chromium/TestExpectations:
* platform/chromium/compositing/rounded-corners.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (139744 => 139745)


--- trunk/LayoutTests/ChangeLog	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/LayoutTests/ChangeLog	2013-01-15 16:57:55 UTC (rev 139745)
@@ -1,3 +1,15 @@
+2013-01-15  Florin Malita  <[email protected]>
+
+        [Chromium] Incorrect opaque region tracking for PlatformContextSkia::drawRRect
+        https://bugs.webkit.org/show_bug.cgi?id=106898
+
+        Reviewed by Stephen White.
+
+        * platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.png: Added.
+        * platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.txt: Added.
+        * platform/chromium/TestExpectations:
+        * platform/chromium/compositing/rounded-corners.html: Added.
+
 2013-01-15  Vsevolod Vlasov  <[email protected]>
 
         Unreviewed failing test skip.

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (139744 => 139745)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2013-01-15 16:57:55 UTC (rev 139745)
@@ -4210,6 +4210,9 @@
 webkit.org/b/104489 [ Win ] http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_clearMarks.html [ Failure Pass ]
 webkit.org/b/104489 [ Win ] http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_associate_with_navigation_timing.html [ Failure Pass ]
 
+# Needs platform-specific results
+webkit.org/b/106898 platform/chromium/compositing/rounded-corners.html [ Pass Missing ]
+
 # Flaky since r136945
 webkit.org/b/94002 [ Win Mac Debug ] inspector/debugger/live-edit-breakpoints.html [ Failure Timeout ]
 webkit.org/b/94002 [ Mac Debug ] inspector/debugger/live-edit.html [ Crash Pass Timeout ]

Added: trunk/LayoutTests/platform/chromium/compositing/rounded-corners.html (0 => 139745)


--- trunk/LayoutTests/platform/chromium/compositing/rounded-corners.html	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/compositing/rounded-corners.html	2013-01-15 16:57:55 UTC (rev 139745)
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<body>
+    <!-- Test for https://bugs.webkit.org/show_bug.cgi?id=106898 -->
+    <div style="width: 200px; height: 200px; background: green; border-radius: 25%; -webkit-transform: translateZ(0);"></div>
+</body>
+</html>

Added: trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.png (0 => 139745)


--- trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.png	2013-01-15 16:57:55 UTC (rev 139745)
@@ -0,0 +1,24 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksumfb023a73ef30b97adb409d2d5d7b11ae7/ŋ\xAFIDATx\x9C\xEDݿ\x8Fw\xC7\xE1\xC9\xE9$\xB6\xF3P\xB1\x9D\x87n;\x9B\x8At\xBB\xA9\xAE\x8CS]\xB9\xA6J\xBA\xDD\xFC,e\xAA@w\xA90\xE5U1]\xAE\xC2t\xB9
+\xD3\xEDU\xE9\x86Ω\xB8\xC2
+\x8A\xFB˼=^<\xCF#\x8A\x90H\xF8#\xE5+\xF1\xD2g\xBE;\xFE\xE2ݻw9\xDB\xF4\xDBF`\x84	,\x800\x81&\xB0\xC2@\x98\xC0\xFB\xFB\xA6\xF8\xABfѼ\xFC\xEDe\xDD\xD4uS\xCF\xEA\xD9\xF2_.\xBBɱ>[UYUe\xB5\xFC\xE7\x83\xEA`\xF9\xDB\xC1\xADA\xB9Snt.\xD8f_\\x87\x8D\xD6M\xFD\xFC\xF5\xF3Y=\x9B\xD53!Վ\xAA\xAC\xAA\x83\x83\xEA`\xBF\xBF\xFF\xBE\xC0\x80\x88MV\xDDԏ\xFE\xFBhz:U\x9BU\x95\xD5hott\xF7Hi@\xC4\xABY4O^>\x99\xCC'\xF37\xF3\x96?\x9A\xF3
+w\x87\xE3\xE1\xF8pp\xE8"|\x8AV\xABn\xEA\xCFLO\xA7͢i\xEDC\xB9\xAAr\xA7\xED\x8D\xEE\xEF߷\xD0\x80մX˴\x9A\xCC'-|)\xE3\xE1Xf\xC0
+\xD6X͢y\xF0\xFC\xC1\xC3_\xAE\xF5SX\x9F\xE3/\x8F\xEF\xEF\xDF\xF7\xD0.o\xBD\x815=\x9D\xDE{z\xCF\xC1\xCF]\xB9S>\xFE\xFA\xF1ho\xB4\xE9A\xE0\xF3\xB0\xAE\xC0\xAA\x9B\xFA\xDE\xD3{\xEF_d\xC58\xA8\xFD\xD8C\xB8\xD0Z\xCB\xE2j[Ye\xC0e\xE4\xEB\xFB\xFF|\xEF\xC6\xD5v;\xFE\xF2\xF8\xC7\xFC\xB8\xE9)\xE0\xFAJV\xB3h\xBEz\xF2\x95\xB7[u\xC1pw\xF8\xEC\xF0\x99\x9B\xEF\xF0Q\xB1/{\x9E\xBF\x99\xAB\xAB\xEE\xF0\xBFΑ\xD9`-\xFF\xBAu\xE9\xAAkʝ\xF2\xD9\xE1\xB3\xE1\xEEpӃ\xC0\xF5\xD8`\xA9\xAB\xCE\xF2P>\xEASK]u\x9C\xC6\x80}R`\xA9+
+\x8DX=\xB0\x9AE\xE3eW,9\xF0g\xAB_r\xBF\xF3\xD3K\xFEl\xB8;|\xF1\xED\x8BMO\x9B\xB7\xE2\xEB\xF8\x97cu\xC5_\xCC\xDF̏9\xDE\xF4\xB0y\xABl\xB0\xA6\xA7\xD3o\xFE\xFD\xCD:\xA6a\xFC\xFCϟ}\x97w\xE5\xC0\xAA\x9B\xFA\xCEOwܶ\xE1,\xE5N\xF9\xE2\xDB\xBE\x80.\xBB\xF2#Bw\x999\xDF\xF2\xC2\xFB\xA6\xA7\x80M\xBAZ`MO\xA7\xB3z\xB6\x9EI\xD8\xB3z6=\x9Dnz
+ؘ+<"l\xCD\xEDG\xB7\xAD\xAF\xB8\x8C\xAA\xAC^|\xFB·A\xD0MW\xD8`\x9D\xCCN\xD4\x97T7\xF5\xC9\xECd\xD3S\xC0f\v\x83U7\xF5\xEDG\xB7\xD7=
+[\xE6\xD5\xD1+\xB7\xDD\xE8\xA0\xCBn\xB0l#X\x81c@7]j\x83e}\xC5\xCA,\xB1\xE8\xA0Km\xB0\xEC!X\x99\xC3@]\xBC\xC1j\xCD\xCDn\xB63
+ۧ\xDC)_\xBD\xF2\xE3\x84t\xCA\xC5\xAC\xC9|\xB2\xFE1\xD8Z͢q\x84蚋\xEB\xC9\xCB'-\xCC\xC1s\x84\xE8\x9A\xABn\xEA\xF9\x9By;\xA3\xB0\xAD\xE6o\xE6uSoz
+h\xCF\x81\xF5\xF0ׇ\xED\xCC\xC1vs\x90\xE8\x94\xEB\xE9\xFF\x9E\xB63\xDB\xCDA\xA0S\xCE\xAC\xBA\xA9=\xD9!\xC2Y\xA0S\xCE\xACY=kk\xB6\x9F\xE3@w,Z\xE28\xD0\xE7\xD6\xF3\xD7\xCF[\x9B\x83\xAD\xE78\xD0gV\xB3h\\x9A!\xC8q\xA0;\xCE,\xAF\xBF"\xCESB:\xE2\xCC\xC0\xB2o Ρ\xA0#\xEDq\xA8\xE8\x8Fi\x8FC@G\x9Cwɽ\xCD9\xE8\x87
+\x80\x8E\xB8\xE0\xABr\xB8\xAA3\xEB\xF5\xDB\xD7m\xCEA8Tt\x84K\xEE\xB4ǡ\xA0#<"Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2\xCE\xAC~\xAF\xDF\xE6t\x81C@G\x9CXUY\xB58\x9D\xE0P\xD0\x84	,\xDAS\xDApf`T-\x8EA'w\x87\x9B\xDA\xE0\xEDq\xA8\xE8\x81E{*:\xE2\xCC\xC0\xF24\x878\x87
+\x80\x8E83\xB0ʝ\xD2[\x8B\xEA\xF7\xFA.\xB9\xD0\xE7\xFD\xA1{\xEE9Nt\x87\xC0\xA2%\x8E\xDD!\xB0h\x89\xE3@w\x9CXUY\xB9\x86ED\xBF\xD7\xF7#\x84t\xC7or\xED\x8Dڙ\x83\xED\xE6 \xD0)_\xBC{\xF7\xEE\x9C\xFF\7\xF5\xEDG\xB7[\x9B\x86m\xF5\xEA\xE8\x95
+\xDDq\xC1\xAB*\xAB\xC1\xADA;\xA3\xB0\xAD\xB7\xEA
+\x80N\xB9\xF8˞\xC7\xC3\xF1\xFA\xC7`\x9B9Bt\xCD\x8F\x8B\xA2h\xCD\xCDn\xB63
+ۧw\xA3W\xD7^1
+@\xA7\\xBC\xC1*w\xCA\xC3\xC1a\xA3\xB0\x95F{#u@\xD7\\xBC\xC1*\u\xE7\xB8\xDE@]\xBC\xC1*\x8A\xA2*+K,Vp88TWtХ6X\x85%+\xB1\xBE\xA0\x9B.\xB5\xC1*\x8A\xA2*\xAB\xA3\xBBGk\x85-st\xF7H]\xD0M\x97\xDD`E\xD1,\x9A\xEAa\xF5\xF6\xF7\xB7k\x88\xED\xE0\x87\xE8\xB2\xCBn\xB0\x8A\xA2(w\xCA\xC9h\xB2\xB6I\xD8*\x93\xD1D]\xD0YW\xAC\xA2(F{\xA3\xFD\xFE\xFE\x9AFak\xEC\xF7\xF7}\xF9 ]v\xB5\xC0*\x8Ab2\x9A\xF4n\xF4\xD61
+ۡw\xA3g\xD3	@\xC7]9\xB0\xAA\xB2\xF2\xD7'瘌&\xEE\xB6\xD0qW\xAC\xA2(F{#?Q\xC8G\xDD=\xF2p\xAE\xF0S\x841\xFC\xD7\xF0\xE5o/\xB3\xD3\xF0Y\xDC̿\x9Boz
+ؼU6XK\xB3\xF1lpk\x85\xCF\xDA\xE0\xD6`6\x9Emz
+\xB8V\xAC\xE5[\x\xA7\xF8\xE3b\xBB\xF72\xC0\xD2\xEA\x81U\xC5pw8\xCF4V\xC7\xF5n\xF4f\xE3\xD9pw\xB8\xE9A\xE0\xBA\xF8\xA4\xC0*4V\xE7\xA9+\xF8ЧV\xA1\xB1:L]\xC0G\xAB\xF8\xA3\xB1\xDCy\xEF\x94\xE5\xADvuZ\xFD5
+j\xCD\xC1\xE4\xC0\xBB\xBA`YWn\xB5\xC0Ge6XK\xE5N9\xFFn\xEE\xA4[\xEF\xE8\xEE\xD1\xFC\xBB\xB9\xBA\x80\xB3$7X\xEFMO\xA7\xE3\xE9\xF8\xED\xEFo\xE32\x9B\xB5|\x83w\xB5\xC0\xF9\xD6XEQ\xD4M=\x9E\x8E\x9F\xBF~\xBE\x8E?\x9C\x8D\xD8\xEF\xEF\xFB\x9EA\xB8\x8Cu֒U\xD6v\xB0\xB8\x80+Yo`E\xD1,\x9A\x93\xD9ɣ\xFF>Z맰>Gw\x8FNNܸ\x80\xCB[{`-\xD5M}2;y\xF2\xF2I\x9FE\xCA\xE1\xE0\xF0\xE4\xE0\xC43A\xB8\xAA\x96ki\x99Y\xD3ө\x87\x86\xD7Y\xEFFo\xB47\x92V\xB0\xB2Vk\xA9Y4\x93\xF9d2\x9Fxc\xD6u3\xB85\xC7\xE3\xE1\xD8A\xF8\xAC\xF7\xEA\xA6~\xF8\xEB\xC3\xE9\xE9\xF4\xF5\xDBכ\x9A\x81\xA2(\xFA\xBD\xFEhot\xFC展Dl2\xB0ޫ\x9BzVϖ\xBF\xC4V;\xFA\xBD\xFEAu\xB0\xFC\xA5\xAB \xEBZ֟5\x8Bf\xFEf^7u\xDD\xD4\xF37\xF3f\xD1EQ7\xB5\xF0ZM\xBF\xD7_\xF6S\xB9Sw\x87UYUe5\xDCz\xEBs\xED\xE0s\x97\xFC.B
+\x81'\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa \xEC\xFF\xB8\\x{1AADED}\xDD8IEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.txt (0 => 139745)


--- trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/platform/chromium/compositing/rounded-corners-expected.txt	2013-01-15 16:57:55 UTC (rev 139745)
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x216
+  RenderBlock {HTML} at (0,0) size 800x216
+    RenderBody {BODY} at (8,8) size 784x200
+layer at (8,8) size 200x200
+  RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000]

Modified: trunk/Source/WebCore/ChangeLog (139744 => 139745)


--- trunk/Source/WebCore/ChangeLog	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/Source/WebCore/ChangeLog	2013-01-15 16:57:55 UTC (rev 139745)
@@ -1,3 +1,19 @@
+2013-01-15  Florin Malita  <[email protected]>
+
+        [Chromium] Incorrect opaque region tracking for PlatformContextSkia::drawRRect
+        https://bugs.webkit.org/show_bug.cgi?id=106898
+
+        Reviewed by Stephen White.
+
+        Since drawRRect() doesn't cover the whole bounding rect, it needs to pass a didDrawBounded
+        notification down to the opaque region tracker (instead of didDrawRect as it currently
+        does).
+
+        Test: platform/chromium/compositing/rounded-corners.html
+
+        * platform/graphics/skia/PlatformContextSkia.h:
+        (WebCore::PlatformContextSkia::drawRRect):
+
 2013-01-15  Allan Sandfeld Jensen  <[email protected]>
 
         [Qt] WebGL does not require accelerated compositing

Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h (139744 => 139745)


--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h	2013-01-15 16:57:55 UTC (rev 139745)
@@ -489,7 +489,7 @@
     m_canvas->drawRRect(rect, paint);
 
     if (m_trackOpaqueRegion)
-        m_opaqueRegion.didDrawRect(this, rect.getBounds(), paint, 0);
+        m_opaqueRegion.didDrawBounded(this, rect.getBounds(), paint);
 }
 
 inline void PlatformContextSkia::drawPosText(const void* text, size_t byteLength,

Modified: trunk/Source/WebKit/chromium/ChangeLog (139744 => 139745)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-15 16:57:55 UTC (rev 139745)
@@ -1,3 +1,14 @@
+2013-01-15  Florin Malita  <[email protected]>
+
+        [Chromium] Incorrect opaque region tracking for PlatformContextSkia::drawRRect
+        https://bugs.webkit.org/show_bug.cgi?id=106898
+
+        Reviewed by Stephen White.
+
+        * tests/PlatformContextSkiaTest.cpp:
+        (WebCore::TEST):
+        (WebCore):
+
 2012-12-28  Vsevolod Vlasov  <[email protected]>
 
         Web Inspector: Support inspector file system access with isolated file system through InspectorFrontendHost.

Modified: trunk/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp (139744 => 139745)


--- trunk/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp	2013-01-15 16:35:41 UTC (rev 139744)
+++ trunk/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp	2013-01-15 16:57:55 UTC (rev 139745)
@@ -664,6 +664,53 @@
     EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
 }
 
+TEST(PlatformContextSkiaTest, trackOpaqueRoundedRectTest)
+{
+    SkBitmap bitmap;
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
+    bitmap.allocPixels();
+    bitmap.eraseColor(0);
+    SkCanvas canvas(bitmap);
+
+    PlatformContextSkia platformContext(&canvas);
+    platformContext.setTrackOpaqueRegion(true);
+    GraphicsContext context(&platformContext);
+
+    Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
+    Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
+    IntSize radii(10, 10);
+
+    EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.fillRoundedRect(IntRect(10, 10, 90, 90), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
+    EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
+    EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.setCompositeOperation(CompositeSourceIn);
+    context.setShouldAntialias(false);
+
+    context.fillRoundedRect(IntRect(10, 10, 50, 30), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
+    EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.fillRoundedRect(IntRect(10, 10, 30, 50), radii, radii, radii, radii, alpha, ColorSpaceDeviceRGB);
+    EXPECT_EQ_RECT(IntRect(40, 10, 60, 90), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.fillRoundedRect(IntRect(10, 0, 50, 30), radii, radii, radii, radii, alpha, ColorSpaceDeviceRGB);
+    EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+
+    context.fillRoundedRect(IntRect(30, 0, 70, 50), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
+    EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext.opaqueRegion().asRect());
+    EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+}
+
 TEST(PlatformContextSkiaTest, trackOpaqueIRectTest)
 {
     SkBitmap bitmap;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to