Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2353)

Unified Diff: cc/LayerChromium.h

Issue 11076013: [cc] Store CCLayerImpls as scoped_ptrs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/IOSurfaceLayerChromium.cpp ('k') | cc/LayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/LayerChromium.h
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h
index b09984bff3b49913e76c64dab62b1b8f9e666f2f..36436d4042a15c5c5f6c29893a955a4128410e4a 100644
--- a/cc/LayerChromium.h
+++ b/cc/LayerChromium.h
@@ -11,7 +11,6 @@
#include "base/memory/ref_counted.h"
#include "CCLayerAnimationController.h"
#include "CCOcclusionTracker.h"
-#include "CCPrioritizedTexture.h"
#include "FloatPoint.h"
#include "Region.h"
#include "RenderSurfaceChromium.h"
@@ -20,8 +19,6 @@
#include <public/WebTransformationMatrix.h>
#include <string>
#include <vector>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
namespace WebKit {
class WebAnimationDelegate;
@@ -35,6 +32,7 @@ struct CCAnimationEvent;
class CCLayerAnimationDelegate;
class CCLayerImpl;
class CCLayerTreeHost;
+class CCPriorityCalculator;
class CCTextureUpdateQueue;
class ScrollbarLayerChromium;
struct CCAnimationEvent;
@@ -291,7 +289,7 @@ protected:
scoped_refptr<LayerChromium> m_maskLayer;
// Constructs a CCLayerImpl of the correct runtime type for this LayerChromium type.
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual scoped_ptr<CCLayerImpl> createCCLayerImpl();
int m_layerId;
private:
« no previous file with comments | « cc/IOSurfaceLayerChromium.cpp ('k') | cc/LayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698