--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1625,17 +1625,17 @@ nsFocusManager::CheckIfFocusable(Element
}
// if this is a child frame content node, check if it is visible and
// call the content node's IsFocusable method instead of the frame's
// IsFocusable method. This skips checking the style system and ensures that
// offscreen browsers can still be focused.
nsIDocument* subdoc = doc->GetSubDocumentFor(aElement);
if (subdoc && IsWindowVisible(subdoc->GetWindow())) {
- const nsStyleUserInterface* ui = frame->StyleUserInterface();
+ const nsStyleUI* ui = frame->StyleUI();
int32_t tabIndex = (ui->mUserFocus == StyleUserFocus::Ignore ||
ui->mUserFocus == StyleUserFocus::None) ? -1 : 0;
return aElement->IsFocusable(&tabIndex, aFlags & FLAG_BYMOUSE) ? aElement : nullptr;
}
return frame->IsFocusable(nullptr, aFlags & FLAG_BYMOUSE) ? aElement : nullptr;
}
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3186,17 +3186,17 @@ EventStateManager::PostHandleEvent(nsPre
// nsEventStatus_eIgnore in EventStateManager::PreHandleEvent. So we also
// check if the event is DefaultPrevented.
if (nsEventStatus_eConsumeNoDefault != *aStatus &&
!aEvent->DefaultPrevented()) {
nsCOMPtr<nsIContent> newFocus;
bool suppressBlur = false;
if (mCurrentTarget) {
mCurrentTarget->GetContentForEvent(aEvent, getter_AddRefs(newFocus));
- const nsStyleUserInterface* ui = mCurrentTarget->StyleUserInterface();
+ const nsStyleUI* ui = mCurrentTarget->StyleUI();
activeContent = mCurrentTarget->GetContent();
// In some cases, we do not want to even blur the current focused
// element. Those cases are:
// 1. -moz-user-focus CSS property is set to 'ignore';
// 2. Element with NS_EVENT_STATE_DISABLED
// (aka :disabled pseudo-class for HTML element);
// 3. XUL control element has the disabled property set to 'true'.
@@ -5216,17 +5216,17 @@ EventStateManager::SetContentState(nsICo
if (aState == NS_EVENT_STATE_HOVER || aState == NS_EVENT_STATE_ACTIVE) {
// Hover and active are hierarchical
updateAncestors = true;
// check to see that this state is allowed by style. Check dragover too?
// XXX Is this even what we want?
if (mCurrentTarget)
{
- const nsStyleUserInterface* ui = mCurrentTarget->StyleUserInterface();
+ const nsStyleUI* ui = mCurrentTarget->StyleUI();
if (ui->mUserInput == StyleUserInput::None) {
return false;
}
}
if (aState == NS_EVENT_STATE_ACTIVE) {
// Editable content can never become active since their default actions
// are disabled. Watch out for editable content in native anonymous
--- a/dom/html/HTMLOptGroupElement.cpp
+++ b/dom/html/HTMLOptGroupElement.cpp
@@ -48,17 +48,17 @@ HTMLOptGroupElement::GetEventTargetParen
// XXXsmaug This is not the right thing to do. But what is?
if (IsDisabled()) {
return;
}
if (nsIFrame* frame = GetPrimaryFrame()) {
// FIXME(emilio): This poking at the style of the frame is broken unless we
// flush before every event handling, which we don't really want to.
- if (frame->StyleUserInterface()->mUserInput == StyleUserInput::None) {
+ if (frame->StyleUI()->mUserInput == StyleUserInput::None) {
return;
}
}
nsGenericHTMLElement::GetEventTargetParent(aVisitor);
}
Element*
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -2175,18 +2175,17 @@ nsGenericHTMLFormElement::IsElementDisab
case eLegacyMousePixelScroll:
return false;
default:
break;
}
// FIXME(emilio): This poking at the style of the frame is slightly bogus
// unless we flush before every event, which we don't really want to do.
- if (aFrame &&
- aFrame->StyleUserInterface()->mUserInput == StyleUserInput::None) {
+ if (aFrame && aFrame->StyleUI()->mUserInput == StyleUserInput::None) {
return true;
}
return IsDisabled();
}
void
nsGenericHTMLFormElement::UpdateFormOwner(bool aBindToTree,
--- a/dom/xul/nsXULPopupListener.cpp
+++ b/dom/xul/nsXULPopupListener.cpp
@@ -200,17 +200,17 @@ nsXULPopupListener::FireFocusOnTargetCon
RefPtr<nsPresContext> context = doc->GetPresContext();
if (!context) {
return NS_ERROR_FAILURE;
}
nsIFrame* targetFrame = aTargetContent->GetPrimaryFrame();
if (!targetFrame) return NS_ERROR_FAILURE;
- const nsStyleUserInterface* ui = targetFrame->StyleUserInterface();
+ const nsStyleUI* ui = targetFrame->StyleUI();
bool suppressBlur = (ui->mUserFocus == StyleUserFocus::Ignore);
RefPtr<Element> newFocusElement;
nsIFrame* currFrame = targetFrame;
// Look for the nearest enclosing focusable frame.
while (currFrame) {
int32_t tabIndexUnused;
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -505,19 +505,18 @@ nsCaret::GetPaintGeometry(nsRect* aRect)
int32_t frameOffset;
nsIFrame* frame = GetFrameAndOffset(GetSelection(),
mOverrideContent, mOverrideOffset, &frameOffset);
if (!frame) {
return nullptr;
}
// now we have a frame, check whether it's appropriate to show the caret here
- const nsStyleUserInterface* userinterface = frame->StyleUserInterface();
- if ((!mIgnoreUserModify &&
- userinterface->mUserModify == StyleUserModify::ReadOnly) ||
+ const nsStyleUI* ui = frame->StyleUI();
+ if ((!mIgnoreUserModify && ui->mUserModify == StyleUserModify::ReadOnly) ||
frame->IsContentDisabled()) {
return nullptr;
}
// If the offset falls outside of the frame, then don't paint the caret.
int32_t startOffset, endOffset;
if (frame->IsTextFrame() &&
(NS_FAILED(frame->GetOffsets(startOffset, endOffset)) ||
--- a/layout/doc/adding-style-props.html
+++ b/layout/doc/adding-style-props.html
@@ -282,17 +282,17 @@ Having implemented support for the new p
Declaration classes in the content module, it is now time to provide support
for the new property in layout. The Style Context must be given a new data
member corresponding to the declaration's new data member, so the computed
value can be held for the layout objects to use.<br>
<br>
First look into <a href="http://lxr.mozilla.org/seamonkey/source/content/shared/public/nsStyleStruct.h">
nsStyleStruct.h</a>
to see the existing style strucs. Find the one that you want to store the
-data on. In this example, we want to put it on the nsStyleUserInterface struct,
+data on. In this example, we want to put it on the nsStyleUI struct,
however there is also a class nsStyleUIReset that holds the non-inherited
values, so we will use that one (remember, our property is not inherited).
Add a <a href="#ComputedStyleMember">data member</a>
to hold the value:
<pre>struct nsStyleUIReset {
nsStyleUIReset(void);
nsStyleUIReset(const nsStyleUIReset& aOther);
~nsStyleUIReset(void);
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -171,17 +171,17 @@ nsImageControlFrame::SetFocus(bool aOn,
}
nsresult
nsImageControlFrame::GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor)
{
// Use style defined cursor if one is provided, otherwise when
// the cursor style is "auto" we use the pointer cursor.
- FillCursorInformationFromStyle(StyleUserInterface(), aCursor);
+ FillCursorInformationFromStyle(StyleUI(), aCursor);
if (NS_STYLE_CURSOR_AUTO == aCursor.mCursor) {
aCursor.mCursor = NS_STYLE_CURSOR_POINTER;
}
return NS_OK;
}
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2388,17 +2388,17 @@ nsIFrame::DisplayCaret(nsDisplayListBuil
return;
aList->AppendToTop(MakeDisplayItem<nsDisplayCaret>(aBuilder, this));
}
nscolor
nsIFrame::GetCaretColorAt(int32_t aOffset)
{
- return nsLayoutUtils::GetColor(this, &nsStyleUserInterface::mCaretColor);
+ return nsLayoutUtils::GetColor(this, &nsStyleUI::mCaretColor);
}
bool
nsFrame::DisplayBackgroundUnconditional(nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists,
bool aForceBackground)
{
// Here we don't try to detect background propagation. Frames that might
@@ -5197,17 +5197,17 @@ nsIFrame::AssociateImage(const nsStyleIm
// If this fails there's not much we can do ...
loader->AssociateRequestToFrame(req, this, aImageLoaderFlags);
}
nsresult
nsFrame::GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor)
{
- FillCursorInformationFromStyle(StyleUserInterface(), aCursor);
+ FillCursorInformationFromStyle(StyleUI(), aCursor);
if (NS_STYLE_CURSOR_AUTO == aCursor.mCursor) {
// If this is editable, I-beam cursor is better for most elements.
aCursor.mCursor =
(mContent && mContent->IsEditable())
? NS_STYLE_CURSOR_TEXT : NS_STYLE_CURSOR_DEFAULT;
}
if (NS_STYLE_CURSOR_TEXT == aCursor.mCursor &&
GetWritingMode().IsVertical()) {
@@ -6498,17 +6498,17 @@ nsFrame::Reflow(nsPresContext*
NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
}
bool
nsIFrame::IsContentDisabled() const
{
// FIXME(emilio): Doing this via CSS means callers must ensure the style is up
// to date, and they don't!
- if (StyleUserInterface()->mUserInput == StyleUserInput::None) {
+ if (StyleUI()->mUserInput == StyleUserInput::None) {
return true;
}
auto* element = nsGenericHTMLElement::FromNodeOrNull(GetContent());
return element && element->IsDisabled();
}
nsresult
@@ -9992,17 +9992,17 @@ nsIFrame::IsFocusable(int32_t *aTabIndex
if (aTabIndex) {
*aTabIndex = -1; // Default for early return is not focusable
}
bool isFocusable = false;
if (mContent && mContent->IsElement() && IsVisibleConsideringAncestors() &&
Style()->GetPseudo() != nsCSSAnonBoxes::anonymousFlexItem &&
Style()->GetPseudo() != nsCSSAnonBoxes::anonymousGridItem) {
- const nsStyleUserInterface* ui = StyleUserInterface();
+ const nsStyleUI* ui = StyleUI();
if (ui->mUserFocus != StyleUserFocus::Ignore &&
ui->mUserFocus != StyleUserFocus::None) {
// Pass in default tabindex of -1 for nonfocusable and 0 for focusable
tabIndex = 0;
}
isFocusable = mContent->IsFocusable(&tabIndex, aWithMouse);
if (!isFocusable && !aWithMouse && IsScrollFrame() &&
mContent->IsHTMLElement() &&
@@ -10092,17 +10092,17 @@ nsIFrame::VerticalAlignEnum() const
if (verticalAlign.GetUnit() == eStyleUnit_Enumerated) {
return verticalAlign.GetIntValue();
}
return eInvalidVerticalAlign;
}
/* static */
-void nsFrame::FillCursorInformationFromStyle(const nsStyleUserInterface* ui,
+void nsFrame::FillCursorInformationFromStyle(const nsStyleUI* ui,
nsIFrame::Cursor& aCursor)
{
aCursor.mCursor = ui->mCursor;
aCursor.mHaveHotspot = false;
aCursor.mLoading = false;
aCursor.mHotspotX = aCursor.mHotspotY = 0.0f;
for (const nsCursorImage& item : ui->mCursorImages) {
@@ -11257,17 +11257,17 @@ nsIFrame::GetCompositorHitTestInfo(nsDis
return result;
}
if (!GetParent()) {
MOZ_ASSERT(IsViewportFrame());
// Viewport frames are never event targets, other frames, like canvas frames,
// are the event targets for any regions viewport frames may cover.
return result;
}
- const uint8_t pointerEvents = StyleUserInterface()->GetEffectivePointerEvents(this);
+ const uint8_t pointerEvents = StyleUI()->GetEffectivePointerEvents(this);
if (pointerEvents == NS_STYLE_POINTER_EVENTS_NONE) {
return result;
}
if (!StyleVisibility()->IsVisible()) {
return result;
}
// Anything that didn't match the above conditions is visible to hit-testing.
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -680,17 +680,17 @@ protected:
nsresult GetDataForTableSelection(const nsFrameSelection* aFrameSelection,
nsIPresShell* aPresShell,
mozilla::WidgetMouseEvent* aMouseEvent,
nsIContent** aParentContent,
int32_t* aContentOffset,
mozilla::TableSelection* aTarget);
// Fills aCursor with the appropriate information from ui
- static void FillCursorInformationFromStyle(const nsStyleUserInterface* ui,
+ static void FillCursorInformationFromStyle(const nsStyleUI* ui,
nsIFrame::Cursor& aCursor);
NS_IMETHOD DoXULLayout(nsBoxLayoutState& aBoxLayoutState) override;
nsBoxLayoutMetrics* BoxMetrics() const;
// Fire DOM event. If no aContent argument use frame's mContent.
void FireDOMEvent(const nsAString& aDOMEventName, nsIContent *aContent = nullptr);
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -2196,18 +2196,17 @@ nsImageFrame::GetCursor(const nsPoint& a
// XXX Using the image as the parent ComputedStyle isn't
// technically correct, but it's probably the right thing to do
// here, since it means that areas on which the cursor isn't
// specified will inherit the style from the image.
RefPtr<ComputedStyle> areaStyle =
PresShell()->StyleSet()->
ResolveStyleFor(area->AsElement(), Style(),
LazyComputeBehavior::Allow);
- FillCursorInformationFromStyle(areaStyle->StyleUserInterface(),
- aCursor);
+ FillCursorInformationFromStyle(areaStyle->StyleUI(), aCursor);
if (NS_STYLE_CURSOR_AUTO == aCursor.mCursor) {
aCursor.mCursor = NS_STYLE_CURSOR_DEFAULT;
}
return NS_OK;
}
}
return nsFrame::GetCursor(aPoint, aCursor);
}
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -335,17 +335,17 @@ nsSubDocumentFrame::BuildDisplayList(nsD
nsFrameLoader* frameLoader = FrameLoader();
RenderFrameParent* rfp = nullptr;
if (frameLoader) {
rfp = frameLoader->GetCurrentRenderFrame();
}
// If we are pointer-events:none then we don't need to HitTest background
bool pointerEventsNone =
- StyleUserInterface()->mPointerEvents == NS_STYLE_POINTER_EVENTS_NONE;
+ StyleUI()->mPointerEvents == NS_STYLE_POINTER_EVENTS_NONE;
if (!aBuilder->IsForEventDelivery() || !pointerEventsNone) {
nsDisplayListCollection decorations(aBuilder);
DisplayBorderBackgroundOutline(aBuilder, decorations);
if (rfp) {
// Wrap background colors of <iframe>s with remote subdocuments in their
// own layer so we generate a ColorLayer. This is helpful for optimizing
// compositing; we can skip compositing the ColorLayer when the
// remote content is opaque.
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -4628,17 +4628,17 @@ NS_IMPL_FRAMEARENA_HELPERS(nsContinuingT
nsTextFrame::~nsTextFrame()
{
}
nsresult
nsTextFrame::GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor)
{
- FillCursorInformationFromStyle(StyleUserInterface(), aCursor);
+ FillCursorInformationFromStyle(StyleUI(), aCursor);
if (NS_STYLE_CURSOR_AUTO == aCursor.mCursor) {
if (!IsSelectable(nullptr)) {
aCursor.mCursor = NS_STYLE_CURSOR_DEFAULT;
} else {
aCursor.mCursor = GetWritingMode().IsVertical()
? NS_STYLE_CURSOR_VERTICAL_TEXT : NS_STYLE_CURSOR_TEXT;
}
return NS_OK;
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -346,17 +346,17 @@ RenderFrameParent::EnsureLayersConnected
nsDisplayRemote::nsDisplayRemote(nsDisplayListBuilder* aBuilder,
nsSubDocumentFrame* aFrame,
RenderFrameParent* aRemoteFrame)
: nsDisplayItem(aBuilder, aFrame)
, mRemoteFrame(aRemoteFrame)
, mEventRegionsOverride(EventRegionsOverride::NoOverride)
{
bool frameIsPointerEventsNone =
- aFrame->StyleUserInterface()->GetEffectivePointerEvents(aFrame) ==
+ aFrame->StyleUI()->GetEffectivePointerEvents(aFrame) ==
NS_STYLE_POINTER_EVENTS_NONE;
if (aBuilder->IsInsidePointerEventsNoneDoc() || frameIsPointerEventsNone) {
mEventRegionsOverride |= EventRegionsOverride::ForceEmptyHitRegion;
}
if (nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(aFrame->PresShell())) {
mEventRegionsOverride |= EventRegionsOverride::ForceDispatchToContent;
}
}
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -2846,17 +2846,17 @@ GetMouseThrough(const nsIFrame* aFrame)
}
return false;
}
static bool
IsFrameReceivingPointerEvents(nsIFrame* aFrame)
{
return NS_STYLE_POINTER_EVENTS_NONE !=
- aFrame->StyleUserInterface()->GetEffectivePointerEvents(aFrame);
+ aFrame->StyleUI()->GetEffectivePointerEvents(aFrame);
}
// A list of frames, and their z depth. Used for sorting
// the results of hit testing.
struct FramesWithDepth
{
explicit FramesWithDepth(float aDepth) :
mDepth(aDepth)
--- a/layout/style/ComputedStyle.cpp
+++ b/layout/style/ComputedStyle.cpp
@@ -126,17 +126,17 @@ ComputedStyle::CalcStyleDifference(Compu
// FIXME: The order of these DO_STRUCT_DIFFERENCE calls is no longer
// significant. With a small amount of effort, we could replace them with a
// #include "nsStyleStructList.h".
DO_STRUCT_DIFFERENCE(Display);
DO_STRUCT_DIFFERENCE(XUL);
DO_STRUCT_DIFFERENCE(Column);
DO_STRUCT_DIFFERENCE(Content);
- DO_STRUCT_DIFFERENCE(UserInterface);
+ DO_STRUCT_DIFFERENCE(UI);
DO_STRUCT_DIFFERENCE(Visibility);
DO_STRUCT_DIFFERENCE(Outline);
DO_STRUCT_DIFFERENCE(TableBorder);
DO_STRUCT_DIFFERENCE(Table);
DO_STRUCT_DIFFERENCE(UIReset);
DO_STRUCT_DIFFERENCE(Text);
DO_STRUCT_DIFFERENCE_WITH_ARGS(List, (, PEEK(Display)));
DO_STRUCT_DIFFERENCE(SVGReset);
--- a/layout/style/ServoBindings.cpp
+++ b/layout/style/ServoBindings.cpp
@@ -1571,35 +1571,34 @@ Gecko_CopyImageValueFrom(nsStyleImage* a
void
Gecko_InitializeImageCropRect(nsStyleImage* aImage)
{
MOZ_ASSERT(aImage);
aImage->SetCropRect(MakeUnique<nsStyleSides>());
}
void
-Gecko_SetCursorArrayLength(nsStyleUserInterface* aStyleUI, size_t aLen)
+Gecko_SetCursorArrayLength(nsStyleUI* aStyleUI, size_t aLen)
{
aStyleUI->mCursorImages.Clear();
aStyleUI->mCursorImages.SetLength(aLen);
}
void
Gecko_SetCursorImageValue(nsCursorImage* aCursor,
mozilla::css::ImageValue* aImageValue)
{
MOZ_ASSERT(aCursor && aImageValue);
aCursor->mImage =
CreateStyleImageRequest(nsStyleImageRequest::Mode::Discard, aImageValue);
}
void
-Gecko_CopyCursorArrayFrom(nsStyleUserInterface* aDest,
- const nsStyleUserInterface* aSrc)
+Gecko_CopyCursorArrayFrom(nsStyleUI* aDest, const nsStyleUI* aSrc)
{
aDest->mCursorImages = aSrc->mCursorImages;
}
void
Gecko_SetContentDataImageValue(nsStyleContentData* aContent,
mozilla::css::ImageValue* aImageValue)
{
--- a/layout/style/ServoBindings.h
+++ b/layout/style/ServoBindings.h
@@ -374,21 +374,20 @@ const nsStyleGradient* Gecko_GetGradient
// list-style-image style.
void Gecko_SetListStyleImageNone(nsStyleList* style_struct);
void Gecko_SetListStyleImageImageValue(nsStyleList* style_struct,
mozilla::css::ImageValue* aImageValue);
void Gecko_CopyListStyleImageFrom(nsStyleList* dest, const nsStyleList* src);
// cursor style.
-void Gecko_SetCursorArrayLength(nsStyleUserInterface* ui, size_t len);
+void Gecko_SetCursorArrayLength(nsStyleUI* ui, size_t len);
void Gecko_SetCursorImageValue(nsCursorImage* aCursor,
mozilla::css::ImageValue* aImageValue);
-void Gecko_CopyCursorArrayFrom(nsStyleUserInterface* dest,
- const nsStyleUserInterface* src);
+void Gecko_CopyCursorArrayFrom(nsStyleUI* dest, const nsStyleUI* src);
void Gecko_SetContentDataImageValue(nsStyleContentData* aList,
mozilla::css::ImageValue* aImageValue);
nsStyleContentData::CounterFunction* Gecko_SetCounterFunction(
nsStyleContentData* content_data, mozilla::StyleContentType);
// Dirtiness tracking.
void Gecko_SetNodeFlags(RawGeckoNodeBorrowed node, uint32_t flags);
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -333,17 +333,17 @@ whitelist-types = [
"nsStyleSVGReset",
"nsStyleTable",
"nsStyleTableBorder",
"nsStyleText",
"nsStyleTextReset",
"nsStyleUIReset",
"nsStyleUnion",
"nsStyleUnit",
- "nsStyleUserInterface",
+ "nsStyleUI",
"nsStyleVisibility",
"nsStyleXUL",
"nsTArrayHeader",
"Position",
"PropertyValuePair",
"Runnable",
"ServoAttrSnapshot",
"ServoBundledURI",
@@ -580,17 +580,17 @@ structs-types = [
"nsStyleSides",
"nsStyleTable",
"nsStyleTableBorder",
"nsStyleText",
"nsStyleTextReset",
"nsStyleUIReset",
"nsStyleUnion",
"nsStyleUnit",
- "nsStyleUserInterface",
+ "nsStyleUI",
"nsStyleVisibility",
"nsStyleXUL",
"nsTimingFunction",
"nscolor",
"nscoord",
"nsresult",
"Loader",
"LoaderReusableStyleSheets",
--- a/layout/style/nsCSSVisitedDependentPropList.h
+++ b/layout/style/nsCSSVisitedDependentPropList.h
@@ -28,9 +28,9 @@ STYLE_STRUCT(Border, (mBorderTopColor,
mBorderLeftColor))
STYLE_STRUCT(Outline, (mOutlineColor))
STYLE_STRUCT(Column, (mColumnRuleColor))
STYLE_STRUCT(Text, (mTextEmphasisColor,
mWebkitTextFillColor,
mWebkitTextStrokeColor))
STYLE_STRUCT(TextReset, (mTextDecorationColor))
STYLE_STRUCT(SVG, (mFill, mStroke))
-STYLE_STRUCT(UserInterface, (mCaretColor))
+STYLE_STRUCT(UI, (mCaretColor))
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -722,17 +722,17 @@ CollectImageURLsForProperty(nsCSSPropert
CSSPROPS_FOR_SHORTHAND_SUBPROPERTIES(p, aProp, CSSEnabledState::eForAllContent) {
CollectImageURLsForProperty(*p, aStyle, aURLs);
}
return;
}
switch (aProp) {
case eCSSProperty_cursor:
- for (auto& image : aStyle.StyleUserInterface()->mCursorImages) {
+ for (auto& image : aStyle.StyleUI()->mCursorImages) {
AddImageURL(*image.mImage, aURLs);
}
break;
case eCSSProperty_background_image:
AddImageURLs(aStyle.StyleBackground()->mImage, aURLs);
break;
case eCSSProperty_mask_clip:
AddImageURLs(aStyle.StyleSVGReset()->mMask, aURLs);
@@ -2980,26 +2980,26 @@ nsComputedDOMStyle::DoGetScrollSnapCoord
return valueList.forget();
}
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetScrollbarFaceColor()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
- SetValueForWidgetColor(val, StyleUserInterface()->mScrollbarFaceColor,
+ SetValueForWidgetColor(val, StyleUI()->mScrollbarFaceColor,
StyleAppearance::ScrollbarthumbVertical);
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetScrollbarTrackColor()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
- SetValueForWidgetColor(val, StyleUserInterface()->mScrollbarTrackColor,
+ SetValueForWidgetColor(val, StyleUI()->mScrollbarTrackColor,
StyleAppearance::ScrollbarVertical);
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineWidth()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
@@ -3472,26 +3472,26 @@ nsComputedDOMStyle::DoGetWebkitTextStrok
static_assert(NS_STYLE_UNICODE_BIDI_NORMAL == 0,
"unicode-bidi style constants not as expected");
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetCaretColor()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
- SetValueFromComplexColor(val, StyleUserInterface()->mCaretColor);
+ SetValueFromComplexColor(val, StyleUI()->mCaretColor);
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetCursor()
{
RefPtr<nsDOMCSSValueList> valueList = GetROCSSValueList(true);
- const nsStyleUserInterface *ui = StyleUserInterface();
+ const nsStyleUI *ui = StyleUI();
for (const nsCursorImage& item : ui->mCursorImages) {
RefPtr<nsDOMCSSValueList> itemList = GetROCSSValueList(false);
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
SetValueToURLValue(item.mImage->GetImageValue(), val);
itemList->AppendCSSValue(val.forget());
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -377,17 +377,17 @@ enum class StyleBorderImageRepeat : uint
enum class StyleContent : uint8_t {
OpenQuote,
CloseQuote,
NoOpenQuote,
NoCloseQuote,
AltContent
};
-// See nsStyleUserInterface
+// See nsStyleUI
#define NS_STYLE_CURSOR_AUTO 1
#define NS_STYLE_CURSOR_CROSSHAIR 2
#define NS_STYLE_CURSOR_DEFAULT 3 // ie: an arrow
#define NS_STYLE_CURSOR_POINTER 4 // for links
#define NS_STYLE_CURSOR_MOVE 5
#define NS_STYLE_CURSOR_E_RESIZE 6
#define NS_STYLE_CURSOR_NE_RESIZE 7
#define NS_STYLE_CURSOR_NW_RESIZE 8
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -4554,17 +4554,17 @@ nsStyleText::TextEmphasisSide(WritingMod
(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_OVER
? eSideTop : eSideBottom);
LogicalSide result = aWM.LogicalSideForPhysicalSide(side);
MOZ_ASSERT(IsBlock(result));
return result;
}
//-----------------------
-// nsStyleUserInterface
+// nsStyleUI
//
nsCursorImage::nsCursorImage()
: mHaveHotspot(false)
, mHotspotX(0.0f)
, mHotspotY(0.0f)
{
}
@@ -4600,51 +4600,51 @@ nsCursorImage::operator==(const nsCursor
(aOther.mHotspotX == 0 && aOther.mHotspotY == 0),
"expected mHotspot{X,Y} to be 0 when mHaveHotspot is false");
return mHaveHotspot == aOther.mHaveHotspot &&
mHotspotX == aOther.mHotspotX &&
mHotspotY == aOther.mHotspotY &&
DefinitelyEqualImages(mImage, aOther.mImage);
}
-nsStyleUserInterface::nsStyleUserInterface(const nsPresContext* aContext)
+nsStyleUI::nsStyleUI(const nsPresContext* aContext)
: mUserInput(StyleUserInput::Auto)
, mUserModify(StyleUserModify::ReadOnly)
, mUserFocus(StyleUserFocus::None)
, mPointerEvents(NS_STYLE_POINTER_EVENTS_AUTO)
, mCursor(NS_STYLE_CURSOR_AUTO)
, mCaretColor(StyleComplexColor::Auto())
, mScrollbarFaceColor(StyleComplexColor::Auto())
, mScrollbarTrackColor(StyleComplexColor::Auto())
{
- MOZ_COUNT_CTOR(nsStyleUserInterface);
-}
-
-nsStyleUserInterface::nsStyleUserInterface(const nsStyleUserInterface& aSource)
+ MOZ_COUNT_CTOR(nsStyleUI);
+}
+
+nsStyleUI::nsStyleUI(const nsStyleUI& aSource)
: mUserInput(aSource.mUserInput)
, mUserModify(aSource.mUserModify)
, mUserFocus(aSource.mUserFocus)
, mPointerEvents(aSource.mPointerEvents)
, mCursor(aSource.mCursor)
, mCursorImages(aSource.mCursorImages)
, mCaretColor(aSource.mCaretColor)
, mScrollbarFaceColor(aSource.mScrollbarFaceColor)
, mScrollbarTrackColor(aSource.mScrollbarTrackColor)
{
- MOZ_COUNT_CTOR(nsStyleUserInterface);
-}
-
-nsStyleUserInterface::~nsStyleUserInterface()
-{
- MOZ_COUNT_DTOR(nsStyleUserInterface);
+ MOZ_COUNT_CTOR(nsStyleUI);
+}
+
+nsStyleUI::~nsStyleUI()
+{
+ MOZ_COUNT_DTOR(nsStyleUI);
}
void
-nsStyleUserInterface::FinishStyle(
- nsPresContext* aPresContext, const nsStyleUserInterface* aOldStyle)
+nsStyleUI::FinishStyle(nsPresContext* aPresContext,
+ const nsStyleUI* aOldStyle)
{
MOZ_ASSERT(NS_IsMainThread());
for (size_t i = 0; i < mCursorImages.Length(); ++i) {
nsCursorImage& cursor = mCursorImages[i];
if (cursor.mImage && !cursor.mImage->IsResolved()) {
const nsCursorImage* oldCursor =
@@ -4653,17 +4653,17 @@ nsStyleUserInterface::FinishStyle(
: nullptr;
cursor.mImage->Resolve(
aPresContext, oldCursor ? oldCursor->mImage.get() : nullptr);
}
}
}
nsChangeHint
-nsStyleUserInterface::CalcDifference(const nsStyleUserInterface& aNewData) const
+nsStyleUI::CalcDifference(const nsStyleUI& aNewData) const
{
nsChangeHint hint = nsChangeHint(0);
if (mCursor != aNewData.mCursor) {
hint |= nsChangeHint_UpdateCursor;
}
// We could do better. But it wouldn't be worth it, URL-specified cursors are
// rare.
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2771,26 +2771,26 @@ struct nsCursorImage
return !(*this == aOther);
}
imgRequestProxy* GetImage() const {
return mImage->get();
}
};
-struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUserInterface
+struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUI
{
- explicit nsStyleUserInterface(const nsPresContext* aContext);
- nsStyleUserInterface(const nsStyleUserInterface& aOther);
- ~nsStyleUserInterface();
-
- void FinishStyle(nsPresContext*, const nsStyleUserInterface*);
+ explicit nsStyleUI(const nsPresContext* aContext);
+ nsStyleUI(const nsStyleUI& aOther);
+ ~nsStyleUI();
+
+ void FinishStyle(nsPresContext*, const nsStyleUI*);
const static bool kHasFinishStyle = true;
- nsChangeHint CalcDifference(const nsStyleUserInterface& aNewData) const;
+ nsChangeHint CalcDifference(const nsStyleUI& aNewData) const;
mozilla::StyleUserInput mUserInput;
mozilla::StyleUserModify mUserModify; // (modify-content)
mozilla::StyleUserFocus mUserFocus; // (auto-select)
uint8_t mPointerEvents; // NS_STYLE_POINTER_EVENTS_*
uint8_t mCursor; // NS_STYLE_CURSOR_*
nsTArray<nsCursorImage> mCursorImages; // images and coords
--- a/layout/style/nsStyleStructInlines.h
+++ b/layout/style/nsStyleStructInlines.h
@@ -241,26 +241,26 @@ bool
nsStyleDisplay::IsAbsolutelyPositioned(const nsIFrame* aContextFrame) const
{
NS_ASSERTION(aContextFrame->StyleDisplay() == this, "unexpected aContextFrame");
return IsAbsolutelyPositionedStyle() &&
!nsSVGUtils::IsInSVGTextSubtree(aContextFrame);
}
uint8_t
-nsStyleUserInterface::GetEffectivePointerEvents(nsIFrame* aFrame) const
+nsStyleUI::GetEffectivePointerEvents(nsIFrame* aFrame) const
{
if (aFrame->GetContent() && !aFrame->GetContent()->GetParent()) {
// The root element has a cluster of frames associated with it
// (root scroll frame, canvas frame, the actual primary frame). Make
// those take their pointer-events value from the root element's primary
// frame.
nsIFrame* f = aFrame->GetContent()->GetPrimaryFrame();
if (f) {
- return f->StyleUserInterface()->mPointerEvents;
+ return f->StyleUI()->mPointerEvents;
}
}
return mPointerEvents;
}
bool
nsStyleBackground::HasLocalBackground() const
{
--- a/layout/style/nsStyleStructList.h
+++ b/layout/style/nsStyleStructList.h
@@ -32,17 +32,17 @@
// nsStyleStructFwd.h that want the structs in id-order just define
// STYLE_STRUCT rather than including the file twice.
STYLE_STRUCT_INHERITED(Font)
STYLE_STRUCT_INHERITED(Color)
STYLE_STRUCT_INHERITED(List)
STYLE_STRUCT_INHERITED(Text)
STYLE_STRUCT_INHERITED(Visibility)
-STYLE_STRUCT_INHERITED(UserInterface)
+STYLE_STRUCT_INHERITED(UI)
STYLE_STRUCT_INHERITED(TableBorder)
STYLE_STRUCT_INHERITED(SVG)
STYLE_STRUCT_RESET(Background)
STYLE_STRUCT_RESET(Position)
STYLE_STRUCT_RESET(TextReset)
STYLE_STRUCT_RESET(Display)
STYLE_STRUCT_RESET(Content)
--- a/layout/svg/nsSVGImageFrame.cpp
+++ b/layout/svg/nsSVGImageFrame.cpp
@@ -497,17 +497,17 @@ nsSVGImageFrame::ReflowCallbackCanceled(
mReflowCallbackPosted = false;
}
uint16_t
nsSVGImageFrame::GetHitTestFlags()
{
uint16_t flags = 0;
- switch (StyleUserInterface()->mPointerEvents) {
+ switch (StyleUI()->mPointerEvents) {
case NS_STYLE_POINTER_EVENTS_NONE:
break;
case NS_STYLE_POINTER_EVENTS_VISIBLEPAINTED:
case NS_STYLE_POINTER_EVENTS_AUTO:
if (StyleVisibility()->IsVisible()) {
/* XXX: should check pixel transparency */
flags |= SVG_HIT_TEST_FILL;
}
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -1699,17 +1699,17 @@ nsSVGUtils::SetupStrokeGeometry(nsIFrame
strokeOptions.mDashOffset);
}
uint16_t
nsSVGUtils::GetGeometryHitTestFlags(nsIFrame* aFrame)
{
uint16_t flags = 0;
- switch (aFrame->StyleUserInterface()->mPointerEvents) {
+ switch (aFrame->StyleUI()->mPointerEvents) {
case NS_STYLE_POINTER_EVENTS_NONE:
break;
case NS_STYLE_POINTER_EVENTS_AUTO:
case NS_STYLE_POINTER_EVENTS_VISIBLEPAINTED:
if (aFrame->StyleVisibility()->IsVisible()) {
if (aFrame->StyleSVG()->mFill.Type() != eStyleSVGPaintType_None)
flags |= SVG_HIT_TEST_FILL;
if (aFrame->StyleSVG()->mStroke.Type() != eStyleSVGPaintType_None)
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -2437,18 +2437,17 @@ nsTreeBodyFrame::GetCursor(const nsPoint
nsTreeColumn* col;
nsICSSAnonBoxPseudo* child;
GetCellAt(aPoint.x, aPoint.y, &row, &col, &child);
if (child) {
// Our scratch array is already prefilled.
ComputedStyle* childContext = GetPseudoComputedStyle(child);
- FillCursorInformationFromStyle(childContext->StyleUserInterface(),
- aCursor);
+ FillCursorInformationFromStyle(childContext->StyleUI(), aCursor);
if (aCursor.mCursor == NS_STYLE_CURSOR_AUTO)
aCursor.mCursor = NS_STYLE_CURSOR_DEFAULT;
return NS_OK;
}
}
return nsLeafBoxFrame::GetCursor(aPoint, aCursor);
--- a/servo/components/style/properties/longhands/inherited_ui.mako.rs
+++ b/servo/components/style/properties/longhands/inherited_ui.mako.rs
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
<%namespace name="helpers" file="/helpers.mako.rs" />
-<% data.new_style_struct("InheritedUI", inherited=True, gecko_name="UserInterface") %>
+<% data.new_style_struct("InheritedUI", inherited=True, gecko_name="UI") %>
${helpers.predefined_type("cursor",
"Cursor",
"computed::Cursor::auto()",
initial_specified_value="specified::Cursor::auto()",
animation_value_type="discrete",
spec="https://drafts.csswg.org/css-ui/#cursor")}
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2743,17 +2743,17 @@ nsNativeThemeCocoa::ComputeScrollbarPara
scrollbarFrame->StyleDisplay()->mAppearance == StyleAppearance::ScrollbarSmall);
params.rtl = IsFrameRTL(aFrame);
params.horizontal = aIsHorizontal;
params.onDarkBackground = IsDarkBackground(aFrame);
// Don't use custom scrollbars for overlay scrollbars since they are
// generally good enough for use cases of custom scrollbars.
if (!params.overlay) {
ComputedStyle* style = nsLayoutUtils::StyleForScrollbar(aFrame);
- if (style->StyleUserInterface()->HasCustomScrollbars()) {
+ if (style->StyleUI()->HasCustomScrollbars()) {
params.custom = true;
params.trackColor =
GetScrollbarTrackColor(style, &GetAutoScrollbarTrackColor);
params.faceColor =
GetScrollbarFaceColor(style, &GetAutoScrollbarFaceColor);
}
}
return params;
--- a/widget/nsNativeTheme.cpp
+++ b/widget/nsNativeTheme.cpp
@@ -844,35 +844,33 @@ GetOpaqueBackgroundColor(ComputedStyle*
// Compose white background with the background color.
return NS_ComposeColors(NS_RGB(255, 255, 255), color);
}
nscolor
nsNativeTheme::GetScrollbarFaceColor(ComputedStyle* aStyle,
AutoColorGetter aAutoGetter)
{
- StyleComplexColor complexColor =
- aStyle->StyleUserInterface()->mScrollbarFaceColor;
+ StyleComplexColor complexColor = aStyle->StyleUI()->mScrollbarFaceColor;
if (complexColor.IsAuto()) {
return aAutoGetter(aStyle);
}
nscolor color = complexColor.CalcColor(aStyle);
if (NS_GET_A(color) == 255) {
return color;
}
nscolor bgColor = GetOpaqueBackgroundColor(aStyle);
return NS_ComposeColors(bgColor, color);
}
nscolor
nsNativeTheme::GetScrollbarTrackColor(ComputedStyle* aStyle,
AutoColorGetter aAutoGetter)
{
- StyleComplexColor complexColor =
- aStyle->StyleUserInterface()->mScrollbarTrackColor;
+ StyleComplexColor complexColor = aStyle->StyleUI()->mScrollbarTrackColor;
nscolor color;
if (complexColor.IsAuto()) {
color = aAutoGetter(aStyle);
} else {
color = complexColor.CalcColor(aStyle);
}
if (NS_GET_A(color) == 255) {
return color;
--- a/widget/windows/nsNativeThemeWin.cpp
+++ b/widget/windows/nsNativeThemeWin.cpp
@@ -1554,17 +1554,17 @@ nsNativeThemeWin::DrawWidgetBackground(g
{
if (aWidgetType == StyleAppearance::MenulistButton &&
StaticPrefs::layout_css_webkit_appearance_enabled()) {
aWidgetType = StyleAppearance::Menulist;
}
if (IsWidgetScrollbarPart(aWidgetType)) {
ComputedStyle* style = nsLayoutUtils::StyleForScrollbar(aFrame);
- if (style->StyleUserInterface()->HasCustomScrollbars()) {
+ if (style->StyleUI()->HasCustomScrollbars()) {
return DrawCustomScrollbarPart(aContext, aFrame, style,
aWidgetType, aRect, aDirtyRect);
}
}
HANDLE theme = GetTheme(aWidgetType);
if (!theme)
return ClassicDrawWidgetBackground(aContext, aFrame, aWidgetType, aRect, aDirtyRect);
@@ -3187,17 +3187,17 @@ nsresult nsNativeThemeWin::ClassicGetThe
aState |= DFCS_INACTIVE;
else if (IsOpenButton(aFrame))
aState |= DFCS_PUSHED;
else if (IsCheckedButton(aFrame))
aState |= DFCS_CHECKED;
else {
if (contentState.HasAllStates(NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_HOVER)) {
aState |= DFCS_PUSHED;
- const nsStyleUserInterface *uiData = aFrame->StyleUserInterface();
+ const nsStyleUI *uiData = aFrame->StyleUI();
// The down state is flat if the button is focusable
if (uiData->mUserFocus == StyleUserFocus::Normal) {
if (!aFrame->GetContent()->IsHTMLElement())
aState |= DFCS_FLAT;
aFocused = true;
}
}
@@ -4226,18 +4226,18 @@ GetScrollbarArrowColor(nscolor aTrackCol
nsresult
nsNativeThemeWin::DrawCustomScrollbarPart(gfxContext* aContext,
nsIFrame* aFrame,
ComputedStyle* aStyle,
WidgetType aWidgetType,
const nsRect& aRect,
const nsRect& aClipRect)
{
- MOZ_ASSERT(!aStyle->StyleUserInterface()->mScrollbarFaceColor.IsAuto() ||
- !aStyle->StyleUserInterface()->mScrollbarTrackColor.IsAuto());
+ MOZ_ASSERT(!aStyle->StyleUI()->mScrollbarFaceColor.IsAuto() ||
+ !aStyle->StyleUI()->mScrollbarTrackColor.IsAuto());
gfxRect tr(aRect.X(), aRect.Y(), aRect.Width(), aRect.Height()),
dr(aClipRect.X(), aClipRect.Y(),
aClipRect.Width(), aClipRect.Height());
nscolor trackColor =
GetScrollbarTrackColor(aStyle, &GetScrollbarTrackColorForAuto);
HBRUSH dcBrush = (HBRUSH) GetStockObject(DC_BRUSH);