webkit/glue/webmediaplayer_impl.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

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: webkit/glue/webmediaplayer_impl.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: webkit/glue/webmediaplayer_impl.h

diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h

index abb1c60557f4216da77545ecab87f01445217822..b5b87449a6ff3a0472ee772396542dad5dc8ec76 100644

--- a/webkit/glue/webmediaplayer_impl.h

+++ b/webkit/glue/webmediaplayer_impl.h

@@ -53,11 +53,11 @@

#ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_

#define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_

-#include "base/lock.h"

#include "base/message_loop.h"

#include "base/ref_counted.h"

#include "base/scoped_ptr.h"

#include "base/threading/thread.h"

+#include "base/synchronization/lock.h"

#include "base/synchronization/waitable_event.h"

#include "gfx/rect.h"

#include "gfx/size.h"

@@ -148,7 +148,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,

scoped_refptr<WebDataSource> data_source_;

scoped_refptr<WebVideoRenderer> video_renderer_;

- Lock lock_;

+ base::Lock lock_;

int outstanding_repaints_;

};

« no previous file with comments | « webkit/glue/webkitclient_impl.cc ('k') | webkit/glue/webmediaplayer_impl.cc » ('j') | no next file with comments »