| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 689e5bea02ec7a1705fec1795361118b3877ca9f..be573f772f463650ff5d913abb408314c483f354 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -29,6 +29,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/time/time.h"
|
| +#include "base/trace_event/trace_event_argument.h"
|
| #include "build/build_config.h"
|
| #include "cc/base/switches.h"
|
| #include "components/scheduler/renderer/renderer_scheduler.h"
|
| @@ -1021,6 +1022,9 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
|
| media_player_delegate_(NULL),
|
| is_using_lofi_(false),
|
| is_pasting_(false),
|
| + trace_object_("blink",
|
| + "RenderFrameImpl",
|
| + TRACE_ID_WITH_SCOPE("RenderFrameImpl", params.routing_id)),
|
| weak_factory_(this) {
|
| std::pair<RoutingIDFrameMap::iterator, bool> result =
|
| g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
|
| @@ -1042,6 +1046,8 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
|
| #endif
|
|
|
| manifest_manager_ = new ManifestManager(this);
|
| +
|
| + base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
|
| }
|
|
|
| RenderFrameImpl::~RenderFrameImpl() {
|
| @@ -1049,6 +1055,7 @@ RenderFrameImpl::~RenderFrameImpl() {
|
| FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
|
|
|
| base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_);
|
| + base::trace_event::TraceLog::GetInstance()->RemoveEnabledStateObserver(this);
|
|
|
| #if defined(VIDEO_HOLE)
|
| if (contains_media_player_)
|
| @@ -1094,8 +1101,17 @@ void RenderFrameImpl::Initialize() {
|
|
|
| RenderFrameImpl* parent_frame = RenderFrameImpl::FromWebFrame(
|
| frame_->parent());
|
| - if (parent_frame)
|
| + if (parent_frame) {
|
| is_using_lofi_ = parent_frame->IsUsingLoFi();
|
| + blame_context_ = make_scoped_ptr(new RenderFrameBlameContext(
|
| + routing_id_, *parent_frame->blame_context_));
|
| + } else {
|
| + blame_context_ = make_scoped_ptr(new RenderFrameBlameContext(
|
| + routing_id_, *RenderThreadImpl::current()->blame_context()));
|
| + }
|
| + web_blame_context_ =
|
| + make_scoped_ptr(new WebBlameContextImpl(blame_context_.get()));
|
| + blame_context_->TakeSnapshot();
|
|
|
| bool is_tracing = false;
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED("navigation", &is_tracing);
|
| @@ -1123,6 +1139,7 @@ void RenderFrameImpl::Initialize() {
|
| }
|
|
|
| RegisterMojoServices();
|
| + TraceSnapshot();
|
|
|
| // We delay calling this until we have the WebFrame so that any observer or
|
| // embedder can call GetWebFrame on any RenderFrame.
|
| @@ -2586,6 +2603,10 @@ blink::WebCookieJar* RenderFrameImpl::cookieJar() {
|
| return &cookie_jar_;
|
| }
|
|
|
| +blink::WebBlameContext* RenderFrameImpl::frameBlameContext() {
|
| + return web_blame_context_.get();
|
| +}
|
| +
|
| blink::WebServiceWorkerProvider*
|
| RenderFrameImpl::createServiceWorkerProvider() {
|
| // At this point we should have non-null data source.
|
| @@ -6123,4 +6144,29 @@ void RenderFrameImpl::SendFindReply(int request_id,
|
| final_status_update));
|
| }
|
|
|
| +void RenderFrameImpl::OnTraceLogEnabled() {
|
| + TraceSnapshot();
|
| +}
|
| +
|
| +void RenderFrameImpl::OnTraceLogDisabled() {}
|
| +
|
| +void RenderFrameImpl::TraceSnapshot() const {
|
| + bool is_tracing = false;
|
| + TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink", &is_tracing);
|
| + if (!is_tracing || !frame_)
|
| + return;
|
| +
|
| + scoped_refptr<base::trace_event::TracedValue> state =
|
| + new base::trace_event::TracedValue();
|
| + state->BeginDictionary("frame");
|
| + state->SetString("id_ref",
|
| + base::StringPrintf("0x%" PRIx64, frame_->frameID()));
|
| + state->SetString("scope", "blink::Frame");
|
| + state->EndDictionary();
|
| + state->SetInteger("routing_id", routing_id_);
|
| + scoped_refptr<base::trace_event::ConvertableToTraceFormat> snapshot_data(
|
| + state);
|
| + trace_object_.Snapshot(snapshot_data);
|
| +}
|
| +
|
| } // namespace content
|
|
|