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

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.cc

Issue 6732015: Build fix for WebKit https://bugs.webkit.org/show_bug.cgi?id=56947 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « no previous file | 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tools/test_shell/test_shell_webkit_init.h" 5 #include "webkit/tools/test_shell/test_shell_webkit_init.h"
6 6
7 #include "base/metrics/stats_counters.h" 7 #include "base/metrics/stats_counters.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "media/base/media.h" 9 #include "media/base/media.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
(...skipping 15 matching lines...) Expand all
26 WebKit::initialize(this); 26 WebKit::initialize(this);
27 WebKit::setLayoutTestMode(layout_test_mode); 27 WebKit::setLayoutTestMode(layout_test_mode);
28 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal( 28 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(
29 WebKit::WebString::fromUTF8("test-shell-resource")); 29 WebKit::WebString::fromUTF8("test-shell-resource"));
30 WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess( 30 WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(
31 WebKit::WebString::fromUTF8("test-shell-resource")); 31 WebKit::WebString::fromUTF8("test-shell-resource"));
32 WebKit::WebScriptController::enableV8SingleThreadMode(); 32 WebKit::WebScriptController::enableV8SingleThreadMode();
33 WebKit::WebRuntimeFeatures::enableSockets(true); 33 WebKit::WebRuntimeFeatures::enableSockets(true);
34 WebKit::WebRuntimeFeatures::enableApplicationCache(true); 34 WebKit::WebRuntimeFeatures::enableApplicationCache(true);
35 WebKit::WebRuntimeFeatures::enableDatabase(true); 35 WebKit::WebRuntimeFeatures::enableDatabase(true);
36 WebKit::WebRuntimeFeatures::enableWebGL(true);
37 WebKit::WebRuntimeFeatures::enablePushState(true); 36 WebKit::WebRuntimeFeatures::enablePushState(true);
38 WebKit::WebRuntimeFeatures::enableNotifications(true); 37 WebKit::WebRuntimeFeatures::enableNotifications(true);
39 WebKit::WebRuntimeFeatures::enableTouch(true); 38 WebKit::WebRuntimeFeatures::enableTouch(true);
40 WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); 39 WebKit::WebRuntimeFeatures::enableIndexedDatabase(true);
41 WebKit::WebRuntimeFeatures::enableSpeechInput(true); 40 WebKit::WebRuntimeFeatures::enableSpeechInput(true);
42 WebKit::WebRuntimeFeatures::enableFileSystem(true); 41 WebKit::WebRuntimeFeatures::enableFileSystem(true);
43 42
44 // TODO(hwennborg): Enable this once the implementation supports it. 43 // TODO(hwennborg): Enable this once the implementation supports it.
45 WebKit::WebRuntimeFeatures::enableDeviceMotion(false); 44 WebKit::WebRuntimeFeatures::enableDeviceMotion(false);
46 WebKit::WebRuntimeFeatures::enableDeviceOrientation(true); 45 WebKit::WebRuntimeFeatures::enableDeviceOrientation(true);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 284 }
286 285
287 WebKit::WebSharedWorkerRepository* 286 WebKit::WebSharedWorkerRepository*
288 TestShellWebKitInit::sharedWorkerRepository() { 287 TestShellWebKitInit::sharedWorkerRepository() {
289 return NULL; 288 return NULL;
290 } 289 }
291 290
292 WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() { 291 WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() {
293 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); 292 return new webkit::gpu::WebGraphicsContext3DInProcessImpl();
294 } 293 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698