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

Side by Side Diff: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 728
729 GraphicsLayer* scrollLayer = 729 GraphicsLayer* scrollLayer =
730 innerFrameView->layoutViewportScrollableArea()->layerForScrolling(); 730 innerFrameView->layoutViewportScrollableArea()->layerForScrolling();
731 ASSERT_TRUE(scrollLayer); 731 ASSERT_TRUE(scrollLayer);
732 ASSERT_EQ(innerFrameView->layoutViewportScrollableArea(), 732 ASSERT_EQ(innerFrameView->layoutViewportScrollableArea(),
733 scrollLayer->getScrollableArea()); 733 scrollLayer->getScrollableArea());
734 734
735 WebLayer* webScrollLayer = scrollLayer->platformLayer(); 735 WebLayer* webScrollLayer = scrollLayer->platformLayer();
736 ASSERT_TRUE(webScrollLayer->scrollable()); 736 ASSERT_TRUE(webScrollLayer->scrollable());
737 737
738 int expectedScrollPosition = 738 int expectedScrollPosition = 958 +
739 958 + (innerFrameView->layoutViewportScrollableArea() 739 (innerFrameView->layoutViewportScrollableArea()
740 ->verticalScrollbar() 740 ->verticalScrollbar()
741 ->isOverlayScrollbar() 741 ->isOverlayScrollbar()
742 ? 0 742 ? 0
743 : 15); 743 : 15);
744 ASSERT_EQ(expectedScrollPosition, webScrollLayer->scrollPosition().x); 744 ASSERT_EQ(expectedScrollPosition, webScrollLayer->scrollPosition().x);
745 } 745 }
746 746
747 TEST_P(ScrollingCoordinatorTest, setupScrollbarLayerShouldNotCrash) { 747 TEST_P(ScrollingCoordinatorTest, setupScrollbarLayerShouldNotCrash) {
748 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html"); 748 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html");
749 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html"); 749 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html");
750 forceFullCompositingUpdate(); 750 forceFullCompositingUpdate();
751 // This test document setup an iframe with scrollbars, then switch to 751 // This test document setup an iframe with scrollbars, then switch to
752 // an empty document by javascript. 752 // an empty document by javascript.
753 } 753 }
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 MainThreadScrollingReason::kHasOpacityAndLCDText | 1165 MainThreadScrollingReason::kHasOpacityAndLCDText |
1166 MainThreadScrollingReason::kHasBorderRadius); 1166 MainThreadScrollingReason::kHasBorderRadius);
1167 } 1167 }
1168 1168
1169 TEST_P(StyleRelatedMainThreadScrollingReasonTest, BoxShadowTest) { 1169 TEST_P(StyleRelatedMainThreadScrollingReasonTest, BoxShadowTest) {
1170 testStyle("box-shadow", 1170 testStyle("box-shadow",
1171 MainThreadScrollingReason::kHasBoxShadowFromNonRootLayer); 1171 MainThreadScrollingReason::kHasBoxShadowFromNonRootLayer);
1172 } 1172 }
1173 1173
1174 } // namespace blink 1174 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/RootScrollerTest.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698