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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2803323002: Avoiding name collisions between flexbox and grid (Closed)
Patch Set: Fixed include, removed empty line. 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:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h ('K') | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h ('K') | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698