From 5e41bae5e1c768a8571ac9e0c9a43f4c5fe5465b Mon Sep 17 00:00:00 2001 From: "enne@chromium.org" Date: Sat, 3 Aug 2013 01:20:47 +0000 Subject: cc: PictureLayer should just derive from Layer It was deriving from contents scaling layer, but as it calculates its own contents scale on the compositor thread, it's just a confusing no-op. R=danakj@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/21951003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215439 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/layers/picture_layer.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cc/layers/picture_layer.h') diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h index 313da87..7a9a427 100644 --- a/cc/layers/picture_layer.h +++ b/cc/layers/picture_layer.h @@ -7,7 +7,6 @@ #include "cc/base/invalidation_region.h" #include "cc/debug/devtools_instrumentation.h" -#include "cc/layers/contents_scaling_layer.h" #include "cc/layers/layer.h" #include "cc/resources/picture_pile.h" #include "cc/trees/occlusion_tracker.h" @@ -17,13 +16,13 @@ namespace cc { class ContentLayerClient; class ResourceUpdateQueue; -class CC_EXPORT PictureLayer : public ContentsScalingLayer { +class CC_EXPORT PictureLayer : public Layer { public: static scoped_refptr Create(ContentLayerClient* client); void ClearClient() { client_ = NULL; } - // Implement Layer interface + // Layer interface. virtual bool DrawsContent() const OVERRIDE; virtual scoped_ptr CreateLayerImpl( LayerTreeImpl* tree_impl) OVERRIDE; -- cgit v1.1