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

Unified Diff: ui/gfx/canvas.h

Issue 1618703006: Remove duplicate typedef (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try to remove spurious dependency Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/canvas.h
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 311cf38830cac30cb1c455827d542ec853aaab41..dd30d54e5fd908e30c3f32c91839ecfa507e468b 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -409,7 +409,7 @@ class GFX_EXPORT Canvas {
const Rect& display_rect,
int flags);
- skia::PlatformCanvas* platform_canvas() { return owned_canvas_.get(); }
+ SkCanvas* platform_canvas() { return owned_canvas_.get(); }
SkCanvas* sk_canvas() { return canvas_; }
float image_scale() const { return image_scale_; }
@@ -439,7 +439,7 @@ class GFX_EXPORT Canvas {
// Canvas::Scale() does not affect |image_scale_|.
float image_scale_;
- skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
+ skia::RefPtr<SkCanvas> owned_canvas_;
SkCanvas* canvas_;
DISALLOW_COPY_AND_ASSIGN(Canvas);
« no previous file with comments | « ui/gfx/blit_unittest.cc ('k') | ui/gfx/canvas_paint_mac.mm » ('j') | ui/gfx/canvas_paint_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698