Source/web/tests/PinchViewportTest.cpp - Issue 480803002: Merge CompositedScrollingForFrames into PreferCompositingToLCDText

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

Issue 480803002: Merge CompositedScrollingForFrames into PreferCompositingToLCDText (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 4 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/WebSettingsImpl.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »

OLD	NEW
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 128 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139	139

140 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); }	140 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); }

141 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); }	141 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()-> frame(); }

142	142

143 static void configureSettings(WebSettings* settings)	143 static void configureSettings(WebSettings* settings)

144 {	144 {

145 settings->setJavaScriptEnabled(true);	145 settings->setJavaScriptEnabled(true);

146 settings->setAcceleratedCompositingEnabled(true);	146 settings->setAcceleratedCompositingEnabled(true);

147 settings->setPreferCompositingToLCDTextEnabled(true);	147 settings->setPreferCompositingToLCDTextEnabled(true);

148 settings->setAcceleratedCompositingForOverflowScrollEnabled(true);	148 settings->setAcceleratedCompositingForOverflowScrollEnabled(true);

149 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);

156 settings->setViewportEnabled(true);	155 settings->setViewportEnabled(true);

157 settings->setViewportMetaEnabled(true);	156 settings->setViewportMetaEnabled(true);

158 settings->setShrinksViewportContentToFit(true);	157 settings->setShrinksViewportContentToFit(true);

159 }	158 }

(...skipping 636 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
796 pinchViewport.scrollIntoView(FloatRect(50, 75, 50, 75));	795 pinchViewport.scrollIntoView(FloatRect(50, 75, 50, 75));

797 EXPECT_POINT_EQ(IntPoint(50, 75), frame()->view()->scrollPosition());	796 EXPECT_POINT_EQ(IntPoint(50, 75), frame()->view()->scrollPosition());

798 EXPECT_FLOAT_POINT_EQ(FloatPoint(), pinchViewport.visibleRect().location());	797 EXPECT_FLOAT_POINT_EQ(FloatPoint(), pinchViewport.visibleRect().location());

799	798

800 pinchViewport.scrollIntoView(FloatRect(190, 290, 10, 10));	799 pinchViewport.scrollIntoView(FloatRect(190, 290, 10, 10));

801 EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());	800 EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());

802 EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 75), pinchViewport.visibleRect().locati on());	801 EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 75), pinchViewport.visibleRect().locati on());

803 }	802 }

804	803

805 } // namespace	804 } // namespace

OLD	NEW