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

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

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.cpp
===================================================================
--- Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (revision 139983)
+++ Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (working copy)
@@ -395,7 +395,7 @@
}
#endif
-bool ScrollingCoordinator::hasVisibleSlowRepaintFixedObjects(FrameView* frameView) const
+bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(FrameView* frameView) const
{
const FrameView::ViewportConstrainedObjectSet* viewportConstrainedObjects = frameView->viewportConstrainedObjects();
if (!viewportConstrainedObjects)
@@ -408,7 +408,7 @@
return true;
RenderLayer* layer = toRenderBoxModelObject(viewportConstrainedObject)->layer();
// Any explicit reason that a fixed position element is not composited shouldn't cause slow scrolling.
- if (!layer->isComposited() && layer->compositor()->fixedPositionLayerNotCompositedReason(layer) == RenderLayerCompositor::NoReason)
+ if (!layer->isComposited() && layer->viewportConstrainedNotCompositedReason() == RenderLayer::NoNotCompositedReason)
return true;
}
return false;
@@ -429,8 +429,8 @@
mainThreadScrollingReasons |= HasSlowRepaintObjects;
if (!supportsFixedPositionLayers() && frameView->hasViewportConstrainedObjects())
mainThreadScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
- if (supportsFixedPositionLayers() && hasVisibleSlowRepaintFixedObjects(frameView))
- mainThreadScrollingReasons |= HasNonLayerFixedObjects;
+ if (supportsFixedPositionLayers() && hasVisibleSlowRepaintViewportConstrainedObjects(frameView))
+ mainThreadScrollingReasons |= HasNonLayerViewportConstrainedObjects;
if (m_page->mainFrame()->document()->isImageDocument())
mainThreadScrollingReasons |= IsImageDocument;
@@ -472,8 +472,8 @@
stringBuilder.append("Has slow repaint objects, ");
if (reasons & ScrollingCoordinator::HasViewportConstrainedObjectsWithoutSupportingFixedLayers)
stringBuilder.append("Has viewport constrained objects without supporting fixed layers, ");
- if (reasons & ScrollingCoordinator::HasNonLayerFixedObjects)
- stringBuilder.append("Has non-layer fixed objects, ");
+ if (reasons & ScrollingCoordinator::HasNonLayerViewportConstrainedObjects)
+ stringBuilder.append("Has non-layer viewport-constrained objects, ");
if (reasons & ScrollingCoordinator::IsImageDocument)
stringBuilder.append("Is image document, ");
« no previous file with comments | « Source/WebCore/page/scrolling/ScrollingCoordinator.h ('k') | Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698