Source/WebCore/css/CSSFontSelector.h - Issue 7932007: Merge 94508 - <rdar://problem/10071256> Retain retired custom fonts until the next style recalc

Side by Side Diff: Source/WebCore/css/CSSFontSelector.h

Issue 7932007: Merge 94508 - <rdar://problem/10071256> Retain retired custom fonts until the next style recalc (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 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/WebCore/css/CSSFontFaceSource.cpp ('k') | Source/WebCore/css/CSSFontSelector.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52	52

53 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName);	53 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName);

54	54

55 void clearDocument() { m_document = 0; }	55 void clearDocument() { m_document = 0; }

56	56

57 void addFontFaceRule(const CSSFontFaceRule*);	57 void addFontFaceRule(const CSSFontFaceRule*);

58	58

59 void fontLoaded();	59 void fontLoaded();

60 virtual void fontCacheInvalidated();	60 virtual void fontCacheInvalidated();

61	61

	62 void retireCustomFont(FontData*);

	63

62 bool isEmpty() const;	64 bool isEmpty() const;

63	65

64 CachedResourceLoader* cachedResourceLoader() const;	66 CachedResourceLoader* cachedResourceLoader() const;

65	67

66 virtual void registerForInvalidationCallbacks(FontSelectorClient*);	68 virtual void registerForInvalidationCallbacks(FontSelectorClient*);

67 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*);	69 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*);

68	70

69 private:	71 private:

70 CSSFontSelector(Document*);	72 CSSFontSelector(Document*);

71	73

72 void dispatchInvalidationCallbacks();	74 void dispatchInvalidationCallbacks();

73	75

74 Document* m_document;	76 Document* m_document;

75 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_fontFaces;	77 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_fontFaces;

76 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_locallyIns talledFontFaces;	78 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_locallyIns talledFontFaces;

77 HashMap<String, HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >*, CaseFoldi ngHash> m_fonts;	79 HashMap<String, HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >*, CaseFoldi ngHash> m_fonts;

78 HashSet<FontSelectorClient*> m_clients;	80 HashSet<FontSelectorClient*> m_clients;

79 };	81 };

80	82

81 } // namespace WebCore	83 } // namespace WebCore

82	84

83 #endif // CSSFontSelector_h	85 #endif // CSSFontSelector_h

OLD	NEW