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

Side by Side Diff: Source/core/loader/ImageLoader.cpp

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 // Prevent the immediate creation of a ResourceLoader (and therefore a n etwork 301 // Prevent the immediate creation of a ResourceLoader (and therefore a n etwork
302 // request) for ImageDocument loads. In this case, the image contents ha ve already 302 // request) for ImageDocument loads. In this case, the image contents ha ve already
303 // been requested as a main resource and ImageDocumentParser will take c are of 303 // been requested as a main resource and ImageDocumentParser will take c are of
304 // funneling the main resource bytes into the ImageResource. 304 // funneling the main resource bytes into the ImageResource.
305 if (m_loadingImageDocument) { 305 if (m_loadingImageDocument) {
306 request.setDefer(FetchRequest::DeferredByClient); 306 request.setDefer(FetchRequest::DeferredByClient);
307 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy); 307 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
308 } 308 }
309 309
310 newImage = document.fetcher()->fetchImage(request); 310 newImage = ImageResource::fetch(request, document.fetcher());
311 if (m_loadingImageDocument && newImage) 311 if (m_loadingImageDocument && newImage)
312 newImage->setLoading(true); 312 newImage->setLoading(true);
313 313
314 if (!newImage && !pageIsBeingDismissed(&document)) { 314 if (!newImage && !pageIsBeingDismissed(&document)) {
315 crossSiteOrCSPViolationOccurred(imageSourceURL); 315 crossSiteOrCSPViolationOccurred(imageSourceURL);
316 dispatchErrorEvent(); 316 dispatchErrorEvent();
317 } else { 317 } else {
318 clearFailedLoadURL(); 318 clearFailedLoadURL();
319 } 319 }
320 } else { 320 } else {
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 #endif 660 #endif
661 } 661 }
662 662
663 #if ENABLE(OILPAN) 663 #if ENABLE(OILPAN)
664 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 664 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
665 { 665 {
666 m_loader.willRemoveClient(m_client); 666 m_loader.willRemoveClient(m_client);
667 } 667 }
668 #endif 668 #endif
669 } 669 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698