content/renderer/media/webmediaplayer_impl.h - Issue 63253002: Rename WebKit namespace to blink (part 3)

Unified Diff: content/renderer/media/webmediaplayer_impl.h

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: content/renderer/media/webmediaplayer_impl.h

diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h

index a17439380223a94a612a055e20ca410c79cbc95f..c1de8f0854d1ca12a419adcede09c493f45979bd 100644

--- a/content/renderer/media/webmediaplayer_impl.h

+++ b/content/renderer/media/webmediaplayer_impl.h

@@ -45,7 +45,7 @@

class RenderAudioSourceProvider;

-namespace WebKit {

+namespace blink {

class WebFrame;

}

@@ -72,7 +72,7 @@ class WebMediaPlayerParams;

class WebTextTrackImpl;

class WebMediaPlayerImpl

- : public WebKit::WebMediaPlayer,

+ : public blink::WebMediaPlayer,

public cc::VideoFrameProvider,

public base::MessageLoop::DestructionObserver,

public base::SupportsWeakPtr<WebMediaPlayerImpl> {

@@ -81,14 +81,14 @@ class WebMediaPlayerImpl

// |delegate| may be null.

WebMediaPlayerImpl(

- WebKit::WebFrame* frame,

- WebKit::WebMediaPlayerClient* client,

+ blink::WebFrame* frame,

+ blink::WebMediaPlayerClient* client,

base::WeakPtr<WebMediaPlayerDelegate> delegate,

const WebMediaPlayerParams& params);

virtual ~WebMediaPlayerImpl();

virtual void load(LoadType load_type,

- const WebKit::WebURL& url,

+ const blink::WebURL& url,

CORSMode cors_mode) OVERRIDE;

// Playback controls.

@@ -99,13 +99,13 @@ class WebMediaPlayerImpl

virtual void seek(double seconds);

virtual void setRate(double rate);

virtual void setVolume(double volume);

- virtual void setPreload(WebKit::WebMediaPlayer::Preload preload);

- virtual const WebKit::WebTimeRanges& buffered();

+ virtual void setPreload(blink::WebMediaPlayer::Preload preload);

+ virtual const blink::WebTimeRanges& buffered();

virtual double maxTimeSeekable() const;

// Methods for painting.

- virtual void paint(WebKit::WebCanvas* canvas,

- const WebKit::WebRect& rect,

+ virtual void paint(blink::WebCanvas* canvas,

+ const blink::WebRect& rect,

unsigned char alpha);

// True if the loaded media has a playable video/audio track.

@@ -113,7 +113,7 @@ class WebMediaPlayerImpl

virtual bool hasAudio() const;

// Dimensions of the video.

- virtual WebKit::WebSize naturalSize() const;

+ virtual blink::WebSize naturalSize() const;

// Getters of playback state.

virtual bool paused() const;

@@ -124,8 +124,8 @@ class WebMediaPlayerImpl

// Internal states of loading and network.

// TODO(hclam): Ask the pipeline about the state rather than having reading

// them from members which would cause race conditions.

- virtual WebKit::WebMediaPlayer::NetworkState networkState() const;

- virtual WebKit::WebMediaPlayer::ReadyState readyState() const;

+ virtual blink::WebMediaPlayer::NetworkState networkState() const;

+ virtual blink::WebMediaPlayer::ReadyState readyState() const;

virtual bool didLoadingProgress() const;

@@ -147,7 +147,7 @@ class WebMediaPlayerImpl

OVERRIDE;

virtual bool copyVideoTextureToPlatformTexture(

- WebKit::WebGraphicsContext3D* web_graphics_context,

+ blink::WebGraphicsContext3D* web_graphics_context,

unsigned int texture,

unsigned int level,

unsigned int internal_format,

@@ -155,23 +155,23 @@ class WebMediaPlayerImpl

bool premultiply_alpha,

bool flip_y);

- virtual WebKit::WebAudioSourceProvider* audioSourceProvider();

+ virtual blink::WebAudioSourceProvider* audioSourceProvider();

virtual MediaKeyException generateKeyRequest(

- const WebKit::WebString& key_system,

+ const blink::WebString& key_system,

const unsigned char* init_data,

unsigned init_data_length);

- virtual MediaKeyException addKey(const WebKit::WebString& key_system,

+ virtual MediaKeyException addKey(const blink::WebString& key_system,

const unsigned char* key,

unsigned key_length,

const unsigned char* init_data,

unsigned init_data_length,

- const WebKit::WebString& session_id);

+ const blink::WebString& session_id);

virtual MediaKeyException cancelKeyRequest(

- const WebKit::WebString& key_system,

- const WebKit::WebString& session_id);

+ const blink::WebString& key_system,

+ const blink::WebString& session_id);

// As we are closing the tab or even the browser, |main_loop_| is destroyed

// even before this object gets destructed, so we need to know when

@@ -205,7 +205,7 @@ class WebMediaPlayerImpl

// Called after |defer_load_cb_| has decided to allow the load. If

// |defer_load_cb_| is null this is called immediately.

void DoLoad(LoadType load_type,

- const WebKit::WebURL& url,

+ const blink::WebURL& url,

CORSMode cors_mode);

// Called after asynchronous initialization of a data source completed.

@@ -219,14 +219,14 @@ class WebMediaPlayerImpl

// Helpers that set the network/ready state and notifies the client if

// they've changed.

- void SetNetworkState(WebKit::WebMediaPlayer::NetworkState state);

- void SetReadyState(WebKit::WebMediaPlayer::ReadyState state);

+ void SetNetworkState(blink::WebMediaPlayer::NetworkState state);

+ void SetReadyState(blink::WebMediaPlayer::ReadyState state);

// Destroy resources held.

void Destroy();

// Getter method to |client_|.

- WebKit::WebMediaPlayerClient* GetClient();

+ blink::WebMediaPlayerClient* GetClient();

// Lets V8 know that player uses extra resources not managed by V8.

void IncrementExternallyAllocatedMemory();

@@ -234,18 +234,18 @@ class WebMediaPlayerImpl

// Actually do the work for generateKeyRequest/addKey so they can easily

// report results to UMA.

MediaKeyException GenerateKeyRequestInternal(

- const WebKit::WebString& key_system,

+ const blink::WebString& key_system,

const unsigned char* init_data,

unsigned init_data_length);

- MediaKeyException AddKeyInternal(const WebKit::WebString& key_system,

+ MediaKeyException AddKeyInternal(const blink::WebString& key_system,

const unsigned char* key,

unsigned key_length,

const unsigned char* init_data,

unsigned init_data_length,

- const WebKit::WebString& session_id);

+ const blink::WebString& session_id);

MediaKeyException CancelKeyRequestInternal(

- const WebKit::WebString& key_system,

- const WebKit::WebString& session_id);

+ const blink::WebString& key_system,

+ const blink::WebString& session_id);

// Gets the duration value reported by the pipeline.

double GetPipelineDuration() const;

@@ -263,14 +263,14 @@ class WebMediaPlayerImpl

// False indicates |current_frame_| is being replaced with a new frame.

void DoneWaitingForPaint(bool painting_frame);

- WebKit::WebFrame* frame_;

+ blink::WebFrame* frame_;

// TODO(hclam): get rid of these members and read from the pipeline directly.

- WebKit::WebMediaPlayer::NetworkState network_state_;

- WebKit::WebMediaPlayer::ReadyState ready_state_;

+ blink::WebMediaPlayer::NetworkState network_state_;

+ blink::WebMediaPlayer::ReadyState ready_state_;

// Keep a list of buffered time ranges.

- WebKit::WebTimeRanges buffered_;

+ blink::WebTimeRanges buffered_;

// Message loops for posting tasks on Chrome's main thread. Also used

// for DCHECKs so methods calls won't execute in the wrong thread.

@@ -281,7 +281,7 @@ class WebMediaPlayerImpl

// The currently selected key system. Empty string means that no key system

// has been selected.

- WebKit::WebString current_key_system_;

+ blink::WebString current_key_system_;

// The LoadType passed in the |load_type| parameter of the load() call.

LoadType load_type_;

@@ -308,7 +308,7 @@ class WebMediaPlayerImpl

bool pending_seek_;

double pending_seek_seconds_;

- WebKit::WebMediaPlayerClient* client_;

+ blink::WebMediaPlayerClient* client_;

base::WeakPtr<WebMediaPlayerDelegate> delegate_;

« no previous file with comments | « content/renderer/media/webmediaplayer_delegate.h ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »