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

Side by Side Diff: Source/web/tests/PinchViewportTest.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "core/frame/PinchViewport.h" 7 #include "core/frame/PinchViewport.h"
8 8
9 #include "core/frame/FrameHost.h" 9 #include "core/frame/FrameHost.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer(); 135 WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer();
136 return webScrollLayer; 136 return webScrollLayer;
137 } 137 }
138 138
139 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); } 139 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); }
140 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); } 140 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); }
141 141
142 static void configureSettings(WebSettings* settings) 142 static void configureSettings(WebSettings* settings)
143 { 143 {
144 settings->setJavaScriptEnabled(true); 144 settings->setJavaScriptEnabled(true);
145 settings->setForceCompositingMode(true);
146 settings->setAcceleratedCompositingEnabled(true); 145 settings->setAcceleratedCompositingEnabled(true);
147 settings->setAcceleratedCompositingForFixedPositionEnabled(true); 146 settings->setAcceleratedCompositingForFixedPositionEnabled(true);
148 settings->setAcceleratedCompositingForOverflowScrollEnabled(true); 147 settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
149 settings->setCompositedScrollingForFramesEnabled(true); 148 settings->setCompositedScrollingForFramesEnabled(true);
150 settings->setPinchVirtualViewportEnabled(true); 149 settings->setPinchVirtualViewportEnabled(true);
151 } 150 }
152 151
153 static void configureAndroidSettings(WebSettings* settings) 152 static void configureAndroidSettings(WebSettings* settings)
154 { 153 {
155 configureSettings(settings); 154 configureSettings(settings);
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 720
722 mouseDownEvent.button = WebMouseEvent::ButtonRight; 721 mouseDownEvent.button = WebMouseEvent::ButtonRight;
723 webViewImpl()->handleInputEvent(mouseDownEvent); 722 webViewImpl()->handleInputEvent(mouseDownEvent);
724 webViewImpl()->handleInputEvent(mouseUpEvent); 723 webViewImpl()->handleInputEvent(mouseUpEvent);
725 724
726 // Reset the old client so destruction can occur naturally. 725 // Reset the old client so destruction can occur naturally.
727 webViewImpl()->mainFrameImpl()->setClient(oldClient); 726 webViewImpl()->mainFrameImpl()->setClient(oldClient);
728 } 727 }
729 728
730 } // namespace 729 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/FrameTestHelpers.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698