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

Unified Diff: third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h

Issue 2620293002: Remove CSSFontSelector argument and member from CSSSegmentedFontFace (Closed)
Patch Set: Update test for CL comments Created 3 years, 10 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
Index: third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
diff --git a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
index 6d759a08712e42c1b11e3967bc4add8712bbf148..0621f62b9e0aa2f33edd678232817cd6ba490a9a 100644
--- a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
+++ b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
@@ -38,7 +38,7 @@
namespace blink {
-class CSSFontSelector;
+class Document;
class FontData;
class FontDescription;
class FontFace;
@@ -47,13 +47,11 @@ class SegmentedFontData;
class CSSSegmentedFontFace final
: public GarbageCollectedFinalized<CSSSegmentedFontFace> {
public:
- static CSSSegmentedFontFace* create(CSSFontSelector* selector,
- FontTraits traits) {
- return new CSSSegmentedFontFace(selector, traits);
+ static CSSSegmentedFontFace* create(FontTraits traits) {
+ return new CSSSegmentedFontFace(traits);
}
~CSSSegmentedFontFace();
- CSSFontSelector* fontSelector() const { return m_fontSelector; }
FontTraits traits() const { return m_traits; }
// Called when status of a FontFace has changed (e.g. loaded or timed out)
@@ -68,8 +66,10 @@ class CSSSegmentedFontFace final
bool checkFont(const String&) const;
void match(const String&, HeapVector<Member<FontFace>>&) const;
- void willUseFontData(const FontDescription&, const String& text);
- void willUseRange(const FontDescription&, const blink::FontDataForRangeSet&);
+ void willUseFontData(Document*, const FontDescription&, const String& text);
+ void willUseRange(Document*,
+ const FontDescription&,
+ const blink::FontDataForRangeSet&);
size_t approximateCharacterCount() const {
return m_approximateCharacterCount;
}
@@ -77,14 +77,13 @@ class CSSSegmentedFontFace final
DECLARE_TRACE();
private:
- CSSSegmentedFontFace(CSSFontSelector*, FontTraits);
+ CSSSegmentedFontFace(FontTraits);
void pruneTable();
bool isValid() const;
using FontFaceList = HeapListHashSet<Member<FontFace>>;
- Member<CSSFontSelector> m_fontSelector;
FontTraits m_traits;
HashMap<FontCacheKey,
RefPtr<SegmentedFontData>,
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSFontSelector.cpp ('k') | third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698