content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc - Issue 63253002: Rename WebKit namespace to blink (part 3)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

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

« no previous file with comments | « content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

diff --git a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

index 3e99e881d6ca6a53e4e53155da1ee455e254b935..c284328a4b28c899d5656caafe49a9b203ddf9ac 100644

--- a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

+++ b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

@@ -154,7 +154,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(

gpu::Mailbox* texture_mailbox,

unsigned* texture_mailbox_sync_point) {

DCHECK(context_provider_);

- WebKit::WebGraphicsContext3D* context = context_provider_->Context3d();

+ blink::WebGraphicsContext3D* context = context_provider_->Context3d();

unsigned stream_id = 0;

if (context->makeContextCurrent()) {

*texture_id = context->createTexture();

@@ -173,7 +173,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(

void StreamTextureFactorySynchronousImpl::DestroyStreamTexture(

unsigned texture_id) {

DCHECK(context_provider_);

- WebKit::WebGraphicsContext3D* context = context_provider_->Context3d();

+ blink::WebGraphicsContext3D* context = context_provider_->Context3d();

if (context->makeContextCurrent()) {

context->destroyStreamTextureCHROMIUM(texture_id);

context->deleteTexture(texture_id);

@@ -185,7 +185,7 @@ void StreamTextureFactorySynchronousImpl::SetStreamTextureSize(

int32 stream_id,

const gfx::Size& size) {}

-WebKit::WebGraphicsContext3D*

+blink::WebGraphicsContext3D*

StreamTextureFactorySynchronousImpl::Context3d() {

DCHECK(context_provider_);

return context_provider_->Context3d();