Title: [129889] branches/chromium/1229/Source/WebCore
- Revision
- 129889
- Author
- voll...@chromium.org
- Date
- 2012-09-28 06:52:18 -0700 (Fri, 28 Sep 2012)
Log Message
LayerChromium::addAnimation should return false if there's no layer tree host
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/ChangeLog (129888 => 129889)
--- branches/chromium/1229/Source/WebCore/ChangeLog 2012-09-28 13:49:46 UTC (rev 129888)
+++ branches/chromium/1229/Source/WebCore/ChangeLog 2012-09-28 13:52:18 UTC (rev 129889)
@@ -1,3 +1,16 @@
+2012-09-28 Ian Vollick <voll...@chromium.org>
+
+ [chromium] LayerChromium should not accelerate animations without a layer tree
+
+ See: http://code.google.com/p/chromium/issues/detail?id=138213
+
+ Unreviewed back port.
+
+ LayerChromium::addAnimation should return false if there is no layer tree host.
+
+ * platform/graphics/chromium/LayerChromium.cpp:
+ (WebCore::LayerChromium::addAnimation):
+
2012-09-24 Ian Vollick <voll...@chromium.org>
[chromium] CCActiveAnimation should handle zero duration gracefully.
Modified: branches/chromium/1229/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (129888 => 129889)
--- branches/chromium/1229/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-09-28 13:49:46 UTC (rev 129888)
+++ branches/chromium/1229/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-09-28 13:52:18 UTC (rev 129889)
@@ -657,6 +657,9 @@
bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation)
{
+ if (!m_layerTreeHost)
+ return false;
+
if (!CCSettings::acceleratedAnimationEnabled())
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
