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

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

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/Font.h ('k') | Source/core/platform/graphics/FontCache.h » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 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, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 #if ENABLE(SVG_FONTS) 244 #if ENABLE(SVG_FONTS)
245 if (TextRun::RenderingContext* renderingContext = run.renderingContext()) 245 if (TextRun::RenderingContext* renderingContext = run.renderingContext())
246 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume d, glyphName); 246 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume d, glyphName);
247 #endif 247 #endif
248 248
249 charsConsumed = run.length(); 249 charsConsumed = run.length();
250 glyphName = ""; 250 glyphName = "";
251 return width(run); 251 return width(run);
252 } 252 }
253 253
254 #if !OS(DARWIN) 254 #if !OS(MACOSX)
255 255
256 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const 256 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
257 { 257 {
258 return nullptr; 258 return nullptr;
259 } 259 }
260 260
261 void Font::deleteLayout(TextLayout*) 261 void Font::deleteLayout(TextLayout*)
262 { 262 {
263 } 263 }
264 264
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 } 695 }
696 696
697 void Font::willUseFontData() const 697 void Font::willUseFontData() const
698 { 698 {
699 const FontFamily& family = fontDescription().family(); 699 const FontFamily& family = fontDescription().family();
700 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami lyIsEmpty()) 700 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami lyIsEmpty())
701 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f amily.family()); 701 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f amily.family());
702 } 702 }
703 703
704 } 704 }
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/Font.h ('k') | Source/core/platform/graphics/FontCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698