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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 629143005: Remove RenderObject::isMarquee() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 39befae260204bc7a2b5b40e9d6460cfa6e6109a..4d5668904d283f2ed27c2dcb2e5edf14e4de556e 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -2040,23 +2040,12 @@ bool RenderBox::sizesLogicalWidthToFitContent(const Length& logicalWidth) const
{
// Marquees in WinIE are like a mixture of blocks and inline-blocks. They size as though they're blocks,
mstensho (USE GERRIT) 2014/10/06 20:00:34 This comment about marquees is no longer valid.
Hajime Morrita 2014/10/06 20:22:10 Done.
// but they allow text to sit on the same line as the marquee.
- if (isFloating() || (isInlineBlockOrInlineTable() && !isMarquee()))
+ if (isFloating() || (isInlineBlockOrInlineTable()))
mstensho (USE GERRIT) 2014/10/06 20:00:34 Extraneous set of parentheses.
Hajime Morrita 2014/10/06 20:22:10 Done.
return true;
if (logicalWidth.type() == Intrinsic)
return true;
- // Children of a horizontal marquee do not fill the container by default.
- // FIXME: Need to deal with MAUTO value properly. It could be vertical.
- // FIXME: Think about block-flow here. Need to find out how marquee direction relates to
- // block-flow (as well as how marquee overflow should relate to block flow).
- // https://bugs.webkit.org/show_bug.cgi?id=46472
- if (parent()->isMarquee()) {
- EMarqueeDirection dir = parent()->style()->marqueeDirection();
- if (dir == MAUTO || dir == MFORWARD || dir == MBACKWARD || dir == MLEFT || dir == MRIGHT)
- return true;
- }
-
// Flexible box items should shrink wrap, so we lay them out at their intrinsic widths.
// In the case of columns that have a stretch alignment, we go ahead and layout at the
// stretched size to avoid an extra layout when applying alignment.
@@ -3798,7 +3787,7 @@ PositionWithAffinity RenderBox::positionForPoint(const LayoutPoint& point)
bool RenderBox::shrinkToAvoidFloats() const
{
// Floating objects don't shrink. Objects that don't avoid floats don't shrink. Marquees don't shrink.
mstensho (USE GERRIT) 2014/10/06 20:00:34 Can you remove the comment about marquees, please?
Hajime Morrita 2014/10/06 20:22:10 Done.
- if ((isInline() && !isMarquee()) || !avoidsFloats() || isFloating())
+ if (isInline() || !avoidsFloats() || isFloating())
return false;
// Only auto width objects can possibly shrink to avoid floats.

Powered by Google App Engine
This is Rietveld 408576698