Changeset 166542 in webkit

Timestamp:

Mar 31, 2014 4:15:58 PM (10 years ago)

Author:

Simon Fraser

Message:

[UI-side compositing] Proxy animations to the UI process
​https://bugs.webkit.org/show_bug.cgi?id=130946

Source/WebCore:

Reviewed by Tim Horton.

To proxy CA animations, make PlatformCAAnimation a pure virtual base class
and subclass for Mac, Windows, and Remote (just like PlatformCALayer).

Add coding support for TimingFunctions.

Do some minor #include tidyup.

Minor refactor in GraphicsLayerCA to share some animations code.

• WebCore.exp.in:
• WebCore.xcodeproj/project.pbxproj:
• platform/animation/TimingFunction.h: Add setters need for encode/decode.

(WebCore::CubicBezierTimingFunction::setValues):
(WebCore::CubicBezierTimingFunction::setTimingFunctionPreset):
(WebCore::StepsTimingFunction::create):
(WebCore::StepsTimingFunction::setNumberOfSteps):
(WebCore::StepsTimingFunction::setStepAtStart):

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::createPlatformCAAnimation):
(WebCore::GraphicsLayerCA::animationCanBeAccelerated): Minor refactor so we can share
code with GraphicsLayerCARemote.
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::createBasicAnimation):
(WebCore::PassRefPtr<PlatformCAAnimation>GraphicsLayerCA::createKeyframeAnimation):

• platform/graphics/ca/GraphicsLayerCA.h:
• platform/graphics/ca/PlatformCAAnimation.h:

(WebCore::PlatformCAAnimation::~PlatformCAAnimation):
(WebCore::PlatformCAAnimation::isPlatformCAAnimationMac):
(WebCore::PlatformCAAnimation::isPlatformCAAnimationWin):
(WebCore::PlatformCAAnimation::isPlatformCAAnimationRemote):
(WebCore::PlatformCAAnimation::PlatformCAAnimation):
(WebCore::PlatformCAAnimation::setType):

• platform/graphics/ca/PlatformCALayer.h:
• platform/graphics/ca/mac/PlatformCAAnimationMac.h: Added.
• platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
• platform/graphics/ca/mac/PlatformCALayerMac.mm:

(PlatformCALayerMac::addAnimationForKey):
(PlatformCALayerMac::animationForKey):

• platform/graphics/ca/mac/TileController.mm:
• platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
• platform/graphics/ca/win/PlatformCAAnimationWin.h: Added.

Source/WebKit2:

Reviewed by Tim Horton.

Add encoding/decoding of TimingFunctions. Add encoding support
for HashSet.

Add PlatformCAAnimationRemote and have PlatformCALayerRemote allow
animations now. PlatformCALayerRemote's properties are defined in the class,
as is the encoding/decoding (much cleaner than having them in the transaction
class I think).

Add support for the "animationDidStart" callback and sending this back to the
web process. This involves a HashMap of layerID->WKAnimationDelegate stored
on the RemoteLayerTreeHost, and a message send via the DrawingArea. On the
other side, RemoteLayerTreeContext stores a HashMap of layerID->PlatformCALayerRemote*
for layers which have just started animations, which is used to get the
PlatformCALayer* to call animationDidStart() on.

This requires that the RemoteLayerTreeHost* be passed down into property application,
and that the RemoteLayerTreeHost have a reference to the drawing area.

To every CALayer in the UI process we -setValue:forKey: to track the PlatformLayerID,
so we can get back to it in order to dispatch "animationDidStart".

Replace some "using namespace WebKit" with "namespace WebKit { }".

• Platform/IPC/ArgumentCoders.h:
• Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<LinearTimingFunction>::encode):
(IPC::ArgumentCoder<LinearTimingFunction>::decode):
(IPC::ArgumentCoder<CubicBezierTimingFunction>::encode):
(IPC::ArgumentCoder<CubicBezierTimingFunction>::decode):
(IPC::ArgumentCoder<StepsTimingFunction>::encode):
(IPC::ArgumentCoder<StepsTimingFunction>::decode):

• Shared/WebCoreArgumentCoders.h:
• Shared/mac/RemoteLayerBackingStore.mm:
• Shared/mac/RemoteLayerTreePropertyApplier.h:
• Shared/mac/RemoteLayerTreePropertyApplier.mm:

(WebKit::applyPropertiesToLayer):
(WebKit::RemoteLayerTreePropertyApplier::applyProperties):

• Shared/mac/RemoteLayerTreeTransaction.h:
• Shared/mac/RemoteLayerTreeTransaction.mm:

(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):

• UIProcess/ios/RemoteLayerTreeHostIOS.mm:

(WebKit::RemoteLayerTreeHost::layerID):
(WebKit::RemoteLayerTreeHost::createLayer):

• UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
• UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:

(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart):
(WebKit::RemoteLayerTreeDrawingAreaProxy::showDebugIndicator):

• UIProcess/mac/RemoteLayerTreeHost.h:

(WebKit::RemoteLayerTreeHost::animationDelegates):

• UIProcess/mac/RemoteLayerTreeHost.mm:

(WebKit::RemoteLayerTreeHost::RemoteLayerTreeHost):
(WebKit::RemoteLayerTreeHost::updateLayerTree):
(WebKit::RemoteLayerTreeHost::layerWillBeRemoved):
(WebKit::RemoteLayerTreeHost::animationDidStart):
(WebKit::RemoteLayerTreeHost::layerID):
(WebKit::RemoteLayerTreeHost::createLayer):

• WebKit2.xcodeproj/project.pbxproj:
• WebProcess/WebPage/DrawingArea.h:

(WebKit::DrawingArea::acceleratedAnimationDidStart):

• WebProcess/WebPage/DrawingArea.messages.in:
• WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:

(WebKit::GraphicsLayerCARemote::createPlatformCAAnimation):

• WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
• WebProcess/WebPage/mac/PlatformCAAnimationRemote.h: Added.
• WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm: Added.
• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
(WebKit::PlatformCALayerRemote::animationStarted):
(WebKit::PlatformCALayerRemote::addAnimationForKey):
(WebKit::PlatformCALayerRemote::removeAnimationForKey):
(WebKit::PlatformCALayerRemote::animationForKey):
(PlatformCALayerRemote::recursiveBuildTransaction): Deleted.
(PlatformCALayerRemote::addAnimationForKey): Deleted.
(PlatformCALayerRemote::removeAnimationForKey): Deleted.
(PlatformCALayerRemote::animationForKey): Deleted.

• WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
• WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
• WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
• WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:

(WebKit::RemoteLayerTreeContext::layerWillBeDestroyed):
(WebKit::RemoteLayerTreeContext::willStartAnimationOnLayer):
(WebKit::RemoteLayerTreeContext::animationDidStart):

• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::acceleratedAnimationDidStart):

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (5 diffs)
• WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/platform/animation/TimingFunction.h (modified) (8 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (7 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (4 diffs)
• WebCore/platform/graphics/ca/PlatformCAAnimation.h (modified) (2 diffs)
• WebCore/platform/graphics/ca/PlatformCALayer.h (modified) (2 diffs)
• WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h (added)
• WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm (modified) (29 diffs)
• WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (3 diffs)
• WebCore/platform/graphics/ca/mac/TileController.mm (modified) (1 diff)
• WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (modified) (26 diffs)
• WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h (added)
• WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (modified) (2 diffs)
• WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/IPC/ArgumentCoders.h (modified) (2 diffs)
• WebKit2/Shared/WebCoreArgumentCoders.cpp (modified) (3 diffs)
• WebKit2/Shared/WebCoreArgumentCoders.h (modified) (5 diffs)
• WebKit2/Shared/mac/RemoteLayerBackingStore.mm (modified) (2 diffs)
• WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.h (modified) (1 diff)
• WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (modified) (6 diffs)
• WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (modified) (4 diffs)
• WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (modified) (4 diffs)
• WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm (modified) (3 diffs)
• WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (modified) (1 diff)
• WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (modified) (3 diffs)
• WebKit2/UIProcess/mac/RemoteLayerTreeHost.h (modified) (2 diffs)
• WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (modified) (5 diffs)
• WebKit2/WebKit2.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebKit2/WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/DrawingArea.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h (added)
• WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (added)
• WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (5 diffs)
• WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Simon Fraser  <simon.fraser@apple.com>
+
+        [UI-side compositing] Proxy animations to the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=130946
+
+        Reviewed by Tim Horton.
+        
+        To proxy CA animations, make PlatformCAAnimation a pure virtual base class
+        and subclass for Mac, Windows, and Remote (just like PlatformCALayer).
+        
+        Add coding support for TimingFunctions.
+        
+        Do some minor #include tidyup.
+        
+        Minor refactor in GraphicsLayerCA to share some animations code.
+
+        * WebCore.exp.in:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/animation/TimingFunction.h: Add setters need for encode/decode.
+        (WebCore::CubicBezierTimingFunction::setValues):
+        (WebCore::CubicBezierTimingFunction::setTimingFunctionPreset):
+        (WebCore::StepsTimingFunction::create):
+        (WebCore::StepsTimingFunction::setNumberOfSteps):
+        (WebCore::StepsTimingFunction::setStepAtStart):
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::createPlatformCAAnimation):
+        (WebCore::GraphicsLayerCA::animationCanBeAccelerated): Minor refactor so we can share
+        code with GraphicsLayerCARemote.
+        (WebCore::GraphicsLayerCA::addAnimation):
+        (WebCore::GraphicsLayerCA::createBasicAnimation):
+        (WebCore::PassRefPtr<PlatformCAAnimation>GraphicsLayerCA::createKeyframeAnimation):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * platform/graphics/ca/PlatformCAAnimation.h:
+        (WebCore::PlatformCAAnimation::~PlatformCAAnimation):
+        (WebCore::PlatformCAAnimation::isPlatformCAAnimationMac):
+        (WebCore::PlatformCAAnimation::isPlatformCAAnimationWin):
+        (WebCore::PlatformCAAnimation::isPlatformCAAnimationRemote):
+        (WebCore::PlatformCAAnimation::PlatformCAAnimation):
+        (WebCore::PlatformCAAnimation::setType):
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/mac/PlatformCAAnimationMac.h: Added.
+        * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::addAnimationForKey):
+        (PlatformCALayerMac::animationForKey):
+        * platform/graphics/ca/mac/TileController.mm:
+        * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+        * platform/graphics/ca/win/PlatformCAAnimationWin.h: Added.
+
 2014-03-31  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -718 +718 @@
 __ZN7WebCore16startOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore16threadGlobalDataEv
+__ZN7WebCore16toCAFillModeTypeENS_19PlatformCAAnimation12FillModeTypeE
 __ZN7WebCore17CredentialStorage24getFromPersistentStorageERKNS_15ProtectionSpaceE
 __ZN7WebCore17CredentialStorage3getERKNS_15ProtectionSpaceE
@@ -793 +794 @@
 __ZN7WebCore19MediaSessionManager30didReceiveRemoteControlCommandENS_12MediaSession24RemoteControlCommandTypeE
 __ZN7WebCore19MediaSessionManager9addClientEPNS_25MediaSessionManagerClientE
-__ZN7WebCore19PlatformCAAnimation10setToValueERKNS_20TransformationMatrixE
-__ZN7WebCore19PlatformCAAnimation6createEP19CAPropertyAnimation
-__ZN7WebCore19PlatformCAAnimationD1Ev
 __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
 __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
@@ -902 +900 @@
 __ZN7WebCore21setGlobalIconDatabaseEPNS_16IconDatabaseBaseE
 __ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE
+__ZN7WebCore21toCAValueFunctionTypeENS_19PlatformCAAnimation17ValueFunctionTypeE
 __ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
 __ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
 __ZN7WebCore22MutableStyleProperties25ensureCSSStyleDeclarationEv
 __ZN7WebCore22MutableStylePropertiesD1Ev
+__ZN7WebCore22PlatformCAAnimationMac6createEP19CAPropertyAnimation
 __ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
@@ -941 +941 @@
 __ZN7WebCore23getFileModificationTimeERKN3WTF6StringERl
 __ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
+__ZN7WebCore23toCAMediaTimingFunctionEPKNS_14TimingFunctionEb
 __ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
 __ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE
@@ -1645 +1646 @@
 __ZNK7WebCore15GraphicsLayerCA21canThrottleLayerFlushEv
 __ZNK7WebCore15GraphicsLayerCA24dumpAdditionalPropertiesERNS_10TextStreamEij
+__ZNK7WebCore15GraphicsLayerCA25animationCanBeAcceleratedERKNS_17KeyframeValueListEPKNS_9AnimationE
 __ZNK7WebCore15GraphicsLayerCA25shouldRepaintOnSizeChangeEv
 __ZNK7WebCore15GraphicsLayerCA26backingStoreMemoryEstimateEv

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -19153 +19153 @@
     <ClInclude Include="..\platform\graphics\cairo\TileCairo.h" />
     <ClInclude Include="..\platform\graphics\ca\PlatformCAFilters.h" />
+    <ClInclude Include="..\platform\graphics\ca\win\PlatformCAAnimationWin.h" />
     <ClInclude Include="..\platform\graphics\ca\win\PlatformCALayerWin.h" />
     <ClInclude Include="..\platform\graphics\GLContext.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -505 +505 @@
                 0F5B7A5410F65D7A00376302 /* RenderEmbeddedObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */; };
                 0F5B7A5510F65D7A00376302 /* RenderEmbeddedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                0F5E200618E771FC003EC3E5 /* PlatformCAAnimationMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5E200518E771FC003EC3E5 /* PlatformCAAnimationMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 0F605AEC15F94848004DF0C0 /* ScrollingConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F605AEA15F94848004DF0C0 /* ScrollingConstraints.cpp */; };
                 0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F605AEB15F94848004DF0C0 /* ScrollingConstraints.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7326 +7327 @@
                 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderEmbeddedObject.cpp; sourceTree = "<group>"; };
                 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderEmbeddedObject.h; sourceTree = "<group>"; };
+                0F5E200518E771FC003EC3E5 /* PlatformCAAnimationMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAAnimationMac.h; path = ca/mac/PlatformCAAnimationMac.h; sourceTree = "<group>"; };
                 0F605AEA15F94848004DF0C0 /* ScrollingConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingConstraints.cpp; sourceTree = "<group>"; };
                 0F605AEB15F94848004DF0C0 /* ScrollingConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingConstraints.h; sourceTree = "<group>"; };
@@ -15596 +15598 @@
                                 93F72AF11666EDFC002A02BD /* LayerPool.h */,
                                 93F72AF21666EDFC002A02BD /* LayerPool.mm */,
+                                0F5E200518E771FC003EC3E5 /* PlatformCAAnimationMac.h */,
                                 4958781F12A57DDF007238AC /* PlatformCAAnimationMac.mm */,
                                 D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */,
@@ -24387 +24390 @@
                                 BC4918C90BFEA050009D6316 /* JSHTMLIFrameElement.h in Headers */,
                                 1AE2AA980A1CDD2D00B42B25 /* JSHTMLImageElement.h in Headers */,
+                                0F5E200618E771FC003EC3E5 /* PlatformCAAnimationMac.h in Headers */,
                                 A80E7E970A1A83E3007FB8C5 /* JSHTMLInputElement.h in Headers */,
                                 E1AD14231295EA7F00ACA989 /* JSHTMLInputElementCustom.h in Headers */,

trunk/Source/WebCore/platform/animation/TimingFunction.h

@@ -33 +33 @@
 public:
 
+    virtual PassRefPtr<TimingFunction> clone() const = 0;
+
     enum TimingFunctionType {
         LinearFunction, CubicBezierFunction, StepsFunction
@@ -69 +71 @@
         return other.isLinearTimingFunction();
     }
-    
+
 private:
     LinearTimingFunction()
@@ -75 +77 @@
     {
     }
-};
-    
+
+    virtual PassRefPtr<TimingFunction> clone() const override
+    {
+        return adoptRef(new LinearTimingFunction);
+    }
+};
+
 class CubicBezierTimingFunction : public TimingFunction {
 public:
@@ -133 +140 @@
     double y2() const { return m_y2; }
     
+    void setValues(double x1, double y1, double x2, double y2)
+    {
+        m_x1 = x1;
+        m_y1 = y1;
+        m_x2 = x2;
+        m_y2 = y2;
+    }
+    
     TimingFunctionPreset timingFunctionPreset() const { return m_timingFunctionPreset; }
+    void setTimingFunctionPreset(TimingFunctionPreset preset) { m_timingFunctionPreset = preset; }
     
     static const CubicBezierTimingFunction* defaultTimingFunction()
@@ -157 +173 @@
     }
 
+    virtual PassRefPtr<TimingFunction> clone() const override
+    {
+        return adoptRef(new CubicBezierTimingFunction(m_timingFunctionPreset, m_x1, m_y1, m_x2, m_y2));
+    }
+
     double m_x1;
     double m_y1;
@@ -166 +187 @@
 class StepsTimingFunction : public TimingFunction {
 public:
+    
     static PassRefPtr<StepsTimingFunction> create(int steps, bool stepAtStart)
     {
         return adoptRef(new StepsTimingFunction(steps, stepAtStart));
+    }
+    static PassRefPtr<StepsTimingFunction> create()
+    {
+        return adoptRef(new StepsTimingFunction(1, true));
     }
     
@@ -183 +209 @@
     
     int numberOfSteps() const { return m_steps; }
+    void setNumberOfSteps(int steps) { m_steps = steps; }
+
     bool stepAtStart() const { return m_stepAtStart; }
+    void setStepAtStart(bool stepAtStart) { m_stepAtStart = stepAtStart; }
     
 private:
@@ -192 +221 @@
     {
     }
+
+    virtual PassRefPtr<TimingFunction> clone() const override
+    {
+        return adoptRef(new StepsTimingFunction(m_steps, m_stepAtStart));
+    }
     
     int m_steps;
     bool m_stepAtStart;
 };
-    
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -32 +32 @@
 #include "FloatRect.h"
 #include "GraphicsLayerFactory.h"
+#include "Image.h"
 #include "PlatformCAFilters.h"
 #include "PlatformCALayer.h"
@@ -52 +53 @@
 
 #if PLATFORM(COCOA)
+#include "PlatformCAAnimationMac.h"
 #include "PlatformCALayerMac.h"
 #include "WebCoreSystemInterface.h"
@@ -57 +59 @@
 
 #if PLATFORM(WIN)
+#include "PlatformCAAnimationWin.h"
 #include "PlatformCALayerWin.h"
 #endif
@@ -342 +345 @@
 }
 
+PassRefPtr<PlatformCAAnimation> GraphicsLayerCA::createPlatformCAAnimation(PlatformCAAnimation::AnimationType type, const String& keyPath)
+{
+#if PLATFORM(COCOA)
+    return PlatformCAAnimationMac::create(type, keyPath);
+#elif PLATFORM(WIN)
+    return PlatformCAAnimationWin::create(type, keyPath);
+#endif
+}
+
 GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
     : GraphicsLayer(client)
@@ -788 +800 @@
 }
 
-bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& animationName, double timeOffset)
-{
-    ASSERT(!animationName.isEmpty());
-
+bool GraphicsLayerCA::animationCanBeAccelerated(const KeyframeValueList& valueList, const Animation* anim) const
+{
     if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2)
         return false;
 
-    // CoreAnimation does not handle the steps() timing function. Fall back
-    // to software animation in that case.
     if (animationHasStepsTimingFunction(valueList, anim))
+        return false;
+
+    return true;
+}
+
+bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& animationName, double timeOffset)
+{
+    ASSERT(!animationName.isEmpty());
+
+    if (!animationCanBeAccelerated(valueList, anim))
         return false;
 
@@ -2577 +2595 @@
 PassRefPtr<PlatformCAAnimation> GraphicsLayerCA::createBasicAnimation(const Animation* anim, const String& keyPath, bool additive)
 {
-    RefPtr<PlatformCAAnimation> basicAnim = PlatformCAAnimation::create(PlatformCAAnimation::Basic, keyPath);
+    RefPtr<PlatformCAAnimation> basicAnim = createPlatformCAAnimation(PlatformCAAnimation::Basic, keyPath);
     setupAnimation(basicAnim.get(), anim, additive);
     return basicAnim;
@@ -2584 +2602 @@
 PassRefPtr<PlatformCAAnimation>GraphicsLayerCA::createKeyframeAnimation(const Animation* anim, const String& keyPath, bool additive)
 {
-    RefPtr<PlatformCAAnimation> keyframeAnim = PlatformCAAnimation::create(PlatformCAAnimation::Keyframe, keyPath);
+    RefPtr<PlatformCAAnimation> keyframeAnim = createPlatformCAAnimation(PlatformCAAnimation::Keyframe, keyPath);
     setupAnimation(keyframeAnim.get(), anim, additive);
     return keyframeAnim;

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -28 +28 @@
 
 #include "GraphicsLayer.h"
-#include "Image.h"
 #include "PlatformCAAnimation.h"
 #include "PlatformCALayer.h"
@@ -43 +42 @@
 namespace WebCore {
 
+class Image;
 class TransformState;
 
@@ -171 +171 @@
 protected:
     virtual void setOpacityInternal(float);
+    
+    bool animationCanBeAccelerated(const KeyframeValueList&, const Animation*) const;
 
 private:
@@ -215 +217 @@
     virtual PassRefPtr<PlatformCALayer> createPlatformCALayer(PlatformCALayer::LayerType, PlatformCALayerClient* owner);
     virtual PassRefPtr<PlatformCALayer> createPlatformCALayer(PlatformLayer*, PlatformCALayerClient* owner);
+    virtual PassRefPtr<PlatformCAAnimation> createPlatformCAAnimation(PlatformCAAnimation::AnimationType, const String& keyPath);
 
     PlatformCALayer* primaryLayer() const { return m_structuralLayer.get() ? m_structuralLayer.get() : m_layer.get(); }

trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h

@@ -32 +32 @@
 #include "TransformationMatrix.h"
 #include <wtf/RefCounted.h>
-#include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
-
-#if PLATFORM(COCOA)
-OBJC_CLASS CAPropertyAnimation;
-typedef CAPropertyAnimation* PlatformAnimationRef;
-#elif PLATFORM(WIN)
-typedef struct _CACFAnimation* CACFAnimationRef;
-typedef CACFAnimationRef PlatformAnimationRef;
-#endif
 
 namespace WebCore {
 
 class FloatRect;
-class PlatformCAAnimation;
 class TimingFunction;
 
 class PlatformCAAnimation : public RefCounted<PlatformCAAnimation> {
 public:
-    friend class PlatformCALayer;
-#if PLATFORM(COCOA)
-    friend class PlatformCALayerMac;
-#elif PLATFORM(WIN)
-    friend class PlatformCALayerWin;
-#endif
-    
     enum AnimationType { Basic, Keyframe };
     enum FillModeType { NoFillMode, Forwards, Backwards, Both };
     enum ValueFunctionType { NoValueFunction, RotateX, RotateY, RotateZ, ScaleX, ScaleY, ScaleZ, Scale, TranslateX, TranslateY, TranslateZ, Translate };
 
-    static PassRefPtr<PlatformCAAnimation> create(AnimationType, const String& keyPath);
-    static PassRefPtr<PlatformCAAnimation> create(PlatformAnimationRef);
+    virtual ~PlatformCAAnimation() { }
 
-    ~PlatformCAAnimation();
+    virtual bool isPlatformCAAnimationMac() const { return false; }
+    virtual bool isPlatformCAAnimationWin() const { return false; }
+    virtual bool isPlatformCAAnimationRemote() const { return false; }
     
-    PassRefPtr<PlatformCAAnimation> copy() const;
-
-    PlatformAnimationRef platformAnimation() const;
+    virtual PassRefPtr<PlatformCAAnimation> copy() const = 0;
     
     AnimationType animationType() const { return m_type; }
-    String keyPath() const;
+    virtual String keyPath() const = 0;
     
-    CFTimeInterval beginTime() const;
-    void setBeginTime(CFTimeInterval);
+    virtual CFTimeInterval beginTime() const = 0;
+    virtual void setBeginTime(CFTimeInterval) = 0;
     
-    CFTimeInterval duration() const;
-    void setDuration(CFTimeInterval);
+    virtual CFTimeInterval duration() const = 0;
+    virtual void setDuration(CFTimeInterval) = 0;
     
-    float speed() const;
-    void setSpeed(float);
+    virtual float speed() const = 0;
+    virtual void setSpeed(float) = 0;
 
-    CFTimeInterval timeOffset() const;
-    void setTimeOffset(CFTimeInterval);
+    virtual CFTimeInterval timeOffset() const = 0;
+    virtual void setTimeOffset(CFTimeInterval) = 0;
 
-    float repeatCount() const;
-    void setRepeatCount(float);
+    virtual float repeatCount() const = 0;
+    virtual void setRepeatCount(float) = 0;
 
-    bool autoreverses() const;
-    void setAutoreverses(bool);
+    virtual bool autoreverses() const = 0;
+    virtual void setAutoreverses(bool) = 0;
 
-    FillModeType fillMode() const;
-    void setFillMode(FillModeType);
+    virtual FillModeType fillMode() const = 0;
+    virtual void setFillMode(FillModeType) = 0;
     
-    void setTimingFunction(const TimingFunction*, bool reverse = false);
-    void copyTimingFunctionFrom(const PlatformCAAnimation*);
+    virtual void setTimingFunction(const TimingFunction*, bool reverse = false) = 0;
+    virtual void copyTimingFunctionFrom(const PlatformCAAnimation*) = 0;
 
-    bool isRemovedOnCompletion() const;
-    void setRemovedOnCompletion(bool);
+    virtual bool isRemovedOnCompletion() const = 0;
+    virtual void setRemovedOnCompletion(bool) = 0;
 
-    bool isAdditive() const;
-    void setAdditive(bool);
+    virtual bool isAdditive() const = 0;
+    virtual void setAdditive(bool) = 0;
 
-    ValueFunctionType valueFunction() const;
-    void setValueFunction(ValueFunctionType);
+    virtual ValueFunctionType valueFunction() const = 0;
+    virtual void setValueFunction(ValueFunctionType) = 0;
 
     // Basic-animation properties.
-    void setFromValue(float);
-    void setFromValue(const WebCore::TransformationMatrix&);
-    void setFromValue(const FloatPoint3D&);
-    void setFromValue(const WebCore::Color&);
+    virtual void setFromValue(float) = 0;
+    virtual void setFromValue(const WebCore::TransformationMatrix&) = 0;
+    virtual void setFromValue(const FloatPoint3D&) = 0;
+    virtual void setFromValue(const WebCore::Color&) = 0;
 #if ENABLE(CSS_FILTERS)
-    void setFromValue(const FilterOperation*, int internalFilterPropertyIndex);
+    virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
 #endif
-    void copyFromValueFrom(const PlatformCAAnimation*);
+    virtual void copyFromValueFrom(const PlatformCAAnimation*) = 0;
 
-    void setToValue(float);
-    void setToValue(const WebCore::TransformationMatrix&);
-    void setToValue(const FloatPoint3D&);
-    void setToValue(const WebCore::Color&);
+    virtual void setToValue(float) = 0;
+    virtual void setToValue(const WebCore::TransformationMatrix&) = 0;
+    virtual void setToValue(const FloatPoint3D&) = 0;
+    virtual void setToValue(const WebCore::Color&) = 0;
 #if ENABLE(CSS_FILTERS)
-    void setToValue(const FilterOperation*, int internalFilterPropertyIndex);
+    virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
 #endif
-    void copyToValueFrom(const PlatformCAAnimation*);
+    virtual void copyToValueFrom(const PlatformCAAnimation*) = 0;
 
     // Keyframe-animation properties.
-    void setValues(const Vector<float>&);
-    void setValues(const Vector<WebCore::TransformationMatrix>&);
-    void setValues(const Vector<FloatPoint3D>&);
-    void setValues(const Vector<WebCore::Color>&);
+    virtual void setValues(const Vector<float>&) = 0;
+    virtual void setValues(const Vector<WebCore::TransformationMatrix>&) = 0;
+    virtual void setValues(const Vector<FloatPoint3D>&) = 0;
+    virtual void setValues(const Vector<WebCore::Color>&) = 0;
 #if ENABLE(CSS_FILTERS)
-    void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex);
+    virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) = 0;
 #endif
-    void copyValuesFrom(const PlatformCAAnimation*);
+    virtual void copyValuesFrom(const PlatformCAAnimation*) = 0;
 
-    void setKeyTimes(const Vector<float>&);
-    void copyKeyTimesFrom(const PlatformCAAnimation*);
+    virtual void setKeyTimes(const Vector<float>&) = 0;
+    virtual void copyKeyTimesFrom(const PlatformCAAnimation*) = 0;
 
-    void setTimingFunctions(const Vector<const TimingFunction*>&, bool reverse = false);
-    void copyTimingFunctionsFrom(const PlatformCAAnimation*);
-
-protected:
-    PlatformCAAnimation(AnimationType, const String& keyPath);
-    PlatformCAAnimation(PlatformAnimationRef);
+    virtual void setTimingFunctions(const Vector<const TimingFunction*>&, bool reverse = false) = 0;
+    virtual void copyTimingFunctionsFrom(const PlatformCAAnimation*) = 0;
 
     void setActualStartTimeIfNeeded(CFTimeInterval t)
@@ -151 +129 @@
             setBeginTime(t);
     }
+    
+protected:
+    PlatformCAAnimation(AnimationType type = Basic)
+        : m_type(type)
+    {
+    }
+
+    void setType(AnimationType type) { m_type = type; }
 
 private:
     AnimationType m_type;
-    
-#if PLATFORM(COCOA)
-    RetainPtr<CAPropertyAnimation> m_animation;
-#elif PLATFORM(WIN)
-    RetainPtr<CACFAnimationRef> m_animation;
-#endif
 };
+
+#define PLATFORM_CAANIMATION_TYPE_CASTS(ToValueTypeName, predicate) \
+    TYPE_CASTS_BASE(ToValueTypeName, WebCore::PlatformCAAnimation, object, object->predicate, object.predicate)
 
 }

trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

@@ -27 +27 @@
 #define PlatformCALayer_h
 
-#include "GraphicsContext.h"
 #include "GraphicsLayer.h"
-#include "PlatformCAAnimation.h"
 #include "PlatformCALayerClient.h"
 #include <QuartzCore/CABase.h>
@@ -43 +41 @@
 OBJC_CLASS AVPlayerLayer;
 
+#if PLATFORM(COCOA)
+typedef struct CGContext *CGContextRef;
+#endif
+
 namespace WebCore {
 
 class PlatformCALayer;
+class PlatformCAAnimation;
 
 typedef Vector<RefPtr<PlatformCALayer>> PlatformCALayerList;

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #include "config.h"
 
-#import "PlatformCAAnimation.h"
+#import "PlatformCAAnimationMac.h"
 
 #import "FloatConversion.h"
@@ -41 +41 @@
 static bool hasNonZeroBeginTimeFlag(const PlatformCAAnimation* animation)
 {
-    return [[animation->platformAnimation() valueForKey:WKNonZeroBeginTimeFlag] boolValue];
+    return [[toPlatformCAAnimationMac(animation)->platformAnimation() valueForKey:WKNonZeroBeginTimeFlag] boolValue];
 }
 
 static void setNonZeroBeginTimeFlag(PlatformCAAnimation* animation, bool value)
 {
-    [animation->platformAnimation() setValue:[NSNumber numberWithBool:value] forKey:WKNonZeroBeginTimeFlag];
-}
-    
-static NSString* toCAFillModeType(PlatformCAAnimation::FillModeType type)
+    [toPlatformCAAnimationMac(animation)->platformAnimation() setValue:[NSNumber numberWithBool:value] forKey:WKNonZeroBeginTimeFlag];
+}
+    
+NSString* WebCore::toCAFillModeType(PlatformCAAnimation::FillModeType type)
 {
     switch (type) {
@@ -71 +71 @@
 }
 
-static NSString* toCAValueFunctionType(PlatformCAAnimation::ValueFunctionType type)
+NSString* WebCore::toCAValueFunctionType(PlatformCAAnimation::ValueFunctionType type)
 {
     switch (type) {
@@ -128 +128 @@
 }
 
-static CAMediaTimingFunction* toCAMediaTimingFunction(const TimingFunction* timingFunction, bool reverse)
+CAMediaTimingFunction* WebCore::toCAMediaTimingFunction(const TimingFunction* timingFunction, bool reverse)
 {
     ASSERT(timingFunction);
@@ -147 +147 @@
     }
     
+    ASSERT(timingFunction->type() == TimingFunction::LinearFunction);
     return [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
 }
 
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::create(AnimationType type, const String& keyPath)
-{
-    return adoptRef(new PlatformCAAnimation(type, keyPath));
-}
-
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::create(PlatformAnimationRef animation)
-{
-    return adoptRef(new PlatformCAAnimation(animation));
-}
-
-PlatformCAAnimation::PlatformCAAnimation(AnimationType type, const String& keyPath)
-    : m_type(type)
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationMac::create(AnimationType type, const String& keyPath)
+{
+    return adoptRef(new PlatformCAAnimationMac(type, keyPath));
+}
+
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationMac::create(PlatformAnimationRef animation)
+{
+    return adoptRef(new PlatformCAAnimationMac(animation));
+}
+
+PlatformCAAnimationMac::PlatformCAAnimationMac(AnimationType type, const String& keyPath)
+    : PlatformCAAnimation(type)
 {
     if (type == Basic)
@@ -169 +170 @@
 }
 
-PlatformCAAnimation::PlatformCAAnimation(PlatformAnimationRef animation)
+PlatformCAAnimationMac::PlatformCAAnimationMac(PlatformAnimationRef animation)
 {
     if ([static_cast<CAAnimation*>(animation) isKindOfClass:[CABasicAnimation class]])
-        m_type = Basic;
+        setType(Basic);
     else if ([static_cast<CAAnimation*>(animation) isKindOfClass:[CAKeyframeAnimation class]])
-        m_type = Keyframe;
+        setType(Keyframe);
     else {
         ASSERT(0);
@@ -183 +184 @@
 }
 
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::copy() const
+PlatformCAAnimationMac::~PlatformCAAnimationMac()
+{
+}
+
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationMac::copy() const
 {
     RefPtr<PlatformCAAnimation> animation = create(animationType(), keyPath());
@@ -213 +218 @@
     return animation;
 }
-PlatformCAAnimation::~PlatformCAAnimation()
-{
-}
-
-PlatformAnimationRef PlatformCAAnimation::platformAnimation() const
+
+PlatformAnimationRef PlatformCAAnimationMac::platformAnimation() const
 {
     return m_animation.get();
 }
 
-String PlatformCAAnimation::keyPath() const
+String PlatformCAAnimationMac::keyPath() const
 {
     return [m_animation.get() keyPath];
 }
 
-CFTimeInterval PlatformCAAnimation::beginTime() const
+CFTimeInterval PlatformCAAnimationMac::beginTime() const
 {
     return [m_animation.get() beginTime];
 }
 
-void PlatformCAAnimation::setBeginTime(CFTimeInterval value)
+void PlatformCAAnimationMac::setBeginTime(CFTimeInterval value)
 {
     [m_animation.get() setBeginTime:value];
@@ -244 +246 @@
 }
 
-CFTimeInterval PlatformCAAnimation::duration() const
+CFTimeInterval PlatformCAAnimationMac::duration() const
 {
     return [m_animation.get() duration];
 }
 
-void PlatformCAAnimation::setDuration(CFTimeInterval value)
+void PlatformCAAnimationMac::setDuration(CFTimeInterval value)
 {
     [m_animation.get() setDuration:value];
 }
 
-float PlatformCAAnimation::speed() const
+float PlatformCAAnimationMac::speed() const
 {
     return [m_animation.get() speed];
 }
 
-void PlatformCAAnimation::setSpeed(float value)
+void PlatformCAAnimationMac::setSpeed(float value)
 {
     [m_animation.get() setSpeed:value];
 }
 
-CFTimeInterval PlatformCAAnimation::timeOffset() const
+CFTimeInterval PlatformCAAnimationMac::timeOffset() const
 {
     return [m_animation.get() timeOffset];
 }
 
-void PlatformCAAnimation::setTimeOffset(CFTimeInterval value)
+void PlatformCAAnimationMac::setTimeOffset(CFTimeInterval value)
 {
     [m_animation.get() setTimeOffset:value];
 }
 
-float PlatformCAAnimation::repeatCount() const
+float PlatformCAAnimationMac::repeatCount() const
 {
     return [m_animation.get() repeatCount];
 }
 
-void PlatformCAAnimation::setRepeatCount(float value)
+void PlatformCAAnimationMac::setRepeatCount(float value)
 {
     [m_animation.get() setRepeatCount:value];
 }
 
-bool PlatformCAAnimation::autoreverses() const
+bool PlatformCAAnimationMac::autoreverses() const
 {
     return [m_animation.get() autoreverses];
 }
 
-void PlatformCAAnimation::setAutoreverses(bool value)
+void PlatformCAAnimationMac::setAutoreverses(bool value)
 {
     [m_animation.get() setAutoreverses:value];
 }
 
-PlatformCAAnimation::FillModeType PlatformCAAnimation::fillMode() const
+PlatformCAAnimation::FillModeType PlatformCAAnimationMac::fillMode() const
 {
     return fromCAFillModeType([m_animation.get() fillMode]);
 }
 
-void PlatformCAAnimation::setFillMode(FillModeType value)
+void PlatformCAAnimationMac::setFillMode(FillModeType value)
 {
     [m_animation.get() setFillMode:toCAFillModeType(value)];
 }
 
-void PlatformCAAnimation::setTimingFunction(const TimingFunction* value, bool reverse)
+void PlatformCAAnimationMac::setTimingFunction(const TimingFunction* value, bool reverse)
 {
     [m_animation.get() setTimingFunction:toCAMediaTimingFunction(value, reverse)];
 }
 
-void PlatformCAAnimation::copyTimingFunctionFrom(const PlatformCAAnimation* value)
-{
-    [m_animation.get() setTimingFunction:[value->m_animation.get() timingFunction]];
-}
-
-bool PlatformCAAnimation::isRemovedOnCompletion() const
+void PlatformCAAnimationMac::copyTimingFunctionFrom(const PlatformCAAnimation* value)
+{
+    [m_animation.get() setTimingFunction:[toPlatformCAAnimationMac(value)->m_animation.get() timingFunction]];
+}
+
+bool PlatformCAAnimationMac::isRemovedOnCompletion() const
 {
     return [m_animation.get() isRemovedOnCompletion];
 }
 
-void PlatformCAAnimation::setRemovedOnCompletion(bool value)
+void PlatformCAAnimationMac::setRemovedOnCompletion(bool value)
 {
     [m_animation.get() setRemovedOnCompletion:value];
 }
 
-bool PlatformCAAnimation::isAdditive() const
+bool PlatformCAAnimationMac::isAdditive() const
 {
     return [m_animation.get() isAdditive];
 }
 
-void PlatformCAAnimation::setAdditive(bool value)
+void PlatformCAAnimationMac::setAdditive(bool value)
 {
     [m_animation.get() setAdditive:value];
 }
 
-PlatformCAAnimation::ValueFunctionType PlatformCAAnimation::valueFunction() const
+PlatformCAAnimation::ValueFunctionType PlatformCAAnimationMac::valueFunction() const
 {
     CAValueFunction* vf = [m_animation.get() valueFunction];
@@ -340 +342 @@
 }
 
-void PlatformCAAnimation::setValueFunction(ValueFunctionType value)
+void PlatformCAAnimationMac::setValueFunction(ValueFunctionType value)
 {
     [m_animation.get() setValueFunction:[CAValueFunction functionWithName:toCAValueFunctionType(value)]];
 }
 
-void PlatformCAAnimation::setFromValue(float value)
+void PlatformCAAnimationMac::setFromValue(float value)
 {
     if (animationType() != Basic)
@@ -352 +354 @@
 }
 
-void PlatformCAAnimation::setFromValue(const WebCore::TransformationMatrix& value)
+void PlatformCAAnimationMac::setFromValue(const WebCore::TransformationMatrix& value)
 {
     if (animationType() != Basic)
@@ -360 +362 @@
 }
 
-void PlatformCAAnimation::setFromValue(const FloatPoint3D& value)
+void PlatformCAAnimationMac::setFromValue(const FloatPoint3D& value)
 {
     if (animationType() != Basic)
@@ -373 +375 @@
 }
 
-void PlatformCAAnimation::setFromValue(const WebCore::Color& value)
+void PlatformCAAnimationMac::setFromValue(const WebCore::Color& value)
 {
     if (animationType() != Basic)
@@ -388 +390 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
+void PlatformCAAnimationMac::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
 {
     RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
@@ -395 +397 @@
 #endif
 
-void PlatformCAAnimation::copyFromValueFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationMac::copyFromValueFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Basic || value->animationType() != Basic)
         return;
         
-    CABasicAnimation* otherAnimation = static_cast<CABasicAnimation*>(value->m_animation.get());
+    CABasicAnimation* otherAnimation = static_cast<CABasicAnimation*>(toPlatformCAAnimationMac(value)->m_animation.get());
     [static_cast<CABasicAnimation*>(m_animation.get()) setFromValue:[otherAnimation fromValue]];
 }
 
-void PlatformCAAnimation::setToValue(float value)
+void PlatformCAAnimationMac::setToValue(float value)
 {
     if (animationType() != Basic)
@@ -411 +413 @@
 }
 
-void PlatformCAAnimation::setToValue(const WebCore::TransformationMatrix& value)
+void PlatformCAAnimationMac::setToValue(const WebCore::TransformationMatrix& value)
 {
     if (animationType() != Basic)
@@ -419 +421 @@
 }
 
-void PlatformCAAnimation::setToValue(const FloatPoint3D& value)
+void PlatformCAAnimationMac::setToValue(const FloatPoint3D& value)
 {
     if (animationType() != Basic)
@@ -432 +434 @@
 }
 
-void PlatformCAAnimation::setToValue(const WebCore::Color& value)
+void PlatformCAAnimationMac::setToValue(const WebCore::Color& value)
 {
     if (animationType() != Basic)
@@ -447 +449 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
+void PlatformCAAnimationMac::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
 {
     RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
@@ -454 +456 @@
 #endif
 
-void PlatformCAAnimation::copyToValueFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationMac::copyToValueFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Basic || value->animationType() != Basic)
         return;
         
-    CABasicAnimation* otherAnimation = static_cast<CABasicAnimation*>(value->m_animation.get());
+    CABasicAnimation* otherAnimation = static_cast<CABasicAnimation*>(toPlatformCAAnimationMac(value)->m_animation.get());
     [static_cast<CABasicAnimation*>(m_animation.get()) setToValue:[otherAnimation toValue]];
 }
@@ -465 +467 @@
 
 // Keyframe-animation properties.
-void PlatformCAAnimation::setValues(const Vector<float>& value)
+void PlatformCAAnimationMac::setValues(const Vector<float>& value)
 {
     if (animationType() != Keyframe)
@@ -476 +478 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<WebCore::TransformationMatrix>& value)
+void PlatformCAAnimationMac::setValues(const Vector<WebCore::TransformationMatrix>& value)
 {
     if (animationType() != Keyframe)
@@ -489 +491 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<FloatPoint3D>& value)
+void PlatformCAAnimationMac::setValues(const Vector<FloatPoint3D>& value)
 {
     if (animationType() != Keyframe)
@@ -507 +509 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<WebCore::Color>& value)
+void PlatformCAAnimationMac::setValues(const Vector<WebCore::Color>& value)
 {
     if (animationType() != Keyframe)
@@ -527 +529 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
+void PlatformCAAnimationMac::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
 {
     if (animationType() != Keyframe)
@@ -542 +544 @@
 #endif
 
-void PlatformCAAnimation::copyValuesFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationMac::copyValuesFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Keyframe || value->animationType() != Keyframe)
         return;
         
-    CAKeyframeAnimation* otherAnimation = static_cast<CAKeyframeAnimation*>(value->m_animation.get());
+    CAKeyframeAnimation* otherAnimation = static_cast<CAKeyframeAnimation*>(toPlatformCAAnimationMac(value)->m_animation.get());
     [static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:[otherAnimation values]];
 }
 
-void PlatformCAAnimation::setKeyTimes(const Vector<float>& value)
+void PlatformCAAnimationMac::setKeyTimes(const Vector<float>& value)
 {
     NSMutableArray* array = [NSMutableArray array];
@@ -561 +563 @@
 }
 
-void PlatformCAAnimation::copyKeyTimesFrom(const PlatformCAAnimation* value)
-{
-    CAKeyframeAnimation* other = static_cast<CAKeyframeAnimation*>(value->m_animation.get());
+void PlatformCAAnimationMac::copyKeyTimesFrom(const PlatformCAAnimation* value)
+{
+    CAKeyframeAnimation* other = static_cast<CAKeyframeAnimation*>(toPlatformCAAnimationMac(value)->m_animation.get());
     [static_cast<CAKeyframeAnimation*>(m_animation.get()) setKeyTimes:[other keyTimes]];
 }
 
-void PlatformCAAnimation::setTimingFunctions(const Vector<const TimingFunction*>& value, bool reverse)
+void PlatformCAAnimationMac::setTimingFunctions(const Vector<const TimingFunction*>& value, bool reverse)
 {
     NSMutableArray* array = [NSMutableArray array];
@@ -577 +579 @@
 }
 
-void PlatformCAAnimation::copyTimingFunctionsFrom(const PlatformCAAnimation* value)
-{
-    CAKeyframeAnimation* other = static_cast<CAKeyframeAnimation*>(value->m_animation.get());
+void PlatformCAAnimationMac::copyTimingFunctionsFrom(const PlatformCAAnimation* value)
+{
+    CAKeyframeAnimation* other = static_cast<CAKeyframeAnimation*>(toPlatformCAAnimationMac(value)->m_animation.get());
     [static_cast<CAKeyframeAnimation*>(m_animation.get()) setTimingFunctions:[other timingFunctions]];
 }

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

@@ -33 +33 @@
 #import "GraphicsLayerCA.h"
 #import "LengthFunctions.h"
+#import "PlatformCAAnimationMac.h"
 #import "PlatformCAFilters.h"
 #import "PlatformCAFiltersMac.h"
@@ -396 +397 @@
     }
     
-    CAPropertyAnimation* propertyAnimation = static_cast<CAPropertyAnimation*>(animation->platformAnimation());
+    CAPropertyAnimation* propertyAnimation = static_cast<CAPropertyAnimation*>(toPlatformCAAnimationMac(animation)->platformAnimation());
     if (![propertyAnimation delegate])
         [propertyAnimation setDelegate:static_cast<id>(m_delegate.get())];
      
     BEGIN_BLOCK_OBJC_EXCEPTIONS
-    [m_layer.get() addAnimation:animation->m_animation.get() forKey:key];
+    [m_layer.get() addAnimation:propertyAnimation forKey:key];
     END_BLOCK_OBJC_EXCEPTIONS
 }
@@ -417 +418 @@
     if (!propertyAnimation)
         return 0;
-    return PlatformCAAnimation::create(propertyAnimation);
+    return PlatformCAAnimationMac::create(propertyAnimation);
 }
 

trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm

@@ -27 +27 @@
 #import "TileController.h"
 
+#import "GraphicsContext.h"
 #import "IntRect.h"
 #import "PlatformCALayer.h"

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #include "config.h"
 
-#include "PlatformCAAnimation.h"
+#if PLATFORM(WIN)
+#include "PlatformCAAnimationWin.h"
 
 #include "FloatConversion.h"
@@ -142 +143 @@
 }
 
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::create(AnimationType type, const String& keyPath)
-{
-    return adoptRef(new PlatformCAAnimation(type, keyPath));
-}
-
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::create(PlatformAnimationRef animation)
-{
-    return adoptRef(new PlatformCAAnimation(animation));
-}
-
-PlatformCAAnimation::PlatformCAAnimation(AnimationType type, const String& keyPath)
-    : m_type(type)
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationWin::create(AnimationType type, const String& keyPath)
+{
+    return adoptRef(new PlatformCAAnimationWin(type, keyPath));
+}
+
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationWin::create(PlatformAnimationRef animation)
+{
+    return adoptRef(new PlatformCAAnimationWin(animation));
+}
+
+PlatformCAAnimationWin::PlatformCAAnimationWin(AnimationType type, const String& keyPath)
+    : PlatformCAAnimation(type)
 {
     if (type == Basic)
@@ -163 +164 @@
 }
 
-PlatformCAAnimation::PlatformCAAnimation(PlatformAnimationRef animation)
+PlatformCAAnimationWin::PlatformCAAnimationWin(PlatformAnimationRef animation)
 {
     if (CACFAnimationGetClass(animation) == kCACFBasicAnimation)
-        m_type = Basic;
+        setType(Basic);
     else if (CACFAnimationGetClass(animation) == kCACFKeyframeAnimation)
-        m_type = Keyframe;
+        setType(Keyframe);
     else {
         ASSERT_NOT_REACHED();
@@ -177 +178 @@
 }
 
-PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::copy() const
+PassRefPtr<PlatformCAAnimation> PlatformCAAnimationWin::copy() const
 {
     RefPtr<PlatformCAAnimation> animation = create(animationType(), keyPath());
@@ -207 +208 @@
 }
 
-PlatformCAAnimation::~PlatformCAAnimation()
-{
-}
-
-PlatformAnimationRef PlatformCAAnimation::platformAnimation() const
+PlatformCAAnimationWin::~PlatformCAAnimationWin()
+{
+}
+
+PlatformAnimationRef PlatformCAAnimationWin::platformAnimation() const
 {
     return m_animation.get();
 }
 
-String PlatformCAAnimation::keyPath() const
+String PlatformCAAnimationWin::keyPath() const
 {
     return CACFAnimationGetKeyPath(m_animation.get());
 }
 
-CFTimeInterval PlatformCAAnimation::beginTime() const
+CFTimeInterval PlatformCAAnimationWin::beginTime() const
 {
     return CACFAnimationGetBeginTime(m_animation.get());
 }
 
-void PlatformCAAnimation::setBeginTime(CFTimeInterval value)
+void PlatformCAAnimationWin::setBeginTime(CFTimeInterval value)
 {
     CACFAnimationSetBeginTime(m_animation.get(), value);
 }
 
-CFTimeInterval PlatformCAAnimation::duration() const
+CFTimeInterval PlatformCAAnimationWin::duration() const
 {
     return CACFAnimationGetDuration(m_animation.get());
 }
 
-void PlatformCAAnimation::setDuration(CFTimeInterval value)
+void PlatformCAAnimationWin::setDuration(CFTimeInterval value)
 {
     CACFAnimationSetDuration(m_animation.get(), value);
 }
 
-float PlatformCAAnimation::speed() const
+float PlatformCAAnimationWin::speed() const
 {
     return CACFAnimationGetSpeed(m_animation.get());
 }
 
-void PlatformCAAnimation::setSpeed(float value)
+void PlatformCAAnimationWin::setSpeed(float value)
 {
     CACFAnimationSetSpeed(m_animation.get(), value);
 }
 
-CFTimeInterval PlatformCAAnimation::timeOffset() const
+CFTimeInterval PlatformCAAnimationWin::timeOffset() const
 {
     return CACFAnimationGetTimeOffset(m_animation.get());
 }
 
-void PlatformCAAnimation::setTimeOffset(CFTimeInterval value)
+void PlatformCAAnimationWin::setTimeOffset(CFTimeInterval value)
 {
     CACFAnimationSetTimeOffset(m_animation.get(), value);
 }
 
-float PlatformCAAnimation::repeatCount() const
+float PlatformCAAnimationWin::repeatCount() const
 {
     return CACFAnimationGetRepeatCount(m_animation.get());
 }
 
-void PlatformCAAnimation::setRepeatCount(float value)
+void PlatformCAAnimationWin::setRepeatCount(float value)
 {
     CACFAnimationSetRepeatCount(m_animation.get(), value);
 }
 
-bool PlatformCAAnimation::autoreverses() const
+bool PlatformCAAnimationWin::autoreverses() const
 {
     return CACFAnimationGetAutoreverses(m_animation.get());
 }
 
-void PlatformCAAnimation::setAutoreverses(bool value)
+void PlatformCAAnimationWin::setAutoreverses(bool value)
 {
     CACFAnimationSetAutoreverses(m_animation.get(), value);
 }
 
-PlatformCAAnimation::FillModeType PlatformCAAnimation::fillMode() const
+PlatformCAAnimationWin::FillModeType PlatformCAAnimationWin::fillMode() const
 {
     return fromCACFFillModeType(CACFAnimationGetFillMode(m_animation.get()));
 }
 
-void PlatformCAAnimation::setFillMode(FillModeType value)
+void PlatformCAAnimationWin::setFillMode(FillModeType value)
 {
     CACFAnimationSetFillMode(m_animation.get(), toCACFFillModeType(value));
 }
 
-void PlatformCAAnimation::setTimingFunction(const TimingFunction* value, bool reverse)
+void PlatformCAAnimationWin::setTimingFunction(const TimingFunction* value, bool reverse)
 {
     UNUSED_PARAM(reverse);
@@ -297 +298 @@
 }
 
-void PlatformCAAnimation::copyTimingFunctionFrom(const PlatformCAAnimation* value)
-{
-    CACFTimingFunctionRef timingFunc = CACFAnimationGetTimingFunction(value->m_animation.get());
+void PlatformCAAnimationWin::copyTimingFunctionFrom(const PlatformCAAnimation* value)
+{
+    CACFTimingFunctionRef timingFunc = CACFAnimationGetTimingFunction(toPlatformCAAnimationWin(value)->m_animation.get());
     if (timingFunc)
         CACFAnimationSetTimingFunction(m_animation.get(), timingFunc);
 }
 
-bool PlatformCAAnimation::isRemovedOnCompletion() const
+bool PlatformCAAnimationWin::isRemovedOnCompletion() const
 {
     return CACFAnimationIsRemovedOnCompletion(m_animation.get());
 }
 
-void PlatformCAAnimation::setRemovedOnCompletion(bool value)
+void PlatformCAAnimationWin::setRemovedOnCompletion(bool value)
 {
     CACFAnimationSetRemovedOnCompletion(m_animation.get(), value);
 }
 
-bool PlatformCAAnimation::isAdditive() const
+bool PlatformCAAnimationWin::isAdditive() const
 {
     return CACFAnimationIsAdditive(m_animation.get());
 }
 
-void PlatformCAAnimation::setAdditive(bool value)
+void PlatformCAAnimationWin::setAdditive(bool value)
 {
     CACFAnimationSetAdditive(m_animation.get(), value);
 }
 
-PlatformCAAnimation::ValueFunctionType PlatformCAAnimation::valueFunction() const
+PlatformCAAnimation::ValueFunctionType PlatformCAAnimationWin::valueFunction() const
 {
     CACFValueFunctionRef func = CACFAnimationGetValueFunction(m_animation.get());
@@ -330 +331 @@
 }
 
-void PlatformCAAnimation::setValueFunction(ValueFunctionType value)
+void PlatformCAAnimationWin::setValueFunction(ValueFunctionType value)
 {
     CFStringRef valueString = toCACFValueFunctionType(value);
@@ -336 +337 @@
 }
 
-void PlatformCAAnimation::setFromValue(float value)
+void PlatformCAAnimationWin::setFromValue(float value)
 {
     if (animationType() != Basic)
@@ -345 +346 @@
 }
 
-void PlatformCAAnimation::setFromValue(const WebCore::TransformationMatrix& value)
+void PlatformCAAnimationWin::setFromValue(const WebCore::TransformationMatrix& value)
 {
     if (animationType() != Basic)
@@ -354 +355 @@
 }
 
-void PlatformCAAnimation::setFromValue(const FloatPoint3D& value)
+void PlatformCAAnimationWin::setFromValue(const FloatPoint3D& value)
 {
     if (animationType() != Basic)
@@ -364 +365 @@
 }
 
-void PlatformCAAnimation::setFromValue(const WebCore::Color& value)
+void PlatformCAAnimationWin::setFromValue(const WebCore::Color& value)
 {
     if (animationType() != Basic)
@@ -375 +376 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setFromValue(const FilterOperation*, int)
+void PlatformCAAnimationWin::setFromValue(const FilterOperation*, int)
 {
     // FIXME: Hardware filter animation not implemented on Windows
@@ -381 +382 @@
 #endif
 
-void PlatformCAAnimation::copyFromValueFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationWin::copyFromValueFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Basic || value->animationType() != Basic)
         return;
     
-    CACFAnimationSetFromValue(m_animation.get(), CACFAnimationGetFromValue(value->platformAnimation()));
-}
-
-void PlatformCAAnimation::setToValue(float value)
+    CACFAnimationSetFromValue(m_animation.get(), CACFAnimationGetFromValue(toPlatformCAAnimationWin(value)->platformAnimation()));
+}
+
+void PlatformCAAnimationWin::setToValue(float value)
 {
     if (animationType() != Basic)
@@ -398 +399 @@
 }
 
-void PlatformCAAnimation::setToValue(const WebCore::TransformationMatrix& value)
+void PlatformCAAnimationWin::setToValue(const WebCore::TransformationMatrix& value)
 {
     if (animationType() != Basic)
@@ -407 +408 @@
 }
 
-void PlatformCAAnimation::setToValue(const FloatPoint3D& value)
+void PlatformCAAnimationWin::setToValue(const FloatPoint3D& value)
 {
     if (animationType() != Basic)
@@ -417 +418 @@
 }
 
-void PlatformCAAnimation::setToValue(const WebCore::Color& value)
+void PlatformCAAnimationWin::setToValue(const WebCore::Color& value)
 {
     if (animationType() != Basic)
@@ -428 +429 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setToValue(const FilterOperation*, int)
+void PlatformCAAnimationWin::setToValue(const FilterOperation*, int)
 {
     // FIXME: Hardware filter animation not implemented on Windows
@@ -434 +435 @@
 #endif
 
-void PlatformCAAnimation::copyToValueFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationWin::copyToValueFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Basic || value->animationType() != Basic)
         return;
         
-    CACFAnimationSetToValue(m_animation.get(), CACFAnimationGetToValue(value->platformAnimation()));
-}
-
+    CACFAnimationSetToValue(m_animation.get(), CACFAnimationGetToValue(toPlatformCAAnimationWin(value)->platformAnimation()));
+}
 
 // Keyframe-animation properties.
-void PlatformCAAnimation::setValues(const Vector<float>& value)
+void PlatformCAAnimationWin::setValues(const Vector<float>& value)
 {
     if (animationType() != Keyframe)
@@ -458 +458 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<WebCore::TransformationMatrix>& value)
+void PlatformCAAnimationWin::setValues(const Vector<WebCore::TransformationMatrix>& value)
 {
     if (animationType() != Keyframe)
@@ -472 +472 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<FloatPoint3D>& value)
+void PlatformCAAnimationWin::setValues(const Vector<FloatPoint3D>& value)
 {
     if (animationType() != Keyframe)
@@ -487 +487 @@
 }
 
-void PlatformCAAnimation::setValues(const Vector<WebCore::Color>& value)
+void PlatformCAAnimationWin::setValues(const Vector<WebCore::Color>& value)
 {
     if (animationType() != Keyframe)
@@ -503 +503 @@
 
 #if ENABLE(CSS_FILTERS)
-void PlatformCAAnimation::setValues(const Vector<RefPtr<FilterOperation> >&, int)
+void PlatformCAAnimationWin::setValues(const Vector<RefPtr<FilterOperation> >&, int)
 {
     // FIXME: Hardware filter animation not implemented on Windows
@@ -509 +509 @@
 #endif
 
-void PlatformCAAnimation::copyValuesFrom(const PlatformCAAnimation* value)
+void PlatformCAAnimationWin::copyValuesFrom(const PlatformCAAnimation* value)
 {
     if (animationType() != Keyframe || value->animationType() != Keyframe)
         return;
     
-    CACFAnimationSetValues(m_animation.get(), CACFAnimationGetValues(value->platformAnimation()));
-}
-
-void PlatformCAAnimation::setKeyTimes(const Vector<float>& value)
+    CACFAnimationSetValues(m_animation.get(), CACFAnimationGetValues(toPlatformCAAnimationWin(value)->platformAnimation()));
+}
+
+void PlatformCAAnimationWin::setKeyTimes(const Vector<float>& value)
 {
     if (animationType() != Keyframe)
@@ -531 +531 @@
 }
 
-void PlatformCAAnimation::copyKeyTimesFrom(const PlatformCAAnimation* value)
-{
-    if (animationType() != Keyframe)
-        return;
-
-    CACFAnimationSetKeyTimes(m_animation.get(), CACFAnimationGetKeyTimes(value->platformAnimation()));
-}
-
-void PlatformCAAnimation::setTimingFunctions(const Vector<const TimingFunction*>& value, bool reverse)
+void PlatformCAAnimationWin::copyKeyTimesFrom(const PlatformCAAnimation* value)
+{
+    if (animationType() != Keyframe)
+        return;
+
+    CACFAnimationSetKeyTimes(m_animation.get(), CACFAnimationGetKeyTimes(toPlatformCAAnimationWin(value)->platformAnimation()));
+}
+
+void PlatformCAAnimationWin::setTimingFunctions(const Vector<const TimingFunction*>& value, bool reverse)
 {
     UNUSED_PARAM(reverse);
@@ -554 +554 @@
 }
 
-void PlatformCAAnimation::copyTimingFunctionsFrom(const PlatformCAAnimation* value)
-{
-    CACFAnimationSetTimingFunctions(m_animation.get(), CACFAnimationGetTimingFunctions(value->platformAnimation()));
-}
+void PlatformCAAnimationWin::copyTimingFunctionsFrom(const PlatformCAAnimation* value)
+{
+    CACFAnimationSetTimingFunctions(m_animation.get(), CACFAnimationGetTimingFunctions(toPlatformCAAnimationWin(value)->platformAnimation()));
+}
+
+#endif // PLATFORM(WIN)

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

@@ -31 +31 @@
 #include "Font.h"
 #include "GraphicsContext.h"
+#include "PlatformCAAnimationWin.h"
 #include "PlatformCALayerWinInternal.h"
 #include <QuartzCore/CoreAnimationCF.h>
@@ -285 +286 @@
     m_animations.add(key, animation);
 
-    CACFLayerAddAnimation(m_layer.get(), key.createCFString().get(), animation->platformAnimation());
+    CACFLayerAddAnimation(m_layer.get(), key.createCFString().get(), toPlatformCAAnimationWin(animation)->platformAnimation());
     setNeedsCommit();
 

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp

@@ -30 +30 @@
 #include "Font.h"
 #include "FontCache.h"
+#include "GraphicsContext.h"
 #include "PlatformCALayer.h"
 #include "TextRun.h"

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-31  Simon Fraser  <simon.fraser@apple.com>
+
+        [UI-side compositing] Proxy animations to the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=130946
+
+        Reviewed by Tim Horton.
+        
+        Add encoding/decoding of TimingFunctions. Add encoding support
+        for HashSet.
+        
+        Add PlatformCAAnimationRemote and have PlatformCALayerRemote allow
+        animations now. PlatformCALayerRemote's properties are defined in the class,
+        as is the encoding/decoding (much cleaner than having them in the transaction
+        class I think).
+        
+        Add support for the "animationDidStart" callback and sending this back to the
+        web process. This involves a HashMap of layerID->WKAnimationDelegate stored
+        on the RemoteLayerTreeHost, and a message send via the DrawingArea. On the
+        other side, RemoteLayerTreeContext stores a HashMap of layerID->PlatformCALayerRemote*
+        for layers which have just started animations, which is used to get the
+        PlatformCALayer* to call animationDidStart() on.
+        
+        This requires that the RemoteLayerTreeHost* be passed down into property application,
+        and that the RemoteLayerTreeHost have a reference to the drawing area.
+        
+        To every CALayer in the UI process we -setValue:forKey: to track the PlatformLayerID,
+        so we can get back to it in order to dispatch "animationDidStart".
+        
+        Replace some "using namespace WebKit" with "namespace WebKit { }".
+
+        * Platform/IPC/ArgumentCoders.h:
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<LinearTimingFunction>::encode):
+        (IPC::ArgumentCoder<LinearTimingFunction>::decode):
+        (IPC::ArgumentCoder<CubicBezierTimingFunction>::encode):
+        (IPC::ArgumentCoder<CubicBezierTimingFunction>::decode):
+        (IPC::ArgumentCoder<StepsTimingFunction>::encode):
+        (IPC::ArgumentCoder<StepsTimingFunction>::decode):
+        * Shared/WebCoreArgumentCoders.h:
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        * Shared/mac/RemoteLayerTreePropertyApplier.h:
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        (WebKit::applyPropertiesToLayer):
+        (WebKit::RemoteLayerTreePropertyApplier::applyProperties):
+        * Shared/mac/RemoteLayerTreeTransaction.h:
+        * Shared/mac/RemoteLayerTreeTransaction.mm:
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+        (WebKit::dumpChangedLayers):
+        * UIProcess/ios/RemoteLayerTreeHostIOS.mm:
+        (WebKit::RemoteLayerTreeHost::layerID):
+        (WebKit::RemoteLayerTreeHost::createLayer):
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart):
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::showDebugIndicator):
+        * UIProcess/mac/RemoteLayerTreeHost.h:
+        (WebKit::RemoteLayerTreeHost::animationDelegates):
+        * UIProcess/mac/RemoteLayerTreeHost.mm:
+        (WebKit::RemoteLayerTreeHost::RemoteLayerTreeHost):
+        (WebKit::RemoteLayerTreeHost::updateLayerTree):
+        (WebKit::RemoteLayerTreeHost::layerWillBeRemoved):
+        (WebKit::RemoteLayerTreeHost::animationDidStart):
+        (WebKit::RemoteLayerTreeHost::layerID):
+        (WebKit::RemoteLayerTreeHost::createLayer):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit::DrawingArea::acceleratedAnimationDidStart):
+        * WebProcess/WebPage/DrawingArea.messages.in:
+        * WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:
+        (WebKit::GraphicsLayerCARemote::createPlatformCAAnimation):
+        * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.h: Added.
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm: Added.
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+        (WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
+        (WebKit::PlatformCALayerRemote::animationStarted):
+        (WebKit::PlatformCALayerRemote::addAnimationForKey):
+        (WebKit::PlatformCALayerRemote::removeAnimationForKey):
+        (WebKit::PlatformCALayerRemote::animationForKey):
+        (PlatformCALayerRemote::recursiveBuildTransaction): Deleted.
+        (PlatformCALayerRemote::addAnimationForKey): Deleted.
+        (PlatformCALayerRemote::removeAnimationForKey): Deleted.
+        (PlatformCALayerRemote::animationForKey): Deleted.
+        * WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
+        * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
+        * WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
+        (WebKit::RemoteLayerTreeContext::layerWillBeDestroyed):
+        (WebKit::RemoteLayerTreeContext::willStartAnimationOnLayer):
+        (WebKit::RemoteLayerTreeContext::animationDidStart):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::acceleratedAnimationDidStart):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
+
 2014-03-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h

@@ -32 +32 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 
@@ -194 +195 @@
 };
 
+template<typename KeyArg, typename HashArg, typename KeyTraitsArg> struct ArgumentCoder<HashSet<KeyArg, HashArg, KeyTraitsArg>> {
+    typedef HashSet<KeyArg, HashArg, KeyTraitsArg> HashSetType;
+
+    static void encode(ArgumentEncoder& encoder, const HashSetType& hashSet)
+    {
+        encoder << static_cast<uint64_t>(hashSet.size());
+        for (typename HashSetType::const_iterator it = hashSet.begin(), end = hashSet.end(); it != end; ++it)
+            encoder << *it;
+    }
+
+    static bool decode(ArgumentDecoder& decoder, HashSetType& hashSet)
+    {
+        uint64_t hashSetSize;
+        if (!decoder.decode(hashSetSize))
+            return false;
+
+        HashSetType tempHashSet;
+        for (uint64_t i = 0; i < hashSetSize; ++i) {
+            KeyArg key;
+            if (!decoder.decode(key))
+                return false;
+
+            if (!tempHashSet.add(key).isNewEntry) {
+                // The hash map already has the specified key, bail.
+                decoder.markInvalid();
+                return false;
+            }
+        }
+
+        hashSet.swap(tempHashSet);
+        return true;
+    }
+};
+
 template<> struct ArgumentCoder<AtomicString> {
     static void encode(ArgumentEncoder&, const AtomicString&);

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -60 +60 @@
 #include <WebCore/SessionID.h>
 #include <WebCore/TextCheckerClient.h>
+#include <WebCore/TimingFunction.h>
 #include <WebCore/TransformationMatrix.h>
 #include <WebCore/URL.h>
@@ -91 +92 @@
 }
 
-
 void ArgumentCoder<TransformationMatrix>::encode(ArgumentEncoder& encoder, const TransformationMatrix& transformationMatrix)
 {
@@ -100 +100 @@
 {
     return SimpleArgumentCoder<TransformationMatrix>::decode(decoder, transformationMatrix);
+}
+
+void ArgumentCoder<LinearTimingFunction>::encode(ArgumentEncoder& encoder, const LinearTimingFunction& timingFunction)
+{
+    encoder.encodeEnum(timingFunction.type());
+}
+
+bool ArgumentCoder<LinearTimingFunction>::decode(ArgumentDecoder& decoder, LinearTimingFunction& timingFunction)
+{
+    // Type is decoded by the caller. Nothing else to decode.
+    return true;
+}
+
+void ArgumentCoder<CubicBezierTimingFunction>::encode(ArgumentEncoder& encoder, const CubicBezierTimingFunction& timingFunction)
+{
+    encoder.encodeEnum(timingFunction.type());
+    
+    encoder << timingFunction.x1();
+    encoder << timingFunction.y1();
+    encoder << timingFunction.x2();
+    encoder << timingFunction.y2();
+    
+    encoder.encodeEnum(timingFunction.timingFunctionPreset());
+}
+
+bool ArgumentCoder<CubicBezierTimingFunction>::decode(ArgumentDecoder& decoder, CubicBezierTimingFunction& timingFunction)
+{
+    // Type is decoded by the caller.
+    double x1;
+    if (!decoder.decode(x1))
+        return false;
+
+    double y1;
+    if (!decoder.decode(y1))
+        return false;
+
+    double x2;
+    if (!decoder.decode(x2))
+        return false;
+
+    double y2;
+    if (!decoder.decode(y2))
+        return false;
+
+    CubicBezierTimingFunction::TimingFunctionPreset preset;
+    if (!decoder.decodeEnum(preset))
+        return false;
+
+    timingFunction.setValues(x1, y1, x2, y2);
+    timingFunction.setTimingFunctionPreset(preset);
+
+    return true;
+}
+
+void ArgumentCoder<StepsTimingFunction>::encode(ArgumentEncoder& encoder, const StepsTimingFunction& timingFunction)
+{
+    encoder.encodeEnum(timingFunction.type());
+    
+    encoder << timingFunction.numberOfSteps();
+    encoder << timingFunction.stepAtStart();
+}
+
+bool ArgumentCoder<StepsTimingFunction>::decode(ArgumentDecoder& decoder, StepsTimingFunction& timingFunction)
+{
+    // Type is decoded by the caller.
+    int numSteps;
+    if (!decoder.decode(numSteps))
+        return false;
+
+    bool stepAtStart;
+    if (!decoder.decode(stepAtStart))
+        return false;
+
+    timingFunction.setNumberOfSteps(numSteps);
+    timingFunction.setStepAtStart(stepAtStart);
+
+    return true;
 }
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -35 +35 @@
 class Color;
 class Credential;
+class CubicBezierTimingFunction;
 class Cursor;
 class DatabaseDetails;
@@ -49 +50 @@
 class IntSize;
 class KeyframeValueList;
-class URL;
+class LinearTimingFunction;
 class Notification;
 class ProtectionSpace;
@@ -57 +58 @@
 class ResourceResponse;
 class SessionID;
+class StepsTimingFunction;
 class StickyPositionViewportConstraints;
 class TextCheckingRequestData;
@@ -62 +64 @@
 class UserStyleSheet;
 class UserScript;
+class URL;
 struct CompositionUnderline;
 struct Cookie;
@@ -113 +116 @@
 };
 
+template<> struct ArgumentCoder<WebCore::LinearTimingFunction> {
+    static void encode(ArgumentEncoder&, const WebCore::LinearTimingFunction&);
+    static bool decode(ArgumentDecoder&, WebCore::LinearTimingFunction&);
+};
+
+template<> struct ArgumentCoder<WebCore::CubicBezierTimingFunction> {
+    static void encode(ArgumentEncoder&, const WebCore::CubicBezierTimingFunction&);
+    static bool decode(ArgumentDecoder&, WebCore::CubicBezierTimingFunction&);
+};
+
+template<> struct ArgumentCoder<WebCore::StepsTimingFunction> {
+    static void encode(ArgumentEncoder&, const WebCore::StepsTimingFunction&);
+    static bool decode(ArgumentDecoder&, WebCore::StepsTimingFunction&);
+};
+
 template<> struct ArgumentCoder<WebCore::CertificateInfo> {
     static void encode(ArgumentEncoder&, const WebCore::CertificateInfo&);

trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

@@ -50 +50 @@
 
 using namespace WebCore;
-using namespace WebKit;
+
+namespace WebKit {
 
 RemoteLayerBackingStore::RemoteLayerBackingStore()
@@ -326 +327 @@
     layer.contents = (id)m_frontBuffer->makeCGImageCopy().get();
 }
+
+} // namespace WebKit

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.h

@@ -33 +33 @@
 namespace WebKit {
 
+class RemoteLayerTreeHost;
+
 class RemoteLayerTreePropertyApplier {
 public:
     typedef HashMap<WebCore::GraphicsLayer::PlatformLayerID, LayerOrView *> RelatedLayerMap;
-    static void applyProperties(CALayer *, const RemoteLayerTreeTransaction::LayerProperties&, const RelatedLayerMap&);
+    static void applyProperties(CALayer *, RemoteLayerTreeHost*, const RemoteLayerTreeTransaction::LayerProperties&, const RelatedLayerMap&);
 #if PLATFORM(IOS)
-    static void applyProperties(UIView *, const RemoteLayerTreeTransaction::LayerProperties&, const RelatedLayerMap&);
+    static void applyProperties(UIView *, RemoteLayerTreeHost*, const RemoteLayerTreeTransaction::LayerProperties&, const RelatedLayerMap&);
 #endif
 };

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm

@@ -27 +27 @@
 #import "RemoteLayerTreePropertyApplier.h"
 
+#import "PlatformCAAnimationRemote.h"
 #import "PlatformCALayerRemote.h"
+#import "RemoteLayerTreeHost.h"
 #import <QuartzCore/CALayer.h>
 #import <WebCore/BlockExceptions.h>
@@ -112 +114 @@
 }
 
-static void applyPropertiesToLayer(CALayer *layer, const RemoteLayerTreeTransaction::LayerProperties& properties)
+static void applyPropertiesToLayer(CALayer *layer, RemoteLayerTreeHost* layerTreeHost, const RemoteLayerTreeTransaction::LayerProperties& properties)
 {
     if (properties.changedProperties & RemoteLayerTreeTransaction::NameChanged)
@@ -129 +131 @@
     if (properties.changedProperties & RemoteLayerTreeTransaction::SizeChanged)
         layer.bounds = FloatRect(FloatPoint(), properties.size);
-
+    
     if (properties.changedProperties & RemoteLayerTreeTransaction::BackgroundColorChanged)
         layer.backgroundColor = cgColorFromColor(properties.backgroundColor).get();
@@ -193 +195 @@
         PlatformCAFilters::setFiltersOnLayer(layer, properties.filters ? *properties.filters : FilterOperations());
 
+    if (properties.changedProperties & RemoteLayerTreeTransaction::AnimationsChanged)
+        PlatformCAAnimationRemote::updateLayerAnimations(layer, layerTreeHost, properties.addedAnimations, properties.keyPathsOfAnimationsToRemove);
+
     if (properties.changedProperties & RemoteLayerTreeTransaction::EdgeAntialiasingMaskChanged)
         layer.edgeAntialiasingMask = properties.edgeAntialiasingMask;
@@ -200 +205 @@
 }
 
-void RemoteLayerTreePropertyApplier::applyProperties(CALayer *layer, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
+void RemoteLayerTreePropertyApplier::applyProperties(CALayer *layer, RemoteLayerTreeHost* layerTreeHost, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    applyPropertiesToLayer(layer, properties);
+    applyPropertiesToLayer(layer, layerTreeHost, properties);
 
     if (properties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged) {
@@ -237 +242 @@
 
 #if PLATFORM(IOS)
-void RemoteLayerTreePropertyApplier::applyProperties(UIView *view, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
+void RemoteLayerTreePropertyApplier::applyProperties(UIView *view, RemoteLayerTreeHost* layerTreeHost, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    applyPropertiesToLayer(view.layer, properties);
+    applyPropertiesToLayer(view.layer, layerTreeHost, properties);
 
     if (properties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged) {

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h

@@ -27 +27 @@
 #define RemoteLayerTreeTransaction_h
 
+#include "PlatformCAAnimationRemote.h"
 #include "RemoteLayerBackingStore.h"
 #include <WebCore/Color.h>
@@ -35 +36 @@
 #include <WebCore/TransformationMatrix.h>
 #include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
 #include <wtf/text/WTFString.h>
 
@@ -75 +77 @@
         BackingStoreChanged = 1 << 24,
         FiltersChanged = 1 << 25,
-        EdgeAntialiasingMaskChanged = 1 << 26,
-        CustomAppearanceChanged = 1 << 27,
-        CustomBehaviorChanged = 1 << 28
+        AnimationsChanged = 1 << 26,
+        EdgeAntialiasingMaskChanged = 1 << 27,
+        CustomAppearanceChanged = 1 << 28,
+        CustomBehaviorChanged = 1 << 29
     };
     typedef unsigned LayerChange;
@@ -113 +116 @@
         std::unique_ptr<WebCore::TransformationMatrix> sublayerTransform;
         Vector<WebCore::GraphicsLayer::PlatformLayerID> children;
+
+        HashMap<String, PlatformCAAnimationRemote::Properties> addedAnimations;
+        HashSet<String> keyPathsOfAnimationsToRemove;
+
         WebCore::FloatPoint3D position;
         WebCore::FloatPoint3D anchorPoint;

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

@@ -104 +104 @@
     , name(other.name)
     , children(other.children)
+    , addedAnimations(other.addedAnimations)
+    , keyPathsOfAnimationsToRemove(other.keyPathsOfAnimationsToRemove)
     , position(other.position)
     , anchorPoint(other.anchorPoint)
@@ -150 +152 @@
         encoder << children;
 
+    if (changedProperties & AnimationsChanged) {
+        encoder << addedAnimations;
+        encoder << keyPathsOfAnimationsToRemove;
+    }
+
     if (changedProperties & PositionChanged)
         encoder << position;
@@ -250 +257 @@
                 return false;
         }
+    }
+
+    if (result.changedProperties & AnimationsChanged) {
+        if (!decoder.decode(result.addedAnimations))
+            return false;
+
+        if (!decoder.decode(result.keyPathsOfAnimationsToRemove))
+            return false;
     }
 
@@ -736 +751 @@
         if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged)
             dumpProperty<Vector<GraphicsLayer::PlatformLayerID>>(ts, "children", layerProperties.children);
+
+// FIXME: dump animations
 
         if (layerProperties.changedProperties & RemoteLayerTreeTransaction::PositionChanged)

trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm

@@ -38 +38 @@
 using namespace WebCore;
 
-@interface UIView(WKViewInternals)
-- (void)_createLayerWithFrame:(CGRect)frame;
-@end
-
 @interface CALayer(WKLayerInternal)
 - (void)setContextId:(uint32_t)contextID;
@@ -77 +73 @@
 namespace WebKit {
 
+static NSString* const WKLayerIDPropertyKey = @"WKLayerID";
+
+WebCore::GraphicsLayer::PlatformLayerID RemoteLayerTreeHost::layerID(LayerOrView* layer)
+{
+    return [[layer valueForKey:WKLayerIDPropertyKey] unsignedLongLongValue];
+}
+
 LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties, const RemoteLayerTreeTransaction::LayerProperties* layerProperties)
 {
@@ -111 +114 @@
     // FIXME: Do through the view.
     [[layerOrView layer] web_disableAllActions];
+    [[layerOrView layer] setValue:[NSNumber numberWithUnsignedLongLong:properties.layerID] forKey:WKLayerIDPropertyKey];
 
     return layerOrView.get();

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h

@@ -44 +44 @@
 
     const RemoteLayerTreeHost& remoteLayerTreeHost() const { return m_remoteLayerTreeHost; }
+
+    void acceleratedAnimationDidStart(uint64_t layerID, double startTime);
 
     void coreAnimationDidCommitLayers();

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm

@@ -44 +44 @@
 RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy* webPageProxy)
     : DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
-    , m_remoteLayerTreeHost()
+    , m_remoteLayerTreeHost(*this)
     , m_isWaitingForDidUpdateGeometry(false)
 {
@@ -140 +140 @@
 
     scheduleCoreAnimationLayerCommitObserver();
+}
+
+void RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart(uint64_t layerID, double startTime)
+{
+    m_webPageProxy->process().send(Messages::DrawingArea::AcceleratedAnimationDidStart(layerID, startTime), m_webPageProxy->pageID());
 }
 
@@ -247 +252 @@
     }
     
-    m_debugIndicatorLayerTreeHost = std::make_unique<RemoteLayerTreeHost>();
+    m_debugIndicatorLayerTreeHost = std::make_unique<RemoteLayerTreeHost>(*this);
     m_debugIndicatorLayerTreeHost->setIsDebugLayerTreeHost(true);
 

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h

@@ -33 +33 @@
 #include <wtf/RetainPtr.h>
 
+OBJC_CLASS WKAnimationDelegate;
+
 namespace WebKit {
 
+class RemoteLayerTreeDrawingAreaProxy;
 class WebPageProxy;
 
 class RemoteLayerTreeHost {
 public:
-    explicit RemoteLayerTreeHost();
+    explicit RemoteLayerTreeHost(RemoteLayerTreeDrawingAreaProxy&);
     virtual ~RemoteLayerTreeHost();
 
     LayerOrView *getLayer(WebCore::GraphicsLayer::PlatformLayerID) const;
     LayerOrView *rootLayer() const { return m_rootLayer; }
+
+    static WebCore::GraphicsLayer::PlatformLayerID layerID(LayerOrView*);
 
     // Returns true if the root layer changed.
@@ -51 +56 @@
     bool isDebugLayerTreeHost() const { return m_isDebugLayerTreeHost; }
 
+    typedef HashMap<WebCore::GraphicsLayer::PlatformLayerID, RetainPtr<WKAnimationDelegate>> LayerAnimationDelegateMap;
+    LayerAnimationDelegateMap& animationDelegates() { return m_animationDelegates; }
+
+    void animationDidStart(WebCore::GraphicsLayer::PlatformLayerID, double startTime);
+
 private:
     LayerOrView *createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties&, const RemoteLayerTreeTransaction::LayerProperties*);
 
+    void layerWillBeRemoved(WebCore::GraphicsLayer::PlatformLayerID);
+
+    RemoteLayerTreeDrawingAreaProxy& m_drawingArea;
     LayerOrView *m_rootLayer;
     HashMap<WebCore::GraphicsLayer::PlatformLayerID, RetainPtr<LayerOrView>> m_layers;
+    HashMap<WebCore::GraphicsLayer::PlatformLayerID, RetainPtr<WKAnimationDelegate>> m_animationDelegates;
     bool m_isDebugLayerTreeHost;
 };

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm

@@ -27 +27 @@
 #import "RemoteLayerTreeHost.h"
 
+#import "RemoteLayerTreeDrawingAreaProxy.h"
 #import "RemoteLayerTreePropertyApplier.h"
 #import "RemoteLayerTreeTransaction.h"
@@ -42 +43 @@
 namespace WebKit {
 
-RemoteLayerTreeHost::RemoteLayerTreeHost()
-    : m_rootLayer(nullptr)
+RemoteLayerTreeHost::RemoteLayerTreeHost(RemoteLayerTreeDrawingAreaProxy& drawingArea)
+    : m_drawingArea(drawingArea)
+    , m_rootLayer(nullptr)
     , m_isDebugLayerTreeHost(false)
 {
@@ -88 +90 @@
                 propertiesCopy.borderWidth *= 1 / indicatorScaleFactor;
             
-            RemoteLayerTreePropertyApplier::applyProperties(layer, propertiesCopy, relatedLayers);
+            RemoteLayerTreePropertyApplier::applyProperties(layer, this, propertiesCopy, relatedLayers);
         } else
-            RemoteLayerTreePropertyApplier::applyProperties(layer, properties, relatedLayers);
+            RemoteLayerTreePropertyApplier::applyProperties(layer, this, properties, relatedLayers);
     }
 
     for (auto& destroyedLayer : transaction.destroyedLayers())
-        m_layers.remove(destroyedLayer);
+        layerWillBeRemoved(destroyedLayer);
 
     return rootLayerChanged;
@@ -107 +109 @@
 }
 
+void RemoteLayerTreeHost::layerWillBeRemoved(WebCore::GraphicsLayer::PlatformLayerID layerID)
+{
+    m_animationDelegates.remove(layerID);
+    m_layers.remove(layerID);
+}
+
+void RemoteLayerTreeHost::animationDidStart(WebCore::GraphicsLayer::PlatformLayerID layerID, double startTime)
+{
+    m_drawingArea.acceleratedAnimationDidStart(layerID, startTime);
+}
+
 #if !PLATFORM(IOS)
+static NSString* const WKLayerIDPropertyKey = @"WKLayerID";
+
+WebCore::GraphicsLayer::PlatformLayerID RemoteLayerTreeHost::layerID(LayerOrView* layer)
+{
+    return [[layer valueForKey:WKLayerIDPropertyKey] unsignedLongLongValue];
+}
+
 LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties, const RemoteLayerTreeTransaction::LayerProperties*)
 {
@@ -138 +158 @@
 
     [layer web_disableAllActions];
+    [layer setValue:[NSNumber numberWithUnsignedLongLong:properties.layerID] forKey:WKLayerIDPropertyKey];
 
     return layer.get();

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -64 +64 @@
                 0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */; };
                 0F5947A8187B517600437857 /* RemoteScrollingCoordinatorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */; };
+                0F5E200318E77051003EC3E5 /* PlatformCAAnimationRemote.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E200118E77051003EC3E5 /* PlatformCAAnimationRemote.mm */; };
+                0F5E200418E77051003EC3E5 /* PlatformCAAnimationRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5E200218E77051003EC3E5 /* PlatformCAAnimationRemote.h */; };
                 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */; };
                 0F931C1D18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */; };
@@ -1800 +1802 @@
                 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingCoordinatorMessageReceiver.cpp; sourceTree = "<group>"; };
                 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorMessages.h; sourceTree = "<group>"; };
+                0F5E200118E77051003EC3E5 /* PlatformCAAnimationRemote.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCAAnimationRemote.mm; sourceTree = "<group>"; };
+                0F5E200218E77051003EC3E5 /* PlatformCAAnimationRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCAAnimationRemote.h; sourceTree = "<group>"; };
                 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollingTreeOverflowScrollingNodeIOS.h; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; };
                 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
@@ -6021 +6025 @@
                                 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */,
                                 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */,
+                                0F5E200118E77051003EC3E5 /* PlatformCAAnimationRemote.mm */,
+                                0F5E200218E77051003EC3E5 /* PlatformCAAnimationRemote.h */,
                                 2DA049B1180CCCD300AAFA9E /* PlatformCALayerRemote.cpp */,
                                 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */,
@@ -6922 +6928 @@
                                 BCB9E2431120DACA00A137E0 /* WebContext.h in Headers */,
                                 31A505FA1680025500A930EB /* WebContextClient.h in Headers */,
+                                0F5E200418E77051003EC3E5 /* PlatformCAAnimationRemote.h in Headers */,
                                 512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */,
                                 BC09B8F9147460F7005F5625 /* WebContextConnectionClient.h in Headers */,
@@ -8663 +8670 @@
                                 BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */,
                                 BCBAACEC145225E30053F82F /* WKProcessGroup.mm in Sources */,
+                                0F5E200318E77051003EC3E5 /* PlatformCAAnimationRemote.mm in Sources */,
                                 512F58FB12A88A5400629530 /* WKProtectionSpace.cpp in Sources */,
                                 37948408150C4B9700E52CE9 /* WKRenderLayer.cpp in Sources */,

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

@@ -92 +92 @@
     virtual void setExposedRect(const WebCore::FloatRect&) = 0;
     virtual WebCore::FloatRect exposedRect() const = 0;
+    virtual void acceleratedAnimationDidStart(uint64_t /*layerID*/, double /*startTime*/) { }
 #endif
 #if PLATFORM(IOS)

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

@@ -34 +34 @@
     AdjustTransientZoom(double scale, WebCore::FloatPoint origin)
     CommitTransientZoom(double scale, WebCore::FloatPoint origin)
+    
+    AcceleratedAnimationDidStart(uint64_t layerID, double startTime)
 #endif
 }

trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "GraphicsLayerCARemote.h"
+#include "PlatformCAAnimationRemote.h"
 #include "PlatformCALayerRemote.h"
 
@@ -53 +54 @@
 }
 
+PassRefPtr<PlatformCAAnimation> GraphicsLayerCARemote::createPlatformCAAnimation(PlatformCAAnimation::AnimationType type, const String& keyPath)
+{
+    return PlatformCAAnimationRemote::create(type, keyPath);
 }
+
+bool GraphicsLayerCARemote::addAnimation(const KeyframeValueList& valueList, const FloatSize&, const Animation* anim, const String&, double)
+{
+    if (!animationCanBeAccelerated(valueList, anim))
+        return false;
+    
+#if ENABLE(CSS_FILTERS)
+    if (valueList.property() == AnimatedPropertyWebkitFilter)
+        return false;
+#endif
+    
+    return true;
+}
+
+} // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h

@@ -53 +53 @@
     virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner) override;
     virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(PlatformLayer*, WebCore::PlatformCALayerClient* owner) override;
-
-    // No accelerated animations for now.
-    virtual bool addAnimation(const WebCore::KeyframeValueList&, const WebCore::FloatSize&, const WebCore::Animation*, const String&, double) override { return false; }
+    virtual PassRefPtr<WebCore::PlatformCAAnimation> createPlatformCAAnimation(WebCore::PlatformCAAnimation::AnimationType, const String& keyPath) override;
 
     // PlatformCALayerRemote can't currently proxy directly composited image contents, so opt out of this optimization.
     virtual bool shouldDirectlyCompositeImage(WebCore::Image*) const override { return false; }
-
+    
+    virtual bool addAnimation(const WebCore::KeyframeValueList&, const WebCore::FloatSize&, const WebCore::Animation*, const String&, double);
+    
     RemoteLayerTreeContext* m_context;
 };

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -43 +43 @@
 
 using namespace WebCore;
-using namespace WebKit;
+
+namespace WebKit {
 
 PassRefPtr<PlatformCALayerRemote> PlatformCALayerRemote::create(LayerType layerType, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
@@ -125 +126 @@
 
         if (m_layerType == LayerTypeCustom) {
-            RemoteLayerTreePropertyApplier::applyProperties(platformLayer(), m_properties, RemoteLayerTreePropertyApplier::RelatedLayerMap());
+            RemoteLayerTreePropertyApplier::applyProperties(platformLayer(), nullptr, m_properties, RemoteLayerTreePropertyApplier::RelatedLayerMap());
             m_properties.changedProperties = RemoteLayerTreeTransaction::NoChange;
             return;
@@ -146 +147 @@
 void PlatformCALayerRemote::animationStarted(CFTimeInterval beginTime)
 {
+    if (m_owner)
+        m_owner->platformCALayerAnimationStarted(beginTime);
 }
 
@@ -268 +271 @@
 void PlatformCALayerRemote::addAnimationForKey(const String& key, PlatformCAAnimation* animation)
 {
-    ASSERT_NOT_REACHED();
+    m_properties.addedAnimations.set(key, toPlatformCAAnimationRemote(animation)->properties());
+    m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnimationsChanged);
+    
+    m_context->willStartAnimationOnLayer(this);
 }
 
 void PlatformCALayerRemote::removeAnimationForKey(const String& key)
 {
-    ASSERT_NOT_REACHED();
+    // FIXME: remove from m_properties.addedAnimations ?
+    m_properties.keyPathsOfAnimationsToRemove.add(key);
+    m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnimationsChanged);
 }
 
 PassRefPtr<PlatformCAAnimation> PlatformCALayerRemote::animationForKey(const String& key)
 {
-    ASSERT_NOT_REACHED();
-
+    // FIXME: implement.
     return nullptr;
 }
@@ -590 +597 @@
     return 0;
 }
+
+} // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm

@@ -38 +38 @@
 
 using namespace WebCore;
-using namespace WebKit;
+
+namespace WebKit {
 
 static NSString * const platformCALayerPointer = @"WKPlatformCALayer";
@@ -84 +85 @@
         PlatformCALayerRemote::setNeedsDisplay(rect);
 }
+
+} // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp

@@ -34 +34 @@
 
 using namespace WebCore;
-using namespace WebKit;
+
+namespace WebKit {
 
 PlatformCALayerRemoteTiledBacking::PlatformCALayerRemoteTiledBacking(LayerType layerType, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
@@ -103 +104 @@
     m_tileController->setTileDebugBorderColor(color);
 }
+
+} // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.h

@@ -56 +56 @@
     void buildTransaction(RemoteLayerTreeTransaction&, WebCore::PlatformCALayer& rootLayer);
 
+    // From the UI process
+    void animationDidStart(WebCore::GraphicsLayer::PlatformLayerID, double startTime);
+
+    void willStartAnimationOnLayer(PlatformCALayerRemote*);
+
 private:
     // WebCore::GraphicsLayerFactory
@@ -67 +72 @@
     Vector<RemoteLayerTreeTransaction::LayerCreationProperties> m_createdLayers;
     Vector<WebCore::GraphicsLayer::PlatformLayerID> m_destroyedLayers;
+    
+    HashMap<WebCore::GraphicsLayer::PlatformLayerID, PlatformCALayerRemote*> m_layersAwaitingAnimationStart;
 };
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm

@@ -66 +66 @@
     ASSERT(!m_destroyedLayers.contains(layer->layerID()));
     m_destroyedLayers.append(layer->layerID());
+    
+    m_layersAwaitingAnimationStart.remove(layer->layerID());
 }
 
@@ -103 +105 @@
 }
 
+void RemoteLayerTreeContext::willStartAnimationOnLayer(PlatformCALayerRemote* layer)
+{
+    m_layersAwaitingAnimationStart.add(layer->layerID(), layer);
+}
+
+void RemoteLayerTreeContext::animationDidStart(WebCore::GraphicsLayer::PlatformLayerID layerID, double startTime)
+{
+    auto it = m_layersAwaitingAnimationStart.find(layerID);
+    if (it != m_layersAwaitingAnimationStart.end())
+        it->value->animationStarted(startTime);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h

@@ -76 +76 @@
     virtual WebCore::FloatRect exposedRect() const override { return m_scrolledExposedRect; }
 
+    virtual void acceleratedAnimationDidStart(uint64_t layerID, double startTime) override;
+
 #if PLATFORM(IOS)
     virtual void setExposedContentRect(const WebCore::FloatRect&) override;

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

@@ -243 +243 @@
 }
 
+void RemoteLayerTreeDrawingArea::acceleratedAnimationDidStart(uint64_t layerID, double startTime)
+{
+    m_remoteLayerTreeContext->animationDidStart(layerID, startTime);
+}
+
 void RemoteLayerTreeDrawingArea::setExposedRect(const FloatRect& exposedRect)
 {

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -45 +45 @@
 #import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
+#import <WebCore/PlatformCAAnimationMac.h>
 #import <WebCore/RenderLayerBacking.h>
 #import <WebCore/RenderLayerCompositor.h>
@@ -755 +756 @@
 
     RetainPtr<CABasicAnimation> renderViewAnimationCA = transientZoomSnapAnimationForKeyPath("transform");
-    RefPtr<PlatformCAAnimation> renderViewAnimation = PlatformCAAnimation::create(renderViewAnimationCA.get());
+    RefPtr<PlatformCAAnimation> renderViewAnimation = PlatformCAAnimationMac::create(renderViewAnimationCA.get());
     renderViewAnimation->setToValue(transform);