| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 15debe08d42f079668b8ce8611a0b4961d34cff4..52a91806b7119d1473e871a5452be34556bac45c 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"
|
| @@ -1065,12 +1066,23 @@ RenderFrameImpl::~RenderFrameImpl() {
|
|
|
| void RenderFrameImpl::BindToWebFrame(blink::WebLocalFrame* web_frame) {
|
| DCHECK(!frame_);
|
| + DCHECK(!blame_context_);
|
|
|
| std::pair<FrameMap::iterator, bool> result = g_frame_map.Get().insert(
|
| std::make_pair(web_frame, this));
|
| CHECK(result.second) << "Inserting a duplicate item.";
|
|
|
| frame_ = web_frame;
|
| +
|
| + if (frame_->parent()) {
|
| + RenderFrameImpl* parent_frame =
|
| + RenderFrameImpl::FromWebFrame(frame_->parent());
|
| + 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()));
|
| + }
|
| }
|
|
|
| void RenderFrameImpl::Initialize() {
|
| @@ -2544,6 +2556,11 @@ blink::WebCookieJar* RenderFrameImpl::cookieJar() {
|
| return &cookie_jar_;
|
| }
|
|
|
| +blink::BlameContext* RenderFrameImpl::frameBlameContext() {
|
| + DCHECK(blame_context_);
|
| + return blame_context_.get();
|
| +}
|
| +
|
| blink::WebServiceWorkerProvider*
|
| RenderFrameImpl::createServiceWorkerProvider() {
|
| // At this point we should have non-null data source.
|
| @@ -3259,6 +3276,9 @@ void RenderFrameImpl::didCommitProvisionalLoad(
|
| void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) {
|
| DCHECK(!frame_ || frame_ == frame);
|
|
|
| + blame_context_->set_url(frame_->getSecurityOrigin().toString().utf8());
|
| + blame_context_->TakeSnapshot();
|
| +
|
| FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidCreateNewDocument());
|
| FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
|
| DidCreateNewDocument(frame));
|
|
|