| OLD | NEW |
| 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 892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 903 | 903 |
| 904 // The precise amount of scroll for the first view position update is not | 904 // The precise amount of scroll for the first view position update is not |
| 905 // deterministic, so this simply verifies that the OOPIF moved from its | 905 // deterministic, so this simply verifies that the OOPIF moved from its |
| 906 // earlier position. | 906 // earlier position. |
| 907 gfx::Rect update_rect = filter->last_rect(); | 907 gfx::Rect update_rect = filter->last_rect(); |
| 908 EXPECT_LT(update_rect.y(), bounds.y() - rwhv_root->GetViewBounds().y()); | 908 EXPECT_LT(update_rect.y(), bounds.y() - rwhv_root->GetViewBounds().y()); |
| 909 } | 909 } |
| 910 | 910 |
| 911 // Test that scrolling a nested out-of-process iframe bubbles unused scroll | 911 // Test that scrolling a nested out-of-process iframe bubbles unused scroll |
| 912 // delta to a parent frame. | 912 // delta to a parent frame. |
| 913 #if defined(OS_ANDROID) | |
| 914 // Browser process hit testing is not implemented on Android. | 913 // Browser process hit testing is not implemented on Android. |
| 915 // https://crbug.com/491334 | 914 // https://crbug.com/491334 |
| 916 #define MAYBE_ScrollBubblingFromOOPIFTest DISABLED_ScrollBubblingFromOOPIFTest | 915 // Flaky: https://crbug.com/627238 |
| 917 #else | |
| 918 #define MAYBE_ScrollBubblingFromOOPIFTest ScrollBubblingFromOOPIFTest | |
| 919 #endif | |
| 920 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, | 916 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| 921 MAYBE_ScrollBubblingFromOOPIFTest) { | 917 DISABLED_ScrollBubblingFromOOPIFTest) { |
| 922 GURL main_url(embedded_test_server()->GetURL( | 918 GURL main_url(embedded_test_server()->GetURL( |
| 923 "a.com", "/cross_site_iframe_factory.html?a(b)")); | 919 "a.com", "/cross_site_iframe_factory.html?a(b)")); |
| 924 NavigateToURL(shell(), main_url); | 920 NavigateToURL(shell(), main_url); |
| 925 | 921 |
| 926 // It is safe to obtain the root frame tree node here, as it doesn't change. | 922 // It is safe to obtain the root frame tree node here, as it doesn't change. |
| 927 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) | 923 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) |
| 928 ->GetFrameTree() | 924 ->GetFrameTree() |
| 929 ->root(); | 925 ->root(); |
| 930 ASSERT_EQ(1U, root->child_count()); | 926 ASSERT_EQ(1U, root->child_count()); |
| 931 | 927 |
| (...skipping 6566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7498 | 7494 |
| 7499 shell()->web_contents()->WasShown(); | 7495 shell()->web_contents()->WasShown(); |
| 7500 | 7496 |
| 7501 EXPECT_TRUE(ExecuteScriptAndExtractInt( | 7497 EXPECT_TRUE(ExecuteScriptAndExtractInt( |
| 7502 root->child_at(0)->current_frame_host(), | 7498 root->child_at(0)->current_frame_host(), |
| 7503 "window.domAutomationController.send(event_fired);", &event_fired)); | 7499 "window.domAutomationController.send(event_fired);", &event_fired)); |
| 7504 EXPECT_EQ(2, event_fired); | 7500 EXPECT_EQ(2, event_fired); |
| 7505 } | 7501 } |
| 7506 | 7502 |
| 7507 } // namespace content | 7503 } // namespace content |
| OLD | NEW |