[webkit-changes] [119241] trunk

Fri, 01 Jun 2012 09:03:40 -0700

Title: [119241] trunk
Revision
119241
Author
[email protected]
Date
2012-06-01 09:03:33 -0700 (Fri, 01 Jun 2012)

Log Message

http://shinydemos.com/clock/ doesn't seem to work
https://bugs.webkit.org/show_bug.cgi?id=79682

Reviewed by Nikolas Zimmermann.

Source/WebCore:

Test: svg/repaint/text-mask-update.svg

Currently, parent resources are not invalidated when SVGInlineText nodes
are added or removed. Adjusting SVGResourcesCache::clientWasAddedToTree()
and SVGResourcesCache::clientWillBeRemovedFromTree() to cover this case.

* rendering/svg/SVGResourcesCache.cpp:
(WebCore::SVGResourcesCache::clientWasAddedToTree):
(WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):

LayoutTests:

* platform/chromium-linux/svg/repaint/text-mask-update-expected.png: Added.
* platform/chromium-linux/svg/repaint/text-mask-update-expected.txt: Added.
* platform/chromium/test_expectations.txt:
* platform/mac/test_expectations.txt:
* svg/repaint/text-mask-update.svg: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (119240 => 119241)


--- trunk/LayoutTests/ChangeLog	2012-06-01 16:03:14 UTC (rev 119240)
+++ trunk/LayoutTests/ChangeLog	2012-06-01 16:03:33 UTC (rev 119241)
@@ -1,3 +1,16 @@
+2012-06-01  Florin Malita  <[email protected]>
+
+        http://shinydemos.com/clock/ doesn't seem to work
+        https://bugs.webkit.org/show_bug.cgi?id=79682
+
+        Reviewed by Nikolas Zimmermann.
+
+        * platform/chromium-linux/svg/repaint/text-mask-update-expected.png: Added.
+        * platform/chromium-linux/svg/repaint/text-mask-update-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+        * platform/mac/test_expectations.txt:
+        * svg/repaint/text-mask-update.svg: Added.
+
 2012-06-01  Christophe Dumez  <[email protected]>
 
         [EFL] EFL's LayoutTestController needs to implement deliverWebIntent

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (119240 => 119241)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-06-01 16:03:14 UTC (rev 119240)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-06-01 16:03:33 UTC (rev 119241)
@@ -1223,6 +1223,9 @@
 BUGWK81217 : svg/carto.net/tabgroup.svg = PASS FAIL
 BUGWK81217 : svg/hixie/perf/003.xml = PASS FAIL
 
+// Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=79682
+BUGWK79682 WIN MAC : svg/repaint/text-mask-update.svg = MISSING IMAGE+TEXT IMAGE TEXT PASS
+
 BUGWK81240 MAC : svg/text/bidi-reorder-value-lists.svg = PASS IMAGE+TEXT
 
 BUGWK81243 : svg/repaint/repainting-after-animation-element-removal.svg = PASS IMAGE

Added: trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.png (0 => 119241)


--- trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.png	2012-06-01 16:03:33 UTC (rev 119241)
@@ -0,0 +1,8 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksumb9636cc360c1d9aab9f48d9a3fb3c267\x8A\xD1l\x97\xA9IDATx\x9C\xED\xDD_\xA8\xDEu\xC0\xF1\xDF9\xFE\xD9\xD2
+\x8E,l*\x86څ\xA69E\xC1\xD0\x9AZ\xA0]\x84k\xE4\xCCɛ]H\xA4\x96	2EtL\xC3]i,KSD
+RF\xCAʜ\xA7%\xCEԡ\xA4E\xEA,\x9DR\xA7n\xEEt\xB186\xF3l\xF2&\x8F\xF2z\xF1\<\xBF\xDF\xF7\xF3\xFC\xCEs\xEE\xDE<ϗ\xDF32111|D,\\xB8\xF0\xC3~\xD3\xFD\xB0\xDF\xC0Ǎ\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88MX#?\x99\xFA\x98uŬC\xAF=t\xC9]K\x9Ey\xE5\x99\xFF\xF5\x92+\xD7\\xB9߲\xFD\xDE\xDA\xFA\xD6{\xAE\xAE\xFC\xF3\xCA#\x96\xB1\xF7O\xF6>b\xF9+\xC6W<\xFA\xCFGG~<\xB2[3\xDC4\x81\xF5\xEE\xA5\xEF>t\xFEC۟o\\xBA\xF1\xF5\xBC~\xF79w\xAF{~\xDDq?=\xEE\xC9MO\xEE<\xBFeۖ\xEB\xD7^\xFF\xF2[/\xDF\xFA\x97[w^\xBD~\xED\xF5K\xEEZ2oK7\xDE\xFB\xED{ǟ?j\xC5Q\xBB50\xF3MX\xA3#\xA3\xC7p\xDC\xF6\xE7\xFB\xEF\xBB\xFF^\xA3{\xF9\x99#/\xFF\xEA\xE5/m~i\xE9o\x97\xEE<\xBFj\xFD\xAA9\xFB\xCC\x86\xE1\xC6\xF1w^]\xF6\xFBe\xC30,\xFF\xC6\xF2\xFD>\xB1߁\x9F:p\xE5\x99+O\xFF\xFC\xE9\xBB50\xF3}\x90=X'|\xD20\xAB\x9F^\xBD\xF3\xD25\xBC\xE6\xA63o:\xE6\xB3\xC7<\xF0\x8Fy\xE1\x91V_\xDE\xFC\xF20\xEB_X?y\xE6\xA2.ڭ\x80\x99\xEF\x83\xD6\xEC=gðmb\xDB\xE7W?\xBDzl\xF6\xD8\xF1ޗ\xCE\x86\xE1\xC6?\xED\xF8!\xD69G\x9D3\xC3Y??\xEB\xF6\xC7o\xDF~愃Nح\x80\x99\xEF\x83\xD6}\xCF\xDC7\xC3\xE4W\x87\x93\xAE~\xE0ꋿ|\xF10\x8B\xBE\xB8h\xD6\xB3ny\xE4\x967\xB6\xBC1uຯ_wޗ\xCE۴yӷ~\xF1\xAD\xF97\xCFx\xE3\xC3c\xB3\xC7&.\x9B\xD8\xF5\x80\x99o7\xEB\x8E'\xEE\x86\xE1\xB1=v\xE1\xAF/\xBD\xE4\xE4K\xA6\xAEnxi\xC3\xF3\xAF??\xFF\xB0\xF9\xC30\x8C\xCD\xFB\xE6\xE1\xDF|\xED\xED\xD7V\xAD_5uf\xD6\xB3n:\xF3\xA65\xDF]s\xE2A'\xDE\xF3\xD7{\x8E\xBD\xF1\xD8\xC5w.~\xE1\x8Dv}`\xE6\x99\x98\x98\xFE\xF3\xA1\xED7J\xD8kt\xAF-۶\xCC\xDAc\xD6џ=\xFAG_\xF9\xD1\x9F?c\xEA\xCCw_p\xEA!\xA7.\xF8‚\xED\x87\xF7\xFC\xF5\x9E\xF97ϟ7w\xDE\xF8\xF7\xC6\xDF\xF3\x9Aw>q\xE7\xC5\xF7^\xBC\xE1\xA5
+s?9w\xF5wV>\xE7\xF0i.\\xF8A\xFEE\x80\xFF\xAF\xDD\xAC\xF7\xF9\xAA\xEE\xC57_<\xF8\x9A\x837oݼ\xF3\xD2\xF8\xF7\xC6\xE7͝7y\x9D\x8DK7\xEE\xBF\xEF\xFE\xDB\xDFy\xF7\x9DE\xBFZt\xDBc\xB7\x9D\xF2\xB9S~\xB7\xF8w\xD3,\xE0#\xA1\xB9\x93\xFB\x8A\xF1?<\xF9\x87\x97ML}\{\xFA\xB5\xC30\xDC0~\xC3\xD4\xC9\xFB\xFFv\xFF\xE4\xF3\xBD\xF7\xD8{\xFB̃\xCF>\xB8\xEB3\X\xAF\xBE\xFD\xEA\xCAu+\x97\xBBd\x87\xF3\x8B\x8FY|ЧZ\xB5~\xD5\xD4MTW\xFD᪭۶\xEE0y\xD8\xD8a\xBB>0\xC3MX\xDB&\xB6\x8D?\xF7\xDFMT\xE3ύ\xEF|k\x86g\xFF\xFD\xEC\xA2\xDB\xCD\xD9gΞ\xA3{\xEEx\xE9\x91\xD1\xEF\x9F\xF0\xFD7\xB7\xBCy\xF6/\xCF~j\xD3S\xC3\xC40k\x9F]{\xDA-\xA7\xAD{~\xDD\xD6m[\x9F\xDC\xF4\xE4\xB9w\x9C;:2\xBA\xECk\xCB&_5\xED\xC07\xCD\xAC\x9Dp\xEAN\xACW\xDEzel\xD9\xD8\xE4\xE1C\xE7?4\xF5\xDE
+\xB3\xAF\x98\xFD\xF6\xBBoO\xFEf\xD1o\xCE\xF8\xD9.\xDC\xF0\xF8\x8B\x8F/_\xBB|\xCD\xDF׌\x8C\x8C\xC0\xF1\x97\x9Er驇\x9C:\xF9\xE7\xDEg\xC0,\xE0#a\x976\xB9\xCF\xF8Hh6\xB90I`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4F,X\xF0a\xBF\x80\x8F\x9F`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@\xEC?\xF2K\xD7\xC1f-\xE7\xBEIEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.txt (0 => 119241)


--- trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/svg/repaint/text-mask-update-expected.txt	2012-06-01 16:03:33 UTC (rev 119241)
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (10,3) size 47x22
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderSVGResourceMasker {mask} [id="mask1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+        RenderSVGText {text} at (10,3) size 47x22 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 47x22
+            chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 4 width 47.00: "PASS"
+      RenderSVGResourceMasker {mask} [id="mask2"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+        RenderSVGText {text}
+    RenderSVGRect {rect} at (10,3) size 47x22 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
+      [masker="mask1"] RenderSVGResourceMasker {mask} at (10,3) size 47x22
+    RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
+      [masker="mask2"] RenderSVGResourceMasker {mask} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (119240 => 119241)


--- trunk/LayoutTests/platform/mac/test_expectations.txt	2012-06-01 16:03:14 UTC (rev 119240)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt	2012-06-01 16:03:33 UTC (rev 119241)
@@ -203,6 +203,9 @@
 
 BUGWK85408 : svg/batik/text/longTextOnPath.svg = TEXT PASS
 
+// Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=79682
+BUGWK79682 : svg/repaint/text-mask-update.svg = MISSING IMAGE+TEXT IMAGE TEXT PASS
+
 // IETC flexbox failures
 BUGWK85211 : ietestcenter/css3/flexbox/flexbox-align-stretch-001.htm = IMAGE
 BUGWK85212 : ietestcenter/css3/flexbox/flexbox-layout-002.htm = IMAGE

Added: trunk/LayoutTests/svg/repaint/text-mask-update.svg (0 => 119241)


--- trunk/LayoutTests/svg/repaint/text-mask-update.svg	                        (rev 0)
+++ trunk/LayoutTests/svg/repaint/text-mask-update.svg	2012-06-01 16:03:33 UTC (rev 119241)
@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" _onload_="runRepaintTest();">
+  <!--
+    Test for https://bugs.webkit.org/show_bug.cgi?id=79682.
+  -->
+  <script xlink:href="" type="text/_javascript_"></script>
+  <defs>
+    <mask id="mask1">
+      <text id="text1" x="10" y="20" fill="#fff" font-size="20px"></text>
+    </mask>
+    <mask id="mask2">
+      <text id="text2" x="10" y="50" fill="#fff" font-size="20px">FAIL</text>
+    </mask>
+  </defs>
+
+  <!-- the updated mask should be "PASS" -->
+  <rect width="100" height="50" fill="green" mask="url(#mask1)"/>
+  <!-- the updated mask should be empty -->
+  <rect width="100" height="50" fill="red" mask="url(#mask2)"/>
+
+  <script>
+    function repaintTest() {
+      var txt = document.createTextNode('PASS');
+      document.getElementById('text1').appendChild(txt);
+      var node = document.getElementById('text2');
+      node.removeChild(node.firstChild);
+    }
+  </script>
+</svg>

Modified: trunk/Source/WebCore/ChangeLog (119240 => 119241)


--- trunk/Source/WebCore/ChangeLog	2012-06-01 16:03:14 UTC (rev 119240)
+++ trunk/Source/WebCore/ChangeLog	2012-06-01 16:03:33 UTC (rev 119241)
@@ -1,3 +1,20 @@
+2012-06-01  Florin Malita  <[email protected]>
+
+        http://shinydemos.com/clock/ doesn't seem to work
+        https://bugs.webkit.org/show_bug.cgi?id=79682
+
+        Reviewed by Nikolas Zimmermann.
+
+        Test: svg/repaint/text-mask-update.svg
+
+        Currently, parent resources are not invalidated when SVGInlineText nodes
+        are added or removed. Adjusting SVGResourcesCache::clientWasAddedToTree()
+        and SVGResourcesCache::clientWillBeRemovedFromTree() to cover this case.
+
+        * rendering/svg/SVGResourcesCache.cpp:
+        (WebCore::SVGResourcesCache::clientWasAddedToTree):
+        (WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):
+
 2012-06-01  John Mellor  <[email protected]>
 
         Don't set scroll position twice in HistoryController::restoreScrollPositionAndViewState

Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (119240 => 119241)


--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp	2012-06-01 16:03:14 UTC (rev 119240)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp	2012-06-01 16:03:33 UTC (rev 119241)
@@ -154,6 +154,10 @@
 
 void SVGResourcesCache::clientWasAddedToTree(RenderObject* renderer, const RenderStyle* newStyle)
 {
+    if (!renderer->node())
+        return;
+    RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, false);
+
     if (!rendererCanHaveResources(renderer))
         return;
     SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
@@ -162,12 +166,14 @@
 
 void SVGResourcesCache::clientWillBeRemovedFromTree(RenderObject* renderer)
 {
+    if (!renderer->node())
+        return;
+    RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, false);
+
     if (!rendererCanHaveResources(renderer))
         return;
     SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
     cache->removeResourcesFromRenderObject(renderer);
-
-    RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, false);
 }
 
 void SVGResourcesCache::clientDestroyed(RenderObject* renderer)

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

Reply via email to