third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h - Issue 2803323002: Avoiding name collisions between flexbox and grid

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

Issue 2803323002: Avoiding name collisions between flexbox and grid (Closed)

Patch Set: Moved functions around. Created 3 years, 8 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:

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

index 38f2c5f04b1c689c72c28af49cb434eeb2ab5ebd..95ba53cd10b515f720c3543050aa2b2a7bd91aa6 100644

--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

@@ -56,6 +56,11 @@ class CORE_EXPORT LayoutFlexibleBox : public LayoutBlock {

bool firstLine,

LineDirectionMode,

LinePositionMode = PositionOnContainingLine) const override;

+ static const StyleContentAlignmentData& contentAlignmentNormalBehavior();

+ static int synthesizedBaselineFromContentBox(const LayoutBox&,

+ LineDirectionMode);

int firstLineBoxBaseline() const override;

int inlineBlockBaseline(LineDirectionMode) const override;

IntSize originAdjustmentForScrollbars() const override;