Extract load times from WebDataSource. Move them to NavigationState.

Move PasswordForm into the webkit_glue namespace.

TEST=none
BUG=10041
R=brettw

Review URL: http://codereview.chromium.org/126190

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

1 files changed, 4 insertions, 26 deletions

diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index a4a77a9..5a31352 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -379,7 +379,6 @@ void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
 
   if (d)
     d->DidFinishDocumentLoadForFrame(webview, webframe_);
-  data_source->set_finish_document_load_time(base::Time::Now());
 }
 
 bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
@@ -683,21 +682,6 @@ void WebFrameLoaderClient::dispatchDidStartProvisionalLoad() {
     // about the client redirect the load is responsible for completing.
     d->DidStartProvisionalLoadForFrame(webview, webframe_,
                                        NavigationGestureForLastLoad());
-    DocumentLoader* documentLoader =
-        webframe_->frame()->loader()->activeDocumentLoader();
-    WebDataSourceImpl* dataSource =
-        WebDataSourceImpl::FromLoader(documentLoader);
-    if (dataSource->GetRequestTime().ToInternalValue() == 0) {
-      const Event *event = documentLoader->triggeringAction().event();
-      if (event) {
-        // If the request was generated by a click, we have to use the time
-        // from the event. Unfortunately this isn't tracked all the way from
-        // the platform event, but it will have to do
-        double eventTime = event->timeStamp() / 1000.0;
-        dataSource->set_request_time(Time::FromDoubleT(eventTime));
-      }
-    }
-    dataSource->set_start_load_time(base::Time::Now());
     if (completing_client_redirect)
       d->DidCompleteClientRedirect(webview, webframe_,
                                    expected_client_redirect_src_);
@@ -767,7 +751,6 @@ void WebFrameLoaderClient::dispatchDidFinishLoad() {
       WebDataSourceImpl::FromLoader(documentLoader);
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
-  dataSource->set_finish_load_time(base::Time::Now());
   if (d)
     d->DidFinishLoadForFrame(webview, webframe_);
   WebPluginDelegate* plg_delegate = webframe_->plugin_delegate();
@@ -780,15 +763,10 @@ void WebFrameLoaderClient::dispatchDidFinishLoad() {
 }
 
 void WebFrameLoaderClient::dispatchDidFirstLayout() {
- // FIXME: called when webkit finished layout of page.
- // All resources have not necessarily finished loading.
-  DocumentLoader* document_loader =
-    webframe_->frame()->loader()->documentLoader();
-  WebDataSourceImpl* ds =
-    WebDataSourceImpl::FromLoader(document_loader);
-  if (ds->GetFirstLayoutTime().ToInternalValue() == 0) {
-    ds->set_first_layout_time(base::Time::Now());
-  }
+  WebViewImpl* webview = webframe_->GetWebViewImpl();
+  WebViewDelegate* d = webview->delegate();
+  if (d)
+    d->DidFirstLayout(webview, webframe_);
 }
 
 void WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout() {