-
dimich@chromium.org authored
https://bugs.webkit.org/show_bug.cgi?id=66165 Reviewed by Darin Fisher. Source/WebCore: No new tests since no change in behavior. The original issue is only reproducible on Chromium in multi-process mode and is tested there by a browsertest. * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::transferLoadingResourcesFromPage): Passing ResourceLoader* into the FrameLoaderClient notification. Also, fixed the bug where the same ResourceRequest was passed for all subresources. * loader/EmptyClients.h: (WebCore::EmptyFrameLoaderClient::transferLoadingResourceFromPage): * loader/FrameLoader.cpp: (WebCore::FrameLoader::dispatchTransferLoadingResourceFromPage): * loader/FrameLoader.h: * loader/FrameLoaderClient.h: * loader/ResourceLoadNotifier.cpp: (WebCore::ResourceLoadNotifier::dispatchTransferLoadingResourceFromPage): * loader/ResourceLoadNotifier.h: * loader/ResourceLoader.cpp: (WebCore::ResourceLoader::init): * loader/ResourceLoader.h: (WebCore::ResourceLoader::originalRequest): Added the originalRequest() accessor that returns the request as it existed before redirects (but after client's will SendRequest). This is to be able to pass the original request for loading subresources into FrameLoaderClient::transferLoadingResourceFromPage, since that one is used to invoke assignIdentifierToInitialRequest, which needs original request. Source/WebKit/chromium: * src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::transferLoadingResourceFromPage): * src/FrameLoaderClientImpl.h: Source/WebKit/efl: * WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::transferLoadingResourceFromPage): * WebCoreSupport/FrameLoaderClientEfl.h: Source/WebKit/gtk: * WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::transferLoadingResourceFromPage): * WebCoreSupport/FrameLoaderClientGtk.h: Source/WebKit/haiku: * WebCoreSupport/FrameLoaderClientHaiku.cpp: (WebCore::FrameLoaderClientHaiku::transferLoadingResourceFromPage): * WebCoreSupport/FrameLoaderClientHaiku.h: Source/WebKit/mac: * WebCoreSupport/WebFrameLoaderClient.h: * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::transferLoadingResourceFromPage): Source/WebKit/qt: * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::transferLoadingResourceFromPage): * WebCoreSupport/FrameLoaderClientQt.h: Source/WebKit/win: * WebCoreSupport/WebFrameLoaderClient.cpp: (WebFrameLoaderClient::transferLoadingResourceFromPage): * WebCoreSupport/WebFrameLoaderClient.h: Source/WebKit/wince: * WebCoreSupport/FrameLoaderClientWinCE.cpp: (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage): * WebCoreSupport/FrameLoaderClientWinCE.h: Source/WebKit/wx: * WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::transferLoadingResourceFromPage): * WebKitSupport/FrameLoaderClientWx.h: Source/WebKit2: * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::transferLoadingResourceFromPage): * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@93066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
f261ddf9