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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 | 441 |
442 WebKit::WebMediaPlayer* CreateMediaPlayer( | 442 WebKit::WebMediaPlayer* CreateMediaPlayer( |
443 WebFrame* frame, | 443 WebFrame* frame, |
444 const WebURL& url, | 444 const WebURL& url, |
445 WebMediaPlayerClient* client) { | 445 WebMediaPlayerClient* client) { |
446 return CreateMediaPlayer(frame, url, client, NULL); | 446 return CreateMediaPlayer(frame, url, client, NULL); |
447 } | 447 } |
448 | 448 |
449 #if defined(OS_ANDROID) | 449 #if defined(OS_ANDROID) |
450 void ReleaseMediaResources() { | 450 void ReleaseMediaResources() { |
451 test_environment->media_player_manager()->ReleaseMediaResources(); | 451 test_environment->media_player_manager()->ReleaseMediaResourcesIfNotPlaying(); |
452 } | 452 } |
453 #endif | 453 #endif |
454 | 454 |
455 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 455 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
456 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 456 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
457 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 457 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
458 } | 458 } |
459 | 459 |
460 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { | 460 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { |
461 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); | 461 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
869 // Logging | 869 // Logging |
870 void EnableWebCoreLogChannels(const std::string& channels) { | 870 void EnableWebCoreLogChannels(const std::string& channels) { |
871 webkit_glue::EnableWebCoreLogChannels(channels); | 871 webkit_glue::EnableWebCoreLogChannels(channels); |
872 } | 872 } |
873 | 873 |
874 void SetGamepadData(const WebKit::WebGamepads& pads) { | 874 void SetGamepadData(const WebKit::WebGamepads& pads) { |
875 test_environment->webkit_platform_support()->setGamepadData(pads); | 875 test_environment->webkit_platform_support()->setGamepadData(pads); |
876 } | 876 } |
877 | 877 |
878 } // namespace webkit_support | 878 } // namespace webkit_support |
OLD | NEW |