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

Side by Side Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 168823003: Take padding into account during calculation of overflow constraining rect for sticky positioning. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased patch. Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/css/sticky/sticky-bottom-overflow-padding-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 LayoutSize RenderBoxModelObject::stickyPositionOffset() const 331 LayoutSize RenderBoxModelObject::stickyPositionOffset() const
332 { 332 {
333 FloatRect constrainingRect; 333 FloatRect constrainingRect;
334 334
335 ASSERT(hasLayer()); 335 ASSERT(hasLayer());
336 RenderLayer* enclosingClippingLayer = layer()->enclosingOverflowClipLayer(Ex cludeSelf); 336 RenderLayer* enclosingClippingLayer = layer()->enclosingOverflowClipLayer(Ex cludeSelf);
337 if (enclosingClippingLayer) { 337 if (enclosingClippingLayer) {
338 RenderBox* enclosingClippingBox = toRenderBox(enclosingClippingLayer->re nderer()); 338 RenderBox* enclosingClippingBox = toRenderBox(enclosingClippingLayer->re nderer());
339 LayoutRect clipRect = enclosingClippingBox->overflowClipRect(LayoutPoint ()); 339 LayoutRect clipRect = enclosingClippingBox->overflowClipRect(LayoutPoint ());
340 clipRect.move(enclosingClippingBox->paddingLeft(), enclosingClippingBox- >paddingTop());
341 clipRect.contract(LayoutSize(enclosingClippingBox->paddingLeft() + enclo singClippingBox->paddingRight(),
342 enclosingClippingBox->paddingTop() + enclosingClippingBox->paddingBo ttom()));
340 constrainingRect = enclosingClippingBox->localToContainerQuad(FloatRect( clipRect), view()).boundingBox(); 343 constrainingRect = enclosingClippingBox->localToContainerQuad(FloatRect( clipRect), view()).boundingBox();
341 } else { 344 } else {
342 LayoutRect viewportRect = view()->frameView()->viewportConstrainedVisibl eContentRect(); 345 LayoutRect viewportRect = view()->frameView()->viewportConstrainedVisibl eContentRect();
343 constrainingRect = viewportRect; 346 constrainingRect = viewportRect;
344 } 347 }
345 348
346 StickyPositionViewportConstraints constraints; 349 StickyPositionViewportConstraints constraints;
347 computeStickyPositionConstraints(constraints, constrainingRect); 350 computeStickyPositionConstraints(constraints, constrainingRect);
348 351
349 // The sticky offset is physical, so we can just return the delta computed i n absolute coords (though it may be wrong with transforms). 352 // The sticky offset is physical, so we can just return the delta computed i n absolute coords (though it may be wrong with transforms).
(...skipping 2439 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2792 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2790 for (RenderObject* child = startChild; child && child != endChild; ) { 2793 for (RenderObject* child = startChild; child && child != endChild; ) {
2791 // Save our next sibling as moveChildTo will clear it. 2794 // Save our next sibling as moveChildTo will clear it.
2792 RenderObject* nextSibling = child->nextSibling(); 2795 RenderObject* nextSibling = child->nextSibling();
2793 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2796 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2794 child = nextSibling; 2797 child = nextSibling;
2795 } 2798 }
2796 } 2799 }
2797 2800
2798 } // namespace WebCore 2801 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/sticky/sticky-bottom-overflow-padding-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698