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

Side by Side Diff: Source/core/platform/graphics/Font.h

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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 unified diff | Download patch
« no previous file with comments | « Source/core/platform/graphics/FloatSize.h ('k') | Source/core/platform/graphics/Font.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 int emphasisMarkAscent(const AtomicString&) const; 140 int emphasisMarkAscent(const AtomicString&) const;
141 int emphasisMarkDescent(const AtomicString&) const; 141 int emphasisMarkDescent(const AtomicString&) const;
142 int emphasisMarkHeight(const AtomicString&) const; 142 int emphasisMarkHeight(const AtomicString&) const;
143 143
144 const SimpleFontData* primaryFont() const; 144 const SimpleFontData* primaryFont() const;
145 const FontData* fontDataAt(unsigned) const; 145 const FontData* fontDataAt(unsigned) const;
146 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria nt variant = AutoVariant) const 146 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria nt variant = AutoVariant) const
147 { 147 {
148 return glyphDataAndPageForCharacter(c, mirror, variant).first; 148 return glyphDataAndPageForCharacter(c, mirror, variant).first;
149 } 149 }
150 #if OS(DARWIN) 150 #if OS(MACOSX)
151 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si ze_t length, FontDataVariant) const; 151 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si ze_t length, FontDataVariant) const;
152 #endif 152 #endif
153 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const; 153 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const;
154 bool primaryFontHasGlyphForCharacter(UChar32) const; 154 bool primaryFontHasGlyphForCharacter(UChar32) const;
155 155
156 static bool isCJKIdeograph(UChar32); 156 static bool isCJKIdeograph(UChar32);
157 static bool isCJKIdeographOrSymbol(UChar32); 157 static bool isCJKIdeographOrSymbol(UChar32);
158 158
159 static unsigned expansionOpportunityCount(const LChar*, size_t length, TextD irection, bool& isAfterExpansion); 159 static unsigned expansionOpportunityCount(const LChar*, size_t length, TextD irection, bool& isAfterExpansion);
160 static unsigned expansionOpportunityCount(const UChar*, size_t length, TextD irection, bool& isAfterExpansion); 160 static unsigned expansionOpportunityCount(const UChar*, size_t length, TextD irection, bool& isAfterExpansion);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 333
334 } 334 }
335 335
336 namespace WTF { 336 namespace WTF {
337 337
338 template <> void deleteOwnedPtr<WebCore::TextLayout>(WebCore::TextLayout*); 338 template <> void deleteOwnedPtr<WebCore::TextLayout>(WebCore::TextLayout*);
339 339
340 } 340 }
341 341
342 #endif 342 #endif
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/FloatSize.h ('k') | Source/core/platform/graphics/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698