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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/frame_host/frame_tree_unittest.cc

Issue 1141283002: Replicate whether a frame is in a document or shadow tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 years, 7 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
« components/printing/renderer/print_web_view_helper.cc ('K') | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_tree_unittest.cc
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index 96f6b4d9466f14b806183d8b548c774d5a350782..cf633e60307c44b36bbac11926834545025a320b 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -140,18 +140,21 @@ TEST_F(FrameTreeTest, DISABLED_Shape) {
ASSERT_EQ("1: []", GetTreeState(frame_tree));
// Simulate attaching a series of frames to build the frame tree.
- frame_tree->AddFrame(root, process_id, 14, std::string(),
- SandboxFlags::NONE);
- frame_tree->AddFrame(root, process_id, 15, std::string(),
- SandboxFlags::NONE);
- frame_tree->AddFrame(root, process_id, 16, std::string(),
- SandboxFlags::NONE);
+ frame_tree->AddFrame(root, process_id, 14, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
+ frame_tree->AddFrame(root, process_id, 15, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
+ frame_tree->AddFrame(root, process_id, 16, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
- frame_tree->AddFrame(root->child_at(0), process_id, 244, std::string(),
+ frame_tree->AddFrame(root->child_at(0), process_id, 244,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
- frame_tree->AddFrame(root->child_at(1), process_id, 255, no_children_node,
+ frame_tree->AddFrame(root->child_at(1), process_id, 255,
+ blink::WebTreeScopeType::Document, no_children_node,
SandboxFlags::NONE);
- frame_tree->AddFrame(root->child_at(0), process_id, 245, std::string(),
+ frame_tree->AddFrame(root->child_at(0), process_id, 245,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
ASSERT_EQ("1: [14: [244: [], 245: []], "
@@ -160,26 +163,35 @@ TEST_F(FrameTreeTest, DISABLED_Shape) {
GetTreeState(frame_tree));
FrameTreeNode* child_16 = root->child_at(2);
- frame_tree->AddFrame(child_16, process_id, 264, std::string(),
+ frame_tree->AddFrame(child_16, process_id, 264,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
- frame_tree->AddFrame(child_16, process_id, 265, std::string(),
+ frame_tree->AddFrame(child_16, process_id, 265,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
- frame_tree->AddFrame(child_16, process_id, 266, std::string(),
+ frame_tree->AddFrame(child_16, process_id, 266,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
- frame_tree->AddFrame(child_16, process_id, 267, deep_subtree,
+ frame_tree->AddFrame(child_16, process_id, 267,
+ blink::WebTreeScopeType::Document, deep_subtree,
SandboxFlags::NONE);
- frame_tree->AddFrame(child_16, process_id, 268, std::string(),
+ frame_tree->AddFrame(child_16, process_id, 268,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
FrameTreeNode* child_267 = child_16->child_at(3);
- frame_tree->AddFrame(child_267, process_id, 365, std::string(),
+ frame_tree->AddFrame(child_267, process_id, 365,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
- frame_tree->AddFrame(child_267->child_at(0), process_id, 455, std::string(),
+ frame_tree->AddFrame(child_267->child_at(0), process_id, 455,
+ blink::WebTreeScopeType::Document, std::string(),
SandboxFlags::NONE);
frame_tree->AddFrame(child_267->child_at(0)->child_at(0), process_id, 555,
- std::string(), SandboxFlags::NONE);
+ blink::WebTreeScopeType::Document, std::string(),
+ SandboxFlags::NONE);
frame_tree->AddFrame(child_267->child_at(0)->child_at(0)->child_at(0),
- process_id, 655, std::string(), SandboxFlags::NONE);
+ process_id, 655, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
// Now that's it's fully built, verify the tree structure is as expected.
ASSERT_EQ("1: [14: [244: [], 245: []], "
@@ -219,16 +231,20 @@ TEST_F(FrameTreeTest, FindFrames) {
// Add a few child frames to the main frame.
FrameTree* frame_tree = contents()->GetFrameTree();
FrameTreeNode* root = frame_tree->root();
- main_test_rfh()->OnCreateChildFrame(22, "child0", SandboxFlags::NONE);
- main_test_rfh()->OnCreateChildFrame(23, "child1", SandboxFlags::NONE);
- main_test_rfh()->OnCreateChildFrame(24, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
+ "child0", SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
+ "child1", SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(24, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
FrameTreeNode* child0 = root->child_at(0);
FrameTreeNode* child1 = root->child_at(1);
+
FrameTreeNode* child2 = root->child_at(2);
// Add one grandchild frame.
- child1->current_frame_host()->OnCreateChildFrame(33, "grandchild",
- SandboxFlags::NONE);
+ child1->current_frame_host()->OnCreateChildFrame(
+ 33, blink::WebTreeScopeType::Document, "grandchild", SandboxFlags::NONE);
FrameTreeNode* grandchild = child1->child_at(0);
// Ensure they can be found by FTN id.
@@ -262,16 +278,19 @@ TEST_F(FrameTreeTest, PreviousSibling) {
// Add a few child frames to the main frame.
FrameTree* frame_tree = contents()->GetFrameTree();
FrameTreeNode* root = frame_tree->root();
- main_test_rfh()->OnCreateChildFrame(22, "child0", SandboxFlags::NONE);
- main_test_rfh()->OnCreateChildFrame(23, "child1", SandboxFlags::NONE);
- main_test_rfh()->OnCreateChildFrame(24, "child2", SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
+ "child0", SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
+ "child1", SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(24, blink::WebTreeScopeType::Document,
+ "child2", SandboxFlags::NONE);
FrameTreeNode* child0 = root->child_at(0);
FrameTreeNode* child1 = root->child_at(1);
FrameTreeNode* child2 = root->child_at(2);
// Add one grandchild frame.
- child1->current_frame_host()->OnCreateChildFrame(33, "grandchild",
- SandboxFlags::NONE);
+ child1->current_frame_host()->OnCreateChildFrame(
+ 33, blink::WebTreeScopeType::Document, "grandchild", SandboxFlags::NONE);
FrameTreeNode* grandchild = child1->child_at(0);
EXPECT_EQ(nullptr, root->PreviousSibling());
@@ -292,12 +311,14 @@ TEST_F(FrameTreeTest, ObserverWalksTreeDuringFrameCreation) {
FrameTreeNode* root = frame_tree->root();
// Simulate attaching a series of frames to build the frame tree.
- main_test_rfh()->OnCreateChildFrame(14, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(14, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
EXPECT_EQ(
"RenderFrameHostChanged(new)(14) -> 1: []\n"
"RenderFrameCreated(14) -> 1: [14: []]",
activity.GetLog());
- main_test_rfh()->OnCreateChildFrame(18, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(18, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
EXPECT_EQ(
"RenderFrameHostChanged(new)(18) -> 1: [14: []]\n"
"RenderFrameCreated(18) -> 1: [14: [], 18: []]",
@@ -315,12 +336,14 @@ TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
contents()->NavigateAndCommit(GURL("http://www.google.com"));
EXPECT_EQ("", activity.GetLog());
- main_test_rfh()->OnCreateChildFrame(22, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
EXPECT_EQ(
"RenderFrameHostChanged(new)(22) -> 1: []\n"
"RenderFrameCreated(22) -> 1: [22: []]",
activity.GetLog());
- main_test_rfh()->OnCreateChildFrame(23, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
EXPECT_EQ(
"RenderFrameHostChanged(new)(23) -> 1: [22: []]\n"
"RenderFrameCreated(23) -> 1: [22: [], 23: []]",
@@ -347,8 +370,9 @@ TEST_F(FrameTreeTest, FailAddFrameWithWrongProcessId) {
ASSERT_EQ("1: []", GetTreeState(frame_tree));
// Simulate attaching a frame from mismatched process id.
- ASSERT_FALSE(frame_tree->AddFrame(root, process_id + 1, 1, std::string(),
- SandboxFlags::NONE));
+ ASSERT_FALSE(frame_tree->AddFrame(root, process_id + 1, 1,
+ blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE));
ASSERT_EQ("1: []", GetTreeState(frame_tree));
}
@@ -358,12 +382,15 @@ TEST_F(FrameTreeTest, ProcessCrashClearsGlobalMap) {
// Add a couple child frames to the main frame.
FrameTreeNode* root = contents()->GetFrameTree()->root();
- main_test_rfh()->OnCreateChildFrame(22, std::string(), SandboxFlags::NONE);
- main_test_rfh()->OnCreateChildFrame(23, std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
+ main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
// Add one grandchild frame.
RenderFrameHostImpl* child1_rfh = root->child_at(0)->current_frame_host();
- child1_rfh->OnCreateChildFrame(33, std::string(), SandboxFlags::NONE);
+ child1_rfh->OnCreateChildFrame(33, blink::WebTreeScopeType::Document,
+ std::string(), SandboxFlags::NONE);
// Ensure they can be found by id.
int id1 = root->child_at(0)->frame_tree_node_id();
« components/printing/renderer/print_web_view_helper.cc ('K') | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698