summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 00:24:20 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 00:24:20 +0000
commit883ce72de20ef56c3c332215c12f14886b67bf8e (patch)
tree01bb9b4b848f52ad91e4b151f935dbf7f2fa00fd /gfx
parent4f2fe461d79175b39787686b76d36b7518e132fd (diff)
downloadchromium_src-883ce72de20ef56c3c332215c12f14886b67bf8e.zip
chromium_src-883ce72de20ef56c3c332215c12f14886b67bf8e.tar.gz
chromium_src-883ce72de20ef56c3c332215c12f14886b67bf8e.tar.bz2
Small cleanups/style fixes. Simplifies RTL functions slightly.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1932006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
-rw-r--r--gfx/canvas.h6
-rw-r--r--gfx/canvas_win.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/gfx/canvas.h b/gfx/canvas.h
index ffc30fb..ef2b716 100644
--- a/gfx/canvas.h
+++ b/gfx/canvas.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -208,8 +208,8 @@ class Canvas : public skia::PlatformCanvas {
// Attempts to fit the text with the provided width and height. Increases
// height and then width as needed to make the text fit. This method
// supports multiple lines.
- static void SizeStringInt(const std::wstring& test, const gfx::Font& font,
- int *width, int* height, int flags);
+ static void SizeStringInt(const std::wstring& text, const gfx::Font& font,
+ int* width, int* height, int flags);
// Returns the default text alignment to be used when drawing text on a
// gfx::Canvas based on the directionality of the system locale language. This
diff --git a/gfx/canvas_win.cc b/gfx/canvas_win.cc
index afee919..98c5f74 100644
--- a/gfx/canvas_win.cc
+++ b/gfx/canvas_win.cc
@@ -138,7 +138,7 @@ Canvas::~Canvas() {
// static
void Canvas::SizeStringInt(const std::wstring& text,
const gfx::Font& font,
- int *width, int *height, int flags) {
+ int* width, int* height, int flags) {
// Clamp the max amount of text we'll measure to 2K. When the string is
// actually drawn, it will be clipped to whatever size box is provided, and
// the time to do that doesn't depend on the length being clipped off.