Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm - Issue 11970041: Merge 139461

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: Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm

Issue 11970041: Merge 139461 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 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:

Index: Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm

===================================================================

--- Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (revision 139983)

+++ Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (working copy)

@@ -366,7 +366,7 @@

reasonsDescription.append("slow-repaint objects,");

if (mainThreadScrollingReasons & ScrollingCoordinator::HasViewportConstrainedObjectsWithoutSupportingFixedLayers)

reasonsDescription.append("viewport-constrained objects,");

- if (mainThreadScrollingReasons & ScrollingCoordinator::HasNonLayerFixedObjects)

+ if (mainThreadScrollingReasons & ScrollingCoordinator::HasNonLayerViewportConstrainedObjects)

reasonsDescription.append("non-layer viewport-constrained objects,");

if (mainThreadScrollingReasons & ScrollingCoordinator::IsImageDocument)

reasonsDescription.append("image document,");