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

Unified Diff: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.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/mac/ScrollAnimatorMac.h
diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
index d07fd3719b123446fe33061d006f1100898adbe5..cdc362b6318bec4cb458955f5768bd5ae8eb43f7 100644
--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
@@ -35,7 +35,6 @@
#include "platform/scroll/ScrollAnimatorBase.h"
#include "public/platform/WebTaskRunner.h"
#include "wtf/RetainPtr.h"
-#include <memory>
OBJC_CLASS BlinkScrollAnimationHelperDelegate;
OBJC_CLASS BlinkScrollbarPainterControllerDelegate;
@@ -83,11 +82,11 @@ private:
RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
void initialScrollbarPaintTask();
- std::unique_ptr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory;
+ OwnPtr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory;
void sendContentAreaScrolledTask();
- std::unique_ptr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory;
- std::unique_ptr<WebTaskRunner> m_taskRunner;
+ OwnPtr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory;
+ OwnPtr<WebTaskRunner> m_taskRunner;
FloatSize m_contentAreaScrolledTimerScrollDelta;
ScrollResult userScroll(ScrollGranularity, const FloatSize& delta) override;

Powered by Google App Engine
This is Rietveld 408576698