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

Unified Diff: Source/WebCore/page/scrolling/ScrollingCoordinator.h

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:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/page/scrolling/ScrollingCoordinator.h
===================================================================
--- Source/WebCore/page/scrolling/ScrollingCoordinator.h (revision 139983)
+++ Source/WebCore/page/scrolling/ScrollingCoordinator.h (working copy)
@@ -137,7 +137,7 @@
ForcedOnMainThread = 1 << 0,
HasSlowRepaintObjects = 1 << 1,
HasViewportConstrainedObjectsWithoutSupportingFixedLayers = 1 << 2,
- HasNonLayerFixedObjects = 1 << 3,
+ HasNonLayerViewportConstrainedObjects = 1 << 3,
IsImageDocument = 1 << 4
};
@@ -174,7 +174,7 @@
virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) { }
virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons) { }
- virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const;
+ virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;
void updateShouldUpdateScrollLayerPositionOnMainThread();
void updateMainFrameScrollPositionTimerFired(Timer<ScrollingCoordinator>*);

Powered by Google App Engine
This is Rietveld 408576698