Title: [166310] trunk/Source/WebCore
- Revision
- 166310
- Author
- simon.fra...@apple.com
- Date
- 2014-03-26 12:42:03 -0700 (Wed, 26 Mar 2014)
Log Message
Fix the Windows build. Add a no-op impl for Mac non-UI-side.
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::PlatformCALayerWin):
* platform/graphics/ca/win/PlatformCALayerWin.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166309 => 166310)
--- trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:42:03 UTC (rev 166310)
@@ -1,5 +1,14 @@
2014-03-26 Simon Fraser <simon.fra...@apple.com>
+ Fix the Windows build. Add a no-op impl for Mac non-UI-side.
+
+ * platform/graphics/ca/mac/PlatformCALayerMac.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayerWin::PlatformCALayerWin):
+ * platform/graphics/ca/win/PlatformCALayerWin.h:
+
+2014-03-26 Simon Fraser <simon.fra...@apple.com>
+
REGRESSION (r155977): matrix animations no longer animate
https://bugs.webkit.org/show_bug.cgi?id=130789
<rdar://problem/15650946>
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (166309 => 166310)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:36:51 UTC (rev 166309)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:42:03 UTC (rev 166310)
@@ -137,7 +137,7 @@
virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) override;
virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
- virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) override { }
+ virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; }
virtual TiledBacking* tiledBacking() override;
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (166309 => 166310)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-03-26 19:36:51 UTC (rev 166309)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-03-26 19:42:03 UTC (rev 166310)
@@ -108,6 +108,7 @@
PlatformCALayerWin::PlatformCALayerWin(LayerType layerType, PlatformLayer* layer, PlatformCALayerClient* owner)
: PlatformCALayer(layer ? LayerTypeCustom : layerType, owner)
, m_customAppearance(GraphicsLayer::NoCustomAppearance)
+ , m_customBehavior(GraphicsLayer::NoCustomBehavior)
{
if (layer) {
m_layer = layer;
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (166309 => 166310)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-03-26 19:36:51 UTC (rev 166309)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-03-26 19:42:03 UTC (rev 166310)
@@ -129,6 +129,9 @@
virtual GraphicsLayer::CustomAppearance customAppearance() const override { return m_customAppearance; }
virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance customAppearance) override { m_customAppearance = customAppearance; }
+ virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
+ virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; }
+
virtual TiledBacking* tiledBacking() override { return nullptr; }
virtual PlatformCALayer* rootLayer() const override;
@@ -148,6 +151,7 @@
HashMap<String, RefPtr<PlatformCAAnimation>> m_animations;
GraphicsLayer::CustomAppearance m_customAppearance;
+ GraphicsLayer::CustomBehavior m_customBehavior;
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
