OLD | NEW |
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/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 WebMediaPlayerClient* client) { | 350 WebMediaPlayerClient* client) { |
351 return CreateMediaPlayer(frame, client, NULL); | 351 return CreateMediaPlayer(frame, client, NULL); |
352 } | 352 } |
353 | 353 |
354 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 354 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
355 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 355 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
356 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 356 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
357 } | 357 } |
358 | 358 |
359 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { | 359 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { |
360 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND | |
361 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); | 360 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); |
362 #else | |
363 return WebKit::WebStorageNamespace::createSessionStorageNamespace(quota); | |
364 #endif | |
365 } | 361 } |
366 | 362 |
367 WebKit::WebString GetWebKitRootDir() { | 363 WebKit::WebString GetWebKitRootDir() { |
368 FilePath path = GetWebKitRootDirFilePath(); | 364 FilePath path = GetWebKitRootDirFilePath(); |
369 std::string path_ascii = path.MaybeAsASCII(); | 365 std::string path_ascii = path.MaybeAsASCII(); |
370 CHECK(!path_ascii.empty()); | 366 CHECK(!path_ascii.empty()); |
371 return WebKit::WebString::fromUTF8(path_ascii.c_str()); | 367 return WebKit::WebString::fromUTF8(path_ascii.c_str()); |
372 } | 368 } |
373 | 369 |
374 void SetUpGLBindings(GLBindingPreferences bindingPref) { | 370 void SetUpGLBindings(GLBindingPreferences bindingPref) { |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 // Logging | 704 // Logging |
709 void EnableWebCoreLogChannels(const std::string& channels) { | 705 void EnableWebCoreLogChannels(const std::string& channels) { |
710 webkit_glue::EnableWebCoreLogChannels(channels); | 706 webkit_glue::EnableWebCoreLogChannels(channels); |
711 } | 707 } |
712 | 708 |
713 void SetGamepadData(const WebKit::WebGamepads& pads) { | 709 void SetGamepadData(const WebKit::WebGamepads& pads) { |
714 test_environment->webkit_platform_support()->setGamepadData(pads); | 710 test_environment->webkit_platform_support()->setGamepadData(pads); |
715 } | 711 } |
716 | 712 |
717 } // namespace webkit_support | 713 } // namespace webkit_support |
OLD | NEW |