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 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
461 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 461 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
462 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 462 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
463 } | 463 } |
464 | 464 |
465 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { | 465 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { |
466 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); | 466 return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); |
467 } | 467 } |
468 | 468 |
469 WebKit::WebString GetWebKitRootDir() { | 469 WebKit::WebString GetWebKitRootDir() { |
470 FilePath path = GetWebKitRootDirFilePath(); | 470 FilePath path = GetWebKitRootDirFilePath(); |
471 CHECK(file_util::AbsolutePath(&path)); | |
Nico
2013/01/21 03:23:00
Shouldn't this be done in GetWebKitRootDirFilePath
| |
471 std::string path_ascii = path.MaybeAsASCII(); | 472 std::string path_ascii = path.MaybeAsASCII(); |
472 CHECK(!path_ascii.empty()); | 473 CHECK(!path_ascii.empty()); |
473 return WebKit::WebString::fromUTF8(path_ascii.c_str()); | 474 return WebKit::WebString::fromUTF8(path_ascii.c_str()); |
474 } | 475 } |
475 | 476 |
476 void SetUpGLBindings(GLBindingPreferences bindingPref) { | 477 void SetUpGLBindings(GLBindingPreferences bindingPref) { |
477 switch (bindingPref) { | 478 switch (bindingPref) { |
478 case GL_BINDING_DEFAULT: | 479 case GL_BINDING_DEFAULT: |
479 gfx::GLSurface::InitializeOneOff(); | 480 gfx::GLSurface::InitializeOneOff(); |
480 break; | 481 break; |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
877 // Logging | 878 // Logging |
878 void EnableWebCoreLogChannels(const std::string& channels) { | 879 void EnableWebCoreLogChannels(const std::string& channels) { |
879 webkit_glue::EnableWebCoreLogChannels(channels); | 880 webkit_glue::EnableWebCoreLogChannels(channels); |
880 } | 881 } |
881 | 882 |
882 void SetGamepadData(const WebKit::WebGamepads& pads) { | 883 void SetGamepadData(const WebKit::WebGamepads& pads) { |
883 test_environment->webkit_platform_support()->setGamepadData(pads); | 884 test_environment->webkit_platform_support()->setGamepadData(pads); |
884 } | 885 } |
885 | 886 |
886 } // namespace webkit_support | 887 } // namespace webkit_support |
OLD | NEW |