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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: consolidate render->browser ipcs into one Created 5 years, 3 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/browser/frame_host/frame_tree_node.cc ('K') | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/browser/frame_host/render_frame_host_impl.h » ('J')
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 b40628b7cfac5f53c6d6b5b070d5ffcc78992b02..4a19be1d66c53092e15d02da3db994af5d79025c 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -140,21 +140,27 @@ TEST_F(FrameTreeTest, Shape) {
// Simulate attaching a series of frames to build the frame tree.
frame_tree->AddFrame(root, process_id, 14, blink::WebTreeScopeType::Document,
- std::string(), blink::WebSandboxFlags::None);
+ std::string(), blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(root, process_id, 15, blink::WebTreeScopeType::Document,
- std::string(), blink::WebSandboxFlags::None);
+ std::string(), blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(root, process_id, 16, blink::WebTreeScopeType::Document,
- std::string(), blink::WebSandboxFlags::None);
+ std::string(), blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(root->child_at(0), process_id, 244,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(root->child_at(1), process_id, 255,
blink::WebTreeScopeType::Document, no_children_node,
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(root->child_at(0), process_id, 245,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
EXPECT_EQ("1*: [14*: [244*: [], 245*: []], "
"15*: [255* 'no children node': []], "
@@ -164,33 +170,42 @@ TEST_F(FrameTreeTest, Shape) {
FrameTreeNode* child_16 = root->child_at(2);
frame_tree->AddFrame(child_16, process_id, 264,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_16, process_id, 265,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_16, process_id, 266,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_16, process_id, 267,
blink::WebTreeScopeType::Document, deep_subtree,
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_16, process_id, 268,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
FrameTreeNode* child_267 = child_16->child_at(3);
frame_tree->AddFrame(child_267, process_id, 365,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_267->child_at(0), process_id, 455,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_267->child_at(0)->child_at(0), process_id, 555,
blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
frame_tree->AddFrame(child_267->child_at(0)->child_at(0)->child_at(0),
process_id, 655, blink::WebTreeScopeType::Document,
- std::string(), blink::WebSandboxFlags::None);
+ std::string(), blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
// Now that's it's fully built, verify the tree structure is as expected.
EXPECT_EQ("1*: [14*: [244*: [], 245*: []], "
@@ -234,12 +249,15 @@ TEST_F(FrameTreeTest, FindFrames) {
FrameTreeNode* root = frame_tree->root();
main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
- "child0", blink::WebSandboxFlags::None);
+ "child0", blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
- "child1", blink::WebSandboxFlags::None);
+ "child1", blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
main_test_rfh()->OnCreateChildFrame(24, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
FrameTreeNode* child0 = root->child_at(0);
FrameTreeNode* child1 = root->child_at(1);
@@ -248,7 +266,7 @@ TEST_F(FrameTreeTest, FindFrames) {
// Add one grandchild frame.
child1->current_frame_host()->OnCreateChildFrame(
33, blink::WebTreeScopeType::Document, "grandchild",
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties());
FrameTreeNode* grandchild = child1->child_at(0);
// Ensure they can be found by FTN id.
@@ -285,11 +303,14 @@ TEST_F(FrameTreeTest, PreviousSibling) {
FrameTree* frame_tree = contents()->GetFrameTree();
FrameTreeNode* root = frame_tree->root();
main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
- "child0", blink::WebSandboxFlags::None);
+ "child0", blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
- "child1", blink::WebSandboxFlags::None);
+ "child1", blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
main_test_rfh()->OnCreateChildFrame(24, blink::WebTreeScopeType::Document,
- "child2", blink::WebSandboxFlags::None);
+ "child2", blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
FrameTreeNode* child0 = root->child_at(0);
FrameTreeNode* child1 = root->child_at(1);
FrameTreeNode* child2 = root->child_at(2);
@@ -297,7 +318,7 @@ TEST_F(FrameTreeTest, PreviousSibling) {
// Add one grandchild frame.
child1->current_frame_host()->OnCreateChildFrame(
33, blink::WebTreeScopeType::Document, "grandchild",
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties());
FrameTreeNode* grandchild = child1->child_at(0);
EXPECT_EQ(nullptr, root->PreviousSibling());
@@ -320,14 +341,16 @@ TEST_F(FrameTreeTest, ObserverWalksTreeDuringFrameCreation) {
// Simulate attaching a series of frames to build the frame tree.
main_test_rfh()->OnCreateChildFrame(14, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
EXPECT_EQ(
"RenderFrameHostChanged(new)(14) -> 1: []\n"
"RenderFrameCreated(14) -> 1: [14: []]",
activity.GetLog());
main_test_rfh()->OnCreateChildFrame(18, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
EXPECT_EQ(
"RenderFrameHostChanged(new)(18) -> 1: [14: []]\n"
"RenderFrameCreated(18) -> 1: [14: [], 18: []]",
@@ -347,14 +370,16 @@ TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
EXPECT_EQ(
"RenderFrameHostChanged(new)(22) -> 1: []\n"
"RenderFrameCreated(22) -> 1: [22: []]",
activity.GetLog());
main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
EXPECT_EQ(
"RenderFrameHostChanged(new)(23) -> 1: [22: []]\n"
"RenderFrameCreated(23) -> 1: [22: [], 23: []]",
@@ -383,7 +408,7 @@ TEST_F(FrameTreeTest, FailAddFrameWithWrongProcessId) {
// Simulate attaching a frame from mismatched process id.
ASSERT_FALSE(frame_tree->AddFrame(
root, process_id + 1, 1, blink::WebTreeScopeType::Document, std::string(),
- blink::WebSandboxFlags::None));
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()));
ASSERT_EQ("1: []", GetTreeState(frame_tree));
}
@@ -397,15 +422,18 @@ TEST_F(FrameTreeTest, ProcessCrashClearsGlobalMap) {
main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
main_test_rfh()->OnCreateChildFrame(23, blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None);
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
// Add one grandchild frame.
RenderFrameHostImpl* child1_rfh = root->child_at(0)->current_frame_host();
child1_rfh->OnCreateChildFrame(33, blink::WebTreeScopeType::Document,
- std::string(), blink::WebSandboxFlags::None);
+ std::string(), blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties());
// Ensure they can be found by id.
int id1 = root->child_at(0)->frame_tree_node_id();
« content/browser/frame_host/frame_tree_node.cc ('K') | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/browser/frame_host/render_frame_host_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698