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

Unified Diff: ui/gfx/blit.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/blit.h ('k') | ui/gfx/canvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/blit.cc
diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc
index 169eae25aafed3e92e67fe0956d4b61c724e1569..f18f95eea1d2f94b7706df85a2b750e96ab5bda2 100644
--- a/ui/gfx/blit.cc
+++ b/ui/gfx/blit.cc
@@ -38,7 +38,7 @@ namespace {
// Returns true if the given canvas has any part of itself clipped out or
// any non-identity tranform.
-bool HasClipOrTransform(SkCanvas& canvas) {
+bool HasClipOrTransform(CdlCanvas& canvas) {
if (!canvas.getTotalMatrix().isIdentity())
return true;
@@ -52,7 +52,7 @@ bool HasClipOrTransform(SkCanvas& canvas) {
SkImageInfo info;
size_t row_bytes;
- void* pixels = canvas.accessTopLayerPixels(&info, &row_bytes);
+ void* pixels = GetSkCanvas(&canvas)->accessTopLayerPixels(&info, &row_bytes);
DCHECK(pixels);
if (!pixels)
return true;
@@ -67,7 +67,7 @@ bool HasClipOrTransform(SkCanvas& canvas) {
} // namespace
-void ScrollCanvas(SkCanvas* canvas,
+void ScrollCanvas(CdlCanvas* canvas,
const gfx::Rect& in_clip,
const gfx::Vector2d& offset) {
DCHECK(!HasClipOrTransform(*canvas)); // Don't support special stuff.
« no previous file with comments | « ui/gfx/blit.h ('k') | ui/gfx/canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698