Merge 139461

Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 71 matching lines @@
 
     // This function will update the ScrollingStateNode for the given viewport constrained object.
     virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) OVERRIDE;
 
     // Called to synch the GraphicsLayer positions for child layers when their CALayers have been moved by the scrolling thread.
     virtual void syncChildPositions(const LayoutRect& viewportRect) OVERRIDE;
 
     virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*);
     virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
 
-    virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const { return false; }
+    virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const { return false; }
 
     void ensureRootStateNodeForFrameView(FrameView*);
     ScrollingStateNode* stateNodeForID(ScrollingNodeID);
 
     struct ScrollParameters {
         ScrollElasticity horizontalScrollElasticity;
         ScrollElasticity verticalScrollElasticity;
 
         bool hasEnabledHorizontalScrollbar;
         bool hasEnabledVerticalScrollbar;
@@ skipping 26 matching lines @@
     Timer<ScrollingCoordinatorMac> m_scrollingStateTreeCommitterTimer;
 
     HashMap<ScrollingNodeID, ScrollingStateNode*> m_stateNodeMap;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(THREADED_SCROLLING)
 
 #endif // ScrollingCoordinatorMac_h