Changeset 96249 in webkit
- Timestamp:
- Sep 28, 2011, 12:55:44 PM (14 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r96239 r96249 1 2011-09-28 Nate Chapin <japhet@chromium.org> 2 3 Fix a regression in r96060. ResourceLoader shouldn't get 4 initialized with a null DocumentLoader. 5 https://bugs.webkit.org/show_bug.cgi?id=69004 6 7 Reviewed by Csaba Osztrogonác. 8 9 This should fix a debug crash in some platforms in 10 plugins/js-from-destroy.html 11 12 * loader/ResourceLoader.cpp: 13 (WebCore::ResourceLoader::init): Move the activeDocumentLoader() null checks back 14 to SubresouceLoader::create(). 15 * loader/SubresourceLoader.cpp: 16 (WebCore::SubresourceLoader::create): 17 1 18 2011-09-28 Adam Barth <abarth@webkit.org> 2 19 -
trunk/Source/WebCore/loader/ResourceLoader.cpp
r96060 r96249 114 114 ResourceRequest clientRequest(r); 115 115 116 FrameLoader* frameLoader = m_frame->loader();117 if (m_options.securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping())) {118 releaseResources();119 return false;120 }121 122 116 if (m_options.securityCheck == DoSecurityCheck && !m_frame->document()->securityOrigin()->canDisplay(clientRequest.url())) { 123 117 FrameLoader::reportLocalLoadFailed(m_frame.get(), clientRequest.url().string()); -
trunk/Source/WebCore/loader/SubresourceLoader.cpp
r96060 r96249 67 67 return 0; 68 68 69 FrameLoader* fl = frame->loader(); 69 FrameLoader* frameLoader = frame->loader(); 70 if (options.securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping())) 71 return 0; 72 70 73 ResourceRequest newRequest = request; 71 74 … … 77 80 String outgoingOrigin; 78 81 if (request.httpReferrer().isNull()) { 79 outgoingReferrer = f l->outgoingReferrer();80 outgoingOrigin = f l->outgoingOrigin();82 outgoingReferrer = frameLoader->outgoingReferrer(); 83 outgoingOrigin = frameLoader->outgoingOrigin(); 81 84 } else { 82 85 outgoingReferrer = request.httpReferrer(); … … 90 93 FrameLoader::addHTTPOriginIfNeeded(newRequest, outgoingOrigin); 91 94 92 f l->addExtraFieldsToSubresourceRequest(newRequest);95 frameLoader->addExtraFieldsToSubresourceRequest(newRequest); 93 96 94 97 RefPtr<SubresourceLoader> subloader(adoptRef(new SubresourceLoader(frame, client, options)));
Note:
See TracChangeset
for help on using the changeset viewer.