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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 2452993002: Clear floats when we make a ruby base's children inline (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/float/rubybase-children-made-inline-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 3110 matching lines...) Expand 10 before | Expand all | Expand 10 after
3121 if (child->continuation()) 3121 if (child->continuation())
3122 return; 3122 return;
3123 // Ruby elements use anonymous wrappers for ruby runs and ruby bases by 3123 // Ruby elements use anonymous wrappers for ruby runs and ruby bases by
3124 // design, so we don't remove them. 3124 // design, so we don't remove them.
3125 if (child->isRubyRun() || child->isRubyBase()) 3125 if (child->isRubyRun() || child->isRubyBase())
3126 return; 3126 return;
3127 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation( 3127 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
3128 LayoutInvalidationReason::ChildAnonymousBlockChanged); 3128 LayoutInvalidationReason::ChildAnonymousBlockChanged);
3129 3129
3130 child->moveAllChildrenTo(this, child->nextSibling(), child->hasLayer()); 3130 child->moveAllChildrenTo(this, child->nextSibling(), child->hasLayer());
3131 // If we make an object's children inline we are going to frustrate any future
3132 // attempts to remove floats from its children's float-lists before the next
3133 // layout happens so clear down all the floatlists now - they will be rebuilt
3134 // at layout.
3135 if (child->childrenInline())
3136 removeFloatingObjectsFromDescendants();
3131 setChildrenInline(child->childrenInline()); 3137 setChildrenInline(child->childrenInline());
3132 3138
3133 children()->removeChildNode(this, child, child->hasLayer()); 3139 children()->removeChildNode(this, child, child->hasLayer());
3134 child->destroy(); 3140 child->destroy();
3135 } 3141 }
3136 3142
3137 bool LayoutBlockFlow::mergeSiblingContiguousAnonymousBlock( 3143 bool LayoutBlockFlow::mergeSiblingContiguousAnonymousBlock(
3138 LayoutBlockFlow* siblingThatMayBeDeleted) { 3144 LayoutBlockFlow* siblingThatMayBeDeleted) {
3139 // Note: |this| and |siblingThatMayBeDeleted| may not be adjacent siblings at 3145 // Note: |this| and |siblingThatMayBeDeleted| may not be adjacent siblings at
3140 // this point. There may be an object between them which is about to be 3146 // this point. There may be an object between them which is about to be
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
4537 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4543 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4538 } 4544 }
4539 4545
4540 void LayoutBlockFlow::invalidateDisplayItemClients( 4546 void LayoutBlockFlow::invalidateDisplayItemClients(
4541 PaintInvalidationReason invalidationReason) const { 4547 PaintInvalidationReason invalidationReason) const {
4542 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4548 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4543 invalidationReason); 4549 invalidationReason);
4544 } 4550 }
4545 4551
4546 } // namespace blink 4552 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/float/rubybase-children-made-inline-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698