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

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: 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/FrameFetchContext.cpp ('k') | Source/core/loader/LinkLoader.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) 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 // Prevent the immediate creation of a ResourceLoader (and therefore a n etwork 292 // Prevent the immediate creation of a ResourceLoader (and therefore a n etwork
293 // request) for ImageDocument loads. In this case, the image contents ha ve already 293 // request) for ImageDocument loads. In this case, the image contents ha ve already
294 // been requested as a main resource and ImageDocumentParser will take c are of 294 // been requested as a main resource and ImageDocumentParser will take c are of
295 // funneling the main resource bytes into the ImageResource. 295 // funneling the main resource bytes into the ImageResource.
296 if (m_loadingImageDocument) { 296 if (m_loadingImageDocument) {
297 request.setDefer(FetchRequest::DeferredByClient); 297 request.setDefer(FetchRequest::DeferredByClient);
298 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy); 298 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
299 } 299 }
300 300
301 newImage = document.fetcher()->fetchImage(request); 301 newImage = ImageResource::fetch(request, document.fetcher());
302 if (m_loadingImageDocument && newImage) 302 if (m_loadingImageDocument && newImage)
303 newImage->setLoading(true); 303 newImage->setLoading(true);
304 304
305 if (!newImage && !pageIsBeingDismissed(&document)) { 305 if (!newImage && !pageIsBeingDismissed(&document)) {
306 crossSiteOrCSPViolationOccurred(imageSourceURL); 306 crossSiteOrCSPViolationOccurred(imageSourceURL);
307 dispatchErrorEvent(); 307 dispatchErrorEvent();
308 } else { 308 } else {
309 clearFailedLoadURL(); 309 clearFailedLoadURL();
310 } 310 }
311 } else { 311 } else {
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 #endif 651 #endif
652 } 652 }
653 653
654 #if ENABLE(OILPAN) 654 #if ENABLE(OILPAN)
655 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 655 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
656 { 656 {
657 m_loader.willRemoveClient(m_client); 657 m_loader.willRemoveClient(m_client);
658 } 658 }
659 #endif 659 #endif
660 } 660 }
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/core/loader/LinkLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698