| 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 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 RenderFrameImpl::FromRoutingID(opener_frame_routing_id); | 1062 RenderFrameImpl::FromRoutingID(opener_frame_routing_id); |
| 1063 if (opener_frame) { | 1063 if (opener_frame) { |
| 1064 if (opener_view_routing_id) | 1064 if (opener_view_routing_id) |
| 1065 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID(); | 1065 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID(); |
| 1066 return opener_frame->GetWebFrame(); | 1066 return opener_frame->GetWebFrame(); |
| 1067 } | 1067 } |
| 1068 | 1068 |
| 1069 return nullptr; | 1069 return nullptr; |
| 1070 } | 1070 } |
| 1071 | 1071 |
| 1072 blink::WebURL RenderFrameImpl::overrideFlashEmbedWithHTML( |
| 1073 const blink::WebURL& url) { |
| 1074 return GetContentClient()->renderer()->OverrideFlashEmbedWithHTML(url); |
| 1075 } |
| 1076 |
| 1072 // RenderFrameImpl ---------------------------------------------------------- | 1077 // RenderFrameImpl ---------------------------------------------------------- |
| 1073 RenderFrameImpl::RenderFrameImpl(const CreateParams& params) | 1078 RenderFrameImpl::RenderFrameImpl(const CreateParams& params) |
| 1074 : frame_(NULL), | 1079 : frame_(NULL), |
| 1075 is_main_frame_(true), | 1080 is_main_frame_(true), |
| 1076 in_browser_initiated_detach_(false), | 1081 in_browser_initiated_detach_(false), |
| 1077 in_frame_tree_(false), | 1082 in_frame_tree_(false), |
| 1078 render_view_(params.render_view->AsWeakPtr()), | 1083 render_view_(params.render_view->AsWeakPtr()), |
| 1079 routing_id_(params.routing_id), | 1084 routing_id_(params.routing_id), |
| 1080 proxy_routing_id_(MSG_ROUTING_NONE), | 1085 proxy_routing_id_(MSG_ROUTING_NONE), |
| 1081 #if defined(ENABLE_PLUGINS) | 1086 #if defined(ENABLE_PLUGINS) |
| (...skipping 5248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6330 // event target. Potentially a Pepper plugin will receive the event. | 6335 // event target. Potentially a Pepper plugin will receive the event. |
| 6331 // In order to tell whether a plugin gets the last mouse event and which it | 6336 // In order to tell whether a plugin gets the last mouse event and which it |
| 6332 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6337 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6333 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6338 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6334 // |pepper_last_mouse_event_target_|. | 6339 // |pepper_last_mouse_event_target_|. |
| 6335 pepper_last_mouse_event_target_ = nullptr; | 6340 pepper_last_mouse_event_target_ = nullptr; |
| 6336 #endif | 6341 #endif |
| 6337 } | 6342 } |
| 6338 | 6343 |
| 6339 } // namespace content | 6344 } // namespace content |
| OLD | NEW |