diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 20:52:25 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 20:52:25 +0000 |
| commit | f809d3bb86532d666d6094497b5b7f93f3b32a9e (patch) | |
| tree | e37a05eb364b08446fbdd4a11e77a79eabf48d02 /cc/prioritized_texture.cc | |
| parent | d388fe22c8c1c6e80c990be37fe067634bfed7a9 (diff) | |
| download | chromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.zip chromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.tar.gz chromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.tar.bz2 | |
Use gfx:: Geometry types for the resource provider and layer updater classes.
This depends on the gfx::Vector2d class from https://codereview.chromium.org/11269022/
Covered by existing tests, just changing data types.
BUG=147395
R=enne
Review URL: https://codereview.chromium.org/11266030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/prioritized_texture.cc')
| -rw-r--r-- | cc/prioritized_texture.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc index 56d50f2..1c4428a 100644 --- a/cc/prioritized_texture.cc +++ b/cc/prioritized_texture.cc @@ -16,7 +16,7 @@ using namespace std; namespace cc { -PrioritizedTexture::PrioritizedTexture(PrioritizedTextureManager* manager, IntSize size, GLenum format) +PrioritizedTexture::PrioritizedTexture(PrioritizedTextureManager* manager, gfx::Size size, GLenum format) : m_size(size) , m_format(format) , m_bytes(0) @@ -28,7 +28,7 @@ PrioritizedTexture::PrioritizedTexture(PrioritizedTextureManager* manager, IntSi , m_manager(0) { // m_manager is set in registerTexture() so validity can be checked. - DCHECK(format || size.isEmpty()); + DCHECK(format || size.IsEmpty()); if (format) m_bytes = Texture::memorySizeBytes(size, format); if (manager) @@ -51,7 +51,7 @@ void PrioritizedTexture::setTextureManager(PrioritizedTextureManager* manager) manager->registerTexture(this); } -void PrioritizedTexture::setDimensions(IntSize size, GLenum format) +void PrioritizedTexture::setDimensions(gfx::Size size, GLenum format) { if (m_format != format || m_size != size) { m_isAbovePriorityCutoff = false; @@ -91,8 +91,8 @@ ResourceProvider::ResourceId PrioritizedTexture::resourceId() const } void PrioritizedTexture::upload(ResourceProvider* resourceProvider, - const uint8_t* image, const IntRect& imageRect, - const IntRect& sourceRect, const IntSize& destOffset) + const uint8_t* image, const gfx::Rect& imageRect, + const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset) { DCHECK(m_isAbovePriorityCutoff); if (m_isAbovePriorityCutoff) @@ -127,12 +127,12 @@ void PrioritizedTexture::unlink() void PrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes) { - setDimensions(IntSize(), GL_RGBA); + setDimensions(gfx::Size(), GL_RGBA); setIsSelfManaged(true); m_bytes = bytes; } -PrioritizedTexture::Backing::Backing(unsigned id, ResourceProvider* resourceProvider, IntSize size, GLenum format) +PrioritizedTexture::Backing::Backing(unsigned id, ResourceProvider* resourceProvider, gfx::Size size, GLenum format) : Texture(id, size, format) , m_owner(0) , m_priorityAtLastPriorityUpdate(PriorityCalculator::lowestPriority()) |