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

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 346603007: Remove position: sticky (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/core/rendering/LayoutState.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 46e99378f2a108f7fd43521e0a8afa1e8f7c0bc1..1a1ee962235a9d13031137a899110ebd62a3c44e 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -385,7 +385,7 @@ void RenderBlock::invalidateTreeAfterLayout(const RenderLayerModelObject& invali
// the inline elements position in LayoutState.
if (box->style()->position() == AbsolutePosition) {
RenderObject* container = box->container(&repaintContainerForChild, 0);
- if (container->isInFlowPositioned() && container->isRenderInline()) {
+ if (container->isRelPositioned() && container->isRenderInline()) {
// FIXME: We should be able to use layout-state for this.
// Currently, we will place absolutly positioned elements inside
// relatively positioned inline blocks in the wrong location. crbug.com/371485
@@ -2362,7 +2362,7 @@ GapRects RenderBlock::blockSelectionGaps(RenderBlock* rootBlock, const LayoutPoi
if (curr->isFloatingOrOutOfFlowPositioned())
continue; // We must be a normal flow object in order to even be considered.
- if (curr->isInFlowPositioned() && curr->hasLayer()) {
+ if (curr->isRelPositioned() && curr->hasLayer()) {
// If the relposition offset is anything other than 0, then treat this just like an absolute positioned element.
// Just disregard it completely.
LayoutSize relOffset = curr->layer()->offsetForInFlowPosition();
@@ -3013,7 +3013,7 @@ static inline bool isEditingBoundary(RenderObject* ancestor, RenderObject* child
static PositionWithAffinity positionForPointRespectingEditingBoundaries(RenderBlock* parent, RenderBox* child, const LayoutPoint& pointInParentCoordinates)
{
LayoutPoint childLocation = child->location();
- if (child->isInFlowPositioned())
+ if (child->isRelPositioned())
childLocation += child->offsetForInFlowPosition();
// FIXME: This is wrong if the child's writing-mode is different from the parent's.
@@ -4889,8 +4889,6 @@ const char* RenderBlock::renderName() const
return "RenderBlock (generated)";
if (isRelPositioned())
return "RenderBlock (relative positioned)";
- if (isStickyPositioned())
- return "RenderBlock (sticky positioned)";
return "RenderBlock";
}
« no previous file with comments | « Source/core/rendering/LayoutState.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698