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

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

Issue 1687503002: Introduce IntrinsicSizingInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make passed reference const Created 4 years, 10 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
Index: third_party/WebKit/Source/core/layout/LayoutReplaced.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutReplaced.h b/third_party/WebKit/Source/core/layout/LayoutReplaced.h
index 2da6fa692185b1a6696442529bdd2264261d570e..e48ff3a21dc06df2c38d7c1a8e3078987eb9c812 100644
--- a/third_party/WebKit/Source/core/layout/LayoutReplaced.h
+++ b/third_party/WebKit/Source/core/layout/LayoutReplaced.h
@@ -78,7 +78,7 @@ protected:
void layout() override;
LayoutSize intrinsicSize() const final { return m_intrinsicSize; }
- void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override;
+ void computeIntrinsicSizingInfo(IntrinsicSizingInfo&) const override;
void computePositionedLogicalWidth(LogicalExtentComputedValues&) const override;
void computePositionedLogicalHeight(LogicalExtentComputedValues&) const override;
@@ -112,7 +112,8 @@ private:
bool canBeSelectionLeaf() const override { return true; }
LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const final;
- void computeAspectRatioInformationForLayoutBox(LayoutBox*, FloatSize& constrainedSize, double& intrinsicRatio) const;
+ void computeIntrinsicSizingInfoForLayoutBox(LayoutBox*, IntrinsicSizingInfo&) const;
+ FloatSize constrainIntrinsicSizeToMinMax(const IntrinsicSizingInfo&) const;
mutable LayoutSize m_intrinsicSize;
};
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698