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

Unified Diff: third_party/WebKit/Source/platform/DragImage.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « third_party/WebKit/Source/platform/Crypto.cpp ('k') | third_party/WebKit/Source/platform/DragImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/DragImage.h
diff --git a/third_party/WebKit/Source/platform/DragImage.h b/third_party/WebKit/Source/platform/DragImage.h
index 9fd422c758cec7f39a006d5f0e99c59712e05ae1..64f458ae94f42721d07d8a36151f7d16cdb01b4d 100644
--- a/third_party/WebKit/Source/platform/DragImage.h
+++ b/third_party/WebKit/Source/platform/DragImage.h
@@ -34,7 +34,6 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "wtf/Allocator.h"
#include "wtf/Forward.h"
-#include <memory>
class SkImage;
@@ -48,12 +47,12 @@ class PLATFORM_EXPORT DragImage {
USING_FAST_MALLOC(DragImage);
WTF_MAKE_NONCOPYABLE(DragImage);
public:
- static std::unique_ptr<DragImage> create(Image*,
+ static PassOwnPtr<DragImage> create(Image*,
RespectImageOrientationEnum = DoNotRespectImageOrientation, float deviceScaleFactor = 1,
InterpolationQuality = InterpolationHigh, float opacity = 1,
FloatSize imageScale = FloatSize(1, 1));
- static std::unique_ptr<DragImage> create(const KURL&, const String& label, const FontDescription& systemFont, float deviceScaleFactor);
+ static PassOwnPtr<DragImage> create(const KURL&, const String& label, const FontDescription& systemFont, float deviceScaleFactor);
~DragImage();
static FloatSize clampedImageScale(const IntSize&, const IntSize&, const IntSize& maxSize);
« no previous file with comments | « third_party/WebKit/Source/platform/Crypto.cpp ('k') | third_party/WebKit/Source/platform/DragImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698