| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/stats_counters.h" | 8 #include "base/stats_counters.h" |
| 9 #include "media/base/media.h" | 9 #include "media/base/media.h" |
| 10 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" | 10 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 WebKit::WebScriptController::registerExtension( | 35 WebKit::WebScriptController::registerExtension( |
| 36 extensions_v8::IntervalExtension::Get()); | 36 extensions_v8::IntervalExtension::Get()); |
| 37 WebKit::WebRuntimeFeatures::enableSockets(true); | 37 WebKit::WebRuntimeFeatures::enableSockets(true); |
| 38 WebKit::WebRuntimeFeatures::enableApplicationCache(true); | 38 WebKit::WebRuntimeFeatures::enableApplicationCache(true); |
| 39 WebKit::WebRuntimeFeatures::enableDatabase(true); | 39 WebKit::WebRuntimeFeatures::enableDatabase(true); |
| 40 WebKit::WebRuntimeFeatures::enableWebGL(true); | 40 WebKit::WebRuntimeFeatures::enableWebGL(true); |
| 41 WebKit::WebRuntimeFeatures::enablePushState(true); | 41 WebKit::WebRuntimeFeatures::enablePushState(true); |
| 42 WebKit::WebRuntimeFeatures::enableNotifications(true); | 42 WebKit::WebRuntimeFeatures::enableNotifications(true); |
| 43 WebKit::WebRuntimeFeatures::enableTouch(true); | 43 WebKit::WebRuntimeFeatures::enableTouch(true); |
| 44 WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); | 44 WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); |
| 45 WebKit::WebRuntimeFeatures::enableSpeechInput(true); |
| 45 | 46 |
| 46 // TODO(hwennborg): Enable this once the implementation supports it. | 47 // TODO(hwennborg): Enable this once the implementation supports it. |
| 47 WebKit::WebRuntimeFeatures::enableDeviceOrientation(false); | 48 WebKit::WebRuntimeFeatures::enableDeviceOrientation(false); |
| 48 | 49 |
| 49 // Load libraries for media and enable the media player. | 50 // Load libraries for media and enable the media player. |
| 50 FilePath module_path; | 51 FilePath module_path; |
| 51 WebKit::WebRuntimeFeatures::enableMediaPlayer( | 52 WebKit::WebRuntimeFeatures::enableMediaPlayer( |
| 52 PathService::Get(base::DIR_MODULE, &module_path) && | 53 PathService::Get(base::DIR_MODULE, &module_path) && |
| 53 media::InitializeMediaLibrary(module_path)); | 54 media::InitializeMediaLibrary(module_path)); |
| 54 | 55 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00" | 102 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00" |
| 102 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a" | 103 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a" |
| 103 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a" | 104 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a" |
| 104 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d" | 105 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d" |
| 105 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60" | 106 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60" |
| 106 "\x82"; | 107 "\x82"; |
| 107 return WebKit::WebData(red_square, arraysize(red_square)); | 108 return WebKit::WebData(red_square, arraysize(red_square)); |
| 108 } | 109 } |
| 109 return webkit_glue::WebKitClientImpl::loadResource(name); | 110 return webkit_glue::WebKitClientImpl::loadResource(name); |
| 110 } | 111 } |
| OLD | NEW |