| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "media/blink/webmediaplayer_impl.h" | 5 #include "media/blink/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "media/blink/webmediaplayer_util.h" | 49 #include "media/blink/webmediaplayer_util.h" |
| 50 #include "media/blink/webmediasource_impl.h" | 50 #include "media/blink/webmediasource_impl.h" |
| 51 #include "media/filters/chunk_demuxer.h" | 51 #include "media/filters/chunk_demuxer.h" |
| 52 #include "media/filters/ffmpeg_demuxer.h" | 52 #include "media/filters/ffmpeg_demuxer.h" |
| 53 #include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h" | 53 #include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h" |
| 54 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 54 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 55 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.
h" | 55 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.
h" |
| 56 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" | 56 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" |
| 57 #include "third_party/WebKit/public/platform/WebMediaSource.h" | 57 #include "third_party/WebKit/public/platform/WebMediaSource.h" |
| 58 #include "third_party/WebKit/public/platform/WebRect.h" | 58 #include "third_party/WebKit/public/platform/WebRect.h" |
| 59 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.h" |
| 59 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" | 60 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
| 60 #include "third_party/WebKit/public/platform/WebSize.h" | 61 #include "third_party/WebKit/public/platform/WebSize.h" |
| 61 #include "third_party/WebKit/public/platform/WebString.h" | 62 #include "third_party/WebKit/public/platform/WebString.h" |
| 62 #include "third_party/WebKit/public/platform/WebURL.h" | 63 #include "third_party/WebKit/public/platform/WebURL.h" |
| 63 #include "third_party/WebKit/public/web/WebDocument.h" | 64 #include "third_party/WebKit/public/web/WebDocument.h" |
| 64 #include "third_party/WebKit/public/web/WebFrame.h" | 65 #include "third_party/WebKit/public/web/WebFrame.h" |
| 65 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 66 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 66 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 67 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
| 67 #include "third_party/WebKit/public/web/WebView.h" | 68 #include "third_party/WebKit/public/web/WebView.h" |
| 68 | 69 |
| (...skipping 2442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2511 } | 2512 } |
| 2512 | 2513 |
| 2513 #undef UMA_HISTOGRAM_VIDEO_HEIGHT | 2514 #undef UMA_HISTOGRAM_VIDEO_HEIGHT |
| 2514 | 2515 |
| 2515 void WebMediaPlayerImpl::SetTickClockForTest(base::TickClock* tick_clock) { | 2516 void WebMediaPlayerImpl::SetTickClockForTest(base::TickClock* tick_clock) { |
| 2516 tick_clock_.reset(tick_clock); | 2517 tick_clock_.reset(tick_clock); |
| 2517 buffered_data_source_host_.SetTickClockForTest(tick_clock); | 2518 buffered_data_source_host_.SetTickClockForTest(tick_clock); |
| 2518 } | 2519 } |
| 2519 | 2520 |
| 2520 } // namespace media | 2521 } // namespace media |
| OLD | NEW |