Title: [105454] trunk
Revision
105454
Author
[email protected]
Date
2012-01-19 15:20:53 -0800 (Thu, 19 Jan 2012)

Log Message

CSS Shaders: Remove the setTimeout from the layout tests
https://bugs.webkit.org/show_bug.cgi?id=76535

Reviewed by Tony Chang.

Source/WebCore:

We had setTimeout on old tests because the snapshot picture was taken too early, before the shaders were loaded.
The problem was that the RenderLayer was notified that the shader was loaded only after the onload event was triggered,
so a simple setTimeout(0) would have fixed the issue, but better than that would be to to always call CachedResource::data
in CachedShader::data, which notifies the load earlier (before onload).

No new tests, just removed the setTimeout from old ones.

* loader/cache/CachedShader.cpp:
(WebCore::CachedShader::data):

LayoutTests:

No need for setTimeout anymore, so I've removed them from the custom filter tests.

* css3/filters/custom-filter-shader-cache.html:
* css3/filters/effect-custom-combined-missing.html:
* css3/filters/effect-custom-parameters.html:
* css3/filters/effect-custom.html:
* css3/filters/missing-custom-filter-shader.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (105453 => 105454)


--- trunk/LayoutTests/ChangeLog	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/ChangeLog	2012-01-19 23:20:53 UTC (rev 105454)
@@ -1,3 +1,18 @@
+2012-01-19  Alexandru Chiculita  <[email protected]>
+
+        CSS Shaders: Remove the setTimeout from the layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=76535
+
+        Reviewed by Tony Chang.
+
+        No need for setTimeout anymore, so I've removed them from the custom filter tests.
+
+        * css3/filters/custom-filter-shader-cache.html:
+        * css3/filters/effect-custom-combined-missing.html:
+        * css3/filters/effect-custom-parameters.html:
+        * css3/filters/effect-custom.html:
+        * css3/filters/missing-custom-filter-shader.html:
+
 2012-01-19  Jon Lee  <[email protected]>
 
         Add text-overflow support that allows placeholder and value text to show an ellipsis when not focused

Modified: trunk/LayoutTests/css3/filters/custom-filter-shader-cache.html (105453 => 105454)


--- trunk/LayoutTests/css3/filters/custom-filter-shader-cache.html	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/css3/filters/custom-filter-shader-cache.html	2012-01-19 23:20:53 UTC (rev 105454)
@@ -13,11 +13,8 @@
             function runTest()
             {
                 // We need to run the tests after the downloading succeeded.
-                // Using a timer is not ideal, but there seems to be no better options.
-                setTimeout(function() {
-                    if (window.layoutTestController)
-                        window.layoutTestController.notifyDone();
-                }, 200);
+                if (window.layoutTestController)
+                    window.layoutTestController.notifyDone();
             }
         </script>
         <style>

Modified: trunk/LayoutTests/css3/filters/effect-custom-combined-missing.html (105453 => 105454)


--- trunk/LayoutTests/css3/filters/effect-custom-combined-missing.html	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/css3/filters/effect-custom-combined-missing.html	2012-01-19 23:20:53 UTC (rev 105454)
@@ -14,11 +14,8 @@
             function runTest()
             {
                 // We need to run the tests after the downloading succeeded.
-                // Using a timer is not ideal, but there seems to be no better options.
-                setTimeout(function() {
-                    if (window.layoutTestController)
-                        window.layoutTestController.notifyDone();
-                }, 200);
+                if (window.layoutTestController)
+                    window.layoutTestController.notifyDone();
             }
         </script>
         <style>

Modified: trunk/LayoutTests/css3/filters/effect-custom-parameters.html (105453 => 105454)


--- trunk/LayoutTests/css3/filters/effect-custom-parameters.html	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/css3/filters/effect-custom-parameters.html	2012-01-19 23:20:53 UTC (rev 105454)
@@ -14,11 +14,8 @@
             function runTest()
             {
                 // We need to run the tests after the downloading succeeded.
-                // Using a timer is not ideal, but there seems to be no better options.
-                setTimeout(function() {
-                    if (window.layoutTestController)
-                        window.layoutTestController.notifyDone();
-                }, 200);
+                if (window.layoutTestController)
+                    window.layoutTestController.notifyDone();
             }
         </script>
         <style>

Modified: trunk/LayoutTests/css3/filters/effect-custom.html (105453 => 105454)


--- trunk/LayoutTests/css3/filters/effect-custom.html	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/css3/filters/effect-custom.html	2012-01-19 23:20:53 UTC (rev 105454)
@@ -14,11 +14,8 @@
             function runTest()
             {
                 // We need to run the tests after the downloading succeeded.
-                // Using a timer is not ideal, but there seems to be no better options.
-                setTimeout(function() {
-                    if (window.layoutTestController)
-                        window.layoutTestController.notifyDone();
-                }, 200);
+                if (window.layoutTestController)
+                    window.layoutTestController.notifyDone();
             }
         </script>
     </head>

Modified: trunk/LayoutTests/css3/filters/missing-custom-filter-shader.html (105453 => 105454)


--- trunk/LayoutTests/css3/filters/missing-custom-filter-shader.html	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/LayoutTests/css3/filters/missing-custom-filter-shader.html	2012-01-19 23:20:53 UTC (rev 105454)
@@ -13,11 +13,8 @@
             function runTest()
             {
                 // We need to run the tests after the downloading succeeded or fails.
-                // Using a timer is not ideal, but there seems to be no better options.
-                setTimeout(function() {
-                    if (window.layoutTestController)
-                        window.layoutTestController.notifyDone();
-                }, 200);
+                if (window.layoutTestController)
+                    window.layoutTestController.notifyDone();
             }
         </script>
         <style>

Modified: trunk/Source/WebCore/ChangeLog (105453 => 105454)


--- trunk/Source/WebCore/ChangeLog	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/Source/WebCore/ChangeLog	2012-01-19 23:20:53 UTC (rev 105454)
@@ -1,3 +1,20 @@
+2012-01-19  Alexandru Chiculita  <[email protected]>
+
+        CSS Shaders: Remove the setTimeout from the layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=76535
+
+        Reviewed by Tony Chang.
+
+        We had setTimeout on old tests because the snapshot picture was taken too early, before the shaders were loaded.
+        The problem was that the RenderLayer was notified that the shader was loaded only after the onload event was triggered,
+        so a simple setTimeout(0) would have fixed the issue, but better than that would be to to always call CachedResource::data 
+        in CachedShader::data, which notifies the load earlier (before onload).
+
+        No new tests, just removed the setTimeout from old ones.
+
+        * loader/cache/CachedShader.cpp:
+        (WebCore::CachedShader::data):
+
 2012-01-19  Min Qin  <[email protected]>
 
         Improve touch handling performance by reusing the hitTest result

Modified: trunk/Source/WebCore/loader/cache/CachedShader.cpp (105453 => 105454)


--- trunk/Source/WebCore/loader/cache/CachedShader.cpp	2012-01-19 23:07:12 UTC (rev 105453)
+++ trunk/Source/WebCore/loader/cache/CachedShader.cpp	2012-01-19 23:20:53 UTC (rev 105454)
@@ -62,11 +62,8 @@
 
 void CachedShader::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
-    if (allDataReceived) {
+    if (allDataReceived)
         m_data = data;
-        return;
-    }
-
     CachedResource::data(data, allDataReceived);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to