From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 16:25:10 +0100 Subject: Merge WebKit at r76408: Initial merge by git. Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53 --- Source/WebCore/platform/graphics/GraphicsLayer.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/platform/graphics/GraphicsLayer.h') diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h index 8943f6c..e3a62b6 100644 --- a/Source/WebCore/platform/graphics/GraphicsLayer.h +++ b/Source/WebCore/platform/graphics/GraphicsLayer.h @@ -100,7 +100,8 @@ class TimingFunction; // Base class for animation values (also used for transitions). Here to // represent values for properties being animated via the GraphicsLayer, // without pulling in style-related data from outside of the platform directory. -class AnimationValue : public Noncopyable { +class AnimationValue { + WTF_MAKE_NONCOPYABLE(AnimationValue); WTF_MAKE_FAST_ALLOCATED; public: AnimationValue(float keyTime, PassRefPtr timingFunction = 0) : m_keyTime(keyTime) @@ -152,7 +153,8 @@ private: // Used to store a series of values in a keyframe list. Values will all be of the same type, // which can be inferred from the property. -class KeyframeValueList : public Noncopyable { +class KeyframeValueList { + WTF_MAKE_NONCOPYABLE(KeyframeValueList); WTF_MAKE_FAST_ALLOCATED; public: KeyframeValueList(AnimatedPropertyID property) @@ -184,8 +186,8 @@ protected: // which may have associated transformation and animations. class GraphicsLayer { + WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED; public: - static PassOwnPtr create(GraphicsLayerClient*); virtual ~GraphicsLayer(); -- cgit v1.1