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

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

Issue 1499063002: input's placeholder is inconsistently laid out (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2344 matching lines...) Expand 10 before | Expand all | Expand 10 after
2355 // https://bugs.webkit.org/show_bug.cgi?id=46418 2355 // https://bugs.webkit.org/show_bug.cgi?id=46418
2356 bool inHorizontalBox = parent()->isDeprecatedFlexibleBox() && parent()-> style()->boxOrient() == HORIZONTAL; 2356 bool inHorizontalBox = parent()->isDeprecatedFlexibleBox() && parent()-> style()->boxOrient() == HORIZONTAL;
2357 bool stretching = parent()->style()->boxAlign() == BSTRETCH; 2357 bool stretching = parent()->style()->boxAlign() == BSTRETCH;
2358 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inHorizontalBo x || !stretching); 2358 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inHorizontalBo x || !stretching);
2359 bool checkMinMaxHeight = false; 2359 bool checkMinMaxHeight = false;
2360 2360
2361 // The parent box is flexing us, so it has increased or decreased our he ight. We have to 2361 // The parent box is flexing us, so it has increased or decreased our he ight. We have to
2362 // grab our cached flexible height. 2362 // grab our cached flexible height.
2363 // FIXME: Account for writing-mode in flexible boxes. 2363 // FIXME: Account for writing-mode in flexible boxes.
2364 // https://bugs.webkit.org/show_bug.cgi?id=46418 2364 // https://bugs.webkit.org/show_bug.cgi?id=46418
2365 if (hasOverrideLogicalContentHeight() && (parent()->isFlexibleBoxIncludi ngDeprecated() || parent()->isLayoutGrid())) { 2365 if (hasOverrideLogicalContentHeight()) {
2366 LayoutUnit contentHeight = overrideLogicalContentHeight(); 2366 LayoutUnit contentHeight = overrideLogicalContentHeight();
2367 if (parent()->isLayoutGrid() && style()->logicalMinHeight().isAuto() && style()->overflowY() == OVISIBLE) { 2367 if (parent()->isLayoutGrid() && style()->logicalMinHeight().isAuto() && style()->overflowY() == OVISIBLE) {
2368 ASSERT(style()->logicalHeight().isAuto()); 2368 ASSERT(style()->logicalHeight().isAuto());
2369 LayoutUnit minContentHeight = computeContentLogicalHeight(MinSiz e, Length(MinContent), computedValues.m_extent - borderAndPaddingLogicalHeight() ); 2369 LayoutUnit minContentHeight = computeContentLogicalHeight(MinSiz e, Length(MinContent), computedValues.m_extent - borderAndPaddingLogicalHeight() );
2370 contentHeight = std::max(contentHeight, constrainContentBoxLogic alHeightByMinMax(minContentHeight, computedValues.m_extent - borderAndPaddingLog icalHeight())); 2370 contentHeight = std::max(contentHeight, constrainContentBoxLogic alHeightByMinMax(minContentHeight, computedValues.m_extent - borderAndPaddingLog icalHeight()));
2371 } 2371 }
2372 h = Length(contentHeight, Fixed); 2372 h = Length(contentHeight, Fixed);
2373 } else if (treatAsReplaced) { 2373 } else if (treatAsReplaced) {
2374 h = Length(computeReplacedLogicalHeight(), Fixed); 2374 h = Length(computeReplacedLogicalHeight(), Fixed);
2375 } else { 2375 } else {
(...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after
4839 StyleImage* borderImage = style()->borderImage().image(); 4839 StyleImage* borderImage = style()->borderImage().image();
4840 return borderImage && borderImage->canRender() && borderImage->isLoaded(); 4840 return borderImage && borderImage->canRender() && borderImage->isLoaded();
4841 } 4841 }
4842 4842
4843 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const 4843 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
4844 { 4844 {
4845 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; 4845 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
4846 } 4846 }
4847 4847
4848 } // namespace blink 4848 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698