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

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

Issue 6469011: Merge 76990 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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 unified diff | Download patch
OLDNEW
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 void setFontFace(CSSFontFace* face) { m_face = face; } 57 void setFontFace(CSSFontFace* face) { m_face = face; }
58 58
59 virtual void fontLoaded(CachedFont*); 59 virtual void fontLoaded(CachedFont*);
60 60
61 SimpleFontData* getFontData(const FontDescription&, bool syntheticBold, bool syntheticItalic, CSSFontSelector*); 61 SimpleFontData* getFontData(const FontDescription&, bool syntheticBold, bool syntheticItalic, CSSFontSelector*);
62 62
63 void pruneTable(); 63 void pruneTable();
64 64
65 #if ENABLE(SVG_FONTS) 65 #if ENABLE(SVG_FONTS)
66 SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement ; } 66 SVGFontFaceElement* svgFontFaceElement() const;
67 void setSVGFontFaceElement(SVGFontFaceElement* element) { m_svgFontFaceEleme nt = element; } 67 void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>);
68 bool isSVGFontFaceSource() const; 68 bool isSVGFontFaceSource() const;
69 #endif 69 #endif
70 70
71 private: 71 private:
72 AtomicString m_string; // URI for remote, built-in font name for local. 72 AtomicString m_string; // URI for remote, built-in font name for local.
73 CachedResourceHandle<CachedFont> m_font; // For remote fonts, a pointer to o ur cached resource. 73 CachedResourceHandle<CachedFont> m_font; // For remote fonts, a pointer to o ur cached resource.
74 CSSFontFace* m_face; // Our owning font face. 74 CSSFontFace* m_face; // Our owning font face.
75 HashMap<unsigned, SimpleFontData*> m_fontDataTable; // The hash key is compo sed of size synthetic styles. 75 HashMap<unsigned, SimpleFontData*> m_fontDataTable; // The hash key is compo sed of size synthetic styles.
76 76
77 #if ENABLE(SVG_FONTS) 77 #if ENABLE(SVG_FONTS)
78 SVGFontFaceElement* m_svgFontFaceElement; 78 RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
79 RefPtr<SVGFontElement> m_externalSVGFontElement; 79 RefPtr<SVGFontElement> m_externalSVGFontElement;
80 #endif 80 #endif
81 }; 81 };
82 82
83 } 83 }
84 84
85 #endif 85 #endif
OLDNEW
« no previous file with comments | « LayoutTests/svg/custom/use-multiple-on-nested-disallowed-font-expected.txt ('k') | Source/WebCore/css/CSSFontFaceSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698