ui/gfx/canvas_skia.cc - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/canvas_skia.cc

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 10 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:

Index: ui/gfx/canvas_skia.cc

diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc

index 1e0d214847203148588d278bf87c24bee7ae80cf..1dafe88aa01fa6d0ffb9f35f591a4415b906c805 100644

--- a/ui/gfx/canvas_skia.cc

+++ b/ui/gfx/canvas_skia.cc

@@ -13,6 +13,7 @@

#include "ui/gfx/brush.h"

#include "ui/gfx/font.h"

#include "ui/gfx/rect.h"

+#include "ui/gfx/canvas.h"

#include "ui/gfx/skia_util.h"

#include "ui/gfx/transform.h"

@@ -85,9 +86,8 @@ int CanvasSkia::GetStringWidth(const string16& text, const gfx::Font& font) {

// static

int CanvasSkia::DefaultCanvasTextAlignment() {

- if (!base::i18n::IsRTL())

- return gfx::Canvas::TEXT_ALIGN_LEFT;

- return gfx::Canvas::TEXT_ALIGN_RIGHT;

+ return base::i18n::IsRTL() ? Canvas::TEXT_ALIGN_RIGHT

+ : Canvas::TEXT_ALIGN_LEFT;

}

SkBitmap CanvasSkia::ExtractBitmap() const {