diff options
| author | reveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 17:32:33 +0000 |
|---|---|---|
| committer | reveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 17:32:33 +0000 |
| commit | f7685bc23afff59c963f9967b162b75b0c3f2580 (patch) | |
| tree | cf7f76b7d3d4d7e5998327ca231a9353ce6dc351 /cc/gl_renderer.h | |
| parent | 1c2433bde9f8b41c9eeaec06232d3905ecc95e40 (diff) | |
| download | chromium_src-f7685bc23afff59c963f9967b162b75b0c3f2580.zip chromium_src-f7685bc23afff59c963f9967b162b75b0c3f2580.tar.gz chromium_src-f7685bc23afff59c963f9967b162b75b0c3f2580.tar.bz2 | |
cc: Rename Texture class to Resource.
Renames Texture to Resource and ScopedTexture to ScopedResource.
BUG=
TEST=cc_unittests
Review URL: https://codereview.chromium.org/11377055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer.h')
| -rw-r--r-- | cc/gl_renderer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index ba861bc..184c144 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -23,7 +23,7 @@ class WebGraphicsContext3D; namespace cc { -class ScopedTexture; +class ScopedResource; class StreamVideoDrawQuad; class TextureDrawQuad; class GeometryBinding; @@ -71,11 +71,11 @@ protected: const gfx::QuadF& sharedGeometryQuad() const { return m_sharedGeometryQuad; } const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); } - bool getFramebufferTexture(ScopedTexture*, const gfx::Rect& deviceRect); + bool getFramebufferTexture(ScopedResource*, const gfx::Rect& deviceRect); void releaseRenderPassTextures(); virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE; - virtual bool bindFramebufferToTexture(DrawingFrame&, const ScopedTexture*, const gfx::Rect& framebufferRect) OVERRIDE; + virtual bool bindFramebufferToTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& framebufferRect) OVERRIDE; virtual void setDrawViewportSize(const gfx::Size&) OVERRIDE; virtual void setScissorTestRect(const gfx::Rect& scissorRect) OVERRIDE; virtual void clearFramebuffer(DrawingFrame&) OVERRIDE; @@ -90,7 +90,7 @@ private: void drawCheckerboardQuad(const DrawingFrame&, const CheckerboardDrawQuad*); void drawDebugBorderQuad(const DrawingFrame&, const DebugBorderDrawQuad*); - scoped_ptr<ScopedTexture> drawBackgroundFilters( + scoped_ptr<ScopedResource> drawBackgroundFilters( DrawingFrame&, const RenderPassDrawQuad*, const WebKit::WebFilterOperations&, const WebKit::WebTransformationMatrix& contentsDeviceTransform, const WebKit::WebTransformationMatrix& contentsDeviceTransformInverse); @@ -108,7 +108,7 @@ private: void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const WebKit::WebTransformationMatrix& drawMatrix); - bool useScopedTexture(DrawingFrame&, const ScopedTexture*, const gfx::Rect& viewportRect); + bool useScopedTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& viewportRect); bool makeContextCurrent(); |