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/software_renderer.cc | |
| 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/software_renderer.cc')
| -rw-r--r-- | cc/software_renderer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 896bad43..6a64cc8 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -128,7 +128,7 @@ void SoftwareRenderer::bindFramebufferToOutputSurface(DrawingFrame& frame) m_skCurrentCanvas = m_skRootCanvas.get(); } -bool SoftwareRenderer::bindFramebufferToTexture(DrawingFrame& frame, const ScopedTexture* texture, const gfx::Rect& framebufferRect) +bool SoftwareRenderer::bindFramebufferToTexture(DrawingFrame& frame, const ScopedResource* texture, const gfx::Rect& framebufferRect) { m_currentFramebufferLock = make_scoped_ptr(new ResourceProvider::ScopedWriteLockSoftware(m_resourceProvider, texture->id())); m_skCurrentCanvas = m_currentFramebufferLock->skCanvas(); @@ -276,7 +276,7 @@ void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad* quad) { - CachedTexture* contentTexture = m_renderPassTextures.get(quad->renderPassId()); + CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId()); if (!contentTexture || !contentTexture->id()) return; |