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

Unified Diff: Source/WebCore/dom/Document.h

Issue 8273018: Merge 97402 - Source/WebCore: Register custom fonts at their creation time, rather than at retire... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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/WebCore/css/CSSSegmentedFontFace.cpp ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/Document.h
===================================================================
--- Source/WebCore/dom/Document.h (revision 97402)
+++ Source/WebCore/dom/Document.h (working copy)
@@ -548,7 +548,7 @@
PassRefPtr<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*);
PassRefPtr<RenderStyle> styleForPage(int pageIndex);
- void retireCustomFont(FontData*);
+ void registerCustomFont(FontData*);
// Returns true if page box (margin boxes and page borders) is visible.
bool isPageBoxVisible(int pageIndex);
@@ -1139,7 +1139,7 @@
void createStyleSelector();
- void deleteRetiredCustomFonts();
+ void deleteCustomFonts();
PassRefPtr<NodeList> handleZeroPadding(const HitTestRequest&, HitTestResult&) const;
@@ -1154,7 +1154,7 @@
OwnPtr<CSSStyleSelector> m_styleSelector;
bool m_didCalculateStyleSelector;
bool m_hasDirtyStyleSelector;
- Vector<OwnPtr<FontData> > m_retiredCustomFonts;
+ Vector<OwnPtr<FontData> > m_customFonts;
mutable RefPtr<CSSPrimitiveValueCache> m_cssPrimitiveValueCache;
« no previous file with comments | « Source/WebCore/css/CSSSegmentedFontFace.cpp ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698