| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_harfbuzz.h" | 5 #include "ui/gfx/render_text_harfbuzz.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/i18n/bidi_line_iterator.h" | 10 #include "base/i18n/bidi_line_iterator.h" |
| (...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1357 continue; | 1357 continue; |
| 1358 #if defined(OS_WIN) | 1358 #if defined(OS_WIN) |
| 1359 if (family == uniscribe_family) | 1359 if (family == uniscribe_family) |
| 1360 continue; | 1360 continue; |
| 1361 #endif | 1361 #endif |
| 1362 if (fallback_fonts.find(family) != fallback_fonts.end()) | 1362 if (fallback_fonts.find(family) != fallback_fonts.end()) |
| 1363 continue; | 1363 continue; |
| 1364 | 1364 |
| 1365 fallback_fonts.insert(family); | 1365 fallback_fonts.insert(family); |
| 1366 | 1366 |
| 1367 FontRenderParamsQuery query(false); | 1367 FontRenderParamsQuery query; |
| 1368 query.families.push_back(family); | 1368 query.families.push_back(family); |
| 1369 query.pixel_size = run->font_size; | 1369 query.pixel_size = run->font_size; |
| 1370 query.style = run->font_style; | 1370 query.style = run->font_style; |
| 1371 FontRenderParams fallback_render_params = GetFontRenderParams(query, NULL); | 1371 FontRenderParams fallback_render_params = GetFontRenderParams(query, NULL); |
| 1372 if (CompareFamily(text, family, fallback_render_params, run, &best_family, | 1372 if (CompareFamily(text, family, fallback_render_params, run, &best_family, |
| 1373 &best_render_params, &best_missing_glyphs)) | 1373 &best_render_params, &best_missing_glyphs)) |
| 1374 return; | 1374 return; |
| 1375 } | 1375 } |
| 1376 | 1376 |
| 1377 if (!best_family.empty() && | 1377 if (!best_family.empty() && |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1556 DCHECK(!update_layout_run_list_); | 1556 DCHECK(!update_layout_run_list_); |
| 1557 DCHECK(!update_display_run_list_); | 1557 DCHECK(!update_display_run_list_); |
| 1558 return text_elided() ? display_run_list_.get() : &layout_run_list_; | 1558 return text_elided() ? display_run_list_.get() : &layout_run_list_; |
| 1559 } | 1559 } |
| 1560 | 1560 |
| 1561 const internal::TextRunList* RenderTextHarfBuzz::GetRunList() const { | 1561 const internal::TextRunList* RenderTextHarfBuzz::GetRunList() const { |
| 1562 return const_cast<RenderTextHarfBuzz*>(this)->GetRunList(); | 1562 return const_cast<RenderTextHarfBuzz*>(this)->GetRunList(); |
| 1563 } | 1563 } |
| 1564 | 1564 |
| 1565 } // namespace gfx | 1565 } // namespace gfx |
| OLD | NEW |