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

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.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
Index: third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h b/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h
index 8eee7b6d77c390f367993bf2fce5c788d9bbc87c..0c67a4aa32317e22b11e3361859b2f4824c869a7 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h
@@ -8,17 +8,17 @@
#include "platform/geometry/FloatRect.h"
#include "platform/graphics/CompositorFilterOperations.h"
#include "platform/graphics/paint/DisplayItem.h"
+#include "wtf/PassOwnPtr.h"
#include "wtf/PassRefPtr.h"
#ifndef NDEBUG
#include "wtf/text/WTFString.h"
#endif
-#include <memory>
namespace blink {
class PLATFORM_EXPORT BeginFilterDisplayItem final : public PairedBeginDisplayItem {
public:
- BeginFilterDisplayItem(const DisplayItemClient& client, sk_sp<SkImageFilter> imageFilter, const FloatRect& bounds, std::unique_ptr<CompositorFilterOperations> filterOperations = nullptr)
+ BeginFilterDisplayItem(const DisplayItemClient& client, sk_sp<SkImageFilter> imageFilter, const FloatRect& bounds, PassOwnPtr<CompositorFilterOperations> filterOperations = nullptr)
: PairedBeginDisplayItem(client, BeginFilter, sizeof(*this))
, m_imageFilter(std::move(imageFilter))
, m_webFilterOperations(std::move(filterOperations))
@@ -43,7 +43,7 @@ private:
// FIXME: m_imageFilter should be replaced with m_webFilterOperations when copying data to the compositor.
sk_sp<SkImageFilter> m_imageFilter;
- std::unique_ptr<CompositorFilterOperations> m_webFilterOperations;
+ OwnPtr<CompositorFilterOperations> m_webFilterOperations;
const FloatRect m_bounds;
};

Powered by Google App Engine
This is Rietveld 408576698