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

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

Issue 2737253003: Remove floating objects from descendants of subtree roots (Closed)
Patch Set: Test from mstensho Created 3 years, 9 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 | « third_party/WebKit/LayoutTests/fast/writing-mode/orthogonal-writing-modes-floats-crash-3.html ('k') | no next file » | 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 781576b2f50fe850f98cf64cc318e54706670b5d..d8dac0e2c4401cba328f05318acdb04cf45686f0 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -2181,8 +2181,9 @@ static inline void removeFloatingObjectsForSubtreeRoot(LayoutObject& root) {
// FloatingObjects.
if (LayoutBlock* cb = root.containingBlock()) {
if ((cb->normalChildNeedsLayout() || cb->selfNeedsLayout()) &&
- cb->isLayoutBlockFlow())
- toLayoutBlockFlow(cb)->removeFloatingObjects();
+ cb->isLayoutBlockFlow()) {
+ toLayoutBlockFlow(cb)->removeFloatingObjectsFromDescendants();
+ }
}
}
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/writing-mode/orthogonal-writing-modes-floats-crash-3.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698