Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1868)

Unified Diff: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

Issue 400543004: Rename WebCore namespace to blink in Platform (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/mac/ComplexTextController.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
index 98b062f328c2a43b45d6384f18537682cfeb3645..d2ce51f0c02809d87c72266d4005c9c76c02ece5 100644
--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
+++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
@@ -41,19 +41,19 @@ CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stri
@interface WebCascadeList : NSArray {
@private
- const WebCore::Font* _font;
+ const blink::Font* _font;
UChar32 _character;
NSUInteger _count;
Vector<RetainPtr<CTFontDescriptorRef>, 16> _fontDescriptors;
}
-- (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character;
+- (id)initWithFont:(const blink::Font*)font character:(UChar32)character;
@end
@implementation WebCascadeList
-- (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character
+- (id)initWithFont:(const blink::Font*)font character:(UChar32)character
{
if (!(self = [super init]))
return nil;
@@ -83,7 +83,7 @@ CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stri
} else
_fontDescriptors.grow(index + 1);
- const WebCore::SimpleFontData* fontData = _font->fontDataAt(index)->fontDataForCharacter(_character);
+ const blink::SimpleFontData* fontData = _font->fontDataAt(index)->fontDataForCharacter(_character);
fontDescriptor = CTFontCopyFontDescriptor(fontData->platformData().ctFont());
_fontDescriptors[index] = RetainPtr<CTFontDescriptorRef>(AdoptCF, fontDescriptor);
return (id)fontDescriptor;
@@ -91,7 +91,7 @@ CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stri
@end
-namespace WebCore {
+namespace blink {
ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength, CFRange runRange)
: m_fontData(fontData)
@@ -294,4 +294,4 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
}
}
-} // namespace WebCore
+} // namespace blink
« no previous file with comments | « Source/platform/fonts/mac/ComplexTextController.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698