chrome/browser/renderer_host/render_widget_helper.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: chrome/browser/renderer_host/render_widget_helper.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

« no previous file with comments | « chrome/browser/renderer_host/download_resource_handler.cc ('k') | chrome/browser/renderer_host/render_widget_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_widget_helper.h

diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h

index 882a3493c6262c2ab1970529cf14785e42e02d33..3b0dc6bc13b6280c5b44eaf9af3cfbab99916feb 100644

--- a/chrome/browser/renderer_host/render_widget_helper.h

+++ b/chrome/browser/renderer_host/render_widget_helper.h

@@ -13,7 +13,7 @@

#include "base/hash_tables.h"

#include "base/process.h"

#include "base/ref_counted.h"

-#include "base/lock.h"

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

#include "base/synchronization/waitable_event.h"

#include "chrome/common/window_container_type.h"

#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"

@@ -197,7 +197,7 @@ class RenderWidgetHelper

// On OSX we keep file descriptors to all the allocated DIBs around until

// the renderer frees them.

- Lock allocated_dibs_lock_;

+ base::Lock allocated_dibs_lock_;

std::map<TransportDIB::Id, int> allocated_dibs_;

#endif

@@ -205,7 +205,7 @@ class RenderWidgetHelper

// The UpdateMsgProxy objects are not owned by this map. (See UpdateMsgProxy

// for details about how the lifetime of instances are managed.)

UpdateMsgProxyMap pending_paints_;

- Lock pending_paints_lock_;

+ base::Lock pending_paints_lock_;

int render_process_id_;

« no previous file with comments | « chrome/browser/renderer_host/download_resource_handler.cc ('k') | chrome/browser/renderer_host/render_widget_helper.cc » ('j') | no next file with comments »