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

Side by Side Diff: ui/gfx/render_text.cc

Issue 823703003: Cleanup: Update the path to insets and point headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: point.h Created 5 years, 12 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/render_text.h ('k') | ui/gfx/screen.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/render_text.h" 5 #include "ui/gfx/render_text.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <climits> 8 #include <climits>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/i18n/break_iterator.h" 11 #include "base/i18n/break_iterator.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "third_party/icu/source/common/unicode/rbbi.h" 16 #include "third_party/icu/source/common/unicode/rbbi.h"
17 #include "third_party/icu/source/common/unicode/utf16.h" 17 #include "third_party/icu/source/common/unicode/utf16.h"
18 #include "third_party/skia/include/core/SkTypeface.h" 18 #include "third_party/skia/include/core/SkTypeface.h"
19 #include "third_party/skia/include/effects/SkGradientShader.h" 19 #include "third_party/skia/include/effects/SkGradientShader.h"
20 #include "ui/gfx/canvas.h" 20 #include "ui/gfx/canvas.h"
21 #include "ui/gfx/geometry/insets.h"
21 #include "ui/gfx/geometry/safe_integer_conversions.h" 22 #include "ui/gfx/geometry/safe_integer_conversions.h"
22 #include "ui/gfx/insets.h"
23 #include "ui/gfx/render_text_harfbuzz.h" 23 #include "ui/gfx/render_text_harfbuzz.h"
24 #include "ui/gfx/scoped_canvas.h" 24 #include "ui/gfx/scoped_canvas.h"
25 #include "ui/gfx/skia_util.h" 25 #include "ui/gfx/skia_util.h"
26 #include "ui/gfx/switches.h" 26 #include "ui/gfx/switches.h"
27 #include "ui/gfx/text_elider.h" 27 #include "ui/gfx/text_elider.h"
28 #include "ui/gfx/text_utils.h" 28 #include "ui/gfx/text_utils.h"
29 #include "ui/gfx/utf16_indexing.h" 29 #include "ui/gfx/utf16_indexing.h"
30 30
31 namespace gfx { 31 namespace gfx {
32 32
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 SetDisplayOffset(display_offset_.x() + delta_x); 1413 SetDisplayOffset(display_offset_.x() + delta_x);
1414 } 1414 }
1415 1415
1416 void RenderText::DrawSelection(Canvas* canvas) { 1416 void RenderText::DrawSelection(Canvas* canvas) {
1417 const std::vector<Rect> sel = GetSubstringBounds(selection()); 1417 const std::vector<Rect> sel = GetSubstringBounds(selection());
1418 for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i) 1418 for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
1419 canvas->FillRect(*i, selection_background_focused_color_); 1419 canvas->FillRect(*i, selection_background_focused_color_);
1420 } 1420 }
1421 1421
1422 } // namespace gfx 1422 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/render_text.h ('k') | ui/gfx/screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698