Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: cc/software_renderer.cc

Issue 11377055: cc: Rename Texture class to Resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/software_renderer.h ('k') | cc/texture.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "cc/software_renderer.h" 7 #include "cc/software_renderer.h"
8 8
9 #include "cc/debug_border_draw_quad.h" 9 #include "cc/debug_border_draw_quad.h"
10 #include "cc/render_pass_draw_quad.h" 10 #include "cc/render_pass_draw_quad.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void SoftwareRenderer::finish() 121 void SoftwareRenderer::finish()
122 { 122 {
123 } 123 }
124 124
125 void SoftwareRenderer::bindFramebufferToOutputSurface(DrawingFrame& frame) 125 void SoftwareRenderer::bindFramebufferToOutputSurface(DrawingFrame& frame)
126 { 126 {
127 m_currentFramebufferLock.reset(); 127 m_currentFramebufferLock.reset();
128 m_skCurrentCanvas = m_skRootCanvas.get(); 128 m_skCurrentCanvas = m_skRootCanvas.get();
129 } 129 }
130 130
131 bool SoftwareRenderer::bindFramebufferToTexture(DrawingFrame& frame, const Scope dTexture* texture, const gfx::Rect& framebufferRect) 131 bool SoftwareRenderer::bindFramebufferToTexture(DrawingFrame& frame, const Scope dResource* texture, const gfx::Rect& framebufferRect)
132 { 132 {
133 m_currentFramebufferLock = make_scoped_ptr(new ResourceProvider::ScopedWrite LockSoftware(m_resourceProvider, texture->id())); 133 m_currentFramebufferLock = make_scoped_ptr(new ResourceProvider::ScopedWrite LockSoftware(m_resourceProvider, texture->id()));
134 m_skCurrentCanvas = m_currentFramebufferLock->skCanvas(); 134 m_skCurrentCanvas = m_currentFramebufferLock->skCanvas();
135 initializeMatrices(frame, framebufferRect, false); 135 initializeMatrices(frame, framebufferRect, false);
136 setDrawViewportSize(framebufferRect.size()); 136 setDrawViewportSize(framebufferRect.size());
137 137
138 return true; 138 return true;
139 } 139 }
140 140
141 void SoftwareRenderer::setScissorTestRect(const gfx::Rect& scissorRect) 141 void SoftwareRenderer::setScissorTestRect(const gfx::Rect& scissorRect)
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 quad->quadRect().width(), quad->quadRect().height()); 269 quad->quadRect().width(), quad->quadRect().height());
270 if (quad->textureFilter() != GL_NEAREST) 270 if (quad->textureFilter() != GL_NEAREST)
271 m_skCurrentPaint.setFilterBitmap(true); 271 m_skCurrentPaint.setFilterBitmap(true);
272 m_skCurrentCanvas->drawBitmapRectToRect(*lock.skBitmap(), &uvRect, 272 m_skCurrentCanvas->drawBitmapRectToRect(*lock.skBitmap(), &uvRect,
273 toSkRect(quadVertexRect()), 273 toSkRect(quadVertexRect()),
274 &m_skCurrentPaint); 274 &m_skCurrentPaint);
275 } 275 }
276 276
277 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad) 277 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad)
278 { 278 {
279 CachedTexture* contentTexture = m_renderPassTextures.get(quad->renderPassId( )); 279 CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId ());
280 if (!contentTexture || !contentTexture->id()) 280 if (!contentTexture || !contentTexture->id())
281 return; 281 return;
282 282
283 DCHECK(isSoftwareResource(contentTexture->id())); 283 DCHECK(isSoftwareResource(contentTexture->id()));
284 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTex ture->id()); 284 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTex ture->id());
285 285
286 SkRect destRect = toSkRect(quadVertexRect()); 286 SkRect destRect = toSkRect(quadVertexRect());
287 287
288 const SkBitmap* content = lock.skBitmap(); 288 const SkBitmap* content = lock.skBitmap();
289 289
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 } 357 }
358 358
359 void SoftwareRenderer::setVisible(bool visible) 359 void SoftwareRenderer::setVisible(bool visible)
360 { 360 {
361 if (m_visible == visible) 361 if (m_visible == visible)
362 return; 362 return;
363 m_visible = visible; 363 m_visible = visible;
364 } 364 }
365 365
366 } // namespace cc 366 } // namespace cc
OLDNEW
« no previous file with comments | « cc/software_renderer.h ('k') | cc/texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698