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

Side by Side Diff: Source/WebCore/loader/ResourceLoader.cpp

Issue 14188008: Move Data uri handling into WebCore Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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/WebCore/loader/DocumentLoader.cpp ('k') | Source/WebCore/loader/cache/CachedImage.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) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 void ResourceLoader::start() 157 void ResourceLoader::start()
158 { 158 {
159 ASSERT(!m_handle); 159 ASSERT(!m_handle);
160 ASSERT(!m_request.isNull()); 160 ASSERT(!m_request.isNull());
161 ASSERT(m_deferredRequest.isNull()); 161 ASSERT(m_deferredRequest.isNull());
162 162
163 if (m_documentLoader->scheduleArchiveLoad(this, m_request)) 163 if (m_documentLoader->scheduleArchiveLoad(this, m_request))
164 return; 164 return;
165 165
166 if (m_request.targetType() == ResourceRequest::TargetIsImage) {
167 if (m_documentLoader->scheduleDataUriLoad(this, m_request))
168 return;
169 }
170
166 if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_requ est, m_request.url())) 171 if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_requ est, m_request.url()))
167 return; 172 return;
168 173
169 if (m_defersLoading) { 174 if (m_defersLoading) {
170 m_deferredRequest = m_request; 175 m_deferredRequest = m_request;
171 return; 176 return;
172 } 177 }
173 178
174 if (!m_reachedTerminalState) 179 if (!m_reachedTerminalState)
175 m_handle = ResourceHandle::create(m_frame->loader()->networkingContext() , m_request, this, m_defersLoading, m_options.sniffContent == SniffContent); 180 m_handle = ResourceHandle::create(m_frame->loader()->networkingContext() , m_request, this, m_defersLoading, m_options.sniffContent == SniffContent);
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 info.addMember(m_originalRequest, "originalRequest"); 504 info.addMember(m_originalRequest, "originalRequest");
500 info.addMember(m_resourceData, "resourceData"); 505 info.addMember(m_resourceData, "resourceData");
501 info.addMember(m_deferredRequest, "deferredRequest"); 506 info.addMember(m_deferredRequest, "deferredRequest");
502 info.addMember(m_options, "options"); 507 info.addMember(m_options, "options");
503 info.addMember(m_resource, "resource"); 508 info.addMember(m_resource, "resource");
504 info.addMember(m_documentLoader, "documentLoader"); 509 info.addMember(m_documentLoader, "documentLoader");
505 info.addMember(m_requestCountTracker, "requestCountTracker"); 510 info.addMember(m_requestCountTracker, "requestCountTracker");
506 } 511 }
507 512
508 } 513 }
OLDNEW
« no previous file with comments | « Source/WebCore/loader/DocumentLoader.cpp ('k') | Source/WebCore/loader/cache/CachedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698