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 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1047 RenderFrameImpl::FromRoutingID(opener_frame_routing_id); | 1047 RenderFrameImpl::FromRoutingID(opener_frame_routing_id); |
1048 if (opener_frame) { | 1048 if (opener_frame) { |
1049 if (opener_view_routing_id) | 1049 if (opener_view_routing_id) |
1050 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID(); | 1050 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID(); |
1051 return opener_frame->GetWebFrame(); | 1051 return opener_frame->GetWebFrame(); |
1052 } | 1052 } |
1053 | 1053 |
1054 return nullptr; | 1054 return nullptr; |
1055 } | 1055 } |
1056 | 1056 |
1057 blink::WebString RenderFrameImpl::overrideFlashEmbedWithHTML( | |
1058 const WebString& url) { | |
1059 std::string ret = | |
1060 GetContentClient()->renderer()->OverrideFlashEmbedWithHTML(url.utf8()); | |
1061 return blink::WebString::fromUTF8(ret); | |
mlamouri (slow - plz ping)
2016/07/21 15:55:07
nit: you might as well have this in one statement:
kdsilva
2016/07/22 13:55:58
Done.
| |
1062 } | |
1063 | |
1057 // RenderFrameImpl ---------------------------------------------------------- | 1064 // RenderFrameImpl ---------------------------------------------------------- |
1058 RenderFrameImpl::RenderFrameImpl(const CreateParams& params) | 1065 RenderFrameImpl::RenderFrameImpl(const CreateParams& params) |
1059 : frame_(NULL), | 1066 : frame_(NULL), |
1060 is_main_frame_(true), | 1067 is_main_frame_(true), |
1061 in_browser_initiated_detach_(false), | 1068 in_browser_initiated_detach_(false), |
1062 in_frame_tree_(false), | 1069 in_frame_tree_(false), |
1063 render_view_(params.render_view->AsWeakPtr()), | 1070 render_view_(params.render_view->AsWeakPtr()), |
1064 routing_id_(params.routing_id), | 1071 routing_id_(params.routing_id), |
1065 proxy_routing_id_(MSG_ROUTING_NONE), | 1072 proxy_routing_id_(MSG_ROUTING_NONE), |
1066 #if defined(ENABLE_PLUGINS) | 1073 #if defined(ENABLE_PLUGINS) |
(...skipping 5260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6327 // event target. Potentially a Pepper plugin will receive the event. | 6334 // event target. Potentially a Pepper plugin will receive the event. |
6328 // In order to tell whether a plugin gets the last mouse event and which it | 6335 // In order to tell whether a plugin gets the last mouse event and which it |
6329 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6336 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6330 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6337 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6331 // |pepper_last_mouse_event_target_|. | 6338 // |pepper_last_mouse_event_target_|. |
6332 pepper_last_mouse_event_target_ = nullptr; | 6339 pepper_last_mouse_event_target_ = nullptr; |
6333 #endif | 6340 #endif |
6334 } | 6341 } |
6335 | 6342 |
6336 } // namespace content | 6343 } // namespace content |
OLD | NEW |