OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 11561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
11572 scrollable_area->SetScrollOffset(ScrollOffset(10, 10), kProgrammaticScroll, | 11572 scrollable_area->SetScrollOffset(ScrollOffset(10, 10), kProgrammaticScroll, |
11573 kScrollBehaviorInstant); | 11573 kScrollBehaviorInstant); |
11574 | 11574 |
11575 EXPECT_FALSE(scrollable_area->ScrollbarsHidden()); | 11575 EXPECT_FALSE(scrollable_area->ScrollbarsHidden()); |
11576 testing::RunDelayedTasks(kMockOverlayFadeOutDelayMs); | 11576 testing::RunDelayedTasks(kMockOverlayFadeOutDelayMs); |
11577 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); | 11577 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); |
11578 | 11578 |
11579 frame->ExecuteScript(WebScriptSource( | 11579 frame->ExecuteScript(WebScriptSource( |
11580 "document.getElementById('space').style.height = '500px';")); | 11580 "document.getElementById('space').style.height = '500px';")); |
11581 frame->View()->UpdateAllLifecyclePhases(); | 11581 frame->View()->UpdateAllLifecyclePhases(); |
11582 | |
11583 EXPECT_FALSE(scrollable_area->ScrollbarsHidden()); | |
11584 testing::RunDelayedTasks(kMockOverlayFadeOutDelayMs); | |
11585 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); | 11582 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); |
11586 | 11583 |
11587 frame->ExecuteScript(WebScriptSource( | 11584 frame->ExecuteScript(WebScriptSource( |
11588 "document.getElementById('container').style.height = '300px';")); | 11585 "document.getElementById('container').style.height = '300px';")); |
11589 frame->View()->UpdateAllLifecyclePhases(); | 11586 frame->View()->UpdateAllLifecyclePhases(); |
11590 | 11587 |
11591 EXPECT_FALSE(scrollable_area->ScrollbarsHidden()); | 11588 EXPECT_FALSE(scrollable_area->ScrollbarsHidden()); |
11592 testing::RunDelayedTasks(kMockOverlayFadeOutDelayMs); | 11589 testing::RunDelayedTasks(kMockOverlayFadeOutDelayMs); |
11593 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); | 11590 EXPECT_TRUE(scrollable_area->ScrollbarsHidden()); |
11594 | 11591 |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
11997 | 11994 |
11998 // Failing the original child frame navigation and trying to render fallback | 11995 // Failing the original child frame navigation and trying to render fallback |
11999 // content shouldn't crash. It should return NoLoadInProgress. This is so the | 11996 // content shouldn't crash. It should return NoLoadInProgress. This is so the |
12000 // caller won't attempt to replace the correctly empty frame with an error | 11997 // caller won't attempt to replace the correctly empty frame with an error |
12001 // page. | 11998 // page. |
12002 EXPECT_EQ(WebLocalFrame::NoLoadInProgress, | 11999 EXPECT_EQ(WebLocalFrame::NoLoadInProgress, |
12003 child->MaybeRenderFallbackContent(WebURLError())); | 12000 child->MaybeRenderFallbackContent(WebURLError())); |
12004 } | 12001 } |
12005 | 12002 |
12006 } // namespace blink | 12003 } // namespace blink |
OLD | NEW |