diff options
Diffstat (limited to 'webkit/media')
23 files changed, 44 insertions, 44 deletions
diff --git a/webkit/media/active_loader.cc b/webkit/media/active_loader.cc index 02d098a..b88daf6 100644 --- a/webkit/media/active_loader.cc +++ b/webkit/media/active_loader.cc @@ -4,7 +4,7 @@ #include "webkit/media/active_loader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" #include "webkit/media/buffered_resource_loader.h" namespace webkit_media { diff --git a/webkit/media/android/audio_decoder_android.cc b/webkit/media/android/audio_decoder_android.cc index 95c581b..05143e8 100644 --- a/webkit/media/android/audio_decoder_android.cc +++ b/webkit/media/android/audio_decoder_android.cc @@ -19,7 +19,7 @@ #include "media/base/android/webaudio_media_codec_info.h" #include "media/base/audio_bus.h" #include "media/base/limits.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h" +#include "third_party/WebKit/public/platform/WebAudioBus.h" namespace webkit_media { diff --git a/webkit/media/android/media_source_delegate.cc b/webkit/media/android/media_source_delegate.cc index 1b63ed1..1386ca2 100644 --- a/webkit/media/android/media_source_delegate.cc +++ b/webkit/media/android/media_source_delegate.cc @@ -11,7 +11,7 @@ #include "media/base/demuxer_stream.h" #include "media/base/media_log.h" #include "media/filters/chunk_demuxer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc index 5a49c90..03f05b1 100644 --- a/webkit/media/android/webmediaplayer_android.cc +++ b/webkit/media/android/webmediaplayer_android.cc @@ -15,7 +15,7 @@ #include "media/base/media_switches.h" #include "media/base/video_frame.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h index ce4f95e..c0fdee3 100644 --- a/webkit/media/android/webmediaplayer_android.h +++ b/webkit/media/android/webmediaplayer_android.h @@ -14,9 +14,9 @@ #include "base/time.h" #include "media/base/demuxer_stream.h" #include "cc/layers/video_frame_provider.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" #include "ui/gfx/rect_f.h" #include "webkit/media/android/media_source_delegate.h" diff --git a/webkit/media/audio_decoder.cc b/webkit/media/audio_decoder.cc index 1985222..617e291 100644 --- a/webkit/media/audio_decoder.cc +++ b/webkit/media/audio_decoder.cc @@ -12,7 +12,7 @@ #include "media/base/limits.h" #include "media/filters/audio_file_reader.h" #include "media/filters/in_memory_url_protocol.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h" +#include "third_party/WebKit/public/platform/WebAudioBus.h" using media::AudioBus; using media::AudioFileReader; diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc index 7bbceeb9..f2e9241 100644 --- a/webkit/media/buffered_data_source_unittest.cc +++ b/webkit/media/buffered_data_source_unittest.cc @@ -8,7 +8,7 @@ #include "media/base/mock_data_source_host.h" #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/media/buffered_data_source.h" #include "webkit/mocks/mock_webframeclient.h" diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc index 5177c89..8bc5b24 100644 --- a/webkit/media/buffered_resource_loader.cc +++ b/webkit/media/buffered_resource_loader.cc @@ -13,9 +13,9 @@ #include "base/strings/string_number_conversions.h" #include "media/base/media_log.h" #include "net/http/http_request_headers.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" #include "webkit/media/cache_util.h" diff --git a/webkit/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h index c048239..274cf30 100644 --- a/webkit/media/buffered_resource_loader.h +++ b/webkit/media/buffered_resource_loader.h @@ -12,9 +12,9 @@ #include "base/timer.h" #include "googleurl/src/gurl.h" #include "media/base/seekable_buffer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "webkit/media/active_loader.h" diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc index f36896a..5d08e75 100644 --- a/webkit/media/buffered_resource_loader_unittest.cc +++ b/webkit/media/buffered_resource_loader_unittest.cc @@ -14,10 +14,10 @@ #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/media/buffered_resource_loader.h" diff --git a/webkit/media/cache_util.cc b/webkit/media/cache_util.cc index 3a34a51..773fa29 100644 --- a/webkit/media/cache_util.cc +++ b/webkit/media/cache_util.cc @@ -11,9 +11,9 @@ #include "base/time.h" #include "net/http/http_util.h" #include "net/http/http_version.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using base::Time; using base::TimeDelta; diff --git a/webkit/media/cache_util_unittest.cc b/webkit/media/cache_util_unittest.cc index e937a97d..f86e0c0 100644 --- a/webkit/media/cache_util_unittest.cc +++ b/webkit/media/cache_util_unittest.cc @@ -11,8 +11,8 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using WebKit::WebString; using WebKit::WebURLResponse; diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc index 0450164..810fd71 100644 --- a/webkit/media/crypto/key_systems.cc +++ b/webkit/media/crypto/key_systems.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/string_util.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/crypto/key_systems_info.h" namespace webkit_media { diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/media/crypto/key_systems_unittest.cc index 9415b2c..489abf9 100644 --- a/webkit/media/crypto/key_systems_unittest.cc +++ b/webkit/media/crypto/key_systems_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/crypto/key_systems.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc index 1a87024..9372f4a4 100644 --- a/webkit/media/crypto/proxy_decryptor.cc +++ b/webkit/media/crypto/proxy_decryptor.cc @@ -11,7 +11,7 @@ #include "webkit/media/crypto/key_systems.h" #if defined(ENABLE_PEPPER_CDMS) -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" #include "webkit/media/crypto/ppapi_decryptor.h" diff --git a/webkit/media/test_response_generator.cc b/webkit/media/test_response_generator.cc index 7ceee23..ae5aeaf2 100644 --- a/webkit/media/test_response_generator.cc +++ b/webkit/media/test_response_generator.cc @@ -8,8 +8,8 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using WebKit::WebString; using WebKit::WebURLError; diff --git a/webkit/media/test_response_generator.h b/webkit/media/test_response_generator.h index ecb4536..39744b0 100644 --- a/webkit/media/test_response_generator.h +++ b/webkit/media/test_response_generator.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" namespace webkit_media { diff --git a/webkit/media/webaudiosourceprovider_impl.h b/webkit/media/webaudiosourceprovider_impl.h index 0030df5..0295011 100644 --- a/webkit/media/webaudiosourceprovider_impl.h +++ b/webkit/media/webaudiosourceprovider_impl.h @@ -7,7 +7,7 @@ #include "base/synchronization/lock.h" #include "media/base/audio_renderer_sink.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h" namespace WebKit { diff --git a/webkit/media/webinbandtexttrack_impl.h b/webkit/media/webinbandtexttrack_impl.h index ed9f5d3..b6b191b 100644 --- a/webkit/media/webinbandtexttrack_impl.h +++ b/webkit/media/webinbandtexttrack_impl.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_ #define WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrack.h" namespace webkit_media { diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index d72c766..3e2b88a 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -35,10 +35,10 @@ #include "media/filters/opus_audio_decoder.h" #include "media/filters/video_renderer_base.h" #include "media/filters/vpx_video_decoder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index 53cb42f..ee7be74 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -35,7 +35,7 @@ #include "media/filters/gpu_video_decoder.h" #include "media/filters/skcanvas_video_renderer.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc index 2b5cdd2..cbd2396 100644 --- a/webkit/media/webmediaplayer_ms.cc +++ b/webkit/media/webmediaplayer_ms.cc @@ -13,9 +13,9 @@ #include "cc/layers/video_layer.h" #include "media/base/media_log.h" #include "media/base/video_frame.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/webkit/media/webmediasourceclient_impl.cc b/webkit/media/webmediasourceclient_impl.cc index 3eb36f4..d53ddb1 100644 --- a/webkit/media/webmediasourceclient_impl.cc +++ b/webkit/media/webmediasourceclient_impl.cc @@ -6,8 +6,8 @@ #include "base/guid.h" #include "media/filters/chunk_demuxer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/websourcebuffer_impl.h" using ::WebKit::WebString; |