diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 05:18:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 05:18:16 +0000 |
| commit | a9288f57632869274ef505d86dc020ef2f3f9311 (patch) | |
| tree | 7daef2b18772b5362eeea3b3b8d55881c5eb97d1 /webkit/support | |
| parent | 084b6bb674002dddd9839248c3cc6b7d6c6dc4c7 (diff) | |
| download | chromium_src-a9288f57632869274ef505d86dc020ef2f3f9311.zip chromium_src-a9288f57632869274ef505d86dc020ef2f3f9311.tar.gz chromium_src-a9288f57632869274ef505d86dc020ef2f3f9311.tar.bz2 | |
Moving media-related files from webkit/glue/ to webkit/media/.
Files under webkit/media/ are now under their very own webkit_media namespace.
Review URL: http://codereview.chromium.org/8570010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 14 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gyp | 3 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gypi | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 9dff248..34c71f7 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -44,12 +44,12 @@ #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" -#include "webkit/glue/media/video_renderer_impl.h" #include "webkit/glue/user_agent.h" #include "webkit/glue/webkit_constants.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" -#include "webkit/glue/webmediaplayer_impl.h" +#include "webkit/media/video_renderer_impl.h" +#include "webkit/media/webmediaplayer_impl.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/plugins/npapi/webplugin_page_delegate.h" @@ -318,14 +318,14 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( - new webkit_glue::VideoRendererImpl(false)); + scoped_refptr<webkit_media::VideoRendererImpl> video_renderer( + new webkit_media::VideoRendererImpl(false)); collection->AddVideoRenderer(video_renderer); - scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( - new webkit_glue::WebMediaPlayerImpl( + scoped_ptr<webkit_media::WebMediaPlayerImpl> result( + new webkit_media::WebMediaPlayerImpl( client, - base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(), + base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), collection.release(), message_loop_factory.release(), NULL, diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index a6d99cd..ac9ffa2 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,6 +11,7 @@ '../fileapi/webkit_fileapi.gypi', '../glue/webkit_glue.gypi', '../gpu/webkit_gpu.gypi', + '../media/webkit_media.gypi', '../quota/webkit_quota.gypi', 'webkit_support.gypi', ], diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index ae165eb..33b17d2 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -24,6 +24,7 @@ 'fileapi', 'glue', 'webkit_gpu', + 'webkit_media', 'webkit_support_common', ], 'include_dirs': [ |