diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
| commit | 329d35ab57451a668331667221eef7352ef04ef6 (patch) | |
| tree | e9cfdb38aa59f09c46df71a856de6ade171f380e /layout/generic/nsFrame.h | |
| parent | d0da27ef572152d1fdd82a9ac15bd5c23ad68160 (diff) | |
| parent | cffb44547ae7997e5eaf71c644bd626eeb3bba00 (diff) | |
| download | UXP-329d35ab57451a668331667221eef7352ef04ef6.tar UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.gz UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.lz UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.xz UXP-329d35ab57451a668331667221eef7352ef04ef6.zip | |
Merge branch 'release' into Basilisk-releasev2020.01.12
Diffstat (limited to 'layout/generic/nsFrame.h')
| -rw-r--r-- | layout/generic/nsFrame.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index af1c95ef2..439e39856 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -261,7 +261,8 @@ public: InlineMinISizeData *aData) override; virtual void AddInlinePrefISize(nsRenderingContext *aRenderingContext, InlinePrefISizeData *aData) override; - virtual IntrinsicISizeOffsetData IntrinsicISizeOffsets() override; + IntrinsicISizeOffsetData + IntrinsicISizeOffsets(nscoord aPercentageBasis = NS_UNCONSTRAINEDSIZE) override; virtual mozilla::IntrinsicSize GetIntrinsicSize() override; virtual nsSize GetIntrinsicRatio() override; |