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

Side by Side Diff: content/browser/site_per_process_browsertest.cc

Issue 2140603004: Disable SitePerProcessBrowserTest.ScrollBubblingFromOOPIFTest for being flaky. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/site_per_process_browsertest.h" 5 #include "content/browser/site_per_process_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 923
924 // The precise amount of scroll for the first view position update is not 924 // The precise amount of scroll for the first view position update is not
925 // deterministic, so this simply verifies that the OOPIF moved from its 925 // deterministic, so this simply verifies that the OOPIF moved from its
926 // earlier position. 926 // earlier position.
927 gfx::Rect update_rect = filter->last_rect(); 927 gfx::Rect update_rect = filter->last_rect();
928 EXPECT_LT(update_rect.y(), bounds.y() - rwhv_root->GetViewBounds().y()); 928 EXPECT_LT(update_rect.y(), bounds.y() - rwhv_root->GetViewBounds().y());
929 } 929 }
930 930
931 // Test that scrolling a nested out-of-process iframe bubbles unused scroll 931 // Test that scrolling a nested out-of-process iframe bubbles unused scroll
932 // delta to a parent frame. 932 // delta to a parent frame.
933 #if defined(OS_ANDROID)
934 // Browser process hit testing is not implemented on Android. 933 // Browser process hit testing is not implemented on Android.
935 // https://crbug.com/491334 934 // https://crbug.com/491334
936 #define MAYBE_ScrollBubblingFromOOPIFTest DISABLED_ScrollBubblingFromOOPIFTest 935 // Flaky https://crbug.com/627238.
937 #else
938 #define MAYBE_ScrollBubblingFromOOPIFTest ScrollBubblingFromOOPIFTest
939 #endif
940 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, 936 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
941 MAYBE_ScrollBubblingFromOOPIFTest) { 937 DISABLED_ScrollBubblingFromOOPIFTest) {
942 GURL main_url(embedded_test_server()->GetURL( 938 GURL main_url(embedded_test_server()->GetURL(
943 "a.com", "/cross_site_iframe_factory.html?a(b)")); 939 "a.com", "/cross_site_iframe_factory.html?a(b)"));
944 NavigateToURL(shell(), main_url); 940 NavigateToURL(shell(), main_url);
945 941
946 // It is safe to obtain the root frame tree node here, as it doesn't change. 942 // It is safe to obtain the root frame tree node here, as it doesn't change.
947 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) 943 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
948 ->GetFrameTree() 944 ->GetFrameTree()
949 ->root(); 945 ->root();
950 ASSERT_EQ(1U, root->child_count()); 946 ASSERT_EQ(1U, root->child_count());
951 947
(...skipping 6554 matching lines...) Expand 10 before | Expand all | Expand 10 after
7506 7502
7507 shell()->web_contents()->WasShown(); 7503 shell()->web_contents()->WasShown();
7508 7504
7509 EXPECT_TRUE(ExecuteScriptAndExtractInt( 7505 EXPECT_TRUE(ExecuteScriptAndExtractInt(
7510 root->child_at(0)->current_frame_host(), 7506 root->child_at(0)->current_frame_host(),
7511 "window.domAutomationController.send(event_fired);", &event_fired)); 7507 "window.domAutomationController.send(event_fired);", &event_fired));
7512 EXPECT_EQ(2, event_fired); 7508 EXPECT_EQ(2, event_fired);
7513 } 7509 }
7514 7510
7515 } // namespace content 7511 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698