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

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h

Issue 1497683002: Make platform/graphics to use USING_FAST_MALLOC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/graphics/ImageFrameGenerator.h
diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
index 39d3c40b00713a5849d327db5aa0bc9b17454317..06664c71efcd8d4b562fa11ad75a1786e45a3593 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
@@ -31,6 +31,8 @@
#include "SkTypes.h"
#include "platform/PlatformExport.h"
#include "platform/graphics/ThreadSafeDataTransport.h"
+#include "wtf/Allocator.h"
+#include "wtf/Noncopyable.h"
#include "wtf/PassOwnPtr.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
@@ -45,6 +47,7 @@ class ImageDecoder;
class SharedBuffer;
class PLATFORM_EXPORT ImageDecoderFactory {
+ USING_FAST_MALLOC(ImageDecoderFactory);
WTF_MAKE_NONCOPYABLE(ImageDecoderFactory);
public:
ImageDecoderFactory() {}
@@ -52,7 +55,7 @@ public:
virtual PassOwnPtr<ImageDecoder> create() = 0;
};
-class PLATFORM_EXPORT ImageFrameGenerator : public ThreadSafeRefCounted<ImageFrameGenerator> {
+class PLATFORM_EXPORT ImageFrameGenerator final : public ThreadSafeRefCounted<ImageFrameGenerator> {
WTF_MAKE_NONCOPYABLE(ImageFrameGenerator);
public:
static PassRefPtr<ImageFrameGenerator> create(const SkISize& fullSize, PassRefPtr<SharedBuffer> data, bool allDataReceived, bool isMultiFrame = false)
@@ -120,6 +123,10 @@ private:
// Protect concurrent access to m_hasAlpha.
Mutex m_alphaMutex;
+
+#if COMPILER(MSVC)
+ friend struct ::WTF::OwnedPtrDeleter<ExternalMemoryAllocator>;
+#endif
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698