Title: [112159] trunk/Source/WebCore
- Revision
- 112159
- Author
- [email protected]
- Date
- 2012-03-26 15:43:43 -0700 (Mon, 26 Mar 2012)
Log Message
[chromium] assertion being hit in CCLayerTreeHost::updateCompositorResources
https://bugs.webkit.org/show_bug.cgi?id=82239
Patch by Dana Jansens <[email protected]> on 2012-03-26
Reviewed by Adrienne Walker.
The assert is incorrect and should check the animation state on
the surface, not the owning layer.
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::updateCompositorResources):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112158 => 112159)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 22:41:28 UTC (rev 112158)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 22:43:43 UTC (rev 112159)
@@ -1,3 +1,16 @@
+2012-03-26 Dana Jansens <[email protected]>
+
+ [chromium] assertion being hit in CCLayerTreeHost::updateCompositorResources
+ https://bugs.webkit.org/show_bug.cgi?id=82239
+
+ Reviewed by Adrienne Walker.
+
+ The assert is incorrect and should check the animation state on
+ the surface, not the owning layer.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::updateCompositorResources):
+
2012-03-26 Levi Weintraub <[email protected]>
Correct LayoutUnit usage in RenderFieldSet and RenderMenuItem
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (112158 => 112159)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-03-26 22:41:28 UTC (rev 112158)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-03-26 22:43:43 UTC (rev 112159)
@@ -579,7 +579,7 @@
CCLayerIteratorType end = CCLayerIteratorType::end(&m_updateList);
for (CCLayerIteratorType it = CCLayerIteratorType::begin(&m_updateList); it != end; ++it) {
if (it.representsTargetRenderSurface()) {
- ASSERT(it->renderSurface()->drawOpacity() || it->drawOpacityIsAnimating());
+ ASSERT(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
if (it->maskLayer())
it->maskLayer()->updateCompositorResources(context, updater);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
