diff options
Diffstat (limited to 'media')
25 files changed, 26 insertions, 26 deletions
diff --git a/media/base/android/demuxer_stream_player_params.h b/media/base/android/demuxer_stream_player_params.h index 0b8886e..be759c3 100644 --- a/media/base/android/demuxer_stream_player_params.h +++ b/media/base/android/demuxer_stream_player_params.h @@ -12,7 +12,7 @@ #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" #include "media/base/video_decoder_config.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index d62300a..c09ea52 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -12,7 +12,7 @@ #include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/video_decoder_config.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 6cbb5e7..46a07da 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -20,7 +20,7 @@ #include "media/base/serial_runner.h" #include "media/base/text_track.h" #include "media/base/video_rotation.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class SingleThreadTaskRunner; diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 0a09a33..b5e91bd 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -20,7 +20,7 @@ #include "media/base/text_track_config.h" #include "media/base/time_delta_interpolator.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index 810e086..3401a09 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h @@ -12,7 +12,7 @@ #include "media/base/sample_format.h" #include "media/base/video_decoder_config.h" #include "testing/gmock/include/gmock/gmock.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoop; diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h index 52aa867..d7e7a79 100644 --- a/media/base/video_decoder.h +++ b/media/base/video_decoder.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "media/base/media_export.h" #include "media/base/pipeline_status.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 66acc84..356b467 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -12,7 +12,7 @@ #include "media/base/media_export.h" #include "media/base/video_frame.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 93cc4f7b..15ee62b 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -13,7 +13,7 @@ #include "base/synchronization/lock.h" #include "media/base/buffers.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_MACOSX) #include <CoreVideo/CVPixelBuffer.h> diff --git a/media/base/video_util.h b/media/base/video_util.h index dfbe1ad..7798ebe 100644 --- a/media/base/video_util.h +++ b/media/base/video_util.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/blink/video_frame_compositor.h b/media/blink/video_frame_compositor.h index f8bdd1e..9e46663e 100644 --- a/media/blink/video_frame_compositor.h +++ b/media/blink/video_frame_compositor.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "cc/layers/video_frame_provider.h" #include "media/base/media_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class VideoFrame; diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index e536c3e..dceda52 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -18,7 +18,7 @@ #define VPX_CODEC_DISABLE_COMPAT 1 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc index 918f7bb..2742c05 100644 --- a/media/cast/test/fake_media_source.cc +++ b/media/cast/test/fake_media_source.cc @@ -26,7 +26,7 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_glue.h" #include "media/filters/in_memory_url_protocol.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/media/cast/test/linux_output_window.cc b/media/cast/test/linux_output_window.cc index 389bb0f..5a934aa 100644 --- a/media/cast/test/linux_output_window.cc +++ b/media/cast/test/linux_output_window.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "media/base/video_frame.h" #include "third_party/libyuv/include/libyuv/convert.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/cast/test/utility/video_utility.cc b/media/cast/test/utility/video_utility.cc index ed72c89..9741cd0 100644 --- a/media/cast/test/utility/video_utility.cc +++ b/media/cast/test/utility/video_utility.cc @@ -9,7 +9,7 @@ #include "base/rand_util.h" #include "third_party/libyuv/include/libyuv/compare.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/filters/fake_demuxer_stream.cc b/media/filters/fake_demuxer_stream.cc index b8bf526..aaffa51 100644 --- a/media/filters/fake_demuxer_stream.cc +++ b/media/filters/fake_demuxer_stream.cc @@ -14,7 +14,7 @@ #include "media/base/test_helpers.h" #include "media/base/video_frame.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 5139e75..bf407b9 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -18,7 +18,7 @@ #include "media/base/video_decoder.h" #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using base::ResetAndReturn; diff --git a/media/formats/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc index a868401..8a50950 100644 --- a/media/formats/mp2t/es_parser_h264.cc +++ b/media/formats/mp2t/es_parser_h264.cc @@ -15,7 +15,7 @@ #include "media/formats/mp2t/es_adapter_video.h" #include "media/formats/mp2t/mp2t_common.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace mp2t { diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index b2d73dc..a652eea 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace media { diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h index fbda94b..11213c3 100644 --- a/media/tools/player_x11/x11_video_renderer.h +++ b/media/tools/player_x11/x11_video_renderer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class VideoFrame; diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm index 6be9c51..ea72cf0 100644 --- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm +++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" #include "media/video/capture/mac/video_capture_device_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation VideoCaptureDeviceAVFoundation diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm index 65103e5..8e64119 100644 --- a/media/video/capture/mac/video_capture_device_mac.mm +++ b/media/video/capture/mac/video_capture_device_mac.mm @@ -11,16 +11,16 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/message_loop/message_loop_proxy.h" #include "base/mac/scoped_ioobject.h" #include "base/mac/scoped_ioplugininterface.h" +#include "base/message_loop/message_loop_proxy.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #import "media/base/mac/avfoundation_glue.h" #import "media/video/capture/mac/platform_video_capturing_mac.h" #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h" #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation DeviceNameAndTransportType diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm index 09622e4..126439e1d 100644 --- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm +++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm @@ -12,7 +12,7 @@ #include "media/video/capture/mac/video_capture_device_mac.h" #include "media/video/capture/video_capture_device.h" #include "media/video/capture/video_capture_types.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation VideoCaptureDeviceQTKit diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h index eee4301..f8e8cab 100644 --- a/media/video/capture/video_capture_types.h +++ b/media/video/capture/video_capture_types.h @@ -8,7 +8,7 @@ #include <vector> #include "media/base/media_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/video/picture.h b/media/video/picture.h index 844e629..ec508ac 100644 --- a/media/video/picture.h +++ b/media/video/picture.h @@ -9,7 +9,7 @@ #include "gpu/command_buffer/common/mailbox.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 547e1bb..a796bdb 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -11,7 +11,7 @@ #include "media/base/bitstream_buffer.h" #include "media/base/video_decoder_config.h" #include "media/video/picture.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" typedef unsigned int GLenum; |