From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp | 12 ++++++++++-- Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h | 5 ++--- .../WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp | 7 ++++--- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'Source/WebCore/platform/graphics/ca') diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp index e9663a6..427c7bf 100644 --- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp +++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp @@ -550,11 +550,17 @@ void GraphicsLayerCA::setNeedsDisplay() setNeedsDisplayInRect(hugeRect); } -void GraphicsLayerCA::setNeedsDisplayInRect(const FloatRect& rect) +void GraphicsLayerCA::setNeedsDisplayInRect(const FloatRect& r) { if (!drawsContent()) return; + FloatRect rect(r); + FloatRect layerBounds(FloatPoint(), m_size); + rect.intersect(layerBounds); + if (rect.isEmpty()) + return; + const size_t maxDirtyRects = 32; for (size_t i = 0; i < m_dirtyRects.size(); ++i) { @@ -1601,9 +1607,11 @@ bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValue TransformOperation::OperationType transformOp = isMatrixAnimation ? TransformOperation::MATRIX_3D : functionList[animationIndex]; RefPtr caAnimation; -#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) +#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) || PLATFORM(WIN) // CA applies animations in reverse order () so we need the last one we add (per property) // to be non-additive. + // FIXME: This fix has not been added to QuartzCore on Windows yet () so we expect the + // reversed animation behavior bool additive = animationIndex < (numAnimations - 1); #else bool additive = animationIndex > 0; diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h index a8528fd..8b5a460 100644 --- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h +++ b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h @@ -38,11 +38,10 @@ #if PLATFORM(MAC) #ifdef __OBJC__ @class CAPropertyAnimation; -typedef CAPropertyAnimation* PlatformAnimationRef; #else -typedef void* CAPropertyAnimation; // So the m_animation declaration works -typedef void* PlatformAnimationRef; +class CAPropertyAnimation; #endif +typedef CAPropertyAnimation* PlatformAnimationRef; #elif PLATFORM(WIN) typedef struct _CACFAnimation* CACFAnimationRef; typedef CACFAnimationRef PlatformAnimationRef; diff --git a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp index f2e1950..75f4a10 100644 --- a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp +++ b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp @@ -307,13 +307,14 @@ void CACFLayerTreeHost::contextDidChange() void CACFLayerTreeHost::notifyAnimationsStarted() { + // Send currentTime to the pending animations. This function is called by CACF in a callback + // which occurs after the drawInContext calls. So currentTime is very close to the time + // the animations actually start double currentTime = WTF::currentTime(); - double time = currentTime + lastCommitTime() - CACurrentMediaTime(); - ASSERT(time <= currentTime); HashSet >::iterator end = m_pendingAnimatedLayers.end(); for (HashSet >::iterator it = m_pendingAnimatedLayers.begin(); it != end; ++it) - (*it)->animationStarted(time); + (*it)->animationStarted(currentTime); m_pendingAnimatedLayers.clear(); } -- cgit v1.1