content/renderer/render_frame_proxy.h - Issue 1373573002: ABANDONED: OOPIFs: Moving stitching of local paths from renderer to browser process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_proxy.h

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: Removed no longer needed WebKit dependency. Created 5 years, 2 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

« content/renderer/dom_serializer_browsertest.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | third_party/WebKit/Source/web/WebPageSerializerImpl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_proxy.h

diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h

index 73a1715f1c570048d19c9e31191a918009152e36..0e6b8354c0de555a583398feefd32ceadae77d56 100644

--- a/content/renderer/render_frame_proxy.h

+++ b/content/renderer/render_frame_proxy.h

@@ -95,6 +95,7 @@ class CONTENT_EXPORT RenderFrameProxy

// Returns the RenderFrameProxy given a WebFrame.

static RenderFrameProxy* FromWebFrame(blink::WebFrame* web_frame);

+ static const RenderFrameProxy* FromWebFrame(const blink::WebFrame* web_frame);

~RenderFrameProxy() override;

@@ -115,7 +116,7 @@ class CONTENT_EXPORT RenderFrameProxy

// with it, so it is not in state where most operations on it will succeed.

bool IsMainFrameDetachedFromTree() const;

- int routing_id() { return routing_id_; }

+ int routing_id() const { return routing_id_; }

RenderViewImpl* render_view() { return render_view_; }

blink::WebRemoteFrame* web_frame() { return web_frame_; }