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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 1373573002: ABANDONED: OOPIFs: Moving stitching of local paths from renderer to browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page-serialization-recursive-begone
Patch Set: Self-review. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
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),

Powered by Google App Engine
This is Rietveld 408576698