-
simonjam@chromium.org authored
https://bugs.webkit.org/show_bug.cgi?id=102151 Reviewed by Adam Barth. Source/WebCore: There's a FIXME that we have too many FrameLoader::load*() functions. This patch consolidates 3 into 1. There are still a few more load functions that will be consolidated later. Using FrameLoadRequest as the interface into FrameLoader will also provide a place to pass in the initiator. Finally, this matches the refactoring done with CachedResourceRequest and CachedResourceLoader. No new tests. No change in functionality. * WebCore.exp.in: * loader/FrameLoadRequest.h: (WebCore::FrameLoadRequest::FrameLoadRequest): (WebCore::FrameLoadRequest::setLockHistory): These are former arguments to load(). (WebCore::FrameLoadRequest::lockHistory): Ditto. (FrameLoadRequest): (WebCore::FrameLoadRequest::setShouldCheckNewWindowPolicy): Ditto. (WebCore::FrameLoadRequest::shouldCheckNewWindowPolicy): Ditto. (WebCore::FrameLoadRequest::substituteData): Ditto. (WebCore::FrameLoadRequest::setSubstituteData): Ditto. (WebCore::FrameLoadRequest::hasSubstituteData): Ditto. * loader/FrameLoader.cpp: (WebCore::FrameLoader::load): No change in behavior, just merged it all into one function. * loader/FrameLoader.h: (FrameLoader): * page/DragController.cpp: (WebCore::DragController::performDrag): Source/WebKit/blackberry: * Api/WebPage.cpp: (BlackBerry::WebKit::WebPagePrivate::load): (BlackBerry::WebKit::WebPagePrivate::loadString): * WebCoreSupport/FrameLoaderClientBlackBerry.cpp: (WebCore::FrameLoaderClientBlackBerry::dispatchDidFailProvisionalLoad): Source/WebKit/chromium: * src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::loadRequest): (WebKit::WebFrameImpl::loadData): * src/WebSharedWorkerImpl.cpp: (WebKit::WebSharedWorkerImpl::initializeLoader): Source/WebKit/efl: * ewk/ewk_frame.cpp: (_ewk_frame_contents_set_internal): Source/WebKit/gtk: * webkit/webkitwebframe.cpp: (webkit_web_frame_load_uri): (webkit_web_frame_load_data): (webkit_web_frame_load_request): Source/WebKit/mac: * Plugins/WebPluginController.mm: * WebView/WebFrame.mm: (-[WebFrame loadRequest:]): (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]): Source/WebKit/qt: * Api/qwebframe.cpp: (QWebFrame::QWebFrame): (QWebFrame::load): (QWebFrame::setHtml): (QWebFrame::setContent): * WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::setAlternateHtml): (qt_dump_set_accepts_editing): * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::callErrorPageExtension): Source/WebKit/win: * WebFrame.cpp: (WebFrame::loadRequest): (WebFrame::loadData): Source/WebKit/wince: * WebView.cpp: (WebView::load): Source/WebKit/wx: * WebFrame.cpp: (WebKit::WebFrame::SetPageSource): Source/WebKit2: * WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::performFrameLoadURLRequest): * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::loadURLRequest): (WebKit::WebPage::loadData): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
c98850bc