OLD | NEW |
---|---|
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 11 matching lines...) Expand all Loading... | |
22 #include "base/memory/shared_memory.h" | 22 #include "base/memory/shared_memory.h" |
23 #include "base/memory/weak_ptr.h" | 23 #include "base/memory/weak_ptr.h" |
24 #include "base/metrics/field_trial.h" | 24 #include "base/metrics/field_trial.h" |
25 #include "base/metrics/histogram.h" | 25 #include "base/metrics/histogram.h" |
26 #include "base/process/process.h" | 26 #include "base/process/process.h" |
27 #include "base/stl_util.h" | 27 #include "base/stl_util.h" |
28 #include "base/strings/string16.h" | 28 #include "base/strings/string16.h" |
29 #include "base/strings/utf_string_conversions.h" | 29 #include "base/strings/utf_string_conversions.h" |
30 #include "base/thread_task_runner_handle.h" | 30 #include "base/thread_task_runner_handle.h" |
31 #include "base/time/time.h" | 31 #include "base/time/time.h" |
32 #include "base/trace_event/trace_event_argument.h" | |
32 #include "build/build_config.h" | 33 #include "build/build_config.h" |
33 #include "cc/base/switches.h" | 34 #include "cc/base/switches.h" |
34 #include "components/scheduler/renderer/renderer_scheduler.h" | 35 #include "components/scheduler/renderer/renderer_scheduler.h" |
35 #include "content/child/appcache/appcache_dispatcher.h" | 36 #include "content/child/appcache/appcache_dispatcher.h" |
36 #include "content/child/permissions/permission_dispatcher.h" | 37 #include "content/child/permissions/permission_dispatcher.h" |
37 #include "content/child/plugin_messages.h" | 38 #include "content/child/plugin_messages.h" |
38 #include "content/child/quota_dispatcher.h" | 39 #include "content/child/quota_dispatcher.h" |
39 #include "content/child/request_extra_data.h" | 40 #include "content/child/request_extra_data.h" |
40 #include "content/child/service_worker/service_worker_handle_reference.h" | 41 #include "content/child/service_worker/service_worker_handle_reference.h" |
41 #include "content/child/service_worker/service_worker_network_provider.h" | 42 #include "content/child/service_worker/service_worker_network_provider.h" |
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1057 render_view_->main_render_frame_ = nullptr; | 1058 render_view_->main_render_frame_ = nullptr; |
1058 } | 1059 } |
1059 | 1060 |
1060 render_view_->UnregisterRenderFrame(this); | 1061 render_view_->UnregisterRenderFrame(this); |
1061 g_routing_id_frame_map.Get().erase(routing_id_); | 1062 g_routing_id_frame_map.Get().erase(routing_id_); |
1062 RenderThread::Get()->RemoveRoute(routing_id_); | 1063 RenderThread::Get()->RemoveRoute(routing_id_); |
1063 } | 1064 } |
1064 | 1065 |
1065 void RenderFrameImpl::BindToWebFrame(blink::WebLocalFrame* web_frame) { | 1066 void RenderFrameImpl::BindToWebFrame(blink::WebLocalFrame* web_frame) { |
1066 DCHECK(!frame_); | 1067 DCHECK(!frame_); |
1068 DCHECK(!blame_context_); | |
1067 | 1069 |
1068 std::pair<FrameMap::iterator, bool> result = g_frame_map.Get().insert( | 1070 std::pair<FrameMap::iterator, bool> result = g_frame_map.Get().insert( |
1069 std::make_pair(web_frame, this)); | 1071 std::make_pair(web_frame, this)); |
1070 CHECK(result.second) << "Inserting a duplicate item."; | 1072 CHECK(result.second) << "Inserting a duplicate item."; |
1071 | 1073 |
1072 frame_ = web_frame; | 1074 frame_ = web_frame; |
1075 | |
1076 if (frame_->parent()) { | |
benjhayden
2016/03/21 17:32:56
Maybe move this logic into RenderFrameBlameContext
Sami
2016/03/21 19:16:29
Good idea, done.
| |
1077 RenderFrameImpl* parent_frame = | |
1078 RenderFrameImpl::FromWebFrame(frame_->parent()); | |
1079 blame_context_ = make_scoped_ptr(new RenderFrameBlameContext( | |
1080 routing_id_, *parent_frame->blame_context_)); | |
1081 } else { | |
1082 blame_context_ = make_scoped_ptr(new RenderFrameBlameContext( | |
1083 routing_id_, *RenderThreadImpl::current()->blame_context())); | |
1084 } | |
1085 blame_context_->Initialize(); | |
1073 } | 1086 } |
1074 | 1087 |
1075 void RenderFrameImpl::Initialize() { | 1088 void RenderFrameImpl::Initialize() { |
1076 is_main_frame_ = !frame_->parent(); | 1089 is_main_frame_ = !frame_->parent(); |
1077 | 1090 |
1078 RenderFrameImpl* parent_frame = RenderFrameImpl::FromWebFrame( | 1091 RenderFrameImpl* parent_frame = RenderFrameImpl::FromWebFrame( |
1079 frame_->parent()); | 1092 frame_->parent()); |
1080 if (parent_frame) | 1093 if (parent_frame) |
1081 is_using_lofi_ = parent_frame->IsUsingLoFi(); | 1094 is_using_lofi_ = parent_frame->IsUsingLoFi(); |
1082 | 1095 |
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2513 return external_popup_menu_.get(); | 2526 return external_popup_menu_.get(); |
2514 #else | 2527 #else |
2515 return NULL; | 2528 return NULL; |
2516 #endif | 2529 #endif |
2517 } | 2530 } |
2518 | 2531 |
2519 blink::WebCookieJar* RenderFrameImpl::cookieJar() { | 2532 blink::WebCookieJar* RenderFrameImpl::cookieJar() { |
2520 return &cookie_jar_; | 2533 return &cookie_jar_; |
2521 } | 2534 } |
2522 | 2535 |
2536 blink::BlameContext* RenderFrameImpl::frameBlameContext() { | |
2537 DCHECK(blame_context_); | |
2538 return blame_context_.get(); | |
2539 } | |
2540 | |
2523 blink::WebServiceWorkerProvider* | 2541 blink::WebServiceWorkerProvider* |
2524 RenderFrameImpl::createServiceWorkerProvider() { | 2542 RenderFrameImpl::createServiceWorkerProvider() { |
2525 // At this point we should have non-null data source. | 2543 // At this point we should have non-null data source. |
2526 DCHECK(frame_->dataSource()); | 2544 DCHECK(frame_->dataSource()); |
2527 if (!ChildThreadImpl::current()) | 2545 if (!ChildThreadImpl::current()) |
2528 return nullptr; // May be null in some tests. | 2546 return nullptr; // May be null in some tests. |
2529 ServiceWorkerNetworkProvider* provider = | 2547 ServiceWorkerNetworkProvider* provider = |
2530 ServiceWorkerNetworkProvider::FromDocumentState( | 2548 ServiceWorkerNetworkProvider::FromDocumentState( |
2531 DocumentState::FromDataSource(frame_->dataSource())); | 2549 DocumentState::FromDataSource(frame_->dataSource())); |
2532 DCHECK(provider); | 2550 DCHECK(provider); |
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3228 | 3246 |
3229 SendDidCommitProvisionalLoad(frame, commit_type, item); | 3247 SendDidCommitProvisionalLoad(frame, commit_type, item); |
3230 | 3248 |
3231 // Check whether we have new encoding name. | 3249 // Check whether we have new encoding name. |
3232 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); | 3250 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
3233 } | 3251 } |
3234 | 3252 |
3235 void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) { | 3253 void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) { |
3236 DCHECK(!frame_ || frame_ == frame); | 3254 DCHECK(!frame_ || frame_ == frame); |
3237 | 3255 |
3256 blame_context_->set_url(frame_->getSecurityOrigin().toString().utf8()); | |
benjhayden
2016/03/21 17:32:56
Could you make the RenderFrameBlameContext observe
Sami
2016/03/21 19:16:29
Great idea, no need to add new explicit calls.
| |
3257 blame_context_->TakeSnapshot(); | |
3258 | |
3238 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidCreateNewDocument()); | 3259 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidCreateNewDocument()); |
3239 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), | 3260 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), |
3240 DidCreateNewDocument(frame)); | 3261 DidCreateNewDocument(frame)); |
3241 } | 3262 } |
3242 | 3263 |
3243 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { | 3264 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { |
3244 DCHECK_EQ(frame_, frame); | 3265 DCHECK_EQ(frame_, frame); |
3245 | 3266 |
3246 int enabled_bindings = render_view_->GetEnabledBindings(); | 3267 int enabled_bindings = render_view_->GetEnabledBindings(); |
3247 | 3268 |
(...skipping 2753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6001 int match_count, | 6022 int match_count, |
6002 int ordinal, | 6023 int ordinal, |
6003 const WebRect& selection_rect, | 6024 const WebRect& selection_rect, |
6004 bool final_status_update) { | 6025 bool final_status_update) { |
6005 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6026 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6006 selection_rect, ordinal, | 6027 selection_rect, ordinal, |
6007 final_status_update)); | 6028 final_status_update)); |
6008 } | 6029 } |
6009 | 6030 |
6010 } // namespace content | 6031 } // namespace content |
OLD | NEW |