Build issue from "IsInlineOutside" renaming, when MOZ_FLEXBOX is #defined

RESOLVED FIXED in mozilla18

Status

()

Core
Layout
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: dholbert, Assigned: dholbert)

Tracking

Trunk
mozilla18
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

5 years ago
A month ago, nsStyleDisplay::IsInlineOutside changed to be called "IsInlineOutsideStyle":
  https://hg.mozilla.org/mozilla-central/rev/d7749fadb594#l13.41
...and a new IsInlineOutside method was created that requires an argument:
  https://hg.mozilla.org/mozilla-central/rev/d7749fadb594#l13.67

This broke some ifdeffed-off flexbox code (which is only noticeable when you #define MOZ_FLEXBOX).

I've had a fix for this in my tree for a while, but hadn't posted it on a bug yet.

The error is:
{
../../../mozilla/layout/base/nsCSSFrameConstructor.cpp: In member function ‘void nsCSSFrameConstructor::CreateNeededAnonFlexItems(nsFrameConstructorState&, nsCSSFrameConstructor::FrameConstructionItemList&, nsIFrame*)’:
../../../mozilla/layout/base/nsCSSFrameConstructor.cpp:9562:66: error: no matching function for call to ‘nsStyleDisplay::IsInlineOutside() const’
../../../mozilla/layout/base/nsCSSFrameConstructor.cpp:9562:66: note: candidate is:
In file included from ../../../mozilla/layout/base/../generic/nsIFrame.h:3204:0,
                 from ../../../mozilla/layout/base/nsGenConList.h:11,
                 from ../../../mozilla/layout/base/nsQuoteList.h:11,
                 from ../../../mozilla/layout/base/nsCSSFrameConstructor.h:18,
                 from ../../../mozilla/layout/base/nsCSSFrameConstructor.cpp:14:
../../../mozilla/layout/base/../style/nsStyleStructInlines.h:92:1: note: bool nsStyleDisplay::IsInlineOutside(const nsIFrame*) const
../../../mozilla/layout/base/../style/nsStyleStructInlines.h:92:1: note:   candidate expects 1 argument, 0 provided
}

For reference, the cset that broke this was:
  https://hg.mozilla.org/mozilla-central/rev/d7749fadb594#l13.41

Fix is just s/IsInlineOutside/IsInlineOutsideStyle/ -- attaching it in a minute.
(Assignee)

Comment 1

5 years ago
Created attachment 660909 [details] [diff] [review]
fix
Attachment #660909 - Flags: review?(dbaron)
(Assignee)

Updated

5 years ago
Assignee: nobody → dholbert
Status: NEW → ASSIGNED
Summary: Build issue when MOZ_FLEXBOX is #defined → Build issue from "IsInlineOutside" renaming, when MOZ_FLEXBOX is #defined
Comment on attachment 660909 [details] [diff] [review]
fix

r=dbaron
Attachment #660909 - Flags: review?(dbaron) → review+
(Assignee)

Comment 3

5 years ago
https://hg.mozilla.org/integration/mozilla-inbound/rev/b704d314748d
https://hg.mozilla.org/mozilla-central/rev/b704d314748d
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla18
You need to log in before you can comment on or make changes to this bug.