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

Unified Diff: ui/gfx/canvas_android.cc

Issue 22835002: Supports gfx::FontList in gfx::Canvas and ui::ElideText family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates based on review comments. Created 7 years, 4 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_android.cc
diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc
index c26a668f1d466ba805125e9dd06f77faa9f70f16..cead54b5eddb811628276f8f2a69a6a0db744bb7 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -5,12 +5,21 @@
#include "ui/gfx/canvas.h"
#include "base/logging.h"
-#include "ui/gfx/font.h"
namespace gfx {
// static
void Canvas::SizeStringInt(const base::string16& text,
msw 2013/08/13 17:39:22 Why are only a subset of Canvas functions stubbed
Yuki 2013/08/14 15:42:16 At a glance, Android version seems not using gfx::
+ const gfx::FontList& font_list,
+ int* width,
+ int* height,
+ int line_height,
+ int flags) {
+ NOTIMPLEMENTED();
+}
+
+// static
+void Canvas::SizeStringInt(const base::string16& text,
const gfx::Font& font,
int* width,
int* height,
@@ -20,6 +29,16 @@ void Canvas::SizeStringInt(const base::string16& text,
}
void Canvas::DrawStringWithShadows(const base::string16& text,
+ const gfx::FontList& font_list,
+ SkColor color,
+ const gfx::Rect& text_bounds,
+ int line_height,
+ int flags,
+ const ShadowValues& shadows) {
+ NOTIMPLEMENTED();
+}
+
+void Canvas::DrawStringWithShadows(const base::string16& text,
const gfx::Font& font,
SkColor color,
const gfx::Rect& text_bounds,

Powered by Google App Engine
This is Rietveld 408576698