| OLD | NEW |
| 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 <limits.h> | 7 #include <limits.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <climits> | 10 #include <climits> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "third_party/skia/include/core/SkFontStyle.h" | 23 #include "third_party/skia/include/core/SkFontStyle.h" |
| 24 #include "third_party/skia/include/core/SkTypeface.h" | 24 #include "third_party/skia/include/core/SkTypeface.h" |
| 25 #include "third_party/skia/include/effects/SkGradientShader.h" | 25 #include "third_party/skia/include/effects/SkGradientShader.h" |
| 26 #include "third_party/skia/include/effects/SkMorphologyImageFilter.h" | 26 #include "third_party/skia/include/effects/SkMorphologyImageFilter.h" |
| 27 #include "ui/gfx/canvas.h" | 27 #include "ui/gfx/canvas.h" |
| 28 #include "ui/gfx/geometry/insets.h" | 28 #include "ui/gfx/geometry/insets.h" |
| 29 #include "ui/gfx/geometry/safe_integer_conversions.h" | 29 #include "ui/gfx/geometry/safe_integer_conversions.h" |
| 30 #include "ui/gfx/platform_font.h" | 30 #include "ui/gfx/platform_font.h" |
| 31 #include "ui/gfx/render_text_harfbuzz.h" | 31 #include "ui/gfx/render_text_harfbuzz.h" |
| 32 #include "ui/gfx/scoped_canvas.h" | 32 #include "ui/gfx/scoped_canvas.h" |
| 33 #include "ui/gfx/skia_paint_util.h" |
| 33 #include "ui/gfx/skia_util.h" | 34 #include "ui/gfx/skia_util.h" |
| 34 #include "ui/gfx/switches.h" | 35 #include "ui/gfx/switches.h" |
| 35 #include "ui/gfx/text_elider.h" | 36 #include "ui/gfx/text_elider.h" |
| 36 #include "ui/gfx/text_utils.h" | 37 #include "ui/gfx/text_utils.h" |
| 37 #include "ui/gfx/utf16_indexing.h" | 38 #include "ui/gfx/utf16_indexing.h" |
| 38 | 39 |
| 39 #if defined(OS_MACOSX) | 40 #if defined(OS_MACOSX) |
| 40 #include "third_party/skia/include/ports/SkTypeface_mac.h" | 41 #include "third_party/skia/include/ports/SkTypeface_mac.h" |
| 41 #include "ui/gfx/render_text_mac.h" | 42 #include "ui/gfx/render_text_mac.h" |
| 42 #endif // defined(OS_MACOSX) | 43 #endif // defined(OS_MACOSX) |
| (...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1710 | 1711 |
| 1711 for (; range_max < length; ++range_max) | 1712 for (; range_max < length; ++range_max) |
| 1712 if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max)) | 1713 if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max)) |
| 1713 break; | 1714 break; |
| 1714 | 1715 |
| 1715 return range.is_reversed() ? Range(range_max, range_min) | 1716 return range.is_reversed() ? Range(range_max, range_min) |
| 1716 : Range(range_min, range_max); | 1717 : Range(range_min, range_max); |
| 1717 } | 1718 } |
| 1718 | 1719 |
| 1719 } // namespace gfx | 1720 } // namespace gfx |
| OLD | NEW |