diff options
| author | cmumford <cmumford@chromium.org> | 2015-01-21 14:07:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 22:08:32 +0000 |
| commit | 04094bf706d970f1fafc94786ec67f511a423d4d (patch) | |
| tree | 498c5978602fad9fed67b9335e522b83e7cdc455 /content/test | |
| parent | 4bc5eddd850f1e72958d4466fc3332e7a471a827 (diff) | |
| download | chromium_src-04094bf706d970f1fafc94786ec67f511a423d4d.zip chromium_src-04094bf706d970f1fafc94786ec67f511a423d4d.tar.gz chromium_src-04094bf706d970f1fafc94786ec67f511a423d4d.tar.bz2 | |
Revert of Make RenderFrame(Host) own a RenderWidget(Host). (patchset #20 id:380001 of https://codereview.chromium.org/616133002/)
Reason for revert:
Speculative revert. After this CL the CrossSiteIframeAccessibility test began failing (build 19379). There was only one other CL in this build and unrelated to iframes.
Original issue's description:
> Make RenderFrame(Host) own a RenderWidget(Host).
>
> When a RenderFrameHost is created for an out-of-process iframe, it
> will create a RenderWidgetHost to manage rendering and input events for
> the iframe and its same-process frame descendants. A corresponding
> RenderWidget is created in the renderer process.
>
> BUG=419087
>
> Committed: https://crrev.com/2dfb76d84f4ebde602c1c3cde700dcf71b4d1bd6
> Cr-Commit-Position: refs/heads/master@{#312451}
TBR=creis@chromium.org,nasko@chromium.org,nick@chromium.org,kenrb@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=419087
Review URL: https://codereview.chromium.org/851333005
Cr-Commit-Position: refs/heads/master@{#312471}
Diffstat (limited to 'content/test')
| -rw-r--r-- | content/test/test_render_frame_host.cc | 2 | ||||
| -rw-r--r-- | content/test/test_render_frame_host.h | 1 | ||||
| -rw-r--r-- | content/test/test_render_frame_host_factory.cc | 7 | ||||
| -rw-r--r-- | content/test/test_render_frame_host_factory.h | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc index 69e837e..5e959ed 100644 --- a/content/test/test_render_frame_host.cc +++ b/content/test/test_render_frame_host.cc @@ -36,14 +36,12 @@ void TestRenderFrameHostCreationObserver::RenderFrameCreated( TestRenderFrameHost::TestRenderFrameHost(RenderViewHostImpl* render_view_host, RenderFrameHostDelegate* delegate, - RenderWidgetHostDelegate* rwh_delegate, FrameTree* frame_tree, FrameTreeNode* frame_tree_node, int routing_id, int flags) : RenderFrameHostImpl(render_view_host, delegate, - rwh_delegate, frame_tree, frame_tree_node, routing_id, diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h index 8019950..621bc6d 100644 --- a/content/test/test_render_frame_host.h +++ b/content/test/test_render_frame_host.h @@ -37,7 +37,6 @@ class TestRenderFrameHost : public RenderFrameHostImpl, public: TestRenderFrameHost(RenderViewHostImpl* render_view_host, RenderFrameHostDelegate* delegate, - RenderWidgetHostDelegate* rwh_delegate, FrameTree* frame_tree, FrameTreeNode* frame_tree_node, int routing_id, diff --git a/content/test/test_render_frame_host_factory.cc b/content/test/test_render_frame_host_factory.cc index 5bb55c5..2085089 100644 --- a/content/test/test_render_frame_host_factory.cc +++ b/content/test/test_render_frame_host_factory.cc @@ -23,14 +23,13 @@ scoped_ptr<RenderFrameHostImpl> TestRenderFrameHostFactory::CreateRenderFrameHost( RenderViewHostImpl* render_view_host, RenderFrameHostDelegate* delegate, - RenderWidgetHostDelegate* rwh_delegate, FrameTree* frame_tree, FrameTreeNode* frame_tree_node, int routing_id, int flags) { - return make_scoped_ptr( - new TestRenderFrameHost(render_view_host, delegate, rwh_delegate, - frame_tree, frame_tree_node, routing_id, flags)); + return make_scoped_ptr(new TestRenderFrameHost(render_view_host, delegate, + frame_tree, frame_tree_node, + routing_id, flags)); } } // namespace content diff --git a/content/test/test_render_frame_host_factory.h b/content/test/test_render_frame_host_factory.h index 7d93954..cb990d3 100644 --- a/content/test/test_render_frame_host_factory.h +++ b/content/test/test_render_frame_host_factory.h @@ -27,7 +27,6 @@ class TestRenderFrameHostFactory : public RenderFrameHostFactory { scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost( RenderViewHostImpl* render_view_host, RenderFrameHostDelegate* delegate, - RenderWidgetHostDelegate* rwh_delegate, FrameTree* frame_tree, FrameTreeNode* frame_tree_node, int routing_id, |