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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes 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
« no previous file with comments | « media/blink/webencryptedmediaclient_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 size_t videoDecodedByteCount() const override; 151 size_t videoDecodedByteCount() const override;
152 152
153 bool copyVideoTextureToPlatformTexture( 153 bool copyVideoTextureToPlatformTexture(
154 blink::WebGraphicsContext3D* web_graphics_context, 154 blink::WebGraphicsContext3D* web_graphics_context,
155 unsigned int texture, 155 unsigned int texture,
156 unsigned int internal_format, 156 unsigned int internal_format,
157 unsigned int type, 157 unsigned int type,
158 bool premultiply_alpha, 158 bool premultiply_alpha,
159 bool flip_y) override; 159 bool flip_y) override;
160 160
161 blink::WebAudioSourceProvider* audioSourceProvider() override; 161 blink::WebAudioSourceProvider* getAudioSourceProvider() override;
162 162
163 void setContentDecryptionModule( 163 void setContentDecryptionModule(
164 blink::WebContentDecryptionModule* cdm, 164 blink::WebContentDecryptionModule* cdm,
165 blink::WebContentDecryptionModuleResult result) override; 165 blink::WebContentDecryptionModuleResult result) override;
166 166
167 void enteredFullscreen() override; 167 void enteredFullscreen() override;
168 void exitedFullscreen() override; 168 void exitedFullscreen() override;
169 169
170 // WebMediaPlayerDelegate::Observer implementation. 170 // WebMediaPlayerDelegate::Observer implementation.
171 void OnHidden(bool must_suspend) override; 171 void OnHidden(bool must_suspend) override;
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 // started; prevents us from spuriously logging errors that are transient or 435 // started; prevents us from spuriously logging errors that are transient or
436 // unimportant. 436 // unimportant.
437 bool suppress_destruction_errors_; 437 bool suppress_destruction_errors_;
438 438
439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
440 }; 440 };
441 441
442 } // namespace media 442 } // namespace media
443 443
444 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 444 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webencryptedmediaclient_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698