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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGeometryMap.h

Issue 1308273010: Adapt and reland old position sticky implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge and attempt to fix base URL Created 5 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: third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h b/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
index 7c35202ac3b90e05c3753e86b709e75e82fba620..3e29608de8f29634c0dc5008d25e3483d3869c3d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
@@ -74,8 +74,8 @@ public:
// Push geometry info between this layoutObject and some ancestor. The ancestor must be its container() or some
// stacking context between the layoutObject and its container.
- void push(const LayoutObject*, const LayoutSize&, bool accumulatingTransform = false, bool isNonUniform = false, bool isFixedPosition = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
- void push(const LayoutObject*, const TransformationMatrix&, bool accumulatingTransform = false, bool isNonUniform = false, bool isFixedPosition = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
+ void push(const LayoutObject*, const LayoutSize&, bool accumulatingTransform = false, bool isNonUniform = false, bool isViewportConstrained = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
+ void push(const LayoutObject*, const TransformationMatrix&, bool accumulatingTransform = false, bool isNonUniform = false, bool isViewportConstrained = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
private:
void mapToContainer(TransformState&, const LayoutBoxModelObject* container = nullptr) const;
@@ -85,7 +85,7 @@ private:
bool hasNonUniformStep() const { return m_nonUniformStepsCount; }
bool hasTransformStep() const { return m_transformedStepsCount; }
- bool hasFixedPositionStep() const { return m_fixedStepsCount; }
+ bool hasViewportConstrainedStep() const { return m_viewportConstrainedStepsCount; }
#ifndef NDEBUG
void dumpSteps() const;
@@ -100,7 +100,7 @@ private:
size_t m_insertionPosition;
int m_nonUniformStepsCount;
int m_transformedStepsCount;
- int m_fixedStepsCount;
+ int m_viewportConstrainedStepsCount;
LayoutGeometryMapSteps m_mapping;
LayoutSize m_accumulatedOffset;
MapCoordinatesFlags m_mapCoordinatesFlags;

Powered by Google App Engine
This is Rietveld 408576698