| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index fc6091cd5ccc6474ba97c7eabe5684fa03aadee1..2b55ad42e13d0a10ff972b8a0804d1300e2981b5 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -112,8 +112,11 @@ RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) {
|
| }
|
|
|
| // static
|
| -RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) {
|
| - FrameMap::iterator iter = g_frame_map.Get().find(web_frame);
|
| +const RenderFrameProxy* RenderFrameProxy::FromWebFrame(
|
| + const blink::WebFrame* web_frame) {
|
| + const auto& const_frame_map = const_cast<const FrameMap&>(g_frame_map.Get());
|
| + FrameMap::const_iterator iter =
|
| + const_frame_map.find(const_cast<blink::WebFrame*>(web_frame));
|
| if (iter != g_frame_map.Get().end()) {
|
| RenderFrameProxy* proxy = iter->second;
|
| DCHECK_EQ(web_frame, proxy->web_frame());
|
| @@ -122,6 +125,12 @@ RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) {
|
| return NULL;
|
| }
|
|
|
| +// static
|
| +RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) {
|
| + return const_cast<RenderFrameProxy*>(RenderFrameProxy::FromWebFrame(
|
| + static_cast<const blink::WebFrame*>(web_frame)));
|
| +}
|
| +
|
| RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id)
|
| : routing_id_(routing_id),
|
| frame_routing_id_(frame_routing_id),
|
|
|