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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1909403002: Revert of Make RenderFrameImpl own its frame blame context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 1119
1120 RegisterMojoServices(); 1120 RegisterMojoServices();
1121 1121
1122 // We delay calling this until we have the WebFrame so that any observer or 1122 // We delay calling this until we have the WebFrame so that any observer or
1123 // embedder can call GetWebFrame on any RenderFrame. 1123 // embedder can call GetWebFrame on any RenderFrame.
1124 GetContentClient()->renderer()->RenderFrameCreated(this); 1124 GetContentClient()->renderer()->RenderFrameCreated(this);
1125 } 1125 }
1126 1126
1127 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) { 1127 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
1128 DCHECK(!blame_context_); 1128 DCHECK(!blame_context_);
1129 blame_context_ = base::WrapUnique(new FrameBlameContext(this, parent_frame)); 1129 blame_context_ = new FrameBlameContext(this, parent_frame);
1130 blame_context_->Initialize(); 1130 blame_context_->Initialize();
1131 } 1131 }
1132 1132
1133 RenderWidget* RenderFrameImpl::GetRenderWidget() { 1133 RenderWidget* RenderFrameImpl::GetRenderWidget() {
1134 RenderFrameImpl* local_root = 1134 RenderFrameImpl* local_root =
1135 RenderFrameImpl::FromWebFrame(frame_->localRoot()); 1135 RenderFrameImpl::FromWebFrame(frame_->localRoot());
1136 return local_root->render_widget_.get(); 1136 return local_root->render_widget_.get();
1137 } 1137 }
1138 1138
1139 #if defined(ENABLE_PLUGINS) 1139 #if defined(ENABLE_PLUGINS)
(...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after
2550 return NULL; 2550 return NULL;
2551 #endif 2551 #endif
2552 } 2552 }
2553 2553
2554 blink::WebCookieJar* RenderFrameImpl::cookieJar() { 2554 blink::WebCookieJar* RenderFrameImpl::cookieJar() {
2555 return &cookie_jar_; 2555 return &cookie_jar_;
2556 } 2556 }
2557 2557
2558 blink::BlameContext* RenderFrameImpl::frameBlameContext() { 2558 blink::BlameContext* RenderFrameImpl::frameBlameContext() {
2559 DCHECK(blame_context_); 2559 DCHECK(blame_context_);
2560 return blame_context_.get(); 2560 return blame_context_;
2561 } 2561 }
2562 2562
2563 blink::WebServiceWorkerProvider* 2563 blink::WebServiceWorkerProvider*
2564 RenderFrameImpl::createServiceWorkerProvider() { 2564 RenderFrameImpl::createServiceWorkerProvider() {
2565 // At this point we should have non-null data source. 2565 // At this point we should have non-null data source.
2566 DCHECK(frame_->dataSource()); 2566 DCHECK(frame_->dataSource());
2567 if (!ChildThreadImpl::current()) 2567 if (!ChildThreadImpl::current())
2568 return nullptr; // May be null in some tests. 2568 return nullptr; // May be null in some tests.
2569 ServiceWorkerNetworkProvider* provider = 2569 ServiceWorkerNetworkProvider* provider =
2570 ServiceWorkerNetworkProvider::FromDocumentState( 2570 ServiceWorkerNetworkProvider::FromDocumentState(
(...skipping 3469 matching lines...) Expand 10 before | Expand all | Expand 10 after
6040 int match_count, 6040 int match_count,
6041 int ordinal, 6041 int ordinal,
6042 const WebRect& selection_rect, 6042 const WebRect& selection_rect,
6043 bool final_status_update) { 6043 bool final_status_update) {
6044 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6044 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6045 selection_rect, ordinal, 6045 selection_rect, ordinal,
6046 final_status_update)); 6046 final_status_update));
6047 } 6047 }
6048 6048
6049 } // namespace content 6049 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698