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

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

Issue 7647003: Update routing id of pending resource requests for reparented iframes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed Copyright that presubmit complains about. Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view.h ('k') | webkit/glue/resource_loader_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "content/renderer/render_view.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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #include "webkit/glue/form_field.h" 134 #include "webkit/glue/form_field.h"
135 #include "webkit/glue/glue_serialize.h" 135 #include "webkit/glue/glue_serialize.h"
136 #include "webkit/glue/media/video_renderer_impl.h" 136 #include "webkit/glue/media/video_renderer_impl.h"
137 #include "webkit/glue/password_form_dom_manager.h" 137 #include "webkit/glue/password_form_dom_manager.h"
138 #include "webkit/glue/request_extra_data.h" 138 #include "webkit/glue/request_extra_data.h"
139 #include "webkit/glue/webaccessibility.h" 139 #include "webkit/glue/webaccessibility.h"
140 #include "webkit/glue/webdropdata.h" 140 #include "webkit/glue/webdropdata.h"
141 #include "webkit/glue/webkit_constants.h" 141 #include "webkit/glue/webkit_constants.h"
142 #include "webkit/glue/webkit_glue.h" 142 #include "webkit/glue/webkit_glue.h"
143 #include "webkit/glue/webmediaplayer_impl.h" 143 #include "webkit/glue/webmediaplayer_impl.h"
144 #include "webkit/glue/weburlloader_impl.h"
144 #include "webkit/plugins/npapi/default_plugin_shared.h" 145 #include "webkit/plugins/npapi/default_plugin_shared.h"
145 #include "webkit/plugins/npapi/plugin_list.h" 146 #include "webkit/plugins/npapi/plugin_list.h"
146 #include "webkit/plugins/npapi/webplugin_delegate.h" 147 #include "webkit/plugins/npapi/webplugin_delegate.h"
147 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 148 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
148 #include "webkit/plugins/npapi/webplugin_impl.h" 149 #include "webkit/plugins/npapi/webplugin_impl.h"
149 #include "webkit/plugins/npapi/webview_plugin.h" 150 #include "webkit/plugins/npapi/webview_plugin.h"
150 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 151 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
151 152
152 #if defined(OS_WIN) 153 #if defined(OS_WIN)
153 // TODO(port): these files are currently Windows only because they concern: 154 // TODO(port): these files are currently Windows only because they concern:
(...skipping 2663 matching lines...) Expand 10 before | Expand all | Expand 10 after
2817 } 2818 }
2818 2819
2819 void RenderView::didRunInsecureContent( 2820 void RenderView::didRunInsecureContent(
2820 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { 2821 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) {
2821 Send(new ViewHostMsg_DidRunInsecureContent( 2822 Send(new ViewHostMsg_DidRunInsecureContent(
2822 routing_id_, 2823 routing_id_,
2823 origin.toString().utf8(), 2824 origin.toString().utf8(),
2824 target)); 2825 target));
2825 } 2826 }
2826 2827
2828 void RenderView::didAdoptURLLoader(WebKit::WebURLLoader* loader) {
2829 webkit_glue::WebURLLoaderImpl* loader_impl =
2830 static_cast<webkit_glue::WebURLLoaderImpl*>(loader);
2831 loader_impl->UpdateRoutingId(routing_id_);
2832 }
2833
2827 void RenderView::didExhaustMemoryAvailableForScript(WebFrame* frame) { 2834 void RenderView::didExhaustMemoryAvailableForScript(WebFrame* frame) {
2828 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); 2835 Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
2829 } 2836 }
2830 2837
2831 void RenderView::didCreateScriptContext(WebFrame* frame) { 2838 void RenderView::didCreateScriptContext(WebFrame* frame) {
2832 content::GetContentClient()->renderer()->DidCreateScriptContext(frame); 2839 content::GetContentClient()->renderer()->DidCreateScriptContext(frame);
2833 } 2840 }
2834 2841
2835 void RenderView::didDestroyScriptContext(WebFrame* frame) { 2842 void RenderView::didDestroyScriptContext(WebFrame* frame) {
2836 content::GetContentClient()->renderer()->DidDestroyScriptContext(frame); 2843 content::GetContentClient()->renderer()->DidDestroyScriptContext(frame);
(...skipping 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after
4529 } 4536 }
4530 #endif 4537 #endif
4531 4538
4532 void RenderView::OnContextMenuClosed( 4539 void RenderView::OnContextMenuClosed(
4533 const webkit_glue::CustomContextMenuContext& custom_context) { 4540 const webkit_glue::CustomContextMenuContext& custom_context) {
4534 if (custom_context.is_pepper_menu) 4541 if (custom_context.is_pepper_menu)
4535 pepper_delegate_.OnContextMenuClosed(custom_context); 4542 pepper_delegate_.OnContextMenuClosed(custom_context);
4536 else 4543 else
4537 context_menu_node_.reset(); 4544 context_menu_node_.reset();
4538 } 4545 }
OLDNEW
« no previous file with comments | « content/renderer/render_view.h ('k') | webkit/glue/resource_loader_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698