diff options
author | danakj <danakj@chromium.org> | 2016-03-10 21:29:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 05:30:41 +0000 |
commit | 3af6f774f26d0153741f84baeb5ddefef0f7cb5d (patch) | |
tree | 265f25e9497e57d3f3320dcf36acd5060e237f23 /content/public/renderer | |
parent | 2eb97bdbc5ebc7fec94c53010b064c677e4cab8f (diff) | |
download | chromium_src-3af6f774f26d0153741f84baeb5ddefef0f7cb5d.zip chromium_src-3af6f774f26d0153741f84baeb5ddefef0f7cb5d.tar.gz chromium_src-3af6f774f26d0153741f84baeb5ddefef0f7cb5d.tar.bz2 |
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}
Diffstat (limited to 'content/public/renderer')
-rw-r--r-- | content/public/renderer/document_state.h | 2 | ||||
-rw-r--r-- | content/public/renderer/media_stream_video_sink.cc | 4 |
2 files changed, 3 insertions, 3 deletions
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<DocumentState*>(ds->extraData()); + return static_cast<DocumentState*>(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<MediaStreamVideoTrack*>(track.extraData()); + static_cast<MediaStreamVideoTrack*>(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<MediaStreamVideoTrack*>(track.extraData()); + static_cast<MediaStreamVideoTrack*>(track.getExtraData()); video_track->RemoveSink(sink); } |