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

Unified Diff: sky/engine/core/rendering/RenderLayerClipper.cpp

Issue 681023002: Remove a bunch of frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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: sky/engine/core/rendering/RenderLayerClipper.cpp
diff --git a/sky/engine/core/rendering/RenderLayerClipper.cpp b/sky/engine/core/rendering/RenderLayerClipper.cpp
index 1c00bb9dc13a2b72ff19aba0dfd7307159350383..9f699a3394ed7fb4df3953d503d81b315c43beb2 100644
--- a/sky/engine/core/rendering/RenderLayerClipper.cpp
+++ b/sky/engine/core/rendering/RenderLayerClipper.cpp
@@ -69,11 +69,6 @@ static void applyClipRects(const ClipRectsContext& context, RenderObject& render
{
ASSERT(renderer.hasOverflowClip() || renderer.hasClip());
- RenderView* view = renderer.view();
- ASSERT(view);
- if (clipRects.fixed() && context.rootLayer->renderer() == view)
- offset -= view->frameView()->scrollOffsetForFixedPosition();
-
if (renderer.hasOverflowClip()) {
ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset, context.scrollbarRelevancy);
newOverflowClip.setHasRadius(renderer.style()->hasBorderRadius());
@@ -329,13 +324,7 @@ ClipRect RenderLayerClipper::backgroundClipRect(const ClipRectsContext& context)
else
m_renderer.layer()->parent()->clipper().getOrCalculateClipRects(context, parentClipRects);
- ClipRect result = backgroundClipRectForPosition(parentClipRects, m_renderer.style()->position());
-
- // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite.
- if (parentClipRects.fixed() && context.rootLayer->renderer() == m_renderer.view() && result != PaintInfo::infiniteRect())
- result.move(m_renderer.view()->frameView()->scrollOffsetForFixedPosition());
-
- return result;
+ return backgroundClipRectForPosition(parentClipRects, m_renderer.style()->position());
}
void RenderLayerClipper::getOrCalculateClipRects(const ClipRectsContext& context, ClipRects& clipRects) const
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698