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

Side by Side Diff: Source/core/css/CSSFontFaceSrcValue.h

Issue 337703004: Revert of Oilpan: Trace CSSFontFaceSrcValue::m_svgFontFaceElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/css/CSSFontFaceSrcValue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #endif 66 #endif
67 67
68 String customCSSText() const; 68 String customCSSText() const;
69 69
70 bool hasFailedOrCanceledSubresources() const; 70 bool hasFailedOrCanceledSubresources() const;
71 71
72 FontResource* fetch(Document*); 72 FontResource* fetch(Document*);
73 73
74 bool equals(const CSSFontFaceSrcValue&) const; 74 bool equals(const CSSFontFaceSrcValue&) const;
75 75
76 void traceAfterDispatch(Visitor*); 76 void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(vis itor); }
77 77
78 private: 78 private:
79 CSSFontFaceSrcValue(const String& resource, bool local) 79 CSSFontFaceSrcValue(const String& resource, bool local)
80 : CSSValue(FontFaceSrcClass) 80 : CSSValue(FontFaceSrcClass)
81 , m_resource(resource) 81 , m_resource(resource)
82 , m_isLocal(local) 82 , m_isLocal(local)
83 #if ENABLE(SVG_FONTS) 83 #if ENABLE(SVG_FONTS)
84 , m_svgFontFaceElement(nullptr) 84 , m_svgFontFaceElement(0)
85 #endif 85 #endif
86 { 86 {
87 } 87 }
88 88
89 void restoreCachedResourceIfNeeded(Document*); 89 void restoreCachedResourceIfNeeded(Document*);
90 bool shouldSetCrossOriginAccessControl(const KURL& resource, SecurityOrigin* ); 90 bool shouldSetCrossOriginAccessControl(const KURL& resource, SecurityOrigin* );
91 91
92 String m_resource; 92 String m_resource;
93 String m_format; 93 String m_format;
94 Referrer m_referrer; 94 Referrer m_referrer;
95 bool m_isLocal; 95 bool m_isLocal;
96 96
97 ResourcePtr<FontResource> m_fetched; 97 ResourcePtr<FontResource> m_fetched;
98 98
99 #if ENABLE(SVG_FONTS) 99 #if ENABLE(SVG_FONTS)
100 RawPtrWillBeMember<SVGFontFaceElement> m_svgFontFaceElement; 100 SVGFontFaceElement* m_svgFontFaceElement;
101 #endif 101 #endif
102 }; 102 };
103 103
104 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue()); 104 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue());
105 105
106 } 106 }
107 107
108 #endif 108 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSFontFaceSrcValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698