| 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 3776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3787 void RenderViewImpl::didExhaustMemoryAvailableForScript(WebFrame* frame) { | 3787 void RenderViewImpl::didExhaustMemoryAvailableForScript(WebFrame* frame) { |
| 3788 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); | 3788 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); |
| 3789 } | 3789 } |
| 3790 | 3790 |
| 3791 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, | 3791 void RenderViewImpl::didCreateScriptContext(WebFrame* frame, |
| 3792 v8::Handle<v8::Context> context, | 3792 v8::Handle<v8::Context> context, |
| 3793 int extension_group, | 3793 int extension_group, |
| 3794 int world_id) { | 3794 int world_id) { |
| 3795 content::GetContentClient()->renderer()->DidCreateScriptContext( | 3795 content::GetContentClient()->renderer()->DidCreateScriptContext( |
| 3796 frame, context, extension_group, world_id); | 3796 frame, context, extension_group, world_id); |
| 3797 |
| 3798 intents_host_->DidCreateScriptContext( |
| 3799 frame, context, extension_group, world_id); |
| 3797 } | 3800 } |
| 3798 | 3801 |
| 3799 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, | 3802 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, |
| 3800 v8::Handle<v8::Context> context, | 3803 v8::Handle<v8::Context> context, |
| 3801 int world_id) { | 3804 int world_id) { |
| 3802 content::GetContentClient()->renderer()->WillReleaseScriptContext( | 3805 content::GetContentClient()->renderer()->WillReleaseScriptContext( |
| 3803 frame, context, world_id); | 3806 frame, context, world_id); |
| 3804 } | 3807 } |
| 3805 | 3808 |
| 3806 void RenderViewImpl::CheckPreferredSize() { | 3809 void RenderViewImpl::CheckPreferredSize() { |
| (...skipping 2543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6350 | 6353 |
| 6351 updating_frame_tree_ = true; | 6354 updating_frame_tree_ = true; |
| 6352 active_frame_id_map_.clear(); | 6355 active_frame_id_map_.clear(); |
| 6353 | 6356 |
| 6354 target_process_id_ = process_id; | 6357 target_process_id_ = process_id; |
| 6355 target_routing_id_ = route_id; | 6358 target_routing_id_ = route_id; |
| 6356 CreateFrameTree(webview()->mainFrame(), frames); | 6359 CreateFrameTree(webview()->mainFrame(), frames); |
| 6357 | 6360 |
| 6358 updating_frame_tree_ = false; | 6361 updating_frame_tree_ = false; |
| 6359 } | 6362 } |
| OLD | NEW |