Commit b86c04f9 authored by Christian Biesinger's avatar Christian Biesinger Committed by Commit Bot

[layoutng] Remove CORE_EXPORT from inline functions

R=mstensho@chromium.org

Change-Id: Ia16d22e1ac587de7588a17be48c0e6d171457022
Reviewed-on: https://chromium-review.googlesource.com/c/1316596Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605197}
parent 75f4804d
...@@ -37,7 +37,7 @@ enum class LengthResolvePhase { kIntrinsic, kLayout }; ...@@ -37,7 +37,7 @@ enum class LengthResolvePhase { kIntrinsic, kLayout };
// kContentSize - width / height // kContentSize - width / height
enum class LengthResolveType { kMinSize, kMaxSize, kContentSize }; enum class LengthResolveType { kMinSize, kMaxSize, kContentSize };
CORE_EXPORT inline bool NeedMinMaxSize(const ComputedStyle& style) { inline bool NeedMinMaxSize(const ComputedStyle& style) {
// This check is technically too broad (fill-available does not need intrinsic // This check is technically too broad (fill-available does not need intrinsic
// size computation) but that's a rare case and only affects performance, not // size computation) but that's a rare case and only affects performance, not
// correctness. // correctness.
...@@ -50,9 +50,8 @@ CORE_EXPORT inline bool NeedMinMaxSize(const ComputedStyle& style) { ...@@ -50,9 +50,8 @@ CORE_EXPORT inline bool NeedMinMaxSize(const ComputedStyle& style) {
// pass them to ResolveInlineLength / ComputeInlineSizeForFragment. // pass them to ResolveInlineLength / ComputeInlineSizeForFragment.
// If this function returns false, it is safe to pass an empty // If this function returns false, it is safe to pass an empty
// MinMaxSize struct to those functions. // MinMaxSize struct to those functions.
CORE_EXPORT inline bool NeedMinMaxSize( inline bool NeedMinMaxSize(const NGConstraintSpace& constraint_space,
const NGConstraintSpace& constraint_space, const ComputedStyle& style) {
const ComputedStyle& style) {
return constraint_space.IsShrinkToFit() || NeedMinMaxSize(style); return constraint_space.IsShrinkToFit() || NeedMinMaxSize(style);
} }
...@@ -95,7 +94,7 @@ CORE_EXPORT LayoutUnit ResolveBlockLength( ...@@ -95,7 +94,7 @@ CORE_EXPORT LayoutUnit ResolveBlockLength(
// given constraint space. // given constraint space.
LayoutUnit ResolveMarginPaddingLength(LayoutUnit percentage_resolution_size, LayoutUnit ResolveMarginPaddingLength(LayoutUnit percentage_resolution_size,
const Length&); const Length&);
CORE_EXPORT inline LayoutUnit ResolveMarginPaddingLength( inline LayoutUnit ResolveMarginPaddingLength(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const Length& length) { const Length& length) {
LayoutUnit percentage_resolution_size = LayoutUnit percentage_resolution_size =
...@@ -191,7 +190,7 @@ CORE_EXPORT NGPhysicalBoxStrut ...@@ -191,7 +190,7 @@ CORE_EXPORT NGPhysicalBoxStrut
ComputePhysicalMargins(const ComputedStyle&, ComputePhysicalMargins(const ComputedStyle&,
LayoutUnit percentage_resolution_size); LayoutUnit percentage_resolution_size);
CORE_EXPORT inline NGPhysicalBoxStrut ComputePhysicalMargins( inline NGPhysicalBoxStrut ComputePhysicalMargins(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
LayoutUnit percentage_resolution_size = LayoutUnit percentage_resolution_size =
...@@ -213,7 +212,7 @@ inline NGBoxStrut ComputeMarginsFor(const ComputedStyle& child_style, ...@@ -213,7 +212,7 @@ inline NGBoxStrut ComputeMarginsFor(const ComputedStyle& child_style,
} }
// Compute margins for the style owner. // Compute margins for the style owner.
CORE_EXPORT inline NGBoxStrut ComputeMarginsForSelf( inline NGBoxStrut ComputeMarginsForSelf(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
if (constraint_space.IsAnonymous()) if (constraint_space.IsAnonymous())
...@@ -228,7 +227,7 @@ CORE_EXPORT inline NGBoxStrut ComputeMarginsForSelf( ...@@ -228,7 +227,7 @@ CORE_EXPORT inline NGBoxStrut ComputeMarginsForSelf(
// //
// The "line" versions compute line-relative logical values. See NGLineBoxStrut // The "line" versions compute line-relative logical values. See NGLineBoxStrut
// for more details. // for more details.
CORE_EXPORT inline NGLineBoxStrut ComputeLineMarginsForSelf( inline NGLineBoxStrut ComputeLineMarginsForSelf(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
if (constraint_space.IsAnonymous()) if (constraint_space.IsAnonymous())
...@@ -241,7 +240,7 @@ CORE_EXPORT inline NGLineBoxStrut ComputeLineMarginsForSelf( ...@@ -241,7 +240,7 @@ CORE_EXPORT inline NGLineBoxStrut ComputeLineMarginsForSelf(
// Compute line logical margins for the constraint space, in the visual order // Compute line logical margins for the constraint space, in the visual order
// (always assumes LTR, ignoring the direction) for inline layout algorithm. // (always assumes LTR, ignoring the direction) for inline layout algorithm.
CORE_EXPORT inline NGLineBoxStrut ComputeLineMarginsForVisualContainer( inline NGLineBoxStrut ComputeLineMarginsForVisualContainer(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
if (constraint_space.IsAnonymous()) if (constraint_space.IsAnonymous())
...@@ -263,7 +262,7 @@ CORE_EXPORT NGBoxStrut ComputeBorders(const NGConstraintSpace&, ...@@ -263,7 +262,7 @@ CORE_EXPORT NGBoxStrut ComputeBorders(const NGConstraintSpace&,
CORE_EXPORT NGBoxStrut ComputeBorders(const NGConstraintSpace&, CORE_EXPORT NGBoxStrut ComputeBorders(const NGConstraintSpace&,
const NGLayoutInputNode); const NGLayoutInputNode);
CORE_EXPORT inline NGLineBoxStrut ComputeLineBorders( inline NGLineBoxStrut ComputeLineBorders(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
return NGLineBoxStrut(ComputeBorders(constraint_space, style), return NGLineBoxStrut(ComputeBorders(constraint_space, style),
...@@ -276,7 +275,7 @@ CORE_EXPORT NGBoxStrut ComputeIntrinsicPadding(const NGConstraintSpace&, ...@@ -276,7 +275,7 @@ CORE_EXPORT NGBoxStrut ComputeIntrinsicPadding(const NGConstraintSpace&,
CORE_EXPORT NGBoxStrut ComputePadding(const NGConstraintSpace&, CORE_EXPORT NGBoxStrut ComputePadding(const NGConstraintSpace&,
const ComputedStyle&); const ComputedStyle&);
CORE_EXPORT inline NGLineBoxStrut ComputeLinePadding( inline NGLineBoxStrut ComputeLinePadding(
const NGConstraintSpace& constraint_space, const NGConstraintSpace& constraint_space,
const ComputedStyle& style) { const ComputedStyle& style) {
return NGLineBoxStrut(ComputePadding(constraint_space, style), return NGLineBoxStrut(ComputePadding(constraint_space, style),
...@@ -316,9 +315,9 @@ CORE_EXPORT LayoutUnit LineOffsetForTextAlign(ETextAlign, ...@@ -316,9 +315,9 @@ CORE_EXPORT LayoutUnit LineOffsetForTextAlign(ETextAlign,
CORE_EXPORT LayoutUnit InlineOffsetForTextAlign(const ComputedStyle&, CORE_EXPORT LayoutUnit InlineOffsetForTextAlign(const ComputedStyle&,
LayoutUnit space_left); LayoutUnit space_left);
CORE_EXPORT inline LayoutUnit ConstrainByMinMax(LayoutUnit length, inline LayoutUnit ConstrainByMinMax(LayoutUnit length,
LayoutUnit min, LayoutUnit min,
LayoutUnit max) { LayoutUnit max) {
return std::max(min, std::min(length, max)); return std::max(min, std::min(length, max));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment