third_party/WebKit/Source/platform/scroll/ScrollableArea.h - Issue 1686483002: Oilpan: Remove most WillBe types from the code base

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/platform/scroll/ScrollableArea.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/scroll/ScrollAnimatorTest.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

index 06c64bf6d10ca24c537aede21a7f80f58435f925..cea0e0e73d0c4ace4064782c6f53c97ce575c477 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

@@ -63,7 +63,7 @@ enum IncludeScrollbarsInRect {

};

#if ENABLE(OILPAN)

-// Oilpan: Using the transition type WillBeGarbageCollectedMixin is

+// Oilpan: Using the transition type GarbageCollectedMixin is

// problematic non-Oilpan as the type expands to DummyBase, exporting it

// also from 'platform' as a result. Bringing about duplicate DummyBases

// as core also exports same; with component build linking fails as a

@@ -326,8 +326,8 @@ private:

virtual int documentStep(ScrollbarOrientation) const;

virtual float pixelStep(ScrollbarOrientation) const;

- mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;

- mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;

+ mutable Member<ScrollAnimatorBase> m_scrollAnimator;

+ mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;

unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle