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

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

Issue 2720823002: Fix crash in FrameView::updateLayersAndCompositingAfterScrollIfNeeded (Closed)
Patch Set: Re-enabled RLS in test, use layoutViewportScrollableArea Created 3 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 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 5bf6441258d162eeb96671455bca7962985f2ab5..a363fe6cf6b423cbfde5f49ea129e77c3360414f 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1974,6 +1974,13 @@ void FrameView::updateLayersAndCompositingAfterScrollIfNeeded() {
continue;
PaintLayer* layer = toLayoutBoxModelObject(layoutObject)->layer();
+
+ // This method can be called during layout at which point the ancestor
+ // overflow layer may not be set yet. We can safely skip such cases as we
+ // will revisit this method during compositing inputs update.
+ if (!layer->ancestorOverflowLayer())
+ continue;
+
StickyConstraintsMap constraintsMap = layer->ancestorOverflowLayer()
->getScrollableArea()
->stickyConstraintsMap();
« 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