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

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

Issue 68483006: Remove ComplexTextController dependency on core (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unneeded includes too Created 7 years, 1 month 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
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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume d, glyphName); 240 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume d, glyphName);
241 #endif 241 #endif
242 242
243 charsConsumed = run.length(); 243 charsConsumed = run.length();
244 glyphName = ""; 244 glyphName = "";
245 return width(run); 245 return width(run);
246 } 246 }
247 247
248 #if !OS(MACOSX) 248 #if !OS(MACOSX)
249 249
250 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const 250 PassOwnPtr<TextLayout> Font::createLayout(const TextRun&, unsigned, float, bool) const
251 { 251 {
252 return nullptr; 252 return nullptr;
253 } 253 }
254 254
255 void Font::deleteLayout(TextLayout*) 255 void Font::deleteLayout(TextLayout*)
256 { 256 {
257 } 257 }
258 258
259 float Font::width(TextLayout&, unsigned, unsigned, HashSet<const SimpleFontData* >*) 259 float Font::width(TextLayout&, unsigned, unsigned, HashSet<const SimpleFontData* >*)
260 { 260 {
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 } 689 }
690 690
691 void Font::willUseFontData() const 691 void Font::willUseFontData() const
692 { 692 {
693 const FontFamily& family = fontDescription().family(); 693 const FontFamily& family = fontDescription().family();
694 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami lyIsEmpty()) 694 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami lyIsEmpty())
695 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f amily.family()); 695 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f amily.family());
696 } 696 }
697 697
698 } 698 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698