Title: [113232] trunk/Source/WebCore
- Revision
- 113232
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-04 13:31:24 -0700 (Wed, 04 Apr 2012)
Log Message
[chromium] When setting animation started events, should check the root layer
https://bugs.webkit.org/show_bug.cgi?id=83060
Patch by Ian Vollick <voll...@chromium.org> on 2012-04-04
Reviewed by Adrienne Walker.
No new tests.
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::animateLayers):
(WebCore::CCLayerTreeHost::animateLayersRecursive):
(WebCore::CCLayerTreeHost::setAnimationEventsRecursive):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113231 => 113232)
--- trunk/Source/WebCore/ChangeLog 2012-04-04 20:27:46 UTC (rev 113231)
+++ trunk/Source/WebCore/ChangeLog 2012-04-04 20:31:24 UTC (rev 113232)
@@ -1,3 +1,17 @@
+2012-04-04 Ian Vollick <voll...@chromium.org>
+
+ [chromium] When setting animation started events, should check the root layer
+ https://bugs.webkit.org/show_bug.cgi?id=83060
+
+ Reviewed by Adrienne Walker.
+
+ No new tests.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::animateLayers):
+ (WebCore::CCLayerTreeHost::animateLayersRecursive):
+ (WebCore::CCLayerTreeHost::setAnimationEventsRecursive):
+
2012-04-04 Adam Klein <ad...@chromium.org>
Web Inspector: break on DOM node insertion only once per operation, not once per inserted node
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (113231 => 113232)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-04-04 20:27:46 UTC (rev 113231)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-04-04 20:31:24 UTC (rev 113232)
@@ -658,7 +658,7 @@
void CCLayerTreeHost::animateLayers(double monotonicTime)
{
- if (!m_settings.threadedAnimationEnabled || !m_needsAnimateLayers || !m_rootLayer)
+ if (!m_settings.threadedAnimationEnabled || !m_needsAnimateLayers)
return;
TRACE_EVENT("CCLayerTreeHostImpl::animateLayers", this, 0);
@@ -667,6 +667,9 @@
bool CCLayerTreeHost::animateLayersRecursive(LayerChromium* current, double monotonicTime)
{
+ if (!current)
+ return false;
+
bool subtreeNeedsAnimateLayers = false;
CCLayerAnimationController* currentController = current->layerAnimationController();
currentController->animate(monotonicTime, 0);
@@ -685,6 +688,9 @@
void CCLayerTreeHost::setAnimationEventsRecursive(const CCAnimationEventsVector& events, LayerChromium* layer, double wallClockTime)
{
+ if (!layer)
+ return;
+
for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
if (layer->id() == events[eventIndex].layerId)
layer->notifyAnimationStarted(events[eventIndex], wallClockTime);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
