| Index: third_party/WebKit/Source/core/page/scrolling/ScrollState.h
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollState.h b/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
|
| index 65f164d9db4e0131cb47be32cbee585b497fb954..050ee6b46e2ed4a6487ce38972c8641e7d5aad0c 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
|
| @@ -12,7 +12,6 @@
|
| #include "platform/scroll/ScrollStateData.h"
|
| #include "wtf/Forward.h"
|
| #include <deque>
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -23,7 +22,7 @@ class CORE_EXPORT ScrollState final : public GarbageCollectedFinalized<ScrollSta
|
|
|
| public:
|
| static ScrollState* create(ScrollStateInit);
|
| - static ScrollState* create(std::unique_ptr<ScrollStateData>);
|
| + static ScrollState* create(PassOwnPtr<ScrollStateData>);
|
|
|
| ~ScrollState()
|
| {
|
| @@ -93,9 +92,9 @@ public:
|
|
|
| private:
|
| ScrollState();
|
| - explicit ScrollState(std::unique_ptr<ScrollStateData>);
|
| + explicit ScrollState(PassOwnPtr<ScrollStateData>);
|
|
|
| - std::unique_ptr<ScrollStateData> m_data;
|
| + OwnPtr<ScrollStateData> m_data;
|
| std::deque<int> m_scrollChain;
|
| };
|
|
|
|
|