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_mac.h" | 5 #include "ui/gfx/render_text_mac.h" |
6 | 6 |
7 #include <ApplicationServices/ApplicationServices.h> | 7 #include <ApplicationServices/ApplicationServices.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <cmath> | 10 #include <cmath> |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 attributes, kCTUnderlineStyleAttributeName); | 332 attributes, kCTUnderlineStyleAttributeName); |
333 CTUnderlineStyle value = kCTUnderlineStyleNone; | 333 CTUnderlineStyle value = kCTUnderlineStyleNone; |
334 if (underline && CFNumberGetValue(underline, kCFNumberSInt32Type, &value)) | 334 if (underline && CFNumberGetValue(underline, kCFNumberSInt32Type, &value)) |
335 run->underline = (value == kCTUnderlineStyleSingle); | 335 run->underline = (value == kCTUnderlineStyleSingle); |
336 | 336 |
337 run_origin.offset(run_width, 0); | 337 run_origin.offset(run_width, 0); |
338 } | 338 } |
339 runs_valid_ = true; | 339 runs_valid_ = true; |
340 } | 340 } |
341 | 341 |
342 RenderText* RenderText::CreateInstance() { | 342 RenderText* RenderText::CreateNativeInstance() { |
343 return new RenderTextMac; | 343 return new RenderTextMac; |
344 } | 344 } |
345 | 345 |
346 } // namespace gfx | 346 } // namespace gfx |
OLD | NEW |