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

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

Issue 2722613003: [css-grid] "normal" alignment is "start" for replaced elements (Closed)
Patch Set: Applied suggested changes 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 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. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2738 matching lines...) Expand 10 before | Expand all | Expand 10 after
2749 LayoutBlock* cb = containingBlock(); 2749 LayoutBlock* cb = containingBlock();
2750 if (!cb) { 2750 if (!cb) {
2751 // We are evaluating align-self/justify-self, which default to 'normal' for 2751 // We are evaluating align-self/justify-self, which default to 'normal' for
2752 // the root element. The 'normal' value behaves like 'start' except for 2752 // the root element. The 'normal' value behaves like 'start' except for
2753 // Flexbox Items, which obviously should have a container. 2753 // Flexbox Items, which obviously should have a container.
2754 return false; 2754 return false;
2755 } 2755 }
2756 const ComputedStyle* parentStyle = isAnonymous() ? cb->style() : nullptr; 2756 const ComputedStyle* parentStyle = isAnonymous() ? cb->style() : nullptr;
2757 if (cb->isHorizontalWritingMode() != isHorizontalWritingMode()) 2757 if (cb->isHorizontalWritingMode() != isHorizontalWritingMode())
2758 return style 2758 return style
2759 .resolvedAlignSelf(cb->selfAlignmentNormalBehavior(), 2759 .resolvedAlignSelf(cb->selfAlignmentNormalBehavior(this),
2760 parentStyle) 2760 parentStyle)
2761 .position() == ItemPositionStretch; 2761 .position() == ItemPositionStretch;
2762 return style 2762 return style
2763 .resolvedJustifySelf(cb->selfAlignmentNormalBehavior(), 2763 .resolvedJustifySelf(cb->selfAlignmentNormalBehavior(this),
2764 parentStyle) 2764 parentStyle)
2765 .position() == ItemPositionStretch; 2765 .position() == ItemPositionStretch;
2766 } 2766 }
2767 2767
2768 bool LayoutBox::sizesLogicalWidthToFitContent( 2768 bool LayoutBox::sizesLogicalWidthToFitContent(
2769 const Length& logicalWidth) const { 2769 const Length& logicalWidth) const {
2770 if (isFloating() || isInlineBlockOrInlineTable() || 2770 if (isFloating() || isInlineBlockOrInlineTable() ||
2771 styleRef().hasOutOfFlowPosition()) 2771 styleRef().hasOutOfFlowPosition())
2772 return true; 2772 return true;
2773 2773
(...skipping 2960 matching lines...) Expand 10 before | Expand all | Expand 10 after
5734 5734
5735 void LayoutBox::MutableForPainting:: 5735 void LayoutBox::MutableForPainting::
5736 savePreviousContentBoxSizeAndLayoutOverflowRect() { 5736 savePreviousContentBoxSizeAndLayoutOverflowRect() {
5737 auto& rareData = layoutBox().ensureRareData(); 5737 auto& rareData = layoutBox().ensureRareData();
5738 rareData.m_hasPreviousContentBoxSizeAndLayoutOverflowRect = true; 5738 rareData.m_hasPreviousContentBoxSizeAndLayoutOverflowRect = true;
5739 rareData.m_previousContentBoxSize = layoutBox().contentBoxRect().size(); 5739 rareData.m_previousContentBoxSize = layoutBox().contentBoxRect().size();
5740 rareData.m_previousLayoutOverflowRect = layoutBox().layoutOverflowRect(); 5740 rareData.m_previousLayoutOverflowRect = layoutBox().layoutOverflowRect();
5741 } 5741 }
5742 5742
5743 } // namespace blink 5743 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698