summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 16:30:50 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 16:30:50 +0000
commit2903f3b113ecdc3fa64076c4d31a78f79e6fe2e6 (patch)
tree5186019b43d30eadb760d6a6581db3b4bad0a4d9 /webkit/glue/webframe_impl.cc
parent98506935a9ca52b1b083c0b3c08088becb52439e (diff)
downloadchromium_src-2903f3b113ecdc3fa64076c4d31a78f79e6fe2e6.zip
chromium_src-2903f3b113ecdc3fa64076c4d31a78f79e6fe2e6.tar.gz
chromium_src-2903f3b113ecdc3fa64076c4d31a78f79e6fe2e6.tar.bz2
Merge WebDocumentLoaderImpl into WebDataSourceImpl. They are peers, and it is
really silly to have them be separate classes. I chose to eliminate WebDocumentLoaderImpl in favor of WebDataSourceImpl since the interface that the outside world sees is named WebDataSource. R=dglazkov Review URL: http://codereview.chromium.org/46028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r--webkit/glue/webframe_impl.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 4894a7d..4f71ec3 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -137,7 +137,6 @@ MSVC_POP_WARNING();
#include "webkit/glue/dom_operations_private.h"
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/glue_util.h"
-#include "webkit/glue/webdocumentloader_impl.h"
#include "webkit/glue/webdatasource_impl.h"
#include "webkit/glue/weberror_impl.h"
#include "webkit/glue/webframe_impl.h"
@@ -544,8 +543,7 @@ void WebFrameImpl::LoadDocumentData(const KURL& base_url,
}
static WebDataSource* DataSourceForDocLoader(DocumentLoader* loader) {
- return (loader ?
- static_cast<WebDocumentLoaderImpl*>(loader)->GetDataSource() : NULL);
+ return loader ? WebDataSourceImpl::FromLoader(loader) : NULL;
}
WebDataSource* WebFrameImpl::GetDataSource() const {