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

Unified Diff: chrome/renderer/renderer_webkitclient_impl.cc

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/renderer/media/audio_renderer_impl.cc ('k') | chrome/service/cloud_print/print_system_cups.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/renderer_webkitclient_impl.cc
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 1683691b145099a79f71f3d2b232fd28ba4b960f..0a2e83b90e32d0b1a5eb79ea50916243b7b8903d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -58,7 +58,7 @@
#include <string>
#include <map>
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
#include "chrome/renderer/renderer_sandbox_support_linux.h"
#include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h"
#endif
@@ -122,7 +122,7 @@ class RendererWebKitClientImpl::SandboxSupport
// unicode code points. It needs this information frequently so we cache it
// here. The key in this map is an array of 16-bit UTF16 values from WebKit.
// The value is a string containing the correct font family.
- Lock unicode_font_families_mutex_;
+ base::Lock unicode_font_families_mutex_;
std::map<std::string, std::string> unicode_font_families_;
#endif
};
@@ -421,7 +421,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
const WebKit::WebUChar* characters, size_t num_characters) {
- AutoLock lock(unicode_font_families_mutex_);
+ base::AutoLock lock(unicode_font_families_mutex_);
const std::string key(reinterpret_cast<const char*>(characters),
num_characters * sizeof(characters[0]));
const std::map<std::string, std::string>::const_iterator iter =
« no previous file with comments | « chrome/renderer/media/audio_renderer_impl.cc ('k') | chrome/service/cloud_print/print_system_cups.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698