Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1545)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/loadtimes_extension_bindings.cc

Issue 2149933003: Pre-work for adding usage counter for chrome.loadtimes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch to using SetAccessor Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/loadtimes_extension_bindings.cc
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc
index a1aad263c03b96d47762d65ffce72580ab480ea0..b1524781997fedd46b5bf3c0a1c99f0fd53d2d60 100644
--- a/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/chrome/renderer/loadtimes_extension_bindings.cc
@@ -8,6 +8,7 @@
#include "base/time/time.h"
#include "content/public/renderer/document_state.h"
+#include "extensions/renderer/v8_helpers.h"
#include "net/http/http_response_info.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebPerformance.h"
@@ -105,6 +106,13 @@ class LoadTimesExtensionWrapper : public v8::Extension {
return kTransitionOther;
}
+ static void LoadtimesGetter(
+ v8::Local<v8::Name> name,
+ const v8::PropertyCallbackInfo<v8::Value>& info) {
+ // TODO(panicker): Add Usage counter.
+ info.GetReturnValue().Set(info.Data());
+ }
+
static void GetLoadTimes(const v8::FunctionCallbackInfo<v8::Value>& args) {
args.GetReturnValue().SetNull();
WebLocalFrame* frame = WebLocalFrame::frameForCurrentContext();
@@ -164,128 +172,165 @@ class LoadTimesExtensionWrapper : public v8::Extension {
document_state->was_alternate_protocol_available();
std::string connection_info = net::HttpResponseInfo::ConnectionInfoToString(
document_state->connection_info());
+
// 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::Context> ctx = isolate->GetCurrentContext();
- v8::Local<v8::Object> load_times = v8::Object::New(isolate);
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "requestTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, request_time))
- .FromMaybe(false)) {
- return;
- }
+ v8::Local<v8::Object> load_times = v8::Object::New(isolate);
adamk 2016/07/20 00:57:22 Nit: looks like indentation got off somewhere here
+
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "requestTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, request_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "startLoadTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, start_load_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "commitLoadTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, commit_load_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "finishDocumentLoadTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, finish_document_load_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "finishLoadTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, finish_load_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "firstPaintTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate, first_paint_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "firstPaintAfterLoadTime", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Number::New(isolate,first_paint_after_load_time))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "navigationType", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::String::NewFromUtf8(isolate, navigation_type.c_str(),
+ v8::NewStringType::kNormal)
+ .ToLocalChecked())
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "wasFetchedViaSpdy", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Boolean::New(isolate, was_fetched_via_spdy))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "wasNpnNegotiated", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Boolean::New(isolate, was_npn_negotiated))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "npnNegotiatedProtocol", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::String::NewFromUtf8(isolate, npn_negotiated_protocol.c_str(),
+ v8::NewStringType::kNormal)
+ .ToLocalChecked())
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "wasAlternateProtocolAvailable",
+ v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::Boolean::New(isolate, was_alternate_protocol_available))
+ .FromMaybe(false)) {
+ return;
+ }
+ if (!load_times->SetAccessor(
+ ctx,
+ v8::String::NewFromUtf8(
+ isolate, "connectionInfo", v8::NewStringType::kNormal)
+ .ToLocalChecked(),
+ LoadtimesGetter,
+ nullptr,
+ v8::String::NewFromUtf8(isolate, connection_info.c_str(),
+ v8::NewStringType::kNormal)
+ .ToLocalChecked())
+ .FromMaybe(false)) {
+ return;
+ }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "startLoadTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, start_load_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "commitLoadTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, commit_load_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx,
- v8::String::NewFromUtf8(isolate, "finishDocumentLoadTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, finish_document_load_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "finishLoadTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, finish_load_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "firstPaintTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, first_paint_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx,
- v8::String::NewFromUtf8(isolate, "firstPaintAfterLoadTime",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Number::New(isolate, first_paint_after_load_time))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "navigationType",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::String::NewFromUtf8(isolate, navigation_type.c_str(),
- v8::NewStringType::kNormal)
- .ToLocalChecked())
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "wasFetchedViaSpdy",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Boolean::New(isolate, was_fetched_via_spdy))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "wasNpnNegotiated",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Boolean::New(isolate, was_npn_negotiated))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx,
- v8::String::NewFromUtf8(isolate, "npnNegotiatedProtocol",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::String::NewFromUtf8(isolate,
- npn_negotiated_protocol.c_str(),
- v8::NewStringType::kNormal)
- .ToLocalChecked())
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate,
- "wasAlternateProtocolAvailable",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::Boolean::New(isolate, was_alternate_protocol_available))
- .FromMaybe(false)) {
- return;
- }
- if (!load_times
- ->Set(ctx, v8::String::NewFromUtf8(isolate, "connectionInfo",
- v8::NewStringType::kNormal)
- .ToLocalChecked(),
- v8::String::NewFromUtf8(isolate, connection_info.c_str(),
- v8::NewStringType::kNormal)
- .ToLocalChecked())
- .FromMaybe(false)) {
- return;
- }
args.GetReturnValue().Set(load_times);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698