diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 02:45:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 02:45:43 +0000 |
| commit | d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57 (patch) | |
| tree | 9fae17aca3536ca96737741724b782c189bd4e23 /webkit/support | |
| parent | 770c714e651efbeef3507a3c177c619867c4f346 (diff) | |
| download | chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.zip chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.gz chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.bz2 | |
reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child
Win x64 warning suppression, and allocator dependency on linux for shared_library build compared to previous land.
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/20003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/test_webkit_platform_support.cc | 14 | ||||
| -rw-r--r-- | webkit/support/webkit_support.cc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index bde978b..8b3c5d2 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -14,12 +14,6 @@ #include "media/base/media.h" #include "net/cookies/cookie_monster.h" #include "net/test/spawned_test_server/spawned_test_server.h" -#include "third_party/WebKit/public/web/WebDatabase.h" -#include "third_party/WebKit/public/web/WebKit.h" -#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" -#include "third_party/WebKit/public/web/WebScriptController.h" -#include "third_party/WebKit/public/web/WebSecurityPolicy.h" -#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "third_party/WebKit/public/platform/WebAudioDevice.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" @@ -28,14 +22,20 @@ #include "third_party/WebKit/public/platform/WebStorageNamespace.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/web/WebDatabase.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebScriptController.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "v8/include/v8.h" #include "webkit/browser/database/vfs_backend.h" +#include "webkit/child/webkitplatformsupport_impl.h" #include "webkit/common/gpu/test_context_provider_factory.h" #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/renderer/appcache/web_application_cache_host_impl.h" #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" #include "webkit/support/gc_extension.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index b96b537..bdb99f9 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -17,10 +17,10 @@ #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "url/url_util.h" +#include "webkit/child/webkitplatformsupport_impl.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/support/platform_support.h" #include "webkit/support/test_webkit_platform_support.h" |