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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 | 101 |
102 private: | 102 private: |
103 static void configureSettings(WebSettings* settings) | 103 static void configureSettings(WebSettings* settings) |
104 { | 104 { |
105 settings->setJavaScriptEnabled(true); | 105 settings->setJavaScriptEnabled(true); |
106 settings->setAcceleratedCompositingEnabled(true); | 106 settings->setAcceleratedCompositingEnabled(true); |
107 settings->setPreferCompositingToLCDTextEnabled(true); | 107 settings->setPreferCompositingToLCDTextEnabled(true); |
108 } | 108 } |
109 | 109 |
110 FrameTestHelpers::WebViewHelper m_helper; | 110 FrameTestHelpers::WebViewHelper m_helper; |
| 111 FrameTestHelpers::UseMockScrollbarSettings m_mockScrollbarSettings; |
111 }; | 112 }; |
112 | 113 |
113 TEST_F(ScrollingCoordinatorTest, fastScrollingByDefault) | 114 TEST_F(ScrollingCoordinatorTest, fastScrollingByDefault) |
114 { | 115 { |
115 navigateTo("about:blank"); | 116 navigateTo("about:blank"); |
116 forceFullCompositingUpdate(); | 117 forceFullCompositingUpdate(); |
117 | 118 |
118 // Make sure the scrolling coordinator is active. | 119 // Make sure the scrolling coordinator is active. |
119 FrameView* frameView = frame()->view(); | 120 FrameView* frameView = frame()->view(); |
120 Page* page = frame()->page(); | 121 Page* page = frame()->page(); |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
600 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread()); | 601 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread()); |
601 | 602 |
602 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone); | 603 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone); |
603 forceFullCompositingUpdate(); | 604 forceFullCompositingUpdate(); |
604 | 605 |
605 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l
ayer()->hasCompositedLayerMapping()); | 606 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l
ayer()->hasCompositedLayerMapping()); |
606 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread()); | 607 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread()); |
607 } | 608 } |
608 | 609 |
609 } // namespace blink | 610 } // namespace blink |
OLD | NEW |