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

Unified Diff: cc/resource_provider.h

Issue 11183006: cc: Remove wtf includes from resource provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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/prioritized_texture_unittest.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index d6eae230311e922436e801bb7a27cffe0ddc4d7a..3c2ba509bfc18e8057cec5125cbb4d3e2cb12e69 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -5,20 +5,17 @@
#ifndef CCResourceProvider_h
#define CCResourceProvider_h
-#include "CCGraphicsContext.h"
-#include "GraphicsContext3D.h"
-#include "IntSize.h"
#include "base/basictypes.h"
#include "base/hash_tables.h"
+#include "base/memory/scoped_ptr.h"
+#include "CCGraphicsContext.h"
#include "cc/texture_copier.h"
+#include "GraphicsContext3D.h"
+#include "IntSize.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
-#include <wtf/Deque.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
+#include <deque>
+#include <vector>
namespace WebKit {
class WebGraphicsContext3D;
@@ -36,7 +33,7 @@ class TextureUploader;
class CCResourceProvider {
public:
typedef unsigned ResourceId;
- typedef Vector<ResourceId> ResourceIdArray;
+ typedef std::vector<ResourceId> ResourceIdArray;
typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
enum ResourceType {
@@ -52,7 +49,7 @@ public:
IntSize size;
Mailbox mailbox;
};
- typedef Vector<TransferableResource> TransferableResourceArray;
+ typedef std::vector<TransferableResource> TransferableResourceArray;
struct TransferableResourceList {
TransferableResourceList();
~TransferableResourceList();
@@ -61,7 +58,7 @@ public:
unsigned syncPoint;
};
- static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
+ static scoped_ptr<CCResourceProvider> create(CCGraphicsContext*);
virtual ~CCResourceProvider();
@@ -205,7 +202,7 @@ public:
CCResourceProvider* m_resourceProvider;
CCResourceProvider::ResourceId m_resourceId;
SkBitmap m_skBitmap;
- OwnPtr<SkCanvas> m_skCanvas;
+ scoped_ptr<SkCanvas> m_skCanvas;
DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
};
@@ -258,15 +255,15 @@ private:
int m_nextChild;
ChildMap m_children;
- Deque<Mailbox> m_mailboxes;
+ std::deque<Mailbox> m_mailboxes;
ResourceType m_defaultResourceType;
bool m_useTextureStorageExt;
bool m_useTextureUsageHint;
bool m_useShallowFlush;
- OwnPtr<LayerTextureSubImage> m_texSubImage;
- OwnPtr<TextureUploader> m_textureUploader;
- OwnPtr<AcceleratedTextureCopier> m_textureCopier;
+ scoped_ptr<LayerTextureSubImage> m_texSubImage;
+ scoped_ptr<TextureUploader> m_textureUploader;
+ scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
int m_maxTextureSize;
DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
« no previous file with comments | « cc/prioritized_texture_unittest.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698