diff options
author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 21:08:51 +0000 |
---|---|---|
committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 21:08:51 +0000 |
commit | 7c6137575c22598d8b78c1d4249a9d29a36deacb (patch) | |
tree | ec62dfdcbf6e97b44bb99631404a691669c82631 /ui/gfx/font.cc | |
parent | f2289e78c5f7bc64ef1cf7378a185f14fa4e344c (diff) | |
download | chromium_src-7c6137575c22598d8b78c1d4249a9d29a36deacb.zip chromium_src-7c6137575c22598d8b78c1d4249a9d29a36deacb.tar.gz chromium_src-7c6137575c22598d8b78c1d4249a9d29a36deacb.tar.bz2 |
Move |PlatformFont::GetStringWidth()| implementation up into font.cc directly.
Also, add |CanvasSkia::GetStringWidth()| convenience method.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9117009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/font.cc')
-rw-r--r-- | ui/gfx/font.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc index 51e2ff4..fffaaf6 100644 --- a/ui/gfx/font.cc +++ b/ui/gfx/font.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "ui/gfx/font.h" #include "base/utf_string_conversions.h" +#include "ui/gfx/canvas_skia.h" #include "ui/gfx/platform_font.h" namespace gfx { @@ -59,7 +60,7 @@ int Font::GetAverageCharacterWidth() const { } int Font::GetStringWidth(const string16& text) const { - return platform_font_->GetStringWidth(text); + return CanvasSkia::GetStringWidth(text, *this); } int Font::GetExpectedTextWidth(int length) const { |