| commit | 0edfa5663e5a6fadb4bf656e9ac057527bd8b3f4 | [log] [tgz] |
|---|---|---|
| author | Daniel Cheng <[email protected]> | Mon Jun 05 19:13:18 2017 |
| committer | Commit Bot <[email protected]> | Tue Jun 06 03:59:31 2017 |
| tree | adbc0f53e35a8ad4e189cd035cfdfdc1d008d59e | |
| parent | f1671492eb9f8403e391bab744ec1ac57e171e91 [diff] [blame] |
Change RenderFrameProxy::FromWebFrame to take a WebRemoteFrame*. RenderFrameProxy objects will only ever be associated with WebRemoteFrames. Bug: 416660 Change-Id: I1eb32276504fb73a31317863286ce5fb9ab17ef2 Reviewed-on: https://chromium-review.googlesource.com/520522 Commit-Queue: Daniel Cheng <[email protected]> Reviewed-by: Alex Moshchuk <[email protected]> Cr-Commit-Position: refs/heads/master@{#477186}
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h index 4b2aa74..87556b3 100644 --- a/content/renderer/render_frame_proxy.h +++ b/content/renderer/render_frame_proxy.h
@@ -94,8 +94,9 @@ // Returns the RenderFrameProxy for the given routing ID. static RenderFrameProxy* FromRoutingID(int routing_id); - // Returns the RenderFrameProxy given a WebFrame. - static RenderFrameProxy* FromWebFrame(blink::WebFrame* web_frame); + // Returns the RenderFrameProxy given a WebRemoteFrame. |web_frame| must not + // be null, nor will this method return null. + static RenderFrameProxy* FromWebFrame(blink::WebRemoteFrame* web_frame); ~RenderFrameProxy() override;