Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 7 deletions

diff --git a/webkit/glue/webdatasource_impl.cc b/webkit/glue/webdatasource_impl.cc
index 7f018b2..3aca942 100644
--- a/webkit/glue/webdatasource_impl.cc
+++ b/webkit/glue/webdatasource_impl.cc
@@ -46,7 +46,7 @@ WebDataSourceImpl::WebDataSourceImpl(WebFrameImpl* frame,
                                      WebDocumentLoaderImpl* loader) :
   frame_(frame),
   loader_(loader),
-  initial_request_(loader->initialRequest()),
+  initial_request_(loader->originalRequest()),
   request_(loader->request()) {
 }
 
@@ -68,7 +68,7 @@ const WebRequest& WebDataSourceImpl::GetInitialRequest() const {
   // WebKit may change the frame load request as it sees fit, so we must sync
   // our request object.
   initial_request_.set_frame_load_request(
-      WebCore::FrameLoadRequest(loader_->initialRequest()));
+      WebCore::FrameLoadRequest(loader_->originalRequest()));
   return initial_request_;
 }
 
@@ -128,6 +128,10 @@ bool WebDataSourceImpl::IsFormSubmit() const {
   return loader_->is_form_submit();
 }
 
+std::wstring WebDataSourceImpl::GetPageTitle() const {
+  return webkit_glue::StringToStdWString(loader_->title());
+}
+
 /*
 See comment in webdatasource.h
 
@@ -152,11 +156,6 @@ bool WebDataSourceImpl::IsLoading() {
   DebugBreak();
 }
 
-std::wstring WebDataSourceImpl::GetPageTitle() {
-  DebugBreak();
-  return L"";
-}
-
 void WebDataSourceImpl::GetWebArchive(IWebArchive** archive) {
   DebugBreak();
 }