| 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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 " |--Site A -- proxies for C\n" | 708 " |--Site A -- proxies for C\n" |
| 709 " +--Site A -- proxies for C\n" | 709 " +--Site A -- proxies for C\n" |
| 710 " +--Site A -- proxies for C\n" | 710 " +--Site A -- proxies for C\n" |
| 711 "Where A = http://a.com/\n" | 711 "Where A = http://a.com/\n" |
| 712 " C = http://bar.com/", | 712 " C = http://bar.com/", |
| 713 DepictFrameTree(root)); | 713 DepictFrameTree(root)); |
| 714 } | 714 } |
| 715 | 715 |
| 716 // Test that mouse events are being routed to the correct RenderWidgetHostView | 716 // Test that mouse events are being routed to the correct RenderWidgetHostView |
| 717 // based on coordinates. | 717 // based on coordinates. |
| 718 #if defined(OS_ANDROID) | 718 #if defined(OS_ANDROID) || defined(THREAD_SANITIZER) |
| 719 // Browser process hit testing is not implemented on Android. | 719 // Browser process hit testing is not implemented on Android. |
| 720 // https://crbug.com/491334 | 720 // https://crbug.com/491334 |
| 721 // The test times out often on TSAN bot. |
| 722 // https://crbug.com/591170. |
| 721 #define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest | 723 #define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest |
| 722 #else | 724 #else |
| 723 #define MAYBE_SurfaceHitTestTest SurfaceHitTestTest | 725 #define MAYBE_SurfaceHitTestTest SurfaceHitTestTest |
| 724 #endif | 726 #endif |
| 725 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_SurfaceHitTestTest) { | 727 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_SurfaceHitTestTest) { |
| 726 SurfaceHitTestTestHelper(shell(), embedded_test_server()); | 728 SurfaceHitTestTestHelper(shell(), embedded_test_server()); |
| 727 } | 729 } |
| 728 | 730 |
| 729 // Same test as above, but runs in high-dpi mode. | 731 // Same test as above, but runs in high-dpi mode. |
| 730 #if defined(OS_ANDROID) || defined(OS_WIN) | 732 #if defined(OS_ANDROID) || defined(OS_WIN) |
| (...skipping 4709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5440 | 5442 |
| 5441 // Force the renderer to generate a new frame. | 5443 // Force the renderer to generate a new frame. |
| 5442 EXPECT_TRUE(ExecuteScript(shell()->web_contents(), | 5444 EXPECT_TRUE(ExecuteScript(shell()->web_contents(), |
| 5443 "document.body.style.background = 'black'")); | 5445 "document.body.style.background = 'black'")); |
| 5444 | 5446 |
| 5445 // Waits for the next frame. | 5447 // Waits for the next frame. |
| 5446 observer->Wait(); | 5448 observer->Wait(); |
| 5447 } | 5449 } |
| 5448 | 5450 |
| 5449 } // namespace content | 5451 } // namespace content |
| OLD | NEW |