Title: [91190] trunk
Revision
91190
Author
[email protected]
Date
2011-07-18 09:54:03 -0700 (Mon, 18 Jul 2011)

Log Message

[REGRESSION] Value 'none' breaks multiple background-image display
https://bugs.webkit.org/show_bug.cgi?id=59274

Patch by Mihnea Ovidenie <[email protected]> on 2011-07-18
Reviewed by Simon Fraser.

When taking fast path for simple color background, we should draw
the background only if it is the last in the list of backgrounds.
Otherwise, it will obscure the previously drawn backgrounds.

Source/WebCore:

Test: fast/backgrounds/background-fast-path-simple-color.html

* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):

LayoutTests:

* fast/backgrounds/background-fast-path-simple-color-expected.png: Added.
* fast/backgrounds/background-fast-path-simple-color-expected.txt: Added.
* fast/backgrounds/background-fast-path-simple-color.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (91189 => 91190)


--- trunk/LayoutTests/ChangeLog	2011-07-18 16:48:32 UTC (rev 91189)
+++ trunk/LayoutTests/ChangeLog	2011-07-18 16:54:03 UTC (rev 91190)
@@ -1,3 +1,18 @@
+2011-07-18  Mihnea Ovidenie  <[email protected]>
+
+        [REGRESSION] Value 'none' breaks multiple background-image display
+        https://bugs.webkit.org/show_bug.cgi?id=59274
+
+        Reviewed by Simon Fraser.
+
+        When taking fast path for simple color background, we should draw
+        the background only if it is the last in the list of backgrounds.
+        Otherwise, it will obscure the previously drawn backgrounds.
+
+        * fast/backgrounds/background-fast-path-simple-color-expected.png: Added.
+        * fast/backgrounds/background-fast-path-simple-color-expected.txt: Added.
+        * fast/backgrounds/background-fast-path-simple-color.html: Added.
+
 2011-07-18  Yi Shen  <[email protected]>
 
         [Qt] ASSERTION FAILED in ResourceHandle::setDefersLoading causes crash

Added: trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.png (0 => 91190)


--- trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.png	                        (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.png	2011-07-18 16:54:03 UTC (rev 91190)
@@ -0,0 +1,12 @@
+\x89PNG
+
+
+IHDR X\x9Av\x82p)tEXtchecksum6b0ecc73552409651fdf34f695a73063\xFDh\xB1E\xEEiCCPICC Profilex\x85T\xCFkA\xFE6n\xA9\xD0"Zk\xB2x\x90"IY\xABhE\xD46\xFDbk\xDB\xB6E\x90d3I\xD6n6\xEB\xEE&\xB5\xA5\x88\xE4\xE2\xD1*\xDEE\xED\xA1\xFF\x80z\xF0d/J\x85ZE(ޫ(b\xA1-\xF1\xCDnL\xB6\xA5\xEA\xC0\xCE~\xF3\xDE7\xEF}ov\xDF
+r\xD24\xF5\x80\xE4
+\xC7R\xA2il|Bj\xFC\x88\x8E\xA2	A4%U\xDB\xECN$A\x83s\xF9{\xE7\xD8z\x81[V\xC3{\xFBw\xB2w\xAD\x9AҶ\x9A\x84\xFD@\xE0G\x9A\xD9*\xB0\xEFq
+Y\x88<ߡ)\xC7t\xDF\xE3\xD8\xF2\xEC\x8F9Nyx\xC1\xB5+=\xC4Y"|@5-\xCEM\xB8S\xCD%\xD3@\x83H8\x94\xF5qR>\x9C׋\x94\xD7inf\xC6\xC8\xBDO\x90\xA6\xBB\xCC\xEE\xABb\xA1\x9CN\xF6\x90\xBD\x9D\xF4~N\xB3\xDE>\xC2!\xC2\xAD?F\xB8\x8D\x9E\xF5\x8C\xD5?\xE2a\xE1\xA4\xE6Ć=5\xF4\xF8`\xB7\xA9\xF85\xC2_M'\xA2Tq\xD9.
+\xF1\x98\xAE\xFDV\xF2J\x82p\x908\xCAda\x80sZHO\xD7Ln\xF8\xBA\x87}&\xD7\xAF\xE2wVQ\xE1y\x8Fg\xDE\xD4\xDD\xEFE\xDA\xAF0\x9A
+HPEa\x98\xB0P@\x86<14\xB2r?#\xAB\x93{2u$j\xBBtbD\xB1A{6\xDC=\xB7Q\xA4\xDD<\xFE("q\x94C\xB5\x92\xFCA\xFE*\xAF\xC9O\xE5y\xF9\xCB\\xB0\xD8V\x{1D4B5B}\x9A\xBA\xF2\xE0;\xC5噹\xD7\xD3\xC8\xE3sM^|\x95\xD4v\x93WG\x96\xACyz\xBC\x9A\xEC?\xECW\x971\xE6\x825\x8F\xC4s\xB0\xFB\xF1-_\x95̗)\x8C\xC5\xE3U\xF3\xEAK\x84uZ17ߟl;=\xE2.\xCF.\xB5\xD6s\xAD\x89\x8B7V\x9B\x97g\xFDjH\xFB\x93\xE6U\xF9O^\xF5\xF1\xFCg\xCD\xC4c\xE2)1&v\x8A\xE7!\x89\x97\xC5.\xF1\x92\xD8K\xAB\xE2`m\xC7\x9D\x95\x86)\xD2m\x91\xFA$\xD5``\x9A\xBC\xF5/]?[x\xBDF\xF5Q\x94\xCC\xD2T\x89\xF7\xC2*d4\x9D\xB9o\xFA\x8F\xDB\xC7\xFC\xE4\xF7\x8A\xE7\x9F(/l\xE0ș\xBAmSq\xEF\xA1e\xA5ns\xAE\xBF\xD1}\xF0\xB6nk\xA3~8\xFCX<\xAB\xADR5\x9F \xBCv\x87z\xE8)\x98Ӗ\x96\xCD9R\x87,\x9F\x93\xBA\xE9\xCAbR\xCCP\xDBCRR\xD7%\xD7eK\xB3\x99Ub\xE9vؙ\xD3n\xA19B\xF7ħJe\x93\xFA\xAF\xF1\xB0\xFD\xB0R\xF9\xF9\xACR\xD9~Nց\x97\xFAo\xC0\xBC\xFDE\xC0x\x8B\x89 IDATx\xED\xDD1jQEA\x8F\xF1\xBE\x8DW.	珛~T\x9D^\xF1\x8AN\xE8\xF3\xF5\xF3\xFC\xF2 @\x80 @\xE0\x81\xC0\xEF\xEF\xF0
+ @\x80\xFC > @\x80\x9E	\x90g\xD4^D\x80 @\x80\x80\xF1
+ @\x80 \xF0L@\x80<\xA3\xF6" @\x80\x88o\x80 @\x80\x81g\xE4\xB5 @\x80 \xF0g|\xFE}֟\xD8
+|\xFD\xF5o[r{ @\x80@,\xE0\x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\x80\xB9m, @\x80\xC4$u\x8E @\x80\x81[@\x80\xDC6 @\x80b\x83:G\x80 @\x80\xC0- @n @\x80\xB1\x80\x89A\x9D#@\x80 @\xE0 \xB7\x8D\x85 @\x80\x81X@\x80Ġ\xCE @\x80 p\x90\xDB\xC6B\x80 @\x80@, @bP\xE7 @\x80\xB8\xC8mc!@\x80 @  1\xA8s @\x80\xDC䶱 @\x80 \x90\xD49 @\x80nr\xDBX @\x80\x88H\xEA @\x80\xB7\xC0\xE7\xEB\xE7\xB9g @\x80:\xBF\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9\xB1)\x9F\x9D\xD9IDAT @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`\x90d&@\x80 @\xA0 \x9D\xA5K @\x802\x80\xCC @\x80t\xA4\xB3t\x89 @\x80\x81! @\x90\x99 @\x80\x81N@\x80t\x96. @\x80 0\xC82 @\x80 \xD0	\x90\xCE\xD2% @\x80\x86\x80@f @\x80:\xD2Y\xBAD\x80 @\x80\xC0 \xC8L\x80 @\x80@' @:K\x97 @\x80d\x99	 @\x80\xE8Hg\xE9 @\x80C@\x80 3 @\x80\x9D\x80\xE9,]"@\x80 @`|\x96\xDE\xA9n\xA0\xF8IEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.txt (0 => 91190)


--- trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.txt	2011-07-18 16:54:03 UTC (rev 91190)
@@ -0,0 +1 @@
+

Added: trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color.html (0 => 91190)


--- trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color.html	                        (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/background-fast-path-simple-color.html	2011-07-18 16:54:03 UTC (rev 91190)
@@ -0,0 +1,30 @@
+<!doctype html>
+<html>
+<head>
+<!--
+Test for <a href=""
+The test passes if you see a green rectangle below.
+-->
+<style type="text/css" media="screen">
+    div {
+        width:100px;
+        height:100px;
+        display:block;
+        background-repeat:no-repeat;
+        background-image:none, url(../../http/tests/multipart/resources/green-100x100.png);
+        background-position:0px 0px, 0px 0px;
+    }
+
+    div:first-child {
+        background-color: red;
+    }
+</style>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText(true);
+</script>
+</head>
+<body>
+<div></div>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (91189 => 91190)


--- trunk/Source/WebCore/ChangeLog	2011-07-18 16:48:32 UTC (rev 91189)
+++ trunk/Source/WebCore/ChangeLog	2011-07-18 16:54:03 UTC (rev 91190)
@@ -1,3 +1,19 @@
+2011-07-18  Mihnea Ovidenie  <[email protected]>
+
+        [REGRESSION] Value 'none' breaks multiple background-image display
+        https://bugs.webkit.org/show_bug.cgi?id=59274
+
+        Reviewed by Simon Fraser.
+
+        When taking fast path for simple color background, we should draw
+        the background only if it is the last in the list of backgrounds.
+        Otherwise, it will obscure the previously drawn backgrounds.
+
+        Test: fast/backgrounds/background-fast-path-simple-color.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+
 2011-07-18  Yi Shen  <[email protected]>
 
         [Qt] ASSERTION FAILED in ResourceHandle::setDefersLoading causes crash

Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (91189 => 91190)


--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp	2011-07-18 16:48:32 UTC (rev 91189)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp	2011-07-18 16:54:03 UTC (rev 91190)
@@ -626,7 +626,7 @@
     bool colorVisible = bgColor.isValid() && bgColor.alpha() > 0;
     
     // Fast path for drawing simple color backgrounds.
-    if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill) {
+    if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill && !bgLayer->next()) {
         if (!colorVisible)
             return;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to