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

Side by Side Diff: cc/software_renderer.cc

Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: cc/ fixes Created 8 years, 2 months 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
« no previous file with comments | « cc/gl_renderer.cc ('k') | chrome/browser/instant/instant_controller.cc » ('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 "CCDebugBorderDrawQuad.h" 9 #include "CCDebugBorderDrawQuad.h"
10 #include "cc/render_pass_draw_quad.h" 10 #include "cc/render_pass_draw_quad.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD rawQuad* quad) 249 void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD rawQuad* quad)
250 { 250 {
251 if (!isSoftwareResource(quad->resourceId())) { 251 if (!isSoftwareResource(quad->resourceId())) {
252 drawUnsupportedQuad(frame, quad); 252 drawUnsupportedQuad(frame, quad);
253 return; 253 return;
254 } 254 }
255 255
256 // FIXME: Add support for non-premultiplied alpha. 256 // FIXME: Add support for non-premultiplied alpha.
257 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider , quad->resourceId()); 257 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider , quad->resourceId());
258 gfx::RectF uvRect = quad->uvRect().Scale(quad->quadRect().width(), quad->qua dRect().height()); 258 gfx::RectF uvRect = quad->uvRect();
259 uvRect.Scale(quad->quadRect().width(), quad->quadRect().height());
259 SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect)); 260 SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect));
260 if (quad->flipped()) 261 if (quad->flipped())
261 m_skCurrentCanvas->scale(1, -1); 262 m_skCurrentCanvas->scale(1, -1);
262 m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &skUvRect, t oSkRect(quadVertexRect()), &m_skCurrentPaint); 263 m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &skUvRect, t oSkRect(quadVertexRect()), &m_skCurrentPaint);
263 } 264 }
264 265
265 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua d* quad) 266 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua d* quad)
266 { 267 {
267 DCHECK(isSoftwareResource(quad->resourceId())); 268 DCHECK(isSoftwareResource(quad->resourceId()));
268 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider , quad->resourceId()); 269 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider , quad->resourceId());
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 349 }
349 350
350 void SoftwareRenderer::setVisible(bool visible) 351 void SoftwareRenderer::setVisible(bool visible)
351 { 352 {
352 if (m_visible == visible) 353 if (m_visible == visible)
353 return; 354 return;
354 m_visible = visible; 355 m_visible = visible;
355 } 356 }
356 357
357 } 358 }
OLDNEW
« no previous file with comments | « cc/gl_renderer.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698