From 3af6f774f26d0153741f84baeb5ddefef0f7cb5d Mon Sep 17 00:00:00 2001 From: danakj Date: Thu, 10 Mar 2016 21:29:32 -0800 Subject: blink: Rename platform/ methods to prefix with get when they collide. This focuses on platform/ to rename methods that are named foo() and that return a Foo*, which will have collisions when foo() is renamed to Foo() in chromium style. This patch uses the following to do many of the replacements: git gs '\b$foo()'|grep '\.\(cpp\|mm\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie 's/\b$foo()/$getFoo()/g' TBR=brettw R=chrishtr@chromium.org BUG=582312 CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel Review URL: https://codereview.chromium.org/1774943003 Cr-Commit-Position: refs/heads/master@{#380529} --- content/public/renderer/document_state.h | 2 +- content/public/renderer/media_stream_video_sink.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'content/public/renderer') diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h index edb66bd..99beb47 100644 --- a/content/public/renderer/document_state.h +++ b/content/public/renderer/document_state.h @@ -45,7 +45,7 @@ class CONTENT_EXPORT DocumentState ~DocumentState() override; static DocumentState* FromDataSource(blink::WebDataSource* ds) { - return static_cast(ds->extraData()); + return static_cast(ds->getExtraData()); } // The time that this navigation was requested. diff --git a/content/public/renderer/media_stream_video_sink.cc b/content/public/renderer/media_stream_video_sink.cc index 716c8df..118d732 100644 --- a/content/public/renderer/media_stream_video_sink.cc +++ b/content/public/renderer/media_stream_video_sink.cc @@ -16,7 +16,7 @@ void MediaStreamVideoSink::AddToVideoTrack( const blink::WebMediaStreamTrack& track) { DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().getType()); MediaStreamVideoTrack* const video_track = - static_cast(track.extraData()); + static_cast(track.getExtraData()); video_track->AddSink(sink, callback); } @@ -25,7 +25,7 @@ void MediaStreamVideoSink::RemoveFromVideoTrack( const blink::WebMediaStreamTrack& track) { DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().getType()); MediaStreamVideoTrack* const video_track = - static_cast(track.extraData()); + static_cast(track.getExtraData()); video_track->RemoveSink(sink); } -- cgit v1.1