Use gfx:: Geometry types for the resource provider and layer updater classes.

cc/resource_provider.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
-#include "IntSize.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/graphics_context.h"
 #include "cc/texture_copier.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/size.h"
 #include <deque>
 #include <vector>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
+namespace gfx {
+class Rect;
+class Vector2d;
+}
+
 namespace cc {
 
-class IntRect;
 class LayerTextureSubImage;
 class TextureCopier;
 class TextureUploader;
 
 // Thread-safety notes: this class is not thread-safe and can only be called
 // from the thread it was created on (in practice, the compositor thread).
 class ResourceProvider {
 public:
     typedef unsigned ResourceId;
     typedef std::vector<ResourceId> ResourceIdArray;
     typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
     struct Mailbox {
         GLbyte name[64];
     };
     struct TransferableResource {
         unsigned id;
         GLenum format;
-        IntSize size;
+        gfx::Size size;
         Mailbox mailbox;
     };
     typedef std::vector<TransferableResource> TransferableResourceArray;
     struct TransferableResourceList {
         TransferableResourceList();
         ~TransferableResourceList();
 
         TransferableResourceArray resources;
         unsigned syncPoint;
     };
@@ skipping 11 matching lines @@
     bool inUseByConsumer(ResourceId);
 
 
     // Producer interface.
 
     void setDefaultResourceType(ResourceType type) { m_defaultResourceType = type; }
     ResourceType defaultResourceType() const { return m_defaultResourceType; }
     ResourceType resourceType(ResourceId);
 
     // Creates a resource of the default resource type.
-    ResourceId createResource(int pool, const IntSize&, GLenum format, TextureUsageHint);
+    ResourceId createResource(int pool, const gfx::Size&, GLenum format, TextureUsageHint);
 
     // You can also explicitly create a specific resource type.
-    ResourceId createGLTexture(int pool, const IntSize&, GLenum format, TextureUsageHint);
-    ResourceId createBitmap(int pool, const IntSize&);
+    ResourceId createGLTexture(int pool, const gfx::Size&, GLenum format, TextureUsageHint);
+    ResourceId createBitmap(int pool, const gfx::Size&);
     // Wraps an external texture into a GL resource.
     ResourceId createResourceFromExternalTexture(unsigned textureId);
 
     void deleteResource(ResourceId);
 
     // Deletes all resources owned by a given pool.
     void deleteOwnedResources(int pool);
 
     // Upload data from image, copying sourceRect (in image) into destRect (in the resource).
-    void upload(ResourceId, const uint8_t* image, const IntRect& imageRect, const IntRect& sourceRect, const IntSize& destOffset);
+    void upload(ResourceId, const uint8_t* image, const gfx::Rect& imageRect, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset);
 
     // Check upload status.
     size_t numBlockingUploads();
     void markPendingUploadsAsNonBlocking();
     double estimatedUploadsPerSecond();
 
     // Flush all context operations, kicking uploads and ensuring ordering with
     // respect to other contexts.
     void flush();
 
@@ skipping 106 matching lines @@
     };
 
      // Temporary functions for debugging crashes in issue 151428 in canary.
      // Do not use these!
      static void debugNotifyEnterZone(unsigned int index);
      static void debugNotifyLeaveZone();
 
 private:
     struct Resource {
         Resource();
-        Resource(unsigned textureId, int pool, const IntSize& size, GLenum format);
-        Resource(uint8_t* pixels, int pool, const IntSize& size, GLenum format);
+        Resource(unsigned textureId, int pool, const gfx::Size& size, GLenum format);
+        Resource(uint8_t* pixels, int pool, const gfx::Size& size, GLenum format);
 
         unsigned glId;
         uint8_t* pixels;
         int pool;
         int lockForReadCount;
         bool lockedForWrite;
         bool external;
         bool exported;
         bool markedForDeletion;
-        IntSize size;
+        gfx::Size size;
         GLenum format;
         ResourceType type;
     };
     typedef base::hash_map<ResourceId, Resource> ResourceMap;
     struct Child {
         Child();
         ~Child();
 
         int pool;
         ResourceIdMap childToParentMap;
@@ skipping 29 matching lines @@
     scoped_ptr<TextureUploader> m_textureUploader;
     scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif