diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 20:53:08 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 20:53:08 +0000 |
| commit | 9a55b8c9af871b1e58b7f4f367b7c26fc53ab543 (patch) | |
| tree | 11f261c89f79392fd66f3357aa924f4d9d4c116d /ui/gfx/render_text.cc | |
| parent | d94b1c828da3dbc06a81fdf7479f6428f0b0dcfb (diff) | |
| download | chromium_src-9a55b8c9af871b1e58b7f4f367b7c26fc53ab543.zip chromium_src-9a55b8c9af871b1e58b7f4f367b7c26fc53ab543.tar.gz chromium_src-9a55b8c9af871b1e58b7f4f367b7c26fc53ab543.tar.bz2 | |
Fix logging of string16s from gfx namespace on Windows.
I don't why this fixes it, but somehow having a SelectionModel << logging operator in the gfx namespace makes Visual Studio fail to find the << logging operator for string16 arguments.
Per discussion with Scott, we decided to remove the << operators altogether and replace them with a ToString() function to be consistent with Rect, Size, etc.
TEST=Check that adding a "LOG(INFO) << text();" line to RenderTextWin compiles.
Review URL: https://chromiumcodereview.appspot.com/10332205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text.cc')
| -rw-r--r-- | ui/gfx/render_text.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 46b1d00..d7de8a3 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -47,11 +47,14 @@ void CheckStyleRanges(const gfx::StyleRanges& style_ranges, size_t length) { for (gfx::StyleRanges::size_type i = 0; i < style_ranges.size() - 1; i++) { const ui::Range& former = style_ranges[i].range; const ui::Range& latter = style_ranges[i + 1].range; - DCHECK(!former.is_empty()) << "Empty range at " << i << ":" << former; - DCHECK(former.IsValid()) << "Invalid range at " << i << ":" << former; - DCHECK(!former.is_reversed()) << "Reversed range at " << i << ":" << former; + DCHECK(!former.is_empty()) << "Empty range at " << i << ":" << + former.ToString(); + DCHECK(former.IsValid()) << "Invalid range at " << i << ":" << + former.ToString(); + DCHECK(!former.is_reversed()) << "Reversed range at " << i << ":" << + former.ToString(); DCHECK(former.end() == latter.start()) << "Ranges gap/overlap/unsorted." << - "former:" << former << ", latter:" << latter; + "former:" << former.ToString() << ", latter:" << latter.ToString(); } const gfx::StyleRange& end_style = *style_ranges.rbegin(); DCHECK(!end_style.range.is_empty()) << "Empty range at end."; |