third_party/WebKit/Source/core/layout/LayoutGrid.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/LayoutGrid.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/LayoutGrid.h

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

index 37f512e56cd805b6e85c6507541b9499e3adc692..7eff71a82e06438601517cb1bcdea5a8c6c506e6 100644

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

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

@@ -269,6 +269,15 @@ class LayoutGrid final : public LayoutBlock {

size_t numTracks(GridTrackSizingDirection, const Grid&) const;

+ static LayoutUnit overrideContainingBlockContentSizeForChild(

+ const LayoutBox& child,

+ GridTrackSizingDirection);

+ static int synthesizedBaselineFromContentBox(const LayoutBox&,

+ LineDirectionMode);

+ static int synthesizedBaselineFromBorderBox(const LayoutBox&,

+ LineDirectionMode);

+ static const StyleContentAlignmentData& contentAlignmentNormalBehavior();

typedef HashMap<unsigned,

std::unique_ptr<BaselineContext>,

DefaultHash<unsigned>::Hash,