Source/core/rendering/RenderObject.h - Issue 343103003: Flexbox: Allow intrinsic aspect ratios to inform main-size calculation

Side by Side Diff: Source/core/rendering/RenderObject.h

Issue 343103003: Flexbox: Allow intrinsic aspect ratios to inform main-size calculation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: WIP Patch 3: Addressing comments of WIP Patch 2 Created 6 years, 5 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

« LayoutTests/css3/flexbox/aspect-ratios-main-size-calculation.html ('K') | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)	5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)

6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.	6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.

7 * Copyright (C) 2009 Google Inc. All rights reserved.	7 * Copyright (C) 2009 Google Inc. 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 535 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
546 bool normalChildNeedsLayout() const { return m_bitfields.normalChildNeedsLay out(); }	546 bool normalChildNeedsLayout() const { return m_bitfields.normalChildNeedsLay out(); }

547	547

548 bool preferredLogicalWidthsDirty() const { return m_bitfields.preferredLogic alWidthsDirty(); }	548 bool preferredLogicalWidthsDirty() const { return m_bitfields.preferredLogic alWidthsDirty(); }

549	549

550 bool needsOverflowRecalcAfterStyleChange() const { return m_bitfields.selfNe edsOverflowRecalcAfterStyleChange() \|\| m_bitfields.childNeedsOverflowRecalcAfter StyleChange(); }	550 bool needsOverflowRecalcAfterStyleChange() const { return m_bitfields.selfNe edsOverflowRecalcAfterStyleChange() \|\| m_bitfields.childNeedsOverflowRecalcAfter StyleChange(); }

551 bool selfNeedsOverflowRecalcAfterStyleChange() const { return m_bitfields.se lfNeedsOverflowRecalcAfterStyleChange(); }	551 bool selfNeedsOverflowRecalcAfterStyleChange() const { return m_bitfields.se lfNeedsOverflowRecalcAfterStyleChange(); }

552 bool childNeedsOverflowRecalcAfterStyleChange() const { return m_bitfields.c hildNeedsOverflowRecalcAfterStyleChange(); }	552 bool childNeedsOverflowRecalcAfterStyleChange() const { return m_bitfields.c hildNeedsOverflowRecalcAfterStyleChange(); }

553	553

554 bool isSelectionBorder() const;	554 bool isSelectionBorder() const;

555	555

	556 bool hasAspectRatio() const { return isReplaced() && (isImage() \|\| isVideo() \|\| isCanvas()); }

	557

556 bool hasClip() const { return isOutOfFlowPositioned() && style()->hasClip(); }	558 bool hasClip() const { return isOutOfFlowPositioned() && style()->hasClip(); }

557 bool hasOverflowClip() const { return m_bitfields.hasOverflowClip(); }	559 bool hasOverflowClip() const { return m_bitfields.hasOverflowClip(); }

558 bool hasClipOrOverflowClip() const { return hasClip() \|\| hasOverflowClip(); }	560 bool hasClipOrOverflowClip() const { return hasClip() \|\| hasOverflowClip(); }

559	561

560 bool hasTransform() const { return m_bitfields.hasTransform(); }	562 bool hasTransform() const { return m_bitfields.hasTransform(); }

561 bool hasMask() const { return style() && style()->hasMask(); }	563 bool hasMask() const { return style() && style()->hasMask(); }

562 bool hasClipPath() const { return style() && style()->clipPath(); }	564 bool hasClipPath() const { return style() && style()->clipPath(); }

563 bool hasHiddenBackface() const { return style() && style()->backfaceVisibili ty() == BackfaceVisibilityHidden; }	565 bool hasHiddenBackface() const { return style() && style()->backfaceVisibili ty() == BackfaceVisibilityHidden; }

564	566

565 bool hasFilter() const { return style() && style()->hasFilter(); }	567 bool hasFilter() const { return style() && style()->hasFilter(); }

(...skipping 908 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1474 void showTree(const WebCore::RenderObject*);	1476 void showTree(const WebCore::RenderObject*);

1475 void showLineTree(const WebCore::RenderObject*);	1477 void showLineTree(const WebCore::RenderObject*);

1476 void showRenderTree(const WebCore::RenderObject* object1);	1478 void showRenderTree(const WebCore::RenderObject* object1);

1477 // We don't make object2 an optional parameter so that showRenderTree	1479 // We don't make object2 an optional parameter so that showRenderTree

1478 // can be called from gdb easily.	1480 // can be called from gdb easily.

1479 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);	1481 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);

1480	1482

1481 #endif	1483 #endif

1482	1484

1483 #endif // RenderObject_h	1485 #endif // RenderObject_h

OLD	NEW