third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.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/core/page/scrolling/ScrollStateTest.cpp ('k') | third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h

diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h

index f9d5dd4a421879ae4de3ef9f5066695b76b7e177..f503f8f7d7371cbe94bec1ed8cef738d4fef8942 100644

--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h

+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h

@@ -34,7 +34,6 @@

#include "platform/scroll/ScrollTypes.h"

#include "wtf/Noncopyable.h"

#include "wtf/text/WTFString.h"

-#include <memory>

namespace blink {

class WebScrollbarLayer;

@@ -96,7 +95,7 @@ public:

MainThreadScrollingReasons mainThreadScrollingReasons() const;

bool shouldUpdateScrollLayerPositionOnMainThread() const { return mainThreadScrollingReasons() != 0; }

- std::unique_ptr<WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, int trackStart, bool isLeftSideVerticalScrollbar);

+ PassOwnPtr<WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, int trackStart, bool isLeftSideVerticalScrollbar);

void willDestroyScrollableArea(ScrollableArea*);

// Returns true if the coordinator handled this change.

@@ -147,15 +146,15 @@ private:

void setTouchEventTargetRects(LayerHitTestRects&);

void computeTouchEventTargetRects(LayerHitTestRects&);

- WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, std::unique_ptr<WebScrollbarLayer>);

+ WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<WebScrollbarLayer>);

WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);

void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);

bool frameViewIsDirty() const;

- std::unique_ptr<CompositorAnimationTimeline> m_programmaticScrollAnimatorTimeline;

+ OwnPtr<CompositorAnimationTimeline> m_programmaticScrollAnimatorTimeline;

- using ScrollbarMap = HeapHashMap<Member<ScrollableArea>, std::unique_ptr<WebScrollbarLayer>>;

+ using ScrollbarMap = HeapHashMap<Member<ScrollableArea>, OwnPtr<WebScrollbarLayer>>;

ScrollbarMap m_horizontalScrollbars;

ScrollbarMap m_verticalScrollbars;

HashSet<const PaintLayer*> m_layersWithTouchRects;