cc: Remove wtf includes from resource provider

cc: Remove wtf includes from resource provider

R=jamesr@chromium.org
BUG=154451
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162393

[jamesr, 2012-10-16 20:14:08]

lgtm

[commit-bot: I haz the power, 2012-10-16 21:17:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11183006/1

[commit-bot: I haz the power, 2012-10-16 21:17:54]

Failed to apply patch for cc/resource_provider.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/resource_provider.h
  Hunk #1 FAILED at 7.
  1 out of 6 hunks FAILED -- saving rejects to file cc/resource_provider.h.rej

Patch:       cc/resource_provider.h
Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index
b3595281c7f8b94a5448b252b8d4b4857a1be510..87bda353336854e6aadc81a4c3d09f45a6a906c6
100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -7,18 +7,15 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
+#include "base/memory/scoped_ptr.h"
 #include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "TextureCopier.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);

[commit-bot: I haz the power, 2012-10-16 21:50:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11183006/5001

[commit-bot: I haz the power, 2012-10-17 11:17:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11183006/5001

[commit-bot: I haz the power, 2012-10-17 14:12:49]

Change committed as 162393