OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 } | 371 } |
372 | 372 |
373 TEST_F(ScrollingCoordinatorTest, updateEventHandlersDuringTeardown) | 373 TEST_F(ScrollingCoordinatorTest, updateEventHandlersDuringTeardown) |
374 { | 374 { |
375 registerMockedHttpURLLoad("scroll-event-handler-window.html"); | 375 registerMockedHttpURLLoad("scroll-event-handler-window.html"); |
376 navigateTo(m_baseURL + "scroll-event-handler-window.html"); | 376 navigateTo(m_baseURL + "scroll-event-handler-window.html"); |
377 forceFullCompositingUpdate(); | 377 forceFullCompositingUpdate(); |
378 | 378 |
379 // Simulate detaching the document from its DOM window. This should not | 379 // Simulate detaching the document from its DOM window. This should not |
380 // cause a crash when the WebViewImpl is closed by the test runner. | 380 // cause a crash when the WebViewImpl is closed by the test runner. |
381 frame()->document()->detachLayoutTree(); | 381 frame()->document()->shutdown(); |
382 } | 382 } |
383 | 383 |
384 TEST_F(ScrollingCoordinatorTest, clippedBodyTest) | 384 TEST_F(ScrollingCoordinatorTest, clippedBodyTest) |
385 { | 385 { |
386 registerMockedHttpURLLoad("clipped-body.html"); | 386 registerMockedHttpURLLoad("clipped-body.html"); |
387 navigateTo(m_baseURL + "clipped-body.html"); | 387 navigateTo(m_baseURL + "clipped-body.html"); |
388 forceFullCompositingUpdate(); | 388 forceFullCompositingUpdate(); |
389 | 389 |
390 WebLayer* rootScrollLayer = getRootScrollLayer(); | 390 WebLayer* rootScrollLayer = getRootScrollLayer(); |
391 ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size()); | 391 ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size()); |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 // remove custom scrollbar class, the scrollbar is expected to scroll on | 677 // remove custom scrollbar class, the scrollbar is expected to scroll on |
678 // impl thread as it is an overlay scrollbar. | 678 // impl thread as it is an overlay scrollbar. |
679 container->removeAttribute("class"); | 679 container->removeAttribute("class"); |
680 forceFullCompositingUpdate(); | 680 forceFullCompositingUpdate(); |
681 scrollbarGraphicsLayer = compositedLayerMapping->layerForVerticalScrollbar()
; | 681 scrollbarGraphicsLayer = compositedLayerMapping->layerForVerticalScrollbar()
; |
682 ASSERT_FALSE(scrollbarGraphicsLayer->platformLayer()->shouldScrollOnMainThre
ad()); | 682 ASSERT_FALSE(scrollbarGraphicsLayer->platformLayer()->shouldScrollOnMainThre
ad()); |
683 ASSERT_FALSE(scrollbarGraphicsLayer->platformLayer()->mainThreadScrollingRea
sons() & MainThreadScrollingReason::kCustomScrollbarScrolling); | 683 ASSERT_FALSE(scrollbarGraphicsLayer->platformLayer()->mainThreadScrollingRea
sons() & MainThreadScrollingReason::kCustomScrollbarScrolling); |
684 } | 684 } |
685 | 685 |
686 } // namespace blink | 686 } // namespace blink |
OLD | NEW |