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

Side by Side Diff: webkit/support/test_webkit_platform_support.cc

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/support/test_webkit_platform_support.h" 5 #include "webkit/support/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/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/metrics/stats_counters.h" 10 #include "base/metrics/stats_counters.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "webkit/tools/test_shell/test_shell_request_context.h" 59 #include "webkit/tools/test_shell/test_shell_request_context.h"
60 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h" 60 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
61 61
62 #if defined(OS_WIN) 62 #if defined(OS_WIN)
63 #include "third_party/WebKit/Source/Platform/chromium/public/win/WebThemeEngine. h" 63 #include "third_party/WebKit/Source/Platform/chromium/public/win/WebThemeEngine. h"
64 #include "webkit/tools/test_shell/test_shell_webthemeengine.h" 64 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
65 #elif defined(OS_MACOSX) 65 #elif defined(OS_MACOSX)
66 #include "base/mac/mac_util.h" 66 #include "base/mac/mac_util.h"
67 #endif 67 #endif
68 68
69 using WebKit::WebLayerTreeViewImplForTesting;
70 using WebKit::WebScriptController; 69 using WebKit::WebScriptController;
70 using webkit::WebLayerTreeViewImplForTesting;
71 71
72 TestWebKitPlatformSupport::TestWebKitPlatformSupport(bool unit_test_mode, 72 TestWebKitPlatformSupport::TestWebKitPlatformSupport(bool unit_test_mode,
73 WebKit::Platform* shadow_platform_delegate) 73 WebKit::Platform* shadow_platform_delegate)
74 : unit_test_mode_(unit_test_mode), 74 : unit_test_mode_(unit_test_mode),
75 shadow_platform_delegate_(shadow_platform_delegate), 75 shadow_platform_delegate_(shadow_platform_delegate),
76 threaded_compositing_enabled_(false) { 76 threaded_compositing_enabled_(false) {
77 v8::V8::SetCounterFunction(base::StatsTable::FindLocation); 77 v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
78 78
79 WebKit::initialize(this); 79 WebKit::initialize(this);
80 WebKit::setLayoutTestMode(true); 80 WebKit::setLayoutTestMode(true);
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 return view.release(); 565 return view.release();
566 } 566 }
567 567
568 WebKit::WebLayerTreeView* 568 WebKit::WebLayerTreeView*
569 TestWebKitPlatformSupport::createLayerTreeViewForTesting( 569 TestWebKitPlatformSupport::createLayerTreeViewForTesting(
570 TestViewType type) { 570 TestViewType type) {
571 DCHECK_EQ(TestViewTypeUnitTest, type); 571 DCHECK_EQ(TestViewTypeUnitTest, type);
572 return createLayerTreeViewForTesting(); 572 return createLayerTreeViewForTesting();
573 } 573 }
574 574
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698