Rewrite most `Foo* field_` pointer fields to `raw_ptr<Foo> field_`.
DO NOT REVERT (unless absolutely necessary)! Report build breaks to keishi@(APAC)/glazunov@(EMEA)/sebmarchand@(NA) as soon as you see them. Fixes are expected to be trivial.
This commit was generated automatically, by running the following script: tools/clang/rewrite_raw_ptr_fields/rewrite-multiple-platforms.sh on commit fe74bc434e5b7e92d13a328362fcb6df15d8847e
For more information, see MiraclePtr One Pager [1], the PSA at chromium-dev@ [2], and the raw_ptr documentation in //base/memory/raw_ptr.md.
FYI This CL does not enable MiraclePtr protection and we expect no behavior change from this.
[1] https://docs.google.com/document/d/1pnnOAIz_DMWDI4oIOFoMAqLnf_MZ2GsrJNb_dbQ3ZBg/edit?usp=sharing
[2] https://groups.google.com/a/chromium.org/g/chromium-dev/c/vAEeVifyf78/m/SkBUc6PhBAAJ
Binary-Size: Increase of around 500kb was approved for MiraclePtr
Include-Ci-Only-Tests: true
No-Tree-Checks: true
No-Presubmit: true
Bug: 1272324, 1073933
Change-Id: I05c86a83bbb4b3f4b017f361dd7f4e7437697f69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3305132
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Owners-Override: Bartek Nowierski <bartekn@chromium.org>
Cr-Commit-Position: refs/heads/main@{#945735}
diff --git a/media/renderers/renderer_impl.h b/media/renderers/renderer_impl.h
index b39c727..a2c5e00 100644
--- a/media/renderers/renderer_impl.h
+++ b/media/renderers/renderer_impl.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/cancelable_callback.h"
+#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
@@ -210,8 +211,8 @@
// Task runner used to execute pipeline tasks.
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- MediaResource* media_resource_;
- RendererClient* client_;
+ raw_ptr<MediaResource> media_resource_;
+ raw_ptr<RendererClient> client_;
// Temporary callback used for Initialize() and Flush().
PipelineStatusCallback init_cb_;
@@ -222,11 +223,11 @@
std::unique_ptr<AudioRenderer> audio_renderer_;
std::unique_ptr<VideoRenderer> video_renderer_;
- DemuxerStream* current_audio_stream_;
- DemuxerStream* current_video_stream_;
+ raw_ptr<DemuxerStream> current_audio_stream_;
+ raw_ptr<DemuxerStream> current_video_stream_;
// Renderer-provided time source used to control playback.
- TimeSource* time_source_;
+ raw_ptr<TimeSource> time_source_;
std::unique_ptr<WallClockTimeSource> wall_clock_time_source_;
bool time_ticking_;
double playback_rate_;
@@ -243,7 +244,7 @@
bool audio_playing_;
bool video_playing_;
- CdmContext* cdm_context_;
+ raw_ptr<CdmContext> cdm_context_;
bool underflow_disabled_for_testing_;
bool clockless_video_playback_enabled_for_testing_;