OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 13 matching lines...) Expand all Loading... |
24 | 24 |
25 #include "config.h" | 25 #include "config.h" |
26 | 26 |
27 #include "core/platform/graphics/mac/ComplexTextController.h" | 27 #include "core/platform/graphics/mac/ComplexTextController.h" |
28 | 28 |
29 #include "core/platform/graphics/Font.h" | 29 #include "core/platform/graphics/Font.h" |
30 #include "core/platform/graphics/FontCache.h" | 30 #include "core/platform/graphics/FontCache.h" |
31 #include "core/platform/graphics/TextRun.h" | 31 #include "core/platform/graphics/TextRun.h" |
32 | 32 |
33 #include <ApplicationServices/ApplicationServices.h> | 33 #include <ApplicationServices/ApplicationServices.h> |
| 34 #import <AvailabilityMacros.h> |
34 | 35 |
35 // Forward declare Mac SPIs. | 36 // Forward declare Mac SPIs. |
36 extern "C" { | 37 extern "C" { |
37 // Request for public API: rdar://13803619 | 38 // Request for public API: rdar://13803619 |
38 CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stri
ngIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (
*dispose)(const UniChar* chars, void* context), void* context); | 39 CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stri
ngIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (
*dispose)(const UniChar* chars, void* context), void* context); |
39 } | 40 } |
40 | 41 |
41 @interface WebCascadeList : NSArray { | 42 @interface WebCascadeList : NSArray { |
42 @private | 43 @private |
43 const WebCore::Font* _font; | 44 const WebCore::Font* _font; |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 } | 288 } |
288 } | 289 } |
289 if (m_fallbackFonts && runFontData != m_font.primaryFont()) | 290 if (m_fallbackFonts && runFontData != m_font.primaryFont()) |
290 m_fallbackFonts->add(fontData); | 291 m_fallbackFonts->add(fontData); |
291 | 292 |
292 m_complexTextRuns.append(ComplexTextRun::create(ctRun, runFontData, cp,
stringLocation, length, runRange)); | 293 m_complexTextRuns.append(ComplexTextRun::create(ctRun, runFontData, cp,
stringLocation, length, runRange)); |
293 } | 294 } |
294 } | 295 } |
295 | 296 |
296 } // namespace WebCore | 297 } // namespace WebCore |
OLD | NEW |