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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

Issue 2518253002: Move Partition Allocator into Chromium base. (Closed)
Patch Set: Remove PRETTY_FUNCTION, and fix (?) ByteSwap for uintptr_t on macOS/iOS. Created 4 years 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: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
index 99960457fab9516a4f3fd35e6e7ae1bfb5d8c62b..27edc0f70b8eda339657297cd4e7f313b15bd12a 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
@@ -31,6 +31,7 @@
#include "platform/image-decoders/png/PNGImageDecoder.h"
#include "platform/image-decoders/webp/WEBPImageDecoder.h"
#include "wtf/PtrUtil.h"
+#include "wtf/SpinLock.h"
#include <memory>
namespace blink {
@@ -512,7 +513,7 @@ size_t ImagePlanes::rowBytes(int i) const {
namespace {
// The output device color space is global and shared across multiple threads.
-SpinLock gTargetColorSpaceLock;
+WTF::SpinLock gTargetColorSpaceLock;
SkColorSpace* gTargetColorSpace = nullptr;
} // namespace
@@ -524,7 +525,7 @@ void ImageDecoder::setGlobalTargetColorProfile(const WebVector<char>& profile) {
// Take a lock around initializing and accessing the global device color
// profile.
- SpinLock::Guard guard(gTargetColorSpaceLock);
+ WTF::SpinLock::Guard guard(gTargetColorSpaceLock);
// Layout tests expect that only the first call will take effect.
if (gTargetColorSpace)
@@ -541,7 +542,7 @@ void ImageDecoder::setGlobalTargetColorProfile(const WebVector<char>& profile) {
sk_sp<SkColorSpace> ImageDecoder::globalTargetColorSpace() {
// Take a lock around initializing and accessing the global device color
// profile.
- SpinLock::Guard guard(gTargetColorSpaceLock);
+ WTF::SpinLock::Guard guard(gTargetColorSpaceLock);
// Initialize the output device profile to sRGB if it has not yet been
// initialized.

Powered by Google App Engine
This is Rietveld 408576698