Title: [93760] trunk/Source/WebCore
- Revision
- 93760
- Author
- commit-qu...@webkit.org
- Date
- 2011-08-24 22:50:01 -0700 (Wed, 24 Aug 2011)
Log Message
Some layerTreeAsText compositing tests are flaky
https://bugs.webkit.org/show_bug.cgi?id=66913
Patch by James Robinson <jam...@chromium.org> on 2011-08-24
Reviewed by Simon Fraser.
Remove compositingLayerUpdatePending() and unconditionally update compositing layers when
RenderLayerCompositor::layerTreeAsText(). compositingLayerUpdatePending() was only used by test code and is
unreliable.
Covered by compositing/ layerTreeAsText tests.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::layerTreeAsText):
* rendering/RenderLayerCompositor.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93759 => 93760)
--- trunk/Source/WebCore/ChangeLog 2011-08-25 05:31:51 UTC (rev 93759)
+++ trunk/Source/WebCore/ChangeLog 2011-08-25 05:50:01 UTC (rev 93760)
@@ -1,3 +1,20 @@
+2011-08-24 James Robinson <jam...@chromium.org>
+
+ Some layerTreeAsText compositing tests are flaky
+ https://bugs.webkit.org/show_bug.cgi?id=66913
+
+ Reviewed by Simon Fraser.
+
+ Remove compositingLayerUpdatePending() and unconditionally update compositing layers when
+ RenderLayerCompositor::layerTreeAsText(). compositingLayerUpdatePending() was only used by test code and is
+ unreliable.
+
+ Covered by compositing/ layerTreeAsText tests.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::layerTreeAsText):
+ * rendering/RenderLayerCompositor.h:
+
2011-08-24 Kentaro Hara <hara...@google.com>
Implement a keypath parser strictly following the specification
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (93759 => 93760)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-08-25 05:31:51 UTC (rev 93759)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-08-25 05:50:01 UTC (rev 93760)
@@ -236,11 +236,6 @@
m_updateCompositingLayersTimer.startOneShot(0);
}
-bool RenderLayerCompositor::compositingLayerUpdatePending() const
-{
- return m_updateCompositingLayersTimer.isActive();
-}
-
void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>*)
{
updateCompositingLayers();
@@ -972,8 +967,7 @@
String RenderLayerCompositor::layerTreeAsText(bool showDebugInfo)
{
- if (compositingLayerUpdatePending())
- updateCompositingLayers();
+ updateCompositingLayers();
if (!m_rootContentLayer)
return String();
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (93759 => 93760)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2011-08-25 05:31:51 UTC (rev 93759)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2011-08-25 05:50:01 UTC (rev 93760)
@@ -101,7 +101,6 @@
// This is only used when state changes and we do not exepect a style update or layout to happen soon (e.g. when
// we discover that an iframe is overlapped during painting).
void scheduleCompositingLayerUpdate();
- bool compositingLayerUpdatePending() const;
// Update the compositing state of the given layer. Returns true if that state changed.
enum CompositingChangeRepaint { CompositingChangeRepaintNow, CompositingChangeWillRepaintLater };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
