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

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

Issue 1764333002: Move WebRuntimeEnabledFeatures to platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing files. Created 4 years, 9 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>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "media/blink/webmediaplayer_util.h" 43 #include "media/blink/webmediaplayer_util.h"
44 #include "media/blink/webmediasource_impl.h" 44 #include "media/blink/webmediasource_impl.h"
45 #include "media/filters/chunk_demuxer.h" 45 #include "media/filters/chunk_demuxer.h"
46 #include "media/filters/ffmpeg_demuxer.h" 46 #include "media/filters/ffmpeg_demuxer.h"
47 #include "third_party/WebKit/public/platform/URLConversion.h" 47 #include "third_party/WebKit/public/platform/URLConversion.h"
48 #include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h" 48 #include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h"
49 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" 49 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
50 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient. h" 50 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient. h"
51 #include "third_party/WebKit/public/platform/WebMediaSource.h" 51 #include "third_party/WebKit/public/platform/WebMediaSource.h"
52 #include "third_party/WebKit/public/platform/WebRect.h" 52 #include "third_party/WebKit/public/platform/WebRect.h"
53 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.h"
53 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 54 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
54 #include "third_party/WebKit/public/platform/WebSize.h" 55 #include "third_party/WebKit/public/platform/WebSize.h"
55 #include "third_party/WebKit/public/platform/WebString.h" 56 #include "third_party/WebKit/public/platform/WebString.h"
56 #include "third_party/WebKit/public/platform/WebURL.h" 57 #include "third_party/WebKit/public/platform/WebURL.h"
57 #include "third_party/WebKit/public/web/WebDocument.h" 58 #include "third_party/WebKit/public/web/WebDocument.h"
58 #include "third_party/WebKit/public/web/WebFrame.h" 59 #include "third_party/WebKit/public/web/WebFrame.h"
59 #include "third_party/WebKit/public/web/WebLocalFrame.h" 60 #include "third_party/WebKit/public/web/WebLocalFrame.h"
60 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
61 #include "third_party/WebKit/public/web/WebView.h" 61 #include "third_party/WebKit/public/web/WebView.h"
62 62
63 using blink::WebCanvas; 63 using blink::WebCanvas;
64 using blink::WebMediaPlayer; 64 using blink::WebMediaPlayer;
65 using blink::WebRect; 65 using blink::WebRect;
66 using blink::WebSize; 66 using blink::WebSize;
67 using blink::WebString; 67 using blink::WebString;
68 using gpu::gles2::GLES2Interface; 68 using gpu::gles2::GLES2Interface;
69 69
70 #define STATIC_ASSERT_ENUM(a, b) \ 70 #define STATIC_ASSERT_ENUM(a, b) \
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 << ", Video: " << stats.video_memory_usage << ", DataSource: " 1603 << ", Video: " << stats.video_memory_usage << ", DataSource: "
1604 << (data_source_ ? data_source_->GetMemoryUsage() : 0) 1604 << (data_source_ ? data_source_->GetMemoryUsage() : 0)
1605 << ", Demuxer: " << demuxer_memory_usage; 1605 << ", Demuxer: " << demuxer_memory_usage;
1606 1606
1607 const int64_t delta = current_memory_usage - last_reported_memory_usage_; 1607 const int64_t delta = current_memory_usage - last_reported_memory_usage_;
1608 last_reported_memory_usage_ = current_memory_usage; 1608 last_reported_memory_usage_ = current_memory_usage;
1609 adjust_allocated_memory_cb_.Run(delta); 1609 adjust_allocated_memory_cb_.Run(delta);
1610 } 1610 }
1611 1611
1612 } // namespace media 1612 } // namespace media
OLDNEW
« no previous file with comments | « extensions/renderer/dispatcher.cc ('k') | third_party/WebKit/Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698