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

Side by Side Diff: Source/web/tests/ScrollingCoordinatorChromiumTest.cpp

Issue 295383008: Remove the forceCompositingMode setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address review comment Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); } 91 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); }
92 92
93 protected: 93 protected:
94 std::string m_baseURL; 94 std::string m_baseURL;
95 FrameTestHelpers::TestWebViewClient m_mockWebViewClient; 95 FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
96 96
97 private: 97 private:
98 static void configureSettings(WebSettings* settings) 98 static void configureSettings(WebSettings* settings)
99 { 99 {
100 settings->setJavaScriptEnabled(true); 100 settings->setJavaScriptEnabled(true);
101 settings->setForceCompositingMode(true);
102 settings->setAcceleratedCompositingEnabled(true); 101 settings->setAcceleratedCompositingEnabled(true);
103 settings->setAcceleratedCompositingForFixedPositionEnabled(true); 102 settings->setAcceleratedCompositingForFixedPositionEnabled(true);
104 settings->setAcceleratedCompositingForOverflowScrollEnabled(true); 103 settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
105 settings->setCompositedScrollingForFramesEnabled(true); 104 settings->setCompositedScrollingForFramesEnabled(true);
106 } 105 }
107 106
108 FrameTestHelpers::WebViewHelper m_helper; 107 FrameTestHelpers::WebViewHelper m_helper;
109 }; 108 };
110 109
111 TEST_F(ScrollingCoordinatorChromiumTest, fastScrollingByDefault) 110 TEST_F(ScrollingCoordinatorChromiumTest, fastScrollingByDefault)
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash) 451 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash)
453 { 452 {
454 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html"); 453 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html");
455 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html"); 454 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html");
456 forceFullCompositingUpdate(); 455 forceFullCompositingUpdate();
457 // This test document setup an iframe with scrollbars, then switch to 456 // This test document setup an iframe with scrollbars, then switch to
458 // an empty document by javascript. 457 // an empty document by javascript.
459 } 458 }
460 459
461 } // namespace 460 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698