| 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 "content/child/browser_font_resource_trusted.h" | 5 #include "content/child/browser_font_resource_trusted.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 9 #include "base/macros.h" |
| 7 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/common/web_preferences.h" | 12 #include "content/public/common/web_preferences.h" |
| 10 #include "ppapi/proxy/connection.h" | 13 #include "ppapi/proxy/connection.h" |
| 11 #include "ppapi/shared_impl/ppapi_preferences.h" | 14 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 12 #include "ppapi/shared_impl/var.h" | 15 #include "ppapi/shared_impl/var.h" |
| 13 #include "ppapi/thunk/enter.h" | 16 #include "ppapi/thunk/enter.h" |
| 14 #include "ppapi/thunk/ppb_image_data_api.h" | 17 #include "ppapi/thunk/ppb_image_data_api.h" |
| 15 #include "ppapi/thunk/thunk.h" | 18 #include "ppapi/thunk/thunk.h" |
| 16 #include "skia/ext/platform_canvas.h" | 19 #include "skia/ext/platform_canvas.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 | 444 |
| 442 // Advance to the next run. Note that we avoid doing this for the last run | 445 // Advance to the next run. Note that we avoid doing this for the last run |
| 443 // since it's unnecessary, measuring text is slow, and most of the time | 446 // since it's unnecessary, measuring text is slow, and most of the time |
| 444 // there will be only one run anyway. | 447 // there will be only one run anyway. |
| 445 if (i != runs.num_runs() - 1) | 448 if (i != runs.num_runs() - 1) |
| 446 web_position.x += font_->calculateWidth(run); | 449 web_position.x += font_->calculateWidth(run); |
| 447 } | 450 } |
| 448 } | 451 } |
| 449 | 452 |
| 450 } // namespace content | 453 } // namespace content |
| OLD | NEW |