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

Side by Side Diff: Source/core/svg/SVGFEImageElement.cpp

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 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/loader/TextTrackLoader.cpp ('k') | Source/core/svg/SVGUseElement.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) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org> 4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 m_cachedImage->removeClient(this); 76 m_cachedImage->removeClient(this);
77 m_cachedImage = 0; 77 m_cachedImage = 0;
78 } 78 }
79 79
80 removeAllOutgoingReferences(); 80 removeAllOutgoingReferences();
81 } 81 }
82 82
83 void SVGFEImageElement::fetchImageResource() 83 void SVGFEImageElement::fetchImageResource()
84 { 84 {
85 FetchRequest request(ResourceRequest(ownerDocument()->completeURL(hrefString ())), localName()); 85 FetchRequest request(ResourceRequest(ownerDocument()->completeURL(hrefString ())), localName());
86 m_cachedImage = document().fetcher()->fetchImage(request); 86 m_cachedImage = ImageResource::fetch(request, document().fetcher());
87 87
88 if (m_cachedImage) 88 if (m_cachedImage)
89 m_cachedImage->addClient(this); 89 m_cachedImage->addClient(this);
90 } 90 }
91 91
92 void SVGFEImageElement::buildPendingResource() 92 void SVGFEImageElement::buildPendingResource()
93 { 93 {
94 clearResourceReferences(); 94 clearResourceReferences();
95 if (!inDocument()) 95 if (!inDocument())
96 return; 96 return;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 158 }
159 159
160 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter) 160 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
161 { 161 {
162 if (m_cachedImage) 162 if (m_cachedImage)
163 return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObj ect(layoutObject()), m_preserveAspectRatio->currentValue()); 163 return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObj ect(layoutObject()), m_preserveAspectRatio->currentValue());
164 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue()); 164 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue());
165 } 165 }
166 166
167 } 167 }
OLDNEW
« no previous file with comments | « Source/core/loader/TextTrackLoader.cpp ('k') | Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698