diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 22:16:30 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 22:16:30 +0000 |
| commit | 108f60905372f2e85e3036cda066593dbbf52fbc (patch) | |
| tree | 8f2f0d669f2827dddb4615a7760e14207e047de1 /content/browser/web_contents/web_contents_impl_browsertest.cc | |
| parent | f09eceae6c876dd028b3de5b44a49f1fb0d354dc (diff) | |
| download | chromium_src-108f60905372f2e85e3036cda066593dbbf52fbc.zip chromium_src-108f60905372f2e85e3036cda066593dbbf52fbc.tar.gz chromium_src-108f60905372f2e85e3036cda066593dbbf52fbc.tar.bz2 | |
Revert 197717 "Create a frame tree in WebContents on the browser..." for DCHECK fail on mac browser_tests.
> Create a frame tree in WebContents on the browser side.
>
> The first step to supporting out-of-process iframes is to replicate the frame tree for each page to the browser process. This CL adds a FrameTreeNode class and forms a tree of such nodes in WebContents. Follow up changes will utilize this class to hold frame-specific functionality.
>
> BUG=235879
>
> Review URL: https://chromiumcodereview.appspot.com/14374002
TBR=nasko@chromium.org
Review URL: https://codereview.chromium.org/14598013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/web_contents_impl_browsertest.cc')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl_browsertest.cc | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 9d90cbd..b3f5df8 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/values.h" -#include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/load_notification_details.h" #include "content/public/browser/navigation_controller.h" @@ -122,42 +121,4 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, load_observer.controller_); } -// Test that the browser receives the proper frame attach/detach messages from -// the renderer and builds proper frame tree. -IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, FrameTree) { - ASSERT_TRUE(test_server()->Start()); - - NavigateToURL(shell(), test_server()->GetURL("files/frame_tree/top.html")); - - WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents()); - RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( - wc->GetRenderViewHost()); - FrameTreeNode* root = wc->GetFrameTreeRootForTesting(); - - // Check that the root node is properly created with the frame id of the - // initial navigation. - EXPECT_EQ(3UL, root->child_count()); - EXPECT_EQ(std::string(), root->frame_name()); - EXPECT_EQ(rvh->main_frame_id(), root->frame_id()); - - EXPECT_EQ(2UL, root->child_at(0)->child_count()); - EXPECT_STREQ("1-1-name", root->child_at(0)->frame_name().c_str()); - - // Verify the deepest node exists and has the right name. - EXPECT_EQ(2UL, root->child_at(2)->child_count()); - EXPECT_EQ(1UL, root->child_at(2)->child_at(1)->child_count()); - EXPECT_EQ(0UL, root->child_at(2)->child_at(1)->child_at(0)->child_count()); - EXPECT_STREQ("3-1-id", - root->child_at(2)->child_at(1)->child_at(0)->frame_name().c_str()); - - // Navigate to about:blank, which should leave only the root node of the frame - // tree in the browser process. - NavigateToURL(shell(), test_server()->GetURL("files/title1.html")); - - root = wc->GetFrameTreeRootForTesting(); - EXPECT_EQ(0UL, root->child_count()); - EXPECT_EQ(std::string(), root->frame_name()); - EXPECT_EQ(rvh->main_frame_id(), root->frame_id()); -} - } // namespace content |