OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 3774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3785 void RenderViewImpl::didExhaustMemoryAvailableForScript(WebFrame* frame) { | 3785 void RenderViewImpl::didExhaustMemoryAvailableForScript(WebFrame* frame) { |
3786 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); | 3786 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); |
3787 } | 3787 } |
3788 | 3788 |
3789 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, | 3789 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, |
3790 v8::Handle<v8::Context> context, | 3790 v8::Handle<v8::Context> context, |
3791 int extension_group, | 3791 int extension_group, |
3792 int world_id) { | 3792 int world_id) { |
3793 content::GetContentClient()->renderer()->DidCreateScriptContext( | 3793 content::GetContentClient()->renderer()->DidCreateScriptContext( |
3794 frame, context, extension_group, world_id); | 3794 frame, context, extension_group, world_id); |
| 3795 |
| 3796 intents_host_->DidCreateScriptContext( |
| 3797 frame, context, extension_group, world_id); |
3795 } | 3798 } |
3796 | 3799 |
3797 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, | 3800 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, |
3798 v8::Handle<v8::Context> context, | 3801 v8::Handle<v8::Context> context, |
3799 int world_id) { | 3802 int world_id) { |
3800 content::GetContentClient()->renderer()->DidCreateScriptContext( | 3803 content::GetContentClient()->renderer()->DidCreateScriptContext( |
3801 frame, context, -1, world_id); | 3804 frame, context, -1, world_id); |
| 3805 |
| 3806 intents_host_->DidCreateScriptContext(frame, context, -1, world_id); |
3802 } | 3807 } |
3803 | 3808 |
3804 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, | 3809 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, |
3805 v8::Handle<v8::Context> context, | 3810 v8::Handle<v8::Context> context, |
3806 int world_id) { | 3811 int world_id) { |
3807 content::GetContentClient()->renderer()->WillReleaseScriptContext( | 3812 content::GetContentClient()->renderer()->WillReleaseScriptContext( |
3808 frame, context, world_id); | 3813 frame, context, world_id); |
3809 } | 3814 } |
3810 | 3815 |
3811 void RenderViewImpl::CheckPreferredSize() { | 3816 void RenderViewImpl::CheckPreferredSize() { |
(...skipping 2538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6350 | 6355 |
6351 updating_frame_tree_ = true; | 6356 updating_frame_tree_ = true; |
6352 active_frame_id_map_.clear(); | 6357 active_frame_id_map_.clear(); |
6353 | 6358 |
6354 target_process_id_ = process_id; | 6359 target_process_id_ = process_id; |
6355 target_routing_id_ = route_id; | 6360 target_routing_id_ = route_id; |
6356 CreateFrameTree(webview()->mainFrame(), frames); | 6361 CreateFrameTree(webview()->mainFrame(), frames); |
6357 | 6362 |
6358 updating_frame_tree_ = false; | 6363 updating_frame_tree_ = false; |
6359 } | 6364 } |
OLD | NEW |