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

Unified Diff: cc/LayerChromium.h

Issue 11083003: Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- cc/LayerChromium.h (revision 160631)
+++ cc/LayerChromium.h (working copy)
@@ -11,6 +11,7 @@
#include "base/memory/ref_counted.h"
#include "CCLayerAnimationController.h"
#include "CCOcclusionTracker.h"
+#include "CCPrioritizedTexture.h"
#include "FloatPoint.h"
#include "Region.h"
#include "RenderSurfaceChromium.h"
@@ -19,6 +20,8 @@
#include <public/WebTransformationMatrix.h>
#include <string>
#include <vector>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
class WebAnimationDelegate;
@@ -32,7 +35,6 @@
class CCLayerAnimationDelegate;
class CCLayerImpl;
class CCLayerTreeHost;
-class CCPriorityCalculator;
class CCTextureUpdateQueue;
class ScrollbarLayerChromium;
struct CCAnimationEvent;
@@ -289,7 +291,7 @@
scoped_refptr<LayerChromium> m_maskLayer;
// Constructs a CCLayerImpl of the correct runtime type for this LayerChromium type.
- virtual scoped_ptr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<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