Index: chrome/renderer/loadtimes_extension_bindings.cc |
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc |
index b71b027a55f4475318c8e045a4d1c3ccda858ed5..91a0c2e8ac068b959228648951e8e593af392880 100644 |
--- a/chrome/renderer/loadtimes_extension_bindings.cc |
+++ b/chrome/renderer/loadtimes_extension_bindings.cc |
@@ -102,43 +102,45 @@ class LoadTimesExtensionWrapper : public v8::Extension { |
if (data_source) { |
NavigationState* navigation_state = |
NavigationState::FromDataSource(data_source); |
+ NavigationState::LoadTimes* navigation_times = |
+ navigation_state->load_times(); |
v8::Local<v8::Object> load_times = v8::Object::New(); |
load_times->Set( |
v8::String::New("requestTime"), |
- v8::Number::New(navigation_state->request_time().ToDoubleT())); |
+ v8::Number::New(navigation_times->request_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("startLoadTime"), |
- v8::Number::New(navigation_state->start_load_time().ToDoubleT())); |
+ v8::Number::New(navigation_times->start_load_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("commitLoadTime"), |
- v8::Number::New(navigation_state->commit_load_time().ToDoubleT())); |
+ v8::Number::New(navigation_times->commit_load_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("finishDocumentLoadTime"), |
v8::Number::New( |
- navigation_state->finish_document_load_time().ToDoubleT())); |
+ navigation_times->finish_document_load_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("finishLoadTime"), |
- v8::Number::New(navigation_state->finish_load_time().ToDoubleT())); |
+ v8::Number::New(navigation_times->finish_load_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("firstPaintTime"), |
- v8::Number::New(navigation_state->first_paint_time().ToDoubleT())); |
+ v8::Number::New(navigation_times->first_paint_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("firstPaintAfterLoadTime"), |
v8::Number::New( |
- navigation_state->first_paint_after_load_time().ToDoubleT())); |
+ navigation_times->first_paint_after_load_time().ToDoubleT())); |
load_times->Set( |
v8::String::New("navigationType"), |
v8::String::New(GetNavigationType(data_source->navigationType()))); |
load_times->Set( |
v8::String::New("wasFetchedViaSpdy"), |
- v8::Boolean::New(navigation_state->was_fetched_via_spdy())); |
+ v8::Boolean::New(navigation_times->was_fetched_via_spdy())); |
load_times->Set( |
v8::String::New("wasNpnNegotiated"), |
- v8::Boolean::New(navigation_state->was_npn_negotiated())); |
+ v8::Boolean::New(navigation_times->was_npn_negotiated())); |
load_times->Set( |
v8::String::New("wasAlternateProtocolAvailable"), |
v8::Boolean::New( |
- navigation_state->was_alternate_protocol_available())); |
+ navigation_times->was_alternate_protocol_available())); |
return load_times; |
} |
} |
@@ -152,12 +154,14 @@ class LoadTimesExtensionWrapper : public v8::Extension { |
if (data_source) { |
NavigationState* navigation_state = |
NavigationState::FromDataSource(data_source); |
+ NavigationState::LoadTimes* navigation_times = |
+ navigation_state->load_times(); |
v8::Local<v8::Object> csi = v8::Object::New(); |
base::Time now = base::Time::Now(); |
- base::Time start = navigation_state->request_time().is_null() ? |
- navigation_state->start_load_time() : |
- navigation_state->request_time(); |
- base::Time onload = navigation_state->finish_document_load_time(); |
+ base::Time start = navigation_times->request_time().is_null() ? |
+ navigation_times->start_load_time() : |
+ navigation_times->request_time(); |
+ base::Time onload = navigation_times->finish_document_load_time(); |
base::TimeDelta page = now - start; |
csi->Set( |
v8::String::New("startE"), |