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

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

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 | « Source/core/css/CSSFontFaceSrcValue.h ('k') | no next file » | 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, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010 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 21 matching lines...) Expand all
32 #include "core/dom/Node.h" 32 #include "core/dom/Node.h"
33 #include "core/fetch/FetchRequest.h" 33 #include "core/fetch/FetchRequest.h"
34 #include "core/fetch/FontResource.h" 34 #include "core/fetch/FontResource.h"
35 #include "core/fetch/ResourceFetcher.h" 35 #include "core/fetch/ResourceFetcher.h"
36 #include "core/svg/SVGFontFaceElement.h" 36 #include "core/svg/SVGFontFaceElement.h"
37 #include "platform/fonts/FontCustomPlatformData.h" 37 #include "platform/fonts/FontCustomPlatformData.h"
38 #include "wtf/text/StringBuilder.h" 38 #include "wtf/text/StringBuilder.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 void CSSFontFaceSrcValue::traceAfterDispatch(Visitor* visitor)
43 {
44 #if ENABLE(SVG_FONTS)
45 visitor->trace(m_svgFontFaceElement);
46 #endif
47 CSSValue::traceAfterDispatch(visitor);
48 }
49
50 #if ENABLE(SVG_FONTS) 42 #if ENABLE(SVG_FONTS)
51 bool CSSFontFaceSrcValue::isSVGFontFaceSrc() const 43 bool CSSFontFaceSrcValue::isSVGFontFaceSrc() const
52 { 44 {
53 return equalIgnoringCase(m_format, "svg"); 45 return equalIgnoringCase(m_format, "svg");
54 } 46 }
55 #endif 47 #endif
56 48
57 bool CSSFontFaceSrcValue::isSupportedFormat() const 49 bool CSSFontFaceSrcValue::isSupportedFormat() const
58 { 50 {
59 // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face, 51 // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css); 125 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css);
134 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache); 126 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache);
135 } 127 }
136 128
137 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const 129 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
138 { 130 {
139 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource; 131 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource;
140 } 132 }
141 133
142 } 134 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceSrcValue.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698