Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Side by Side Diff: media/blink/webmediaplayer_impl.cc

Issue 1907783002: Delete //gpu/blink/ and WebGraphicsContext3DImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rm-webgraphicscontext3dimpl: noflush Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/callback_helpers.h" 16 #include "base/callback_helpers.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/debug/alias.h" 18 #include "base/debug/alias.h"
19 #include "base/debug/crash_logging.h" 19 #include "base/debug/crash_logging.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
22 #include "base/synchronization/waitable_event.h" 22 #include "base/synchronization/waitable_event.h"
23 #include "base/task_runner_util.h" 23 #include "base/task_runner_util.h"
24 #include "base/thread_task_runner_handle.h" 24 #include "base/thread_task_runner_handle.h"
25 #include "base/trace_event/trace_event.h" 25 #include "base/trace_event/trace_event.h"
26 #include "build/build_config.h" 26 #include "build/build_config.h"
27 #include "cc/blink/web_layer_impl.h" 27 #include "cc/blink/web_layer_impl.h"
28 #include "cc/layers/video_layer.h" 28 #include "cc/layers/video_layer.h"
29 #include "gpu/blink/webgraphicscontext3d_impl.h"
30 #include "media/audio/null_audio_sink.h" 29 #include "media/audio/null_audio_sink.h"
31 #include "media/base/bind_to_current_loop.h" 30 #include "media/base/bind_to_current_loop.h"
32 #include "media/base/cdm_context.h" 31 #include "media/base/cdm_context.h"
33 #include "media/base/limits.h" 32 #include "media/base/limits.h"
34 #include "media/base/media_log.h" 33 #include "media/base/media_log.h"
35 #include "media/base/media_switches.h" 34 #include "media/base/media_switches.h"
36 #include "media/base/text_renderer.h" 35 #include "media/base/text_renderer.h"
37 #include "media/base/timestamp_constants.h" 36 #include "media/base/timestamp_constants.h"
38 #include "media/base/video_frame.h" 37 #include "media/base/video_frame.h"
39 #include "media/blink/texttrack_impl.h" 38 #include "media/blink/texttrack_impl.h"
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 << ", Video: " << stats.video_memory_usage << ", DataSource: " 1593 << ", Video: " << stats.video_memory_usage << ", DataSource: "
1595 << (data_source_ ? data_source_->GetMemoryUsage() : 0) 1594 << (data_source_ ? data_source_->GetMemoryUsage() : 0)
1596 << ", Demuxer: " << demuxer_memory_usage; 1595 << ", Demuxer: " << demuxer_memory_usage;
1597 1596
1598 const int64_t delta = current_memory_usage - last_reported_memory_usage_; 1597 const int64_t delta = current_memory_usage - last_reported_memory_usage_;
1599 last_reported_memory_usage_ = current_memory_usage; 1598 last_reported_memory_usage_ = current_memory_usage;
1600 adjust_allocated_memory_cb_.Run(delta); 1599 adjust_allocated_memory_cb_.Run(delta);
1601 } 1600 }
1602 1601
1603 } // namespace media 1602 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_cast_android.cc ('k') | third_party/WebKit/public/platform/WebGraphicsContext3D.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698