Cache csi info before passing it to JS setters.

chrome/renderer/loadtimes_extension_bindings.cc

Index: chrome/renderer/loadtimes_extension_bindings.cc
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc
index 692b80867db37c8c199d6b0494e9eba990864b7f..ba88e2b86a262b920c6e21b8e12c876093c5058b 100644
--- a/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/chrome/renderer/loadtimes_extension_bindings.cc
@@ -170,36 +170,41 @@ class LoadTimesExtensionWrapper : public v8::Extension {
 
   static void GetCSI(const v8::FunctionCallbackInfo<v8::Value>& args) {
     WebLocalFrame* frame = WebLocalFrame::frameForCurrentContext();
-    if (frame) {
-      WebDataSource* data_source = frame->dataSource();
-      if (data_source) {
-        DocumentState* document_state =
-            DocumentState::FromDataSource(data_source);
-        v8::Isolate* isolate = args.GetIsolate();
-        v8::Local<v8::Object> csi = v8::Object::New(isolate);
-        base::Time now = base::Time::Now();
-        base::Time start = document_state->request_time().is_null() ?
-            document_state->start_load_time() :
-            document_state->request_time();
-        base::Time onload = document_state->finish_document_load_time();
-        base::TimeDelta page = now - start;
-        csi->Set(v8::String::NewFromUtf8(isolate, "startE"),
-                 v8::Number::New(isolate, floor(start.ToDoubleT() * 1000)));
-        csi->Set(v8::String::NewFromUtf8(isolate, "onloadT"),
-                 v8::Number::New(isolate, floor(onload.ToDoubleT() * 1000)));
-        csi->Set(v8::String::NewFromUtf8(isolate, "pageT"),
-                 v8::Number::New(isolate, page.InMillisecondsF()));
-        csi->Set(
-            v8::String::NewFromUtf8(isolate, "tran"),
-            v8::Number::New(
-                isolate, GetCSITransitionType(data_source->navigationType())));
-
-        args.GetReturnValue().Set(csi);
-        return;
-      }
+    if (!frame) {
+      args.GetReturnValue().SetNull();
+      return;
+    }
+    WebDataSource* data_source = frame->dataSource();
+    if (!data_source) {
+      args.GetReturnValue().SetNull();
+      return;
     }
-    args.GetReturnValue().SetNull();
-    return;
+    DocumentState* document_state = DocumentState::FromDataSource(data_source);
+    if (!document_state) {
+      args.GetReturnValue().SetNull();
+      return;
+    }
+    base::Time now = base::Time::Now();
+    base::Time start = document_state->request_time().is_null()
+                           ? document_state->start_load_time()
+                           : document_state->request_time();
+    base::Time onload = document_state->finish_document_load_time();
+    base::TimeDelta page = now - start;
+    int navigation_type = GetCSITransitionType(data_source->navigationType());
+    // Important: |frame|, |data_source| and |document_state| should not be
+    // referred to below this line, as JS setters below can invalidate these
+    // pointers.
+    v8::Isolate* isolate = args.GetIsolate();
+    v8::Local<v8::Object> csi = v8::Object::New(isolate);
+    csi->Set(v8::String::NewFromUtf8(isolate, "startE"),

[jochen (gone - plz use gerrit), 2016/03/02 10:48:31]

please use the non-deprecated versions:

v8::Local<v8::Context> ctx = isolate->GetCurrentContext();
if (!csi->Set(ctx, v8::String::NewFromUtf8(isolate, "startE",
v8::NewStringType::kNormal).ToLocalChecked()).FromMaybe(false))
  return;

[meacer, 2016/03/02 20:46:36]

Done.

+             v8::Number::New(isolate, floor(start.ToDoubleT() * 1000)));
+    csi->Set(v8::String::NewFromUtf8(isolate, "onloadT"),
+             v8::Number::New(isolate, floor(onload.ToDoubleT() * 1000)));
+    csi->Set(v8::String::NewFromUtf8(isolate, "pageT"),
+             v8::Number::New(isolate, page.InMillisecondsF()));
+    csi->Set(v8::String::NewFromUtf8(isolate, "tran"),
+             v8::Number::New(isolate, navigation_type));
+    args.GetReturnValue().Set(csi);
   }
 };