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

Side by Side Diff: content/test/test_webkit_platform_support.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased for parallel breaking changes 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 | « content/test/test_webkit_platform_support.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/test/test_webkit_platform_support.h" 5 #include "content/test/test_webkit_platform_support.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 blink::WebThemeEngine* TestWebKitPlatformSupport::themeEngine() { 209 blink::WebThemeEngine* TestWebKitPlatformSupport::themeEngine() {
210 return active_theme_engine_; 210 return active_theme_engine_;
211 } 211 }
212 #endif 212 #endif
213 213
214 blink::WebCompositorSupport* TestWebKitPlatformSupport::compositorSupport() { 214 blink::WebCompositorSupport* TestWebKitPlatformSupport::compositorSupport() {
215 return &compositor_support_; 215 return &compositor_support_;
216 } 216 }
217 217
218 blink::WebGestureCurve* TestWebKitPlatformSupport::createFlingAnimationCurve( 218 blink::WebGestureCurve* TestWebKitPlatformSupport::createFlingAnimationCurve(
219 int device_source, 219 blink::WebGestureDevice device_source,
220 const blink::WebFloatPoint& velocity, 220 const blink::WebFloatPoint& velocity,
221 const blink::WebSize& cumulative_scroll) { 221 const blink::WebSize& cumulative_scroll) {
222 // Caller will retain and release. 222 // Caller will retain and release.
223 return new WebGestureCurveMock(velocity, cumulative_scroll); 223 return new WebGestureCurveMock(velocity, cumulative_scroll);
224 } 224 }
225 225
226 blink::WebUnitTestSupport* TestWebKitPlatformSupport::unitTestSupport() { 226 blink::WebUnitTestSupport* TestWebKitPlatformSupport::unitTestSupport() {
227 return this; 227 return this;
228 } 228 }
229 229
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 const blink::WebString& path) { 283 const blink::WebString& path) {
284 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); 284 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
285 285
286 std::string buffer; 286 std::string buffer;
287 base::ReadFileToString(file_path, &buffer); 287 base::ReadFileToString(file_path, &buffer);
288 288
289 return blink::WebData(buffer.data(), buffer.size()); 289 return blink::WebData(buffer.data(), buffer.size());
290 } 290 }
291 291
292 } // namespace content 292 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698