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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2769353002: Only create sticky position constraints for constrained sticky position. (Closed)
Patch Set: Merge with master. Created 3 years, 8 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 | « no previous file | third_party/WebKit/Source/core/frame/FrameViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index a7254f82cf1954e4841113cd7d203798305245b5..92ba0eb06d50e6d7570f58d6bee9367c7354881e 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1767,8 +1767,9 @@ bool FrameView::InvalidateViewportConstrainedObjects() {
*viewport_constrained_objects_) {
LayoutObject* layout_object = viewport_constrained_object;
LayoutItem layout_item = LayoutItem(layout_object);
- ASSERT(layout_item.Style()->HasViewportConstrainedPosition());
- ASSERT(layout_item.HasLayer());
+ DCHECK(layout_item.Style()->HasViewportConstrainedPosition() ||
+ layout_item.Style()->HasStickyConstrainedPosition());
+ DCHECK(layout_item.HasLayer());
PaintLayer* layer = LayoutBoxModel(layout_item).Layer();
if (layer->IsPaintInvalidationContainer())
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698