diff --git a/browser/base/content/test/tabs/browser.ini b/browser/base/content/test/tabs/browser.ini index 77edb8da9f3c..8856b7bc79f9 100644 --- a/browser/base/content/test/tabs/browser.ini +++ b/browser/base/content/test/tabs/browser.ini @@ -28,7 +28,6 @@ skip-if = !e10s # Pref and test only relevant for e10s. [browser_pinnedTabs_closeByKeyboard.js] [browser_positional_attributes.js] [browser_preloadedBrowser_zoom.js] -skip-if = !debug && (os == 'win' && (os_version == '6.1')) # Bug 1397098 [browser_reload_deleted_file.js] skip-if = (debug && os == 'mac') || (debug && os == 'linux' && bits == 64) #Bug 1421183, disabled on Linux/OSX for leaked windows [browser_tabswitch_updatecommands.js] diff --git a/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js b/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js index 6d50bb4aaf9b..589cb3ceead6 100644 --- a/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js +++ b/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js @@ -38,6 +38,21 @@ async function zoomNewTab(changeZoom, message) { const level = tab.linkedBrowser.fullZoom; BrowserTestUtils.removeTab(tab); + // Wait for the the update of the full-zoom content pref value, that happens + // asynchronously after changing the zoom level. + let cps2 = Cc["@mozilla.org/content-pref/service;1"]. + getService(Ci.nsIContentPrefService2); + await BrowserTestUtils.waitForCondition(() => { + return new Promise(resolve => { + cps2.getByDomainAndName("about:newtab", "browser.content.full-zoom", null, { + handleResult(pref) { + resolve(level == pref.value); + }, + handleCompletion() {}, + }); + }); + }); + await checkPreloadedZoom(level, `${message}: ${level}`); } diff --git a/browser/components/places/tests/browser/browser.ini b/browser/components/places/tests/browser/browser.ini index 75591d190d5c..5408a2113180 100644 --- a/browser/components/places/tests/browser/browser.ini +++ b/browser/components/places/tests/browser/browser.ini @@ -114,3 +114,4 @@ support-files = support-files = bookmark_dummy_1.html bookmark_dummy_2.html +[browser_drag_folder_on_newTab.js] diff --git a/browser/components/places/tests/browser/browser_drag_folder_on_newTab.js b/browser/components/places/tests/browser/browser_drag_folder_on_newTab.js new file mode 100644 index 000000000000..00646fff18b4 --- /dev/null +++ b/browser/components/places/tests/browser/browser_drag_folder_on_newTab.js @@ -0,0 +1,94 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +add_task(async function setup() { + let toolbar = document.getElementById("PersonalToolbar"); + let wasCollapsed = toolbar.collapsed; + + // Uncollapse the personal toolbar if needed. + if (wasCollapsed) { + await promiseSetToolbarVisibility(toolbar, true); + } + + // Clean before and after so we don't have anything in the folders. + await PlacesUtils.bookmarks.eraseEverything(); + + registerCleanupFunction(async function() { + // Collapse the personal toolbar if needed. + if (wasCollapsed) { + await promiseSetToolbarVisibility(toolbar, false); + } + + await PlacesUtils.bookmarks.eraseEverything(); + }); +}); + +const TEST_FOLDER_NAME = "Test folder"; + +add_task(async function test_change_location_from_Toolbar() { + let newTabButton = document.getElementById("new-tab-button"); + + let children = [ + { + title: "first", + url: "http://www.mochi.test/first" + }, + { + title: "second", + url: "http://www.mochi.test/second" + }, + { + type: PlacesUtils.bookmarks.TYPE_SEPARATOR, + }, + { + title: "third", + url: "http://www.mochi.test/third" + }, + ]; + let guid = PlacesUtils.history.makeGuid(); + await PlacesUtils.bookmarks.insertTree({ + guid: PlacesUtils.bookmarks.toolbarGuid, + children: [ + { + guid, + type: PlacesUtils.bookmarks.TYPE_FOLDER, + title: TEST_FOLDER_NAME, + children, + }, + ], + }); + + let folder = getToolbarNodeForItemGuid(guid); + + let loadedPromises = children.filter(item => "url" in item).map( + item => BrowserTestUtils.waitForNewTab(gBrowser, item.url, false, true)); + + let srcX = 10, srcY = 10; + // We should drag upwards, since dragging downwards opens menu instead. + let stepX = 0, stepY = -5; + + // We need to dispatch mousemove before dragging, to populate + // PlacesToolbar._cachedMouseMoveEvent, with the cursor position after the + // first step, so that the places code detects it as dragging upward. + EventUtils.synthesizeMouse(folder, srcX + stepX, srcY + stepY, + { type: "mousemove" }); + + await EventUtils.synthesizePlainDragAndDrop({ + srcElement: folder, + destElement: newTabButton, + srcX, + srcY, + stepX, + stepY, + }); + + let tabs = await Promise.all(loadedPromises); + + for (let tab of tabs) { + BrowserTestUtils.removeTab(tab); + } + + ok(true); +}); diff --git a/browser/modules/AsyncTabSwitcher.jsm b/browser/modules/AsyncTabSwitcher.jsm index 4f5adda12c04..b5d0679f09b9 100644 --- a/browser/modules/AsyncTabSwitcher.jsm +++ b/browser/modules/AsyncTabSwitcher.jsm @@ -416,13 +416,12 @@ class AsyncTabSwitcher { this.maybeVisibleTabs.add(showTab); - let tabs = this.tabbrowser.tabbox.tabs; - let tabPanel = this.tabbrowser.tabpanels; - let showPanel = tabs.getRelatedElement(showTab); - let index = Array.indexOf(tabPanel.childNodes, showPanel); + let tabpanels = this.tabbrowser.tabpanels; + let showPanel = this.tabbrowser.tabContainer.getRelatedElement(showTab); + let index = Array.indexOf(tabpanels.childNodes, showPanel); if (index != -1) { this.log(`Switch to tab ${index} - ${this.tinfo(showTab)}`); - tabPanel.setAttribute("selectedIndex", index); + tabpanels.setAttribute("selectedIndex", index); if (showTab === this.requestedTab) { if (this._requestingTab) { /* diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp index 30038195a236..8a192606cf6a 100644 --- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -110,9 +110,9 @@ KeyframeEffect::SetTarget(const Nullable& aTarget) if (mTarget) { UpdateTargetRegistration(); - RefPtr styleContext = GetTargetComputedStyle(); - if (styleContext) { - UpdateProperties(styleContext); + RefPtr computedStyle = GetTargetComputedStyle(); + if (computedStyle) { + UpdateProperties(computedStyle); } MaybeUpdateFrameForCompositor(); @@ -163,9 +163,9 @@ KeyframeEffect::SetComposite(const CompositeOperation& aComposite) } if (mTarget) { - RefPtr styleContext = GetTargetComputedStyle(); - if (styleContext) { - UpdateProperties(styleContext); + RefPtr computedStyle = GetTargetComputedStyle(); + if (computedStyle) { + UpdateProperties(computedStyle); } } } diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp index 2ec5fe0a8673..1d4d6223da0a 100644 --- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -1023,7 +1023,7 @@ KeyframeEffectReadOnly::GetKeyframes(JSContext*& aCx, // be consistent with Gecko, we just expand the variables (assuming we have // enough context to do so). For that we need to grab the style context so we // know what custom property values to provide. - RefPtr styleContext; + RefPtr computedStyle; if (isServo && isCSSAnimation) { // The following will flush style but that's ok since if you update // a variable's computed value, you expect to see that updated value in the @@ -1033,7 +1033,7 @@ KeyframeEffectReadOnly::GetKeyframes(JSContext*& aCx, // we might end up returning variables as-is or empty string. That should be // acceptable however, since such a case is rare and this is only // short-term (and unshipped) behavior until bug 1391537 is fixed. - styleContext = GetTargetComputedStyle(); + computedStyle = GetTargetComputedStyle(); } for (const Keyframe& keyframe : mKeyframes) { @@ -1086,7 +1086,7 @@ KeyframeEffectReadOnly::GetKeyframes(JSContext*& aCx, } if (propertyValue.mServoDeclarationBlock) { const ComputedStyle* servoComputedStyle = - styleContext ? styleContext->AsServo() : nullptr; + computedStyle ? computedStyle->AsServo() : nullptr; Servo_DeclarationBlock_SerializeOneValue( propertyValue.mServoDeclarationBlock, propertyValue.mProperty, diff --git a/dom/base/DOMMatrix.cpp b/dom/base/DOMMatrix.cpp index efbec0009a04..550560ede00e 100644 --- a/dom/base/DOMMatrix.cpp +++ b/dom/base/DOMMatrix.cpp @@ -12,7 +12,6 @@ #include "mozilla/dom/DOMPointBinding.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/ToJSValue.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "mozilla/ServoCSSParser.h" #include "nsCSSParser.h" #include "nsGlobalWindowInner.h" diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index cf76d6c9962c..fd63d72bb12d 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -1505,10 +1505,10 @@ Element::GetElementsWithGrid(nsTArray>& aElements) // generate a nsGridContainerFrame during layout. auto IsDisplayGrid = [](Element* aElement) -> bool { - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyle(aElement, nullptr); - if (styleContext) { - const nsStyleDisplay* display = styleContext->StyleDisplay(); + if (computedStyle) { + const nsStyleDisplay* display = computedStyle->StyleDisplay(); return (display->mDisplay == StyleDisplay::Grid || display->mDisplay == StyleDisplay::InlineGrid); } diff --git a/dom/base/WebKitCSSMatrix.cpp b/dom/base/WebKitCSSMatrix.cpp index 635dd0cfca33..087798373dc8 100644 --- a/dom/base/WebKitCSSMatrix.cpp +++ b/dom/base/WebKitCSSMatrix.cpp @@ -10,7 +10,6 @@ #include "mozilla/dom/WebKitCSSMatrixBinding.h" #include "mozilla/Preferences.h" #include "nsPresContext.h" -#include "RuleNodeCacheConditions.h" #include "nsGlobalWindowInner.h" namespace mozilla { diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 57250163191c..16ab1d33c24e 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -2723,9 +2723,9 @@ nsDOMWindowUtils::ComputeAnimationDistance(nsIDOMElement* aElement, return NS_ERROR_ILLEGAL_VALUE; } - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyle(element, nullptr); - *aResult = v1.ComputeDistance(property, v2, styleContext); + *aResult = v1.ComputeDistance(property, v2, computedStyle); return NS_OK; } @@ -2821,14 +2821,14 @@ nsDOMWindowUtils::GetUnanimatedComputedStyle(nsIDOMElement* aElement, } RefPtr pseudo = nsCSSPseudoElements::GetPseudoAtom(aPseudoElement); - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetUnanimatedComputedStyleNoFlush(element, pseudo); - if (!styleContext) { + if (!computedStyle) { return NS_ERROR_FAILURE; } RefPtr value = - Servo_ComputedValues_ExtractAnimationValue(styleContext->AsServo(), + Servo_ComputedValues_ExtractAnimationValue(computedStyle, propertyID).Consume(); if (!value) { return NS_ERROR_FAILURE; diff --git a/dom/base/nsPlainTextSerializer.cpp b/dom/base/nsPlainTextSerializer.cpp index f5147acf87e4..2e218e9fcd9f 100644 --- a/dom/base/nsPlainTextSerializer.cpp +++ b/dom/base/nsPlainTextSerializer.cpp @@ -1851,10 +1851,10 @@ nsPlainTextSerializer::IsInPre() bool nsPlainTextSerializer::IsElementPreformatted(Element* aElement) { - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); - if (styleContext) { - const nsStyleText* textStyle = styleContext->StyleText(); + if (computedStyle) { + const nsStyleText* textStyle = computedStyle->StyleText(); return textStyle->WhiteSpaceOrNewlineIsSignificant(); } // Fall back to looking at the tag, in case there is no style information. @@ -1864,10 +1864,10 @@ nsPlainTextSerializer::IsElementPreformatted(Element* aElement) bool nsPlainTextSerializer::IsElementBlock(Element* aElement) { - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); - if (styleContext) { - const nsStyleDisplay* displayStyle = styleContext->StyleDisplay(); + if (computedStyle) { + const nsStyleDisplay* displayStyle = computedStyle->StyleDisplay(); return displayStyle->IsBlockOutsideStyle(); } // Fall back to looking at the tag, in case there is no style information. diff --git a/dom/base/nsXHTMLContentSerializer.cpp b/dom/base/nsXHTMLContentSerializer.cpp index de482783ac25..e5a86d6d1da9 100644 --- a/dom/base/nsXHTMLContentSerializer.cpp +++ b/dom/base/nsXHTMLContentSerializer.cpp @@ -720,10 +720,10 @@ nsXHTMLContentSerializer::IsElementPreformatted(nsIContent* aNode) if (!aNode->IsElement()) { return false; } - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aNode->AsElement(), nullptr); - if (styleContext) { - const nsStyleText* textStyle = styleContext->StyleText(); + if (computedStyle) { + const nsStyleText* textStyle = computedStyle->StyleText(); return textStyle->WhiteSpaceOrNewlineIsSignificant(); } return false; diff --git a/dom/smil/nsSMILCSSProperty.cpp b/dom/smil/nsSMILCSSProperty.cpp index f6041894d081..c678beb6563f 100644 --- a/dom/smil/nsSMILCSSProperty.cpp +++ b/dom/smil/nsSMILCSSProperty.cpp @@ -69,7 +69,7 @@ nsSMILCSSProperty::GetBaseValue() const AnimationValue computedValue; if (mElement->IsStyledByServo()) { computedValue.mServo = - Servo_ComputedValues_ExtractAnimationValue(mBaseComputedStyle->AsServo(), mPropID) + Servo_ComputedValues_ExtractAnimationValue(mBaseComputedStyle, mPropID) .Consume(); if (!computedValue.mServo) { return baseValue; diff --git a/dom/smil/nsSMILCSSValueType.cpp b/dom/smil/nsSMILCSSValueType.cpp index 7bea50392ca9..8f4f30ca28db 100644 --- a/dom/smil/nsSMILCSSValueType.cpp +++ b/dom/smil/nsSMILCSSValueType.cpp @@ -550,15 +550,15 @@ nsSMILCSSValueType::ValueFromString(nsCSSPropertyID aPropID, return; } - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyle(aTargetElement, nullptr); - if (!styleContext) { + if (!computedStyle) { return; } ServoAnimationValues parsedValues = ValueFromStringHelper(aPropID, aTargetElement, presContext, - styleContext, aString); + computedStyle, aString); if (aIsContextSensitive) { // FIXME: Bug 1358955 - detect context-sensitive values and set this value // appropriately. diff --git a/dom/svg/SVGContentUtils.cpp b/dom/svg/SVGContentUtils.cpp index 584cde488dbc..b79e77068503 100644 --- a/dom/svg/SVGContentUtils.cpp +++ b/dom/svg/SVGContentUtils.cpp @@ -175,19 +175,19 @@ SVGContentUtils::GetStrokeOptions(AutoStrokeOptions* aStrokeOptions, SVGContextPaint* aContextPaint, StrokeOptionFlags aFlags) { - RefPtr styleContext; + RefPtr computedStyle; if (aComputedStyle) { - styleContext = aComputedStyle; + computedStyle = aComputedStyle; } else { - styleContext = + computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); } - if (!styleContext) { + if (!computedStyle) { return; } - const nsStyleSVG* styleSVG = styleContext->StyleSVG(); + const nsStyleSVG* styleSVG = computedStyle->StyleSVG(); bool checkedDashAndStrokeIsDashed = false; if (aFlags != eIgnoreStrokeDashing) { @@ -207,7 +207,7 @@ SVGContentUtils::GetStrokeOptions(AutoStrokeOptions* aStrokeOptions, } aStrokeOptions->mLineWidth = - GetStrokeWidth(aElement, styleContext, aContextPaint); + GetStrokeWidth(aElement, computedStyle, aContextPaint); aStrokeOptions->mMiterLimit = Float(styleSVG->mStrokeMiterlimit); @@ -248,19 +248,19 @@ SVGContentUtils::GetStrokeWidth(nsSVGElement* aElement, ComputedStyle* aComputedStyle, SVGContextPaint* aContextPaint) { - RefPtr styleContext; + RefPtr computedStyle; if (aComputedStyle) { - styleContext = aComputedStyle; + computedStyle = aComputedStyle; } else { - styleContext = + computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); } - if (!styleContext) { + if (!computedStyle) { return 0.0f; } - const nsStyleSVG* styleSVG = styleContext->StyleSVG(); + const nsStyleSVG* styleSVG = computedStyle->StyleSVG(); if (aContextPaint && styleSVG->StrokeWidthFromObject()) { return aContextPaint->GetStrokeWidth(); @@ -275,15 +275,15 @@ SVGContentUtils::GetFontSize(Element *aElement) if (!aElement) return 1.0f; - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); - if (!styleContext) { + if (!computedStyle) { // ReportToConsole NS_WARNING("Couldn't get style context for content in GetFontStyle"); return 1.0f; } - return GetFontSize(styleContext); + return GetFontSize(computedStyle); } float @@ -312,15 +312,15 @@ SVGContentUtils::GetFontXHeight(Element *aElement) if (!aElement) return 1.0f; - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr); - if (!styleContext) { + if (!computedStyle) { // ReportToConsole NS_WARNING("Couldn't get style context for content in GetFontStyle"); return 1.0f; } - return GetFontXHeight(styleContext); + return GetFontXHeight(computedStyle); } float diff --git a/dom/svg/SVGGeometryElement.cpp b/dom/svg/SVGGeometryElement.cpp index 3a9d11e431dc..d7fd0e3f73bf 100644 --- a/dom/svg/SVGGeometryElement.cpp +++ b/dom/svg/SVGGeometryElement.cpp @@ -138,14 +138,14 @@ SVGGeometryElement::GetFillRule() { FillRule fillRule = FillRule::FILL_WINDING; // Equivalent to StyleFillRule::Nonzero - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(this, nullptr); - if (styleContext) { - MOZ_ASSERT(styleContext->StyleSVG()->mFillRule == StyleFillRule::Nonzero || - styleContext->StyleSVG()->mFillRule == StyleFillRule::Evenodd); + if (computedStyle) { + MOZ_ASSERT(computedStyle->StyleSVG()->mFillRule == StyleFillRule::Nonzero || + computedStyle->StyleSVG()->mFillRule == StyleFillRule::Evenodd); - if (styleContext->StyleSVG()->mFillRule == StyleFillRule::Evenodd) { + if (computedStyle->StyleSVG()->mFillRule == StyleFillRule::Evenodd) { fillRule = FillRule::FILL_EVEN_ODD; } } else { diff --git a/dom/svg/SVGLengthList.h b/dom/svg/SVGLengthList.h index 8beeb3343adb..f9c8bd35613f 100644 --- a/dom/svg/SVGLengthList.h +++ b/dom/svg/SVGLengthList.h @@ -301,7 +301,7 @@ private: * Consumers should check that the user unit values returned are finite. Even * if the consumer can guarantee the list's element has a valid viewport * ancestor to resolve percentage units against, and a valid presContext and - * styleContext to resolve absolute and em/ex units against, unit conversions + * ComputedStyle to resolve absolute and em/ex units against, unit conversions * could still overflow. In that case the value returned will be * numeric_limits::quiet_NaN(). */ diff --git a/dom/svg/SVGPathElement.cpp b/dom/svg/SVGPathElement.cpp index 5df1ac3cb699..150b7873b068 100644 --- a/dom/svg/SVGPathElement.cpp +++ b/dom/svg/SVGPathElement.cpp @@ -298,17 +298,18 @@ SVGPathElement::BuildPath(PathBuilder* aBuilder) uint8_t strokeLineCap = NS_STYLE_STROKE_LINECAP_BUTT; Float strokeWidth = 0; - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyleNoFlush(this, nullptr); - if (styleContext) { - const nsStyleSVG* style = styleContext->StyleSVG(); + if (computedStyle) { + const nsStyleSVG* style = computedStyle->StyleSVG(); // Note: the path that we return may be used for hit-testing, and SVG // exposes hit-testing of strokes that are not actually painted. For that // reason we do not check for eStyleSVGPaintType_None or check the stroke // opacity here. if (style->mStrokeLinecap != NS_STYLE_STROKE_LINECAP_BUTT) { strokeLineCap = style->mStrokeLinecap; - strokeWidth = SVGContentUtils::GetStrokeWidth(this, styleContext, nullptr); + strokeWidth = + SVGContentUtils::GetStrokeWidth(this, computedStyle, nullptr); } } diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index 3a1ba922c696..4191cfc98528 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -80,8 +80,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] # Work around a crash when jumping into assembly on platforms where -# Clang has 4-byte stack alignment (BSDs, Windows). -if CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +# Clang has 4-byte stack alignment. +if CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] == 'clang': SOURCES['skia/src/jumper/SkJumper.cpp'].flags += [ '-mstack-alignment=16', '-mstackrealign' diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 36ef14a101d6..e66488bcdf5b 100755 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -755,8 +755,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] # Work around a crash when jumping into assembly on platforms where -# Clang has 4-byte stack alignment (BSDs, Windows). -if CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +# Clang has 4-byte stack alignment. +if CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] == 'clang': SOURCES['skia/src/jumper/SkJumper.cpp'].flags += [ '-mstack-alignment=16', '-mstackrealign' diff --git a/layout/base/ServoRestyleManager.cpp b/layout/base/ServoRestyleManager.cpp index 2d061972667c..da664bd9aa06 100644 --- a/layout/base/ServoRestyleManager.cpp +++ b/layout/base/ServoRestyleManager.cpp @@ -507,17 +507,17 @@ public: void ComputeHintIfNeeded(nsIContent* aContent, nsIFrame* aTextFrame, - ComputedStyle& aNewContext) + ComputedStyle& aNewStyle) { MOZ_ASSERT(aTextFrame); - MOZ_ASSERT(aNewContext.GetPseudo() == nsCSSAnonBoxes::mozText); + MOZ_ASSERT(aNewStyle.GetPseudo() == nsCSSAnonBoxes::mozText); if (MOZ_LIKELY(!mShouldPostHints)) { return; } - ComputedStyle* oldContext = aTextFrame->Style()->AsServo(); - MOZ_ASSERT(oldContext->GetPseudo() == nsCSSAnonBoxes::mozText); + ComputedStyle* oldStyle = aTextFrame->Style(); + MOZ_ASSERT(oldStyle->GetPseudo() == nsCSSAnonBoxes::mozText); // We rely on the fact that all the text children for the same element share // style to avoid recomputing style differences for all of them. @@ -528,9 +528,9 @@ public: mShouldComputeHints = false; uint32_t equalStructs, samePointerStructs; mComputedHint = - oldContext->CalcStyleDifference(&aNewContext, - &equalStructs, - &samePointerStructs); + oldStyle->CalcStyleDifference(&aNewStyle, + &equalStructs, + &samePointerStructs); mComputedHint = NS_RemoveSubsumedHints( mComputedHint, mParentRestyleState.ChangesHandledFor(*aTextFrame)); } @@ -588,10 +588,10 @@ UpdateBackdropIfNeeded(nsIFrame* aFrame, MOZ_ASSERT(backdropFrame->Style()->GetPseudoType() == CSSPseudoElementType::backdrop); - RefPtr newContext = + RefPtr newStyle = aStyleSet.ResolvePseudoElementStyle(aFrame->GetContent()->AsElement(), CSSPseudoElementType::backdrop, - aFrame->Style()->AsServo(), + aFrame->Style(), /* aPseudoElement = */ nullptr); // NOTE(emilio): We can't use the changes handled for the owner of the @@ -601,7 +601,7 @@ UpdateBackdropIfNeeded(nsIFrame* aFrame, backdropFrame->GetParent()->IsCanvasFrame()); nsTArray wrappersToRestyle; ServoRestyleState state(aStyleSet, aChangeList, wrappersToRestyle); - nsIFrame::UpdateStyleOfOwnedChildFrame(backdropFrame, newContext, state); + nsIFrame::UpdateStyleOfOwnedChildFrame(backdropFrame, newStyle, state); } static void @@ -636,16 +636,16 @@ UpdateOneAdditionalComputedStyle(nsIFrame* aFrame, MOZ_ASSERT( !nsCSSPseudoElements::PseudoElementSupportsUserActionState(pseudoType)); - RefPtr newContext = + RefPtr newStyle = aRestyleState.StyleSet().ResolvePseudoElementStyle( aFrame->GetContent()->AsElement(), pseudoType, - aFrame->Style()->AsServo(), + aFrame->Style(), /* aPseudoElement = */ nullptr); uint32_t equalStructs, samePointerStructs; // Not used, actually. nsChangeHint childHint = aOldContext.CalcStyleDifference( - newContext, + newStyle, &equalStructs, &samePointerStructs); if (!aFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW)) { @@ -663,7 +663,7 @@ UpdateOneAdditionalComputedStyle(nsIFrame* aFrame, aFrame, aFrame->GetContent(), childHint); } - aFrame->SetAdditionalComputedStyle(aIndex, newContext); + aFrame->SetAdditionalComputedStyle(aIndex, newStyle); } static void @@ -676,9 +676,9 @@ UpdateAdditionalComputedStyles(nsIFrame* aFrame, // FIXME(emilio): Consider adding a bit or something to avoid the initial // virtual call? uint32_t index = 0; - while (auto* oldContext = aFrame->GetAdditionalComputedStyle(index)) { + while (auto* oldStyle = aFrame->GetAdditionalComputedStyle(index)) { UpdateOneAdditionalComputedStyle( - aFrame, index++, *oldContext->AsServo(), aRestyleState); + aFrame, index++, *oldStyle, aRestyleState); } } @@ -854,7 +854,7 @@ ServoRestyleManager::ProcessPostTraversal( // during the replacement. In practice it's not a huge deal, but better not // playing with dangling pointers if not needed. RefPtr oldComputedStyle = - styleFrame ? styleFrame->Style()->AsServo() : nullptr; + styleFrame ? styleFrame->Style() : nullptr; ComputedStyle* displayContentsStyle = nullptr; // FIXME(emilio, bug 1303605): This can be simpler for Servo. @@ -863,7 +863,7 @@ ServoRestyleManager::ProcessPostTraversal( displayContentsStyle = PresContext()->FrameConstructor()->GetDisplayContentsStyleFor(aElement); if (displayContentsStyle) { - oldComputedStyle = displayContentsStyle->AsServo(); + oldComputedStyle = displayContentsStyle; } } @@ -899,7 +899,7 @@ ServoRestyleManager::ProcessPostTraversal( // We want to walk all the continuations here, even the ones with different // styles. In practice, the only reason we get continuations with different // styles here is ::first-line (::first-letter never affects element - // styles). But in that case, newContext is the right context for the + // styles). But in that case, newStyle is the right context for the // _later_ continuations anyway (the ones not affected by ::first-line), not // the earlier ones, so there is no point stopping right at the point when // we'd actually be setting the right ComputedStyle. @@ -938,7 +938,7 @@ ServoRestyleManager::ProcessPostTraversal( // // We can sometimes reach this when the animated style is being removed. // Since AddLayerChangesForAnimation checks if |styleFrame| has a transform - // style or not, we need to call it *after* setting |newContext| to + // style or not, we need to call it *after* setting |newStyle| to // |styleFrame| to ensure the animated transform has been removed first. AddLayerChangesForAnimation( styleFrame, aElement, aRestyleState.ChangeList()); @@ -1045,13 +1045,13 @@ ServoRestyleManager::ProcessPostTraversalForText( ServoRestyleState::TableAwareParentFor(primaryFrame)); } - ComputedStyle& newContext = aPostTraversalState.ComputeStyle(aTextNode); - aPostTraversalState.ComputeHintIfNeeded(aTextNode, primaryFrame, newContext); + ComputedStyle& newStyle = aPostTraversalState.ComputeStyle(aTextNode); + aPostTraversalState.ComputeHintIfNeeded(aTextNode, primaryFrame, newStyle); // We want to walk all the continuations here, even the ones with different // styles. In practice, the only reasons we get continuations with different // styles are ::first-line and ::first-letter. But in those cases, - // newContext is the right context for the _later_ continuations anyway (the + // newStyle is the right context for the _later_ continuations anyway (the // ones not affected by ::first-line/::first-letter), not the earlier ones, // so there is no point stopping right at the point when we'd actually be // setting the right ComputedStyle. @@ -1060,7 +1060,7 @@ ServoRestyleManager::ProcessPostTraversalForText( // initial continuations; ::first-line/::first-letter fix that up after the // fact. for (nsIFrame* f = primaryFrame; f; f = f->GetNextContinuation()) { - f->SetComputedStyle(&newContext); + f->SetComputedStyle(&newStyle); } return true; @@ -1591,7 +1591,7 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, } nsIFrame* providerFrame; - ComputedStyle* newParentContext = + ComputedStyle* newParentStyle = aFrame->GetParentComputedStyle(&providerFrame); // If our provider is our child, we want to reparent it first, because we // inherit style from it. @@ -1601,13 +1601,13 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, DoReparentComputedStyle(providerFrame, aStyleSet); // Get the style again after ReparentComputedStyle() which might have // changed it. - newParentContext = providerFrame->Style(); + newParentStyle = providerFrame->Style(); providerChild = providerFrame; MOZ_ASSERT(!providerFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW), "Out of flow provider?"); } - if (!newParentContext) { + if (!newParentStyle) { // No need to do anything here for this frame, but we should still reparent // its descendants, because those may have styles that inherit from the // parent of this frame (e.g. non-anonymous columns in an anonymous @@ -1629,13 +1629,13 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, // We don't try to do the fancy copying from previous continuations that // GeckoRestyleManager does here, because that relies on knowing the parents // of ComputedStyles, and we don't know those. - ComputedStyle* oldContext = aFrame->Style()->AsServo(); + ComputedStyle* oldStyle = aFrame->Style(); Element* ourElement = - oldContext->GetPseudoType() == CSSPseudoElementType::NotPseudo && + oldStyle->GetPseudoType() == CSSPseudoElementType::NotPseudo && isElement ? aFrame->GetContent()->AsElement() : nullptr; - ComputedStyle* newParent = newParentContext->AsServo(); + ComputedStyle* newParent = newParentStyle; ComputedStyle* newParentIgnoringFirstLine; if (newParent->GetPseudoType() == CSSPseudoElementType::firstLine) { @@ -1648,8 +1648,8 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, // Use the resulting style for the "parent style ignoring ::first-line". nsIFrame* blockFrame = providerFrame->GetParent(); nsIFrame* correctedFrame = - nsFrame::CorrectStyleParentFrame(blockFrame, oldContext->GetPseudo()); - newParentIgnoringFirstLine = correctedFrame->Style()->AsServo(); + nsFrame::CorrectStyleParentFrame(blockFrame, oldStyle->GetPseudo()); + newParentIgnoringFirstLine = correctedFrame->Style(); } else { newParentIgnoringFirstLine = newParent; } @@ -1663,18 +1663,18 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, aFrame->GetPlaceholderFrame()->GetLayoutParentStyleForOutOfFlow(&providerFrame); } else { providerFrame = nsFrame::CorrectStyleParentFrame(aFrame->GetParent(), - oldContext->GetPseudo()); + oldStyle->GetPseudo()); } } - ComputedStyle* layoutParent = providerFrame->Style()->AsServo(); + ComputedStyle* layoutParent = providerFrame->Style(); - RefPtr newContext = - aStyleSet.ReparentComputedStyle(oldContext, - newParent, - newParentIgnoringFirstLine, - layoutParent, - ourElement); - aFrame->SetComputedStyle(newContext); + RefPtr newStyle = + aStyleSet.ReparentComputedStyle(oldStyle, + newParent, + newParentIgnoringFirstLine, + layoutParent, + ourElement); + aFrame->SetComputedStyle(newStyle); // This logic somewhat mirrors the logic in // ServoRestyleManager::ProcessPostTraversal. @@ -1683,14 +1683,13 @@ ServoRestyleManager::DoReparentComputedStyle(nsIFrame* aFrame, // ServoRestyleState and maintaining one of those during a _frametree_ // traversal is basically impossible. uint32_t index = 0; - while (ComputedStyle* oldAdditionalContext = - aFrame->GetAdditionalComputedStyle(index)) { + while (auto* oldAdditionalStyle = aFrame->GetAdditionalComputedStyle(index)) { RefPtr newAdditionalContext = - aStyleSet.ReparentComputedStyle(oldAdditionalContext->AsServo(), - newContext, - newContext, - newContext, - nullptr); + aStyleSet.ReparentComputedStyle(oldAdditionalStyle, + newStyle, + newStyle, + newStyle, + nullptr); aFrame->SetAdditionalComputedStyle(index, newAdditionalContext); ++index; } diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 95c616027e0b..aef591a2daa5 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -2074,14 +2074,14 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState, "Unexpected call"); nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; const uint32_t nameSpaceID = aItem.mNameSpaceID; // create the pseudo SC for the table wrapper as a child of the inner SC RefPtr outerComputedStyle; outerComputedStyle = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::tableWrapper, - styleContext); + computedStyle); // Create the table wrapper frame which holds the caption and inner table frame nsContainerFrame* newFrame; @@ -2100,9 +2100,9 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState, // Create the inner table frame nsContainerFrame* innerFrame; if (kNameSpaceID_MathML == nameSpaceID) - innerFrame = NS_NewMathMLmtableFrame(mPresShell, styleContext); + innerFrame = NS_NewMathMLmtableFrame(mPresShell, computedStyle); else - innerFrame = NS_NewTableFrame(mPresShell, styleContext); + innerFrame = NS_NewTableFrame(mPresShell, computedStyle); InitAndRestoreFrame(aState, content, newFrame, innerFrame); innerFrame->AddStateBits(NS_FRAME_OWNS_ANON_BOXES); @@ -2139,7 +2139,7 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState, aItem.mFCData->mBits & FCDATA_IS_WRAPPER_ANON_BOX, childItems); } else { - ProcessChildren(aState, content, styleContext, innerFrame, + ProcessChildren(aState, content, computedStyle, innerFrame, true, childItems, false, aItem.mPendingBinding); } @@ -2193,17 +2193,17 @@ nsCSSFrameConstructor::ConstructTableRowOrRowGroup(nsFrameConstructorState& aSta MOZ_ASSERT(aItem.mComputedStyle->StyleDisplay() == aDisplay, "Display style doesn't match style"); nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; const uint32_t nameSpaceID = aItem.mNameSpaceID; nsContainerFrame* newFrame; if (aDisplay->mDisplay == StyleDisplay::TableRow) { if (kNameSpaceID_MathML == nameSpaceID) - newFrame = NS_NewMathMLmtrFrame(mPresShell, styleContext); + newFrame = NS_NewMathMLmtrFrame(mPresShell, computedStyle); else - newFrame = NS_NewTableRowFrame(mPresShell, styleContext); + newFrame = NS_NewTableRowFrame(mPresShell, computedStyle); } else { - newFrame = NS_NewTableRowGroupFrame(mPresShell, styleContext); + newFrame = NS_NewTableRowGroupFrame(mPresShell, computedStyle); } InitAndRestoreFrame(aState, content, aParentFrame, newFrame); @@ -2223,7 +2223,7 @@ nsCSSFrameConstructor::ConstructTableRowOrRowGroup(nsFrameConstructorState& aSta aItem.mFCData->mBits & FCDATA_IS_WRAPPER_ANON_BOX, childItems); } else { - ProcessChildren(aState, content, styleContext, newFrame, + ProcessChildren(aState, content, computedStyle, newFrame, true, childItems, false, aItem.mPendingBinding); } @@ -2240,19 +2240,19 @@ nsCSSFrameConstructor::ConstructTableCol(nsFrameConstructorState& aState, nsFrameItems& aFrameItems) { nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; - nsTableColFrame* colFrame = NS_NewTableColFrame(mPresShell, styleContext); + nsTableColFrame* colFrame = NS_NewTableColFrame(mPresShell, computedStyle); InitAndRestoreFrame(aState, content, aParentFrame, colFrame); - NS_ASSERTION(colFrame->Style() == styleContext, "Unexpected style"); + NS_ASSERTION(colFrame->Style() == computedStyle, "Unexpected style"); aFrameItems.AddChild(colFrame); // construct additional col frames if the col frame has a span > 1 int32_t span = colFrame->GetSpan(); for (int32_t spanX = 1; spanX < span; spanX++) { - nsTableColFrame* newCol = NS_NewTableColFrame(mPresShell, styleContext); + nsTableColFrame* newCol = NS_NewTableColFrame(mPresShell, computedStyle); InitAndRestoreFrame(aState, content, aParentFrame, newCol, false); aFrameItems.LastChild()->SetNextContinuation(newCol); newCol->SetPrevContinuation(aFrameItems.LastChild()); @@ -2274,7 +2274,7 @@ nsCSSFrameConstructor::ConstructTableCell(nsFrameConstructorState& aState, "Unexpected call"); nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; const uint32_t nameSpaceID = aItem.mNameSpaceID; nsTableFrame* tableFrame = @@ -2288,12 +2288,12 @@ nsCSSFrameConstructor::ConstructTableCell(nsFrameConstructorState& aState, // What will happen is just that non-MathML frames won't understand MathML attributes // and will therefore miss the special handling that the MathML code does. if (kNameSpaceID_MathML == nameSpaceID && !tableFrame->IsBorderCollapse()) { - newFrame = NS_NewMathMLmtdFrame(mPresShell, styleContext, tableFrame); + newFrame = NS_NewMathMLmtdFrame(mPresShell, computedStyle, tableFrame); } else { // Warning: If you change this and add a wrapper frame around table cell // frames, make sure Bug 368554 doesn't regress! // See IsInAutoWidthTableCellForQuirk() in nsImageFrame.cpp. - newFrame = NS_NewTableCellFrame(mPresShell, styleContext, tableFrame); + newFrame = NS_NewTableCellFrame(mPresShell, computedStyle, tableFrame); } // Initialize the table cell frame @@ -2304,7 +2304,7 @@ nsCSSFrameConstructor::ConstructTableCell(nsFrameConstructorState& aState, RefPtr innerPseudoStyle; innerPseudoStyle = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::cellContent, - styleContext); + computedStyle); // Create a block frame that will format the cell's content bool isBlock; @@ -2346,7 +2346,7 @@ nsCSSFrameConstructor::ConstructTableCell(nsFrameConstructorState& aState, childItems); } else { // Process the child content - ProcessChildren(aState, content, styleContext, cellInnerFrame, + ProcessChildren(aState, content, computedStyle, cellInnerFrame, true, childItems, isBlock, aItem.mPendingBinding); } @@ -2455,10 +2455,10 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle } } - RefPtr styleContext = + RefPtr computedStyle = mPresShell->StyleSet()->AsServo()->ResolveServoStyle(aDocElement); - const nsStyleDisplay* display = styleContext->StyleDisplay(); + const nsStyleDisplay* display = computedStyle->StyleDisplay(); // Ensure that our XBL bindings are installed. if (display->mBinding) { @@ -2488,9 +2488,9 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle } if (resolveStyle) { - styleContext = + computedStyle = mPresShell->StyleSet()->AsServo()->ResolveServoStyle(aDocElement); - display = styleContext->StyleDisplay(); + display = computedStyle->StyleDisplay(); } } @@ -2502,12 +2502,12 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle "Scrollbars should have been propagated to the viewport"); if (MOZ_UNLIKELY(display->mDisplay == StyleDisplay::None)) { - RegisterDisplayNoneStyleFor(aDocElement, styleContext); + RegisterDisplayNoneStyleFor(aDocElement, computedStyle); return nullptr; } // Make sure to start any background image loads for the root element now. - styleContext->StartBackgroundImageLoads(); + computedStyle->StartBackgroundImageLoads(); nsFrameConstructorSaveState docElementContainingBlockAbsoluteSaveState; if (mHasRootAbsPosContainingBlock) { @@ -2538,7 +2538,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle // Check whether we need to build a XUL box or SVG root frame #ifdef MOZ_XUL if (aDocElement->IsXULElement()) { - contentFrame = NS_NewDocElementBoxFrame(mPresShell, styleContext); + contentFrame = NS_NewDocElementBoxFrame(mPresShell, computedStyle); InitAndRestoreFrame(state, aDocElement, mDocElementContainingBlock, contentFrame); newFrame = contentFrame; @@ -2560,7 +2560,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle // Use a null PendingBinding, since our binding is not in fact pending. static const FrameConstructionData rootSVGData = FCDATA_DECL(0, nullptr); already_AddRefed extraRef = - RefPtr(styleContext).forget(); + RefPtr(computedStyle).forget(); AutoFrameConstructionItem item(this, &rootSVGData, aDocElement, aDocElement->NodeInfo()->NameAtom(), kNameSpaceID_SVG, nullptr, extraRef, true, @@ -2569,7 +2569,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle nsFrameItems frameItems; contentFrame = static_cast( ConstructOuterSVG(state, item, mDocElementContainingBlock, - styleContext->StyleDisplay(), + computedStyle->StyleDisplay(), frameItems)); newFrame = frameItems.FirstChild(); NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames"); @@ -2577,7 +2577,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle display->mDisplay == StyleDisplay::WebkitBox || (StylePrefs::sEmulateMozBoxWithFlex && display->mDisplay == StyleDisplay::MozBox)) { - contentFrame = NS_NewFlexContainerFrame(mPresShell, styleContext); + contentFrame = NS_NewFlexContainerFrame(mPresShell, computedStyle); InitAndRestoreFrame(state, aDocElement, mDocElementContainingBlock, contentFrame); newFrame = contentFrame; @@ -2590,7 +2590,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle } } else if (display->mDisplay == StyleDisplay::Grid) { - contentFrame = NS_NewGridContainerFrame(mPresShell, styleContext); + contentFrame = NS_NewGridContainerFrame(mPresShell, computedStyle); InitAndRestoreFrame(state, aDocElement, mDocElementContainingBlock, contentFrame); newFrame = contentFrame; @@ -2612,7 +2612,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle // Use a null PendingBinding, since our binding is not in fact pending. static const FrameConstructionData rootTableData = FCDATA_DECL(0, nullptr); already_AddRefed extraRef = - RefPtr(styleContext).forget(); + RefPtr(computedStyle).forget(); AutoFrameConstructionItem item(this, &rootTableData, aDocElement, aDocElement->NodeInfo()->NameAtom(), kNameSpaceID_None, nullptr, extraRef, true, @@ -2622,7 +2622,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle // if the document is a table then just populate it. contentFrame = static_cast( ConstructTable(state, item, mDocElementContainingBlock, - styleContext->StyleDisplay(), + computedStyle->StyleDisplay(), frameItems)); newFrame = frameItems.FirstChild(); NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames"); @@ -2630,13 +2630,13 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle MOZ_ASSERT(display->mDisplay == StyleDisplay::Block || display->mDisplay == StyleDisplay::FlowRoot, "Unhandled display type for root element"); - contentFrame = NS_NewBlockFormattingContext(mPresShell, styleContext); + contentFrame = NS_NewBlockFormattingContext(mPresShell, computedStyle); nsFrameItems frameItems; // Use a null PendingBinding, since our binding is not in fact pending. ConstructBlock(state, aDocElement, state.GetGeometricParent(display, mDocElementContainingBlock), - mDocElementContainingBlock, styleContext, + mDocElementContainingBlock, computedStyle, &contentFrame, frameItems, display->IsAbsPosContainingBlock(contentFrame) ? contentFrame : nullptr, nullptr); @@ -2670,7 +2670,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle !contentFrame->IsFrameOfType(nsIFrame::eSVG), "Only XUL frames should reach here"); // Use a null PendingBinding, since our binding is not in fact pending. - ProcessChildren(state, aDocElement, styleContext, contentFrame, true, + ProcessChildren(state, aDocElement, computedStyle, contentFrame, true, childItems, false, nullptr); // Set the initial child lists @@ -2885,8 +2885,7 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) // created. // resolve a context for the scrollframe - RefPtr styleContext; - styleContext = + RefPtr computedStyle = styleSet->ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::viewportScroll, viewportPseudoStyle); @@ -2900,7 +2899,7 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) newFrame = nullptr; rootPseudoStyle = BeginBuildingScrollFrame( state, aDocElement, - styleContext, + computedStyle, viewportFrame, rootPseudo, true, @@ -3076,7 +3075,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState, nsFrameItems& aFrameItems) { nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; // Construct a frame-based listbox or combobox dom::HTMLSelectElement* sel = dom::HTMLSelectElement::FromNode(content); @@ -3089,7 +3088,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState, // with the drop-down list. nsFrameState flags = NS_BLOCK_FLOAT_MGR; nsComboboxControlFrame* comboboxFrame = - NS_NewComboboxControlFrame(mPresShell, styleContext, flags); + NS_NewComboboxControlFrame(mPresShell, computedStyle, flags); // Save the history state so we don't restore during construction // since the complete tree is required before we restore. @@ -3108,7 +3107,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState, RefPtr listStyle; listStyle = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::dropDownList, - styleContext); + computedStyle); // Create a listbox nsContainerFrame* listFrame = NS_NewListControlFrame(mPresShell, listStyle); @@ -3135,7 +3134,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState, // Initialize the scroll frame positioned. Note that it is NOT // initialized as absolutely positioned. nsContainerFrame* scrolledFrame = - NS_NewSelectsAreaFrame(mPresShell, styleContext, flags); + NS_NewSelectsAreaFrame(mPresShell, computedStyle, flags); InitializeSelectFrame(aState, listFrame, scrolledFrame, content, comboboxFrame, listStyle, true, @@ -3194,16 +3193,17 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState, } // Listbox, not combobox - nsContainerFrame* listFrame = NS_NewListControlFrame(mPresShell, styleContext); + nsContainerFrame* listFrame = + NS_NewListControlFrame(mPresShell, computedStyle); nsContainerFrame* scrolledFrame = NS_NewSelectsAreaFrame( - mPresShell, styleContext, NS_BLOCK_FLOAT_MGR); + mPresShell, computedStyle, NS_BLOCK_FLOAT_MGR); // ******* this code stolen from Initialze ScrollFrame ******** // please adjust this code to use BuildScrollFrame. InitializeSelectFrame(aState, listFrame, scrolledFrame, content, - aParentFrame, styleContext, false, + aParentFrame, computedStyle, false, aItem.mPendingBinding, aFrameItems); return listFrame; @@ -3265,9 +3265,10 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState, nsFrameItems& aFrameItems) { nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; - nsContainerFrame* fieldsetFrame = NS_NewFieldSetFrame(mPresShell, styleContext); + nsContainerFrame* fieldsetFrame = + NS_NewFieldSetFrame(mPresShell, computedStyle); // Initialize it InitAndRestoreFrame(aState, content, @@ -3280,7 +3281,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState, RefPtr fieldsetContentStyle; fieldsetContentStyle = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::fieldsetContent, - styleContext); + computedStyle); const nsStyleDisplay* fieldsetContentDisplay = fieldsetContentStyle->StyleDisplay(); bool isScrollable = fieldsetContentDisplay->IsScrollableOverflow(); @@ -3356,7 +3357,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState, aState.PushAbsoluteContainingBlock(contentFrame, absPosContainer, absoluteSaveState); } - ProcessChildren(aState, content, styleContext, contentFrame, true, + ProcessChildren(aState, content, computedStyle, contentFrame, true, childItems, true, aItem.mPendingBinding); nsFrameItems fieldsetKids; @@ -3871,8 +3872,8 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt nsIContent* const content = aItem.mContent; nsIFrame* newFrame; nsIFrame* primaryFrame; - ComputedStyle* const styleContext = aItem.mComputedStyle; - const nsStyleDisplay* display = styleContext->StyleDisplay(); + ComputedStyle* const computedStyle = aItem.mComputedStyle; + const nsStyleDisplay* display = computedStyle->StyleDisplay(); if (bits & FCDATA_FUNC_IS_FULL_CTOR) { newFrame = (this->*(data->mFullConstructor))(aState, aItem, aParentFrame, @@ -3881,7 +3882,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt primaryFrame = newFrame; } else { newFrame = - (*data->mFunc.mCreationFunc)(mPresShell, styleContext); + (*data->mFunc.mCreationFunc)(mPresShell, computedStyle); bool allowOutOfFlow = !(bits & FCDATA_DISALLOW_OUT_OF_FLOW); bool isPopup = aItem.mIsPopup; @@ -3900,7 +3901,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt if ((bits & FCDATA_MAY_NEED_SCROLLFRAME) && display->IsScrollableOverflow()) { nsContainerFrame* scrollframe = nullptr; - BuildScrollFrame(aState, content, styleContext, newFrame, + BuildScrollFrame(aState, content, computedStyle, newFrame, geometricParent, scrollframe); frameToAddToList = scrollframe; } else { @@ -3923,7 +3924,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt if (bits & FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS) { RefPtr outerSC = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(*data->mAnonBoxPseudo, - styleContext); + computedStyle); #ifdef DEBUG nsContainerFrame* containerFrame = do_QueryFrame(newFrame); MOZ_ASSERT(containerFrame); @@ -4059,7 +4060,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt childItems); } else { // Process the child frames. - ProcessChildren(aState, content, styleContext, newFrameAsContainer, + ProcessChildren(aState, content, computedStyle, newFrameAsContainer, !(bits & FCDATA_DISALLOW_GENERATED_CONTENT), childItems, (bits & FCDATA_ALLOW_BLOCK_STYLES) != 0, @@ -4910,18 +4911,18 @@ nsCSSFrameConstructor::ConstructScrollableBlockWithConstructor( BlockFrameCreationFunc aConstructor) { nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; nsContainerFrame* newFrame = nullptr; RefPtr scrolledContentStyle - = BeginBuildingScrollFrame(aState, content, styleContext, + = BeginBuildingScrollFrame(aState, content, computedStyle, aState.GetGeometricParent(aDisplay, aParentFrame), nsCSSAnonBoxes::scrolledContent, false, newFrame); // Create our block frame // pass a temporary stylecontext, the correct one will be set later - nsContainerFrame* scrolledFrame = aConstructor(mPresShell, styleContext); + nsContainerFrame* scrolledFrame = aConstructor(mPresShell, computedStyle); // Make sure to AddChild before we call ConstructBlock so that we // end up before our descendants in fixed-pos lists as needed. @@ -4961,7 +4962,7 @@ nsCSSFrameConstructor::ConstructNonScrollableBlockWithConstructor( nsFrameItems& aFrameItems, BlockFrameCreationFunc aConstructor) { - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; // We want a block formatting context root in paginated contexts for // every block that would be scrollable in a non-paginated context. @@ -4981,11 +4982,11 @@ nsCSSFrameConstructor::ConstructNonScrollableBlockWithConstructor( } } - nsContainerFrame* newFrame = aConstructor(mPresShell, styleContext); + nsContainerFrame* newFrame = aConstructor(mPresShell, computedStyle); newFrame->AddStateBits(flags); ConstructBlock(aState, aItem.mContent, aState.GetGeometricParent(aDisplay, aParentFrame), - aParentFrame, styleContext, &newFrame, + aParentFrame, computedStyle, &newFrame, aFrameItems, aDisplay->IsAbsPosContainingBlock(newFrame) ? newFrame : nullptr, aItem.mPendingBinding); @@ -5181,14 +5182,14 @@ nsCSSFrameConstructor::ConstructFrameWithAnonymousChild( bool aCandidateRootFrame) { nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; // Create the outer frame: - nsContainerFrame* newFrame = aConstructor(mPresShell, styleContext); + nsContainerFrame* newFrame = aConstructor(mPresShell, computedStyle); InitAndRestoreFrame(aState, content, aCandidateRootFrame ? - aState.GetGeometricParent(styleContext->StyleDisplay(), + aState.GetGeometricParent(computedStyle->StyleDisplay(), aParentFrame) : aParentFrame, newFrame); @@ -5197,7 +5198,7 @@ nsCSSFrameConstructor::ConstructFrameWithAnonymousChild( // Create the pseudo SC for the anonymous wrapper child as a child of the SC: RefPtr scForAnon; scForAnon = mPresShell->StyleSet()-> - ResolveInheritingAnonymousBoxStyle(aInnerPseudo, styleContext); + ResolveInheritingAnonymousBoxStyle(aInnerPseudo, computedStyle); // Create the anonymous inner wrapper frame nsContainerFrame* innerFrame = aInnerConstructor(mPresShell, scForAnon); @@ -5229,7 +5230,7 @@ nsCSSFrameConstructor::ConstructFrameWithAnonymousChild( aItem.mFCData->mBits & FCDATA_IS_WRAPPER_ANON_BOX, childItems); } else { - ProcessChildren(aState, content, styleContext, innerFrame, + ProcessChildren(aState, content, computedStyle, innerFrame, true, childItems, false, aItem.mPendingBinding); } @@ -5637,8 +5638,8 @@ nsCSSFrameConstructor::AddFrameConstructionItems(nsFrameConstructorState& aState if (!ShouldCreateItemsForChild(aState, aContent, parentFrame)) { return; } - RefPtr styleContext = ResolveComputedStyle(aContent); - DoAddFrameConstructionItems(aState, aContent, styleContext, + RefPtr computedStyle = ResolveComputedStyle(aContent); + DoAddFrameConstructionItems(aState, aContent, computedStyle, aSuppressWhiteSpaceOptimizations, parentFrame, nullptr, aItems); } @@ -5689,7 +5690,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState // of an element using XBL. XUL and HTML objects (like boxes, menus, etc.) // can then be extended arbitrarily. const nsStyleDisplay* display = aComputedStyle->StyleDisplay(); - RefPtr styleContext(aComputedStyle); + RefPtr computedStyle(aComputedStyle); PendingBinding* pendingBinding = nullptr; if (aFlags & ITEM_ALLOW_XBL_BASE) { if (display->mBinding) { @@ -5717,12 +5718,12 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState } if (resolveStyle) { - styleContext = + computedStyle = mPresShell->StyleSet()->AsServo()->ResolveServoStyle(aContent->AsElement()); } - display = styleContext->StyleDisplay(); - aComputedStyle = styleContext; + display = computedStyle->StyleDisplay(); + aComputedStyle = computedStyle; aTag = mDocument->BindingManager()->ResolveTag(aContent, &aNameSpaceID); } } @@ -5732,7 +5733,8 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState // Pre-check for display "none" - if we find that, don't create // any frame at all if (StyleDisplay::None == display->mDisplay) { - SetAsUndisplayedContent(aState, aItems, aContent, styleContext, isGeneratedContent); + SetAsUndisplayedContent(aState, aItems, aContent, computedStyle, + isGeneratedContent); return; } @@ -5754,7 +5756,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState !aContent->IsRootOfNativeAnonymousSubtree()) { // No frame for aContent if (!isText) { - SetAsUndisplayedContent(aState, aItems, aContent, styleContext, + SetAsUndisplayedContent(aState, aItems, aContent, computedStyle, isGeneratedContent); } return; @@ -5773,7 +5775,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState aContent->IsGeneratedContentContainerForAfter())) { auto* summary = HTMLSummaryElement::FromNodeOrNull(aContent); if (!summary || !summary->IsMainSummary()) { - SetAsUndisplayedContent(aState, aItems, aContent, styleContext, + SetAsUndisplayedContent(aState, aItems, aContent, computedStyle, isGeneratedContent); return; } @@ -5798,41 +5800,41 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState IsFrameForSVG(aParentFrame) && !aParentFrame->IsFrameOfType(nsIFrame::eSVGForeignObject)) || (aFlags & ITEM_IS_WITHIN_SVG_TEXT))) { - SetAsUndisplayedContent(aState, aItems, element, styleContext, + SetAsUndisplayedContent(aState, aItems, element, computedStyle, isGeneratedContent); return; } data = FindHTMLData(element, aTag, aNameSpaceID, aParentFrame, - styleContext); + computedStyle); if (!data) { - data = FindXULTagData(element, aTag, aNameSpaceID, styleContext); + data = FindXULTagData(element, aTag, aNameSpaceID, computedStyle); } if (!data) { - data = FindMathMLData(element, aTag, aNameSpaceID, styleContext); + data = FindMathMLData(element, aTag, aNameSpaceID, computedStyle); foundMathMLData = !!data; } if (!data) { data = FindSVGData(element, aTag, aNameSpaceID, aParentFrame, aFlags & ITEM_IS_WITHIN_SVG_TEXT, aFlags & ITEM_ALLOWS_TEXT_PATH_CHILD, - styleContext); + computedStyle); } // Now check for XUL display types if (!data) { - data = FindXULDisplayData(display, element, styleContext); + data = FindXULDisplayData(display, element, computedStyle); } // And general display types if (!data) { - data = FindDisplayData(display, element, styleContext); + data = FindDisplayData(display, element, computedStyle); } NS_ASSERTION(data, "Should have frame construction data now"); if (data->mBits & FCDATA_SUPPRESS_FRAME) { - SetAsUndisplayedContent(aState, aItems, element, styleContext, isGeneratedContent); + SetAsUndisplayedContent(aState, aItems, element, computedStyle, isGeneratedContent); return; } @@ -5842,7 +5844,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState !aParentFrame->IsMenuFrame())) { if (!aState.mPopupItems.containingBlock && !aState.mHavePendingPopupgroup) { - SetAsUndisplayedContent(aState, aItems, element, styleContext, + SetAsUndisplayedContent(aState, aItems, element, computedStyle, isGeneratedContent); return; } @@ -5858,7 +5860,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState if (aParentFrame && aParentFrame->IsTableColGroupFrame() && (!(bits & FCDATA_IS_TABLE_PART) || display->mDisplay != StyleDisplay::TableColumn)) { - SetAsUndisplayedContent(aState, aItems, aContent, styleContext, isGeneratedContent); + SetAsUndisplayedContent(aState, aItems, aContent, computedStyle, isGeneratedContent); return; } @@ -5878,20 +5880,20 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState if (display->mDisplay == StyleDisplay::Contents && !foundMathMLData) { if (!GetDisplayContentsStyleFor(aContent)) { - MOZ_ASSERT(styleContext->GetPseudo() || !isGeneratedContent, + MOZ_ASSERT(computedStyle->GetPseudo() || !isGeneratedContent, "Should have had pseudo type"); aState.mFrameManager->RegisterDisplayContentsStyleFor(aContent, - styleContext); + computedStyle); } else { aState.mFrameManager->ChangeRegisteredDisplayContentsStyleFor(aContent, - styleContext); + computedStyle); } if (aParentFrame) { aParentFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT); } CreateGeneratedContentItem(aState, aParentFrame, aContent->AsElement(), - styleContext, CSSPseudoElementType::before, + computedStyle, CSSPseudoElementType::before, aItems); FlattenedChildIterator iter(aContent); @@ -5908,7 +5910,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState aItems.SetParentHasNoXBLChildren(!iter.XBLInvolved()); CreateGeneratedContentItem(aState, aParentFrame, aContent->AsElement(), - styleContext, CSSPseudoElementType::after, + computedStyle, CSSPseudoElementType::after, aItems); if (canHavePageBreak && display->mBreakAfter) { AddPageBreakItem(aContent, aItems); @@ -5923,14 +5925,14 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState // If details is open, the main summary needs to be rendered as if it is // the first child, so add the item to the front of the item list. item = aItems.PrependItem(this, data, aContent, aTag, aNameSpaceID, - pendingBinding, styleContext.forget(), + pendingBinding, computedStyle.forget(), aSuppressWhiteSpaceOptimizations, aAnonChildren); } } if (!item) { item = aItems.AppendItem(this, data, aContent, aTag, aNameSpaceID, - pendingBinding, styleContext.forget(), + pendingBinding, computedStyle.forget(), aSuppressWhiteSpaceOptimizations, aAnonChildren); } item->mIsText = isText; @@ -6081,8 +6083,8 @@ nsCSSFrameConstructor::ConstructFramesFromItem(nsFrameConstructorState& aState, { nsContainerFrame* adjParentFrame = aParentFrame; FrameConstructionItem& item = aIter.item(); - ComputedStyle* styleContext = item.mComputedStyle; - AdjustParentFrame(&adjParentFrame, item.mFCData, styleContext); + ComputedStyle* computedStyle = item.mComputedStyle; + AdjustParentFrame(&adjParentFrame, item.mFCData, computedStyle); if (item.mIsText) { // If this is collapsible whitespace next to a line boundary, @@ -6100,7 +6102,7 @@ nsCSSFrameConstructor::ConstructFramesFromItem(nsFrameConstructorState& aState, // We don't do it for SVG text, since we might need to position and // measure the white space glyphs due to x/y/dx/dy attributes. if (AtLineBoundary(aIter) && - !styleContext->StyleText()->WhiteSpaceOrNewlineIsSignificant() && + !computedStyle->StyleText()->WhiteSpaceOrNewlineIsSignificant() && aIter.List()->ParentHasNoXBLChildren() && !(aState.mAdditionalStateBits & NS_FRAME_GENERATED_CONTENT) && (item.mFCData->mBits & FCDATA_IS_LINE_PARTICIPANT) && @@ -6110,14 +6112,14 @@ nsCSSFrameConstructor::ConstructFramesFromItem(nsFrameConstructorState& aState, return; ConstructTextFrame(item.mFCData, aState, item.mContent, - adjParentFrame, styleContext, + adjParentFrame, computedStyle, aFrameItems); return; } // Start background loads during frame construction so that we're // guaranteed that they will be started before onload fires. - styleContext->StartBackgroundImageLoads(); + computedStyle->StartBackgroundImageLoads(); nsFrameState savedStateBits = aState.mAdditionalStateBits; if (item.mIsGeneratedContent) { @@ -6451,8 +6453,8 @@ nsCSSFrameConstructor::IsValidSibling(nsIFrame* aSibling, return false; } // FIXME(emilio): This is buggy some times, see bug 1424656. - RefPtr styleContext = ResolveComputedStyle(aContent); - const nsStyleDisplay* display = styleContext->StyleDisplay(); + RefPtr computedStyle = ResolveComputedStyle(aContent); + const nsStyleDisplay* display = computedStyle->StyleDisplay(); aDisplay = display->mDisplay; } if (LayoutFrameType::Menu == parentType) { @@ -8618,7 +8620,7 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, bool aIsFluid) { nsIPresShell* shell = aPresContext->PresShell(); - ComputedStyle* styleContext = aFrame->Style(); + ComputedStyle* computedStyle = aFrame->Style(); nsIFrame* newFrame = nullptr; nsIFrame* nextContinuation = aFrame->GetNextContinuation(); nsIFrame* nextInFlow = aFrame->GetNextInFlow(); @@ -8631,25 +8633,25 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, "why CreateContinuingFrame for a non-splittable frame?"); if (LayoutFrameType::Text == frameType) { - newFrame = NS_NewContinuingTextFrame(shell, styleContext); + newFrame = NS_NewContinuingTextFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Inline == frameType) { - newFrame = NS_NewInlineFrame(shell, styleContext); + newFrame = NS_NewInlineFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Block == frameType) { MOZ_ASSERT(!aFrame->IsTableCaption(), "no support for fragmenting table captions yet"); - newFrame = NS_NewBlockFrame(shell, styleContext); + newFrame = NS_NewBlockFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); #ifdef MOZ_XUL } else if (LayoutFrameType::XULLabel == frameType) { - newFrame = NS_NewXULLabelFrame(shell, styleContext); + newFrame = NS_NewXULLabelFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); #endif } else if (LayoutFrameType::ColumnSet == frameType) { MOZ_ASSERT(!aFrame->IsTableCaption(), "no support for fragmenting table captions yet"); - newFrame = NS_NewColumnSetFrame(shell, styleContext, nsFrameState(0)); + newFrame = NS_NewColumnSetFrame(shell, computedStyle, nsFrameState(0)); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Page == frameType) { nsContainerFrame* canvasFrame; @@ -8657,21 +8659,21 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, } else if (LayoutFrameType::TableWrapper == frameType) { newFrame = CreateContinuingOuterTableFrame(shell, aPresContext, aFrame, aParentFrame, - content, styleContext); + content, computedStyle); } else if (LayoutFrameType::Table == frameType) { newFrame = CreateContinuingTableFrame(shell, aFrame, aParentFrame, - content, styleContext); + content, computedStyle); } else if (LayoutFrameType::TableRowGroup == frameType) { - newFrame = NS_NewTableRowGroupFrame(shell, styleContext); + newFrame = NS_NewTableRowGroupFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); if (newFrame->GetStateBits() & NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN) { nsTableFrame::RegisterPositionedTablePart(newFrame); } } else if (LayoutFrameType::TableRow == frameType) { - nsTableRowFrame* rowFrame = NS_NewTableRowFrame(shell, styleContext); + nsTableRowFrame* rowFrame = NS_NewTableRowFrame(shell, computedStyle); rowFrame->Init(content, aParentFrame, aFrame); if (rowFrame->GetStateBits() & NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN) { @@ -8701,7 +8703,7 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, nsTableFrame* tableFrame = static_cast(aParentFrame)->GetTableFrame(); nsTableCellFrame* cellFrame = - NS_NewTableCellFrame(shell, styleContext, tableFrame); + NS_NewTableCellFrame(shell, computedStyle, tableFrame); cellFrame->Init(content, aParentFrame, aFrame); if (cellFrame->GetStateBits() & NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN) { @@ -8717,16 +8719,16 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, SetInitialSingleChild(cellFrame, continuingBlockFrame); newFrame = cellFrame; } else if (LayoutFrameType::Line == frameType) { - newFrame = NS_NewFirstLineFrame(shell, styleContext); + newFrame = NS_NewFirstLineFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Letter == frameType) { - newFrame = NS_NewFirstLetterFrame(shell, styleContext); + newFrame = NS_NewFirstLetterFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Image == frameType) { - newFrame = NS_NewImageFrame(shell, styleContext); + newFrame = NS_NewImageFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::ImageControl == frameType) { - newFrame = NS_NewImageControlFrame(shell, styleContext); + newFrame = NS_NewImageControlFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Placeholder == frameType) { // create a continuing out of flow frame @@ -8738,7 +8740,7 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, aParentFrame, aFrame, aFrame->GetStateBits() & PLACEHOLDER_TYPE_MASK); } else if (LayoutFrameType::FieldSet == frameType) { - nsContainerFrame* fieldset = NS_NewFieldSetFrame(shell, styleContext); + nsContainerFrame* fieldset = NS_NewFieldSetFrame(shell, computedStyle); fieldset->Init(content, aParentFrame, aFrame); @@ -8756,25 +8758,25 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext, } newFrame = fieldset; } else if (LayoutFrameType::Legend == frameType) { - newFrame = NS_NewLegendFrame(shell, styleContext); + newFrame = NS_NewLegendFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::FlexContainer == frameType) { - newFrame = NS_NewFlexContainerFrame(shell, styleContext); + newFrame = NS_NewFlexContainerFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::GridContainer == frameType) { - newFrame = NS_NewGridContainerFrame(shell, styleContext); + newFrame = NS_NewGridContainerFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Ruby == frameType) { - newFrame = NS_NewRubyFrame(shell, styleContext); + newFrame = NS_NewRubyFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::RubyBaseContainer == frameType) { - newFrame = NS_NewRubyBaseContainerFrame(shell, styleContext); + newFrame = NS_NewRubyBaseContainerFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::RubyTextContainer == frameType) { - newFrame = NS_NewRubyTextContainerFrame(shell, styleContext); + newFrame = NS_NewRubyTextContainerFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else if (LayoutFrameType::Details == frameType) { - newFrame = NS_NewDetailsFrame(shell, styleContext); + newFrame = NS_NewDetailsFrame(shell, computedStyle); newFrame->Init(content, aParentFrame, aFrame); } else { MOZ_CRASH("unexpected frame type"); @@ -8866,14 +8868,14 @@ nsCSSFrameConstructor::ReplicateFixedFrames(nsPageContentFrame* aParentFrame) // We want to use the same style as the primary style frame for // our content nsIContent* content = fixed->GetContent(); - ComputedStyle* styleContext = + ComputedStyle* computedStyle = nsLayoutUtils::GetStyleFrame(content)->Style(); AutoFrameConstructionItemList items(this); AddFrameConstructionItemsInternal(state, content, canvasFrame, content->NodeInfo()->NameAtom(), content->GetNameSpaceID(), true, - styleContext, + computedStyle, ITEM_ALLOW_XBL_BASE | ITEM_ALLOW_PAGE_BREAK, nullptr, items); @@ -10312,7 +10314,7 @@ nsCSSFrameConstructor::AddFCItemsForAnonymousContent( MOZ_ASSERT(!content->IsStyledByServo() || !content->IsElement() || content->AsElement()->HasServoData()); - RefPtr styleContext = ResolveComputedStyle(content); + RefPtr computedStyle = ResolveComputedStyle(content); nsTArray* anonChildren = nullptr; if (!aAnonymousItems[i].mChildren.IsEmpty()) { @@ -10325,7 +10327,7 @@ nsCSSFrameConstructor::AddFCItemsForAnonymousContent( AddFrameConstructionItemsInternal(aState, content, aFrame, content->NodeInfo()->NameAtom(), content->GetNameSpaceID(), - true, styleContext, flags, + true, computedStyle, flags, anonChildren, aItemsToConstruct); } } @@ -10413,15 +10415,15 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState, // Note that we don't use this style for looking up things like special // block styles because in some cases involving table pseudo-frames it has // nothing to do with the parent frame's desired behavior. - ComputedStyle* styleContext; + ComputedStyle* computedStyle; if (aCanHaveGeneratedContent) { aFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT); - styleContext = + computedStyle = nsFrame::CorrectStyleParentFrame(aFrame, nullptr)->Style(); // Probe for generated content before CreateGeneratedContentItem(aState, aFrame, aContent->AsElement(), - styleContext, CSSPseudoElementType::before, + computedStyle, CSSPseudoElementType::before, itemsToConstruct); } @@ -10465,7 +10467,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState, if (aCanHaveGeneratedContent) { // Probe for generated content after CreateGeneratedContentItem(aState, aFrame, aContent->AsElement(), - styleContext, CSSPseudoElementType::after, + computedStyle, CSSPseudoElementType::after, itemsToConstruct); } } else { @@ -10875,10 +10877,10 @@ nsCSSFrameConstructor::CreateLetterFrame(nsContainerFrame* aBlockFrame, sc = mPresShell->StyleSet()->AsServo()->ReparentComputedStyle( - sc->AsServo(), - parentComputedStyle->AsServo(), - parentIgnoringFirstLine->Style()->AsServo(), - parentComputedStyle->AsServo(), + sc, + parentComputedStyle, + parentIgnoringFirstLine->Style(), + parentComputedStyle, blockContent->AsElement()); } @@ -11290,11 +11292,11 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame, GetFloatContainingBlock(aParentFrame), do_AddRef(mTempFrameTreeState)); - RefPtr styleContext = ResolveComputedStyle(aChild); + RefPtr computedStyle = ResolveComputedStyle(aChild); // Pre-check for display "none" - only if we find that, do we create // any frame at all - const nsStyleDisplay* display = styleContext->StyleDisplay(); + const nsStyleDisplay* display = computedStyle->StyleDisplay(); if (StyleDisplay::None == display->mDisplay) { *aNewFrame = nullptr; @@ -11305,7 +11307,7 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame, AddFrameConstructionItemsInternal(state, aChild, aParentFrame, aChild->NodeInfo()->NameAtom(), aChild->GetNameSpaceID(), - true, styleContext, + true, computedStyle, ITEM_ALLOW_XBL_BASE, nullptr, items); ConstructFramesFromItemList(state, items, aParentFrame, /* aParentIsWrapperAnonBox = */ false, @@ -11476,14 +11478,14 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState, // Text("f") nsIContent* const content = aItem.mContent; - ComputedStyle* const styleContext = aItem.mComputedStyle; + ComputedStyle* const computedStyle = aItem.mComputedStyle; bool positioned = StyleDisplay::Inline == aDisplay->mDisplay && aDisplay->IsRelativelyPositionedStyle() && !nsSVGUtils::IsInSVGTextSubtree(aParentFrame); - nsInlineFrame* newFrame = NS_NewInlineFrame(mPresShell, styleContext); + nsInlineFrame* newFrame = NS_NewInlineFrame(mPresShell, computedStyle); // Initialize the frame InitAndRestoreFrame(aState, content, aParentFrame, newFrame); @@ -11548,7 +11550,7 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState, nsFrameItems& aSiblings) { nsIContent* content = aInitialInline->GetContent(); - ComputedStyle* styleContext = aInitialInline->Style(); + ComputedStyle* computedStyle = aInitialInline->Style(); nsContainerFrame* parentFrame = aInitialInline->GetParent(); // Resolve the right style for our anonymous blocks. @@ -11561,7 +11563,7 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState, // in the inline box. RefPtr blockSC = mPresShell->StyleSet()-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::mozBlockInsideInlineWrapper, - styleContext); + computedStyle); nsContainerFrame* lastNewInline = static_cast(aInitialInline->FirstContinuation()); @@ -11591,7 +11593,7 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState, // Now grab the initial inlines in aChildItems and put them into an inline // frame. - nsInlineFrame* inlineFrame = NS_NewInlineFrame(mPresShell, styleContext); + nsInlineFrame* inlineFrame = NS_NewInlineFrame(mPresShell, computedStyle); InitAndRestoreFrame(aState, content, parentFrame, inlineFrame, false); inlineFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT | NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN); diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 8b144ea56eee..7f876880fed4 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -115,7 +115,6 @@ #include "mozilla/layers/CompositorBridgeChild.h" #include "mozilla/Telemetry.h" #include "mozilla/EventDispatcher.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "mozilla/StyleAnimationValue.h" #include "mozilla/StyleSetHandle.h" #include "mozilla/StyleSetHandleInlines.h" @@ -4684,9 +4683,9 @@ nsLayoutUtils::ComputeObjectDestRect(const nsRect& aConstraintRect, already_AddRefed nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame, float aInflation) { - ComputedStyle* styleContext = aFrame->Style(); + ComputedStyle* computedStyle = aFrame->Style(); uint8_t variantWidth = NS_FONT_VARIANT_WIDTH_NORMAL; - if (styleContext->IsTextCombined()) { + if (computedStyle->IsTextCombined()) { MOZ_ASSERT(aFrame->IsTextFrame()); auto textFrame = static_cast(aFrame); auto clusters = textFrame->CountGraphemeClusters(); @@ -4698,7 +4697,7 @@ nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame, float aInflation) variantWidth = NS_FONT_VARIANT_WIDTH_QUARTER; } } - return GetFontMetricsForComputedStyle(styleContext, aInflation, variantWidth); + return GetFontMetricsForComputedStyle(computedStyle, aInflation, variantWidth); } already_AddRefed diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 96e9f1db89f5..72348a0d835f 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -2220,15 +2220,15 @@ nsPresContext::HasAuthorSpecifiedRules(const nsIFrame* aFrame, return false; } - ComputedStyle* styleContext = aFrame->Style(); - CSSPseudoElementType pseudoType = styleContext->GetPseudoType(); + ComputedStyle* computedStyle = aFrame->Style(); + CSSPseudoElementType pseudoType = computedStyle->GetPseudoType(); // Anonymous boxes are more complicated, and we just assume that they // cannot have any author-specified rules here. if (pseudoType == CSSPseudoElementType::InheritingAnonBox || pseudoType == CSSPseudoElementType::NonInheritingAnonBox) { return false; } - return Servo_HasAuthorSpecifiedRules(styleContext->AsServo(), + return Servo_HasAuthorSpecifiedRules(computedStyle->AsServo(), elem, pseudoType, aRuleTypeMask, UseDocumentColors()); diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 7011f9bfd451..738665031837 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -1386,9 +1386,9 @@ nsComboboxControlFrame::CreateFrameForDisplayNode() nsIPresShell *shell = PresShell(); StyleSetHandle styleSet = shell->StyleSet(); - // create the style contexts for the anonymous block frame and text frame - RefPtr styleContext; - styleContext = styleSet-> + // create the ComputedStyle for the anonymous block frame and text frame + RefPtr computedStyle; + computedStyle = styleSet-> ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::mozDisplayComboboxControlFrame, mComputedStyle); @@ -1397,7 +1397,7 @@ nsComboboxControlFrame::CreateFrameForDisplayNode() styleSet->ResolveStyleForText(mDisplayContent, mComputedStyle); // Start by creating our anonymous block frame - mDisplayFrame = new (shell) nsComboboxDisplayFrame(styleContext, this); + mDisplayFrame = new (shell) nsComboboxDisplayFrame(computedStyle, this); mDisplayFrame->Init(mContent, this, nullptr); // Create a text frame and put it inside the block frame diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp index e96b03f7077f..dadc021b78d9 100644 --- a/layout/forms/nsRangeFrame.cpp +++ b/layout/forms/nsRangeFrame.cpp @@ -220,10 +220,10 @@ nsDisplayRangeFocusRing::GetBounds(nsDisplayListBuilder* aBuilder, // We want to paint as if specifying a border for ::-moz-focus-outer // specifies an outline for our frame, so inflate by the border widths: - ComputedStyle* styleContext = + ComputedStyle* computedStyle = static_cast(mFrame)->mOuterFocusStyle; - MOZ_ASSERT(styleContext, "We only exist if mOuterFocusStyle is non-null"); - rect.Inflate(styleContext->StyleBorder()->GetComputedBorder()); + MOZ_ASSERT(computedStyle, "We only exist if mOuterFocusStyle is non-null"); + rect.Inflate(computedStyle->StyleBorder()->GetComputedBorder()); return rect; } @@ -233,9 +233,9 @@ nsDisplayRangeFocusRing::Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) { bool unused; - ComputedStyle* styleContext = + ComputedStyle* computedStyle = static_cast(mFrame)->mOuterFocusStyle; - MOZ_ASSERT(styleContext, "We only exist if mOuterFocusStyle is non-null"); + MOZ_ASSERT(computedStyle, "We only exist if mOuterFocusStyle is non-null"); PaintBorderFlags flags = aBuilder->ShouldSyncDecodeImages() ? PaintBorderFlags::SYNC_DECODE_IMAGES @@ -244,7 +244,7 @@ nsDisplayRangeFocusRing::Paint(nsDisplayListBuilder* aBuilder, ImgDrawResult result = nsCSSRendering::PaintBorder(mFrame->PresContext(), *aCtx, mFrame, mVisibleRect, GetBounds(aBuilder, &unused), - styleContext, flags); + computedStyle, flags); nsDisplayItemGenericImageGeometry::UpdateDrawResult(this, result); } diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index f8e265d630c4..41efd93196d0 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -104,7 +104,6 @@ #include "mozilla/Preferences.h" #include "mozilla/LookAndFeel.h" #include "mozilla/MouseEvents.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "mozilla/ServoStyleSet.h" #include "mozilla/css/ImageLoader.h" #include "mozilla/gfx/Tools.h" @@ -10721,8 +10720,7 @@ nsIFrame::UpdateStyleOfChildAnonBox(nsIFrame* aChildFrame, // Anon boxes inherit from their parent; that's us. RefPtr newContext = - aRestyleState.StyleSet().ResolveInheritingAnonymousBoxStyle(pseudo, - Style()->AsServo()); + aRestyleState.StyleSet().ResolveInheritingAnonymousBoxStyle(pseudo, Style()); nsChangeHint childHint = UpdateStyleOfOwnedChildFrame(aChildFrame, newContext, aRestyleState); diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 4d11de4f11a2..db98c4839778 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -957,7 +957,7 @@ nsInlineFrame::UpdateStyleOfOwnedAnonBoxesForIBSplit( MOZ_ASSERT(blockFrame, "Why did we have an IB split?"); // The later inlines need to get our style. - ComputedStyle* ourStyle = Style()->AsServo(); + ComputedStyle* ourStyle = Style(); // The anonymous block's style inherits from ours, and we already have our new // style context. diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index 821ba862ee87..5e5dc05e1511 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -5575,16 +5575,16 @@ nsTextFrame::UpdateTextEmphasis(WritingMode aWM, PropertyProvider& aProvider) return nsRect(); } - ComputedStyle* styleContext = Style(); - bool isTextCombined = styleContext->IsTextCombined(); + ComputedStyle* computedStyle = Style(); + bool isTextCombined = computedStyle->IsTextCombined(); if (isTextCombined) { - styleContext = GetParent()->Style(); + computedStyle = GetParent()->Style(); } RefPtr fm = nsLayoutUtils:: - GetFontMetricsOfEmphasisMarks(styleContext, GetFontSizeInflation()); + GetFontMetricsOfEmphasisMarks(computedStyle, GetFontSizeInflation()); EmphasisMarkInfo* info = new EmphasisMarkInfo; info->textRun = - GenerateTextRunForEmphasisMarks(this, fm, styleContext, styleText); + GenerateTextRunForEmphasisMarks(this, fm, computedStyle, styleText); info->advance = info->textRun->GetAdvanceWidth(); // Calculate the baseline offset diff --git a/layout/inspector/InspectorUtils.cpp b/layout/inspector/InspectorUtils.cpp index 2fcdac1fbac5..e16e08ee294b 100644 --- a/layout/inspector/InspectorUtils.cpp +++ b/layout/inspector/InspectorUtils.cpp @@ -168,9 +168,9 @@ InspectorUtils::GetCSSStyleRules(GlobalObject& aGlobalObject, pseudoElt = NS_Atomize(aPseudo); } - RefPtr styleContext = + RefPtr computedStyle = GetCleanComputedStyleForElement(&aElement, pseudoElt); - if (!styleContext) { + if (!computedStyle) { // This can fail for elements that are not in the document or // if the document they're in doesn't have a presshell. Bail out. return; @@ -183,7 +183,7 @@ InspectorUtils::GetCSSStyleRules(GlobalObject& aGlobalObject, return; } - ComputedStyle* servo = styleContext->AsServo(); + ComputedStyle* servo = computedStyle->AsServo(); nsTArray rawRuleList; Servo_ComputedValues_GetStyleRuleList(servo, &rawRuleList); @@ -397,12 +397,7 @@ InspectorUtils::GetCSSPropertyNames(GlobalObject& aGlobalObject, } for ( ; prop < eCSSProperty_COUNT; ++prop) { - // Some shorthands are also aliases - if (aOptions.mIncludeAliases || - !nsCSSProps::PropHasFlags(nsCSSPropertyID(prop), - CSS_PROPERTY_IS_ALIAS)) { - DO_PROP(prop); - } + DO_PROP(prop); } if (aOptions.mIncludeAliases) { @@ -967,9 +962,7 @@ InspectorUtils::GetCleanComputedStyleForElement(dom::Element* aElement, presContext->EnsureSafeToHandOutCSSRules(); - RefPtr styleContext = - nsComputedDOMStyle::GetComputedStyle(aElement, aPseudo); - return styleContext.forget(); + return nsComputedDOMStyle::GetComputedStyle(aElement, aPseudo); } /* static */ void diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp index f3bbea959027..f61fa20fec11 100644 --- a/layout/mathml/nsMathMLChar.cpp +++ b/layout/mathml/nsMathMLChar.cpp @@ -1945,7 +1945,7 @@ void nsDisplayMathMLCharDebug::Paint(nsDisplayListBuilder* aBuilder, // for visual debug Sides skipSides; nsPresContext* presContext = mFrame->PresContext(); - ComputedStyle* styleContext = mFrame->Style(); + ComputedStyle* computedStyle = mFrame->Style(); nsRect rect = mRect + ToReferenceFrame(); PaintBorderFlags flags = aBuilder->ShouldSyncDecodeImages() @@ -1956,10 +1956,10 @@ void nsDisplayMathMLCharDebug::Paint(nsDisplayListBuilder* aBuilder, // tracking the ImgDrawResult. Unused << nsCSSRendering::PaintBorder(presContext, *aCtx, mFrame, mVisibleRect, - rect, styleContext, flags, skipSides); + rect, computedStyle, flags, skipSides); nsCSSRendering::PaintOutline(presContext, *aCtx, mFrame, - mVisibleRect, rect, styleContext); + mVisibleRect, rect, computedStyle); } #endif @@ -1971,19 +1971,20 @@ nsMathMLChar::Display(nsDisplayListBuilder* aBuilder, uint32_t aIndex, const nsRect* aSelectedRect) { - ComputedStyle* parentContext = aForFrame->Style(); - ComputedStyle* styleContext = mComputedStyle; + bool usingParentStyle = false; + ComputedStyle* computedStyle = mComputedStyle; if (mDraw == DRAW_NORMAL) { // normal drawing if there is nothing special about this char - // Set default context to the parent context - styleContext = parentContext; + // Use our parent element's style + usingParentStyle = true; + computedStyle = aForFrame->Style(); } - if (!styleContext->StyleVisibility()->IsVisible()) + if (!computedStyle->StyleVisibility()->IsVisible()) return; - // if the leaf style context that we use for stretchy chars has a background + // if the leaf computed style that we use for stretchy chars has a background // color we use it -- this feature is mostly used for testing and debugging // purposes. Normally, users will set the background on the container frame. // paint the selection background -- beware MathML frames overlap a lot @@ -1992,12 +1993,12 @@ nsMathMLChar::Display(nsDisplayListBuilder* aBuilder, MakeDisplayItem(aBuilder, aForFrame, *aSelectedRect)); } else if (mRect.width && mRect.height) { - if (styleContext != parentContext && - NS_GET_A(styleContext->StyleBackground()-> - BackgroundColor(styleContext)) > 0) { + if (!usingParentStyle && + NS_GET_A(computedStyle->StyleBackground()-> + BackgroundColor(computedStyle)) > 0) { nsDisplayBackgroundImage::AppendBackgroundItemsToTop( aBuilder, aForFrame, mRect, aLists.BorderBackground(), - /* aAllowWillPaintBorderOptimization */ true, styleContext); + /* aAllowWillPaintBorderOptimization */ true, computedStyle); } //else // our container frame will take care of painting its background @@ -2049,18 +2050,17 @@ nsMathMLChar::PaintForeground(nsIFrame* aForFrame, nsPoint aPt, bool aIsSelected) { - ComputedStyle* parentContext = aForFrame->Style(); - ComputedStyle* styleContext = mComputedStyle; + ComputedStyle* computedStyle = mComputedStyle; nsPresContext* presContext = aForFrame->PresContext(); if (mDraw == DRAW_NORMAL) { // normal drawing if there is nothing special about this char - // Set default context to the parent context - styleContext = parentContext; + // Use our parent element's style + computedStyle = aForFrame->Style(); } // Set color ... - nscolor fgColor = styleContext-> + nscolor fgColor = computedStyle-> GetVisitedDependentColor(&nsStyleText::mWebkitTextFillColor); if (aIsSelected) { // get color to use for selection from the look&feel object diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp index 16f17f92c879..71e0adff64ca 100644 --- a/layout/mathml/nsMathMLmtableFrame.cpp +++ b/layout/mathml/nsMathMLmtableFrame.cpp @@ -448,7 +448,7 @@ ExtractSpacingValues(const nsAString& aString, float aFontSizeInflation) { nsPresContext* presContext = aFrame->PresContext(); - ComputedStyle* styleContext = aFrame->Style(); + ComputedStyle* computedStyle = aFrame->Style(); const char16_t* start = aString.BeginReading(); const char16_t* end = aString.EndReading(); @@ -483,7 +483,7 @@ ExtractSpacingValues(const nsAString& aString, } nsMathMLFrame::ParseNumericValue(valueString, &newValue, nsMathMLElement::PARSE_ALLOW_UNITLESS, - presContext, styleContext, + presContext, computedStyle, aFontSizeInflation); aSpacingArray.AppendElement(newValue); diff --git a/layout/painting/ActiveLayerTracker.cpp b/layout/painting/ActiveLayerTracker.cpp index 7859f71b9fa6..4a9d3ec40ba3 100644 --- a/layout/painting/ActiveLayerTracker.cpp +++ b/layout/painting/ActiveLayerTracker.cpp @@ -11,7 +11,6 @@ #include "mozilla/gfx/Matrix.h" #include "mozilla/EffectSet.h" #include "mozilla/PodOperations.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "gfx2DGlue.h" #include "nsExpirationTracker.h" #include "nsContainerFrame.h" diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp index 93eeabb183d1..9ac3024145f2 100644 --- a/layout/painting/nsDisplayList.cpp +++ b/layout/painting/nsDisplayList.cpp @@ -81,7 +81,6 @@ #include "nsCaret.h" #include "nsISelection.h" #include "nsDOMTokenList.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "nsCSSProps.h" #include "nsSVGMaskFrame.h" #include "nsTableCellFrame.h" diff --git a/layout/style/RuleNodeCacheConditions.h b/layout/style/RuleNodeCacheConditions.h deleted file mode 100644 index b617d7a97c41..000000000000 --- a/layout/style/RuleNodeCacheConditions.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* 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/. */ - -/* - * an object that stores the result of determining whether a style struct that - * was computed can be cached in the rule tree, and if so, what the conditions - * it relies on are - */ - -#ifndef RuleNodeCacheConditions_h_ -#define RuleNodeCacheConditions_h_ - - -namespace mozilla { - -// Define this dummy class so there are fewer call sites to change when the old -// style system code is compiled out. -class RuleNodeCacheConditions -{ -}; - -} // namespace mozilla - - -#endif // !defined(RuleNodeCacheConditions_h_) diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp index c51486bc6dab..71d39bafd243 100644 --- a/layout/style/StyleAnimationValue.cpp +++ b/layout/style/StyleAnimationValue.cpp @@ -10,7 +10,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/MathAlgorithms.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "mozilla/ServoBindings.h" #include "mozilla/StyleSetHandle.h" #include "mozilla/StyleSetHandleInlines.h" @@ -230,9 +229,9 @@ AnimationValue::FromString(nsCSSPropertyID aProperty, // GetComputedStyle() flushes style, so we shouldn't assume that any // non-owning references we have are still valid. - RefPtr styleContext = + RefPtr computedStyle = nsComputedDOMStyle::GetComputedStyle(aElement, nullptr); - MOZ_ASSERT(styleContext); + MOZ_ASSERT(computedStyle); RefPtr declarations = ServoCSSParser::ParseProperty(aProperty, aValue, @@ -245,7 +244,7 @@ AnimationValue::FromString(nsCSSPropertyID aProperty, result.mServo = shell->StyleSet()->AsServo()->ComputeAnimationValue(aElement, declarations, - styleContext); + computedStyle); return result; } diff --git a/layout/style/StyleSetHandleInlines.h b/layout/style/StyleSetHandleInlines.h index d6e4f2ae2916..bc8daf53f9a6 100644 --- a/layout/style/StyleSetHandleInlines.h +++ b/layout/style/StyleSetHandleInlines.h @@ -16,10 +16,6 @@ #define FORWARD_CONCRETE(method_, geckoargs_, servoargs_) \ return AsServo()->method_ servoargs_; -#define FORWARD_WITH_PARENT(method_, parent_, args_) \ - auto* parent = parent_ ? parent_->AsServo() : nullptr; \ - return AsServo()->method_ args_; - #define FORWARD(method_, args_) FORWARD_CONCRETE(method_, args_, args_) @@ -81,17 +77,17 @@ StyleSetHandle::Ptr::EndUpdate() // resolve a style context already_AddRefed StyleSetHandle::Ptr::ResolveStyleFor(dom::Element* aElement, - ComputedStyle* aParentContext, + ComputedStyle* aParentStyle, LazyComputeBehavior aMayCompute) { - FORWARD_WITH_PARENT(ResolveStyleFor, aParentContext, (aElement, parent, aMayCompute)); + FORWARD(ResolveStyleFor, (aElement, aParentStyle, aMayCompute)); } already_AddRefed StyleSetHandle::Ptr::ResolveStyleForText(nsIContent* aTextNode, - ComputedStyle* aParentContext) + ComputedStyle* aParentStyle) { - FORWARD_WITH_PARENT(ResolveStyleForText, aParentContext, (aTextNode, parent)); + FORWARD(ResolveStyleForText, (aTextNode, aParentStyle)); } already_AddRefed @@ -101,25 +97,25 @@ StyleSetHandle::Ptr::ResolveStyleForPlaceholder() } already_AddRefed -StyleSetHandle::Ptr::ResolveStyleForFirstLetterContinuation(ComputedStyle* aParentContext) +StyleSetHandle::Ptr::ResolveStyleForFirstLetterContinuation(ComputedStyle* aParentStyle) { - FORWARD_WITH_PARENT(ResolveStyleForFirstLetterContinuation, aParentContext, (parent)); + FORWARD(ResolveStyleForFirstLetterContinuation, (aParentStyle)); } already_AddRefed StyleSetHandle::Ptr::ResolvePseudoElementStyle(dom::Element* aParentElement, CSSPseudoElementType aType, - ComputedStyle* aParentContext, + ComputedStyle* aParentStyle, dom::Element* aPseudoElement) { - FORWARD_WITH_PARENT(ResolvePseudoElementStyle, aParentContext, (aParentElement, aType, parent, aPseudoElement)); + FORWARD(ResolvePseudoElementStyle, (aParentElement, aType, aParentStyle, aPseudoElement)); } already_AddRefed StyleSetHandle::Ptr::ResolveInheritingAnonymousBoxStyle(nsAtom* aPseudoTag, - ComputedStyle* aParentContext) + ComputedStyle* aParentStyle) { - FORWARD_WITH_PARENT(ResolveInheritingAnonymousBoxStyle, aParentContext, (aPseudoTag, parent)); + FORWARD(ResolveInheritingAnonymousBoxStyle, (aPseudoTag, aParentStyle)); } already_AddRefed @@ -132,11 +128,10 @@ StyleSetHandle::Ptr::ResolveNonInheritingAnonymousBoxStyle(nsAtom* aPseudoTag) already_AddRefed StyleSetHandle::Ptr::ResolveXULTreePseudoStyle(dom::Element* aParentElement, nsICSSAnonBoxPseudo* aPseudoTag, - ComputedStyle* aParentContext, + ComputedStyle* aParentStyle, const AtomArray& aInputWord) { - FORWARD_WITH_PARENT(ResolveXULTreePseudoStyle, aParentContext, - (aParentElement, aPseudoTag, parent, aInputWord)); + FORWARD(ResolveXULTreePseudoStyle, (aParentElement, aPseudoTag, aParentStyle, aInputWord)); } #endif @@ -276,9 +271,9 @@ StyleSetHandle::Ptr::InvalidateStyleForCSSRuleChanges() already_AddRefed StyleSetHandle::Ptr::ProbePseudoElementStyle(dom::Element* aParentElement, CSSPseudoElementType aType, - ComputedStyle* aParentContext) + ComputedStyle* aParentStyle) { - FORWARD_WITH_PARENT(ProbePseudoElementStyle, aParentContext, (aParentElement, aType, parent)); + FORWARD(ProbePseudoElementStyle, (aParentElement, aType, aParentStyle)); } void diff --git a/layout/style/moz.build b/layout/style/moz.build index bb3135a3e1d9..8fee55879ab9 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -83,7 +83,6 @@ EXPORTS.mozilla += [ 'MediaFeatureChange.h', 'PostTraversalTask.h', 'PreloadedStyleSheet.h', - 'RuleNodeCacheConditions.h', 'ServoArcTypeList.h', 'ServoBindingList.h', 'ServoBindings.h', diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 84a8e992479b..21e276a560e0 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -331,11 +331,6 @@ nsCSSProps::BuildShorthandsContainingTable() subpropCounts[shorthand - eCSSProperty_COUNT_no_shorthands]; subpropCountsEntry.property = shorthand; subpropCountsEntry.count = 0; - if (nsCSSProps::PropHasFlags(shorthand, CSS_PROPERTY_IS_ALIAS)) { - // Don't put shorthands that are acting as aliases in the - // shorthands-containing lists. - continue; - } for (const nsCSSPropertyID* subprops = SubpropertyEntryFor(shorthand); *subprops != eCSSProperty_UNKNOWN; ++subprops) { @@ -395,12 +390,6 @@ nsCSSProps::BuildShorthandsContainingTable() shorthandAndCount->count, nsCSSProps::GetStringValue(shorthandAndCount->property).get()); #endif - if (nsCSSProps::PropHasFlags(shorthandAndCount->property, - CSS_PROPERTY_IS_ALIAS)) { - // Don't put shorthands that are acting as aliases in the - // shorthands-containing lists. - continue; - } for (const nsCSSPropertyID* subprops = SubpropertyEntryFor(shorthandAndCount->property); *subprops != eCSSProperty_UNKNOWN; @@ -429,11 +418,6 @@ nsCSSProps::BuildShorthandsContainingTable() for (nsCSSPropertyID shorthand = eCSSProperty_COUNT_no_shorthands; shorthand < eCSSProperty_COUNT; shorthand = nsCSSPropertyID(shorthand + 1)) { - if (nsCSSProps::PropHasFlags(shorthand, CSS_PROPERTY_IS_ALIAS)) { - // Don't put shorthands that are acting as aliases in the - // shorthands-containing lists. - continue; - } for (const nsCSSPropertyID* subprops = SubpropertyEntryFor(shorthand); *subprops != eCSSProperty_UNKNOWN; ++subprops) { diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h index 80288336a08b..a651387f85f6 100644 --- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -204,8 +204,7 @@ static_assert((CSS_PROPERTY_PARSE_PROPERTY_MASK & // Does this property support the unitless length quirk in quirks mode? #define CSS_PROPERTY_UNITLESS_LENGTH_QUIRK (1<<16) -// Is this property (which must be a shorthand) really an alias? -#define CSS_PROPERTY_IS_ALIAS (1<<17) +// There's a free bit here. // Does the property apply to ::placeholder? #define CSS_PROPERTY_APPLIES_TO_PLACEHOLDER (1<<18) diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index 0b186688614c..cbc788de6281 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -1920,7 +1920,6 @@ nsCSSValue::AppendToString(nsCSSPropertyID aProperty, } else if (eCSSUnit_TokenStream == unit) { nsCSSPropertyID shorthand = mValue.mTokenStream->mShorthandPropertyID; if (shorthand == eCSSProperty_UNKNOWN || - nsCSSProps::PropHasFlags(shorthand, CSS_PROPERTY_IS_ALIAS) || aProperty == eCSSProperty__x_system_font) { // We treat serialization of aliases like '-moz-transform' as a special // case, since it really wants to be serialized as if it were a longhand diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 493a6e250705..d63001870993 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -71,12 +71,10 @@ using namespace mozilla::dom; already_AddRefed NS_NewComputedDOMStyle(dom::Element* aElement, const nsAString& aPseudoElt, nsIPresShell* aPresShell, - nsComputedDOMStyle::StyleType aStyleType, - nsComputedDOMStyle::AnimationFlag aFlag) + nsComputedDOMStyle::StyleType aStyleType) { - RefPtr computedStyle; - computedStyle = new nsComputedDOMStyle(aElement, aPseudoElt, - aPresShell, aStyleType, aFlag); + RefPtr computedStyle = + new nsComputedDOMStyle(aElement, aPseudoElt, aPresShell, aStyleType); return computedStyle.forget(); } @@ -151,28 +149,24 @@ DocumentNeedsRestyle( } } - if (styleSet->IsServo()) { - // For Servo, we need to process the restyle-hint-invalidations first, to - // expand LaterSiblings hint, so that we can look whether ancestors need - // restyling. - ServoRestyleManager* restyleManager = - presContext->RestyleManager()->AsServo(); - restyleManager->ProcessAllPendingAttributeAndStateInvalidations(); + // For Servo, we need to process the restyle-hint-invalidations first, to + // expand LaterSiblings hint, so that we can look whether ancestors need + // restyling. + ServoRestyleManager* restyleManager = + presContext->RestyleManager()->AsServo(); + restyleManager->ProcessAllPendingAttributeAndStateInvalidations(); - if (!presContext->EffectCompositor()->HasPendingStyleUpdates() && - !aDocument->GetServoRestyleRoot()) { - return false; - } - - // Then if there is a restyle root, we check if the root is an ancestor of - // this content. If it is not, then we don't need to restyle immediately. - // Note this is different from Gecko: we only check if any ancestor needs - // to restyle _itself_, not descendants, since dirty descendants can be - // another subtree. - return restyleManager->HasPendingRestyleAncestor(aElement); + if (!presContext->EffectCompositor()->HasPendingStyleUpdates() && + !aDocument->GetServoRestyleRoot()) { + return false; } - MOZ_CRASH("old style system disabled"); + // Then if there is a restyle root, we check if the root is an ancestor of + // this content. If it is not, then we don't need to restyle immediately. + // Note this is different from Gecko: we only check if any ancestor needs + // to restyle _itself_, not descendants, since dirty descendants can be + // another subtree. + return restyleManager->HasPendingRestyleAncestor(aElement); } /** @@ -321,8 +315,7 @@ ComputedStyleMap::Update() nsComputedDOMStyle::nsComputedDOMStyle(dom::Element* aElement, const nsAString& aPseudoElt, nsIPresShell* aPresShell, - StyleType aStyleType, - AnimationFlag aFlag) + StyleType aStyleType) : mDocumentWeak(nullptr) , mOuterFrame(nullptr) , mInnerFrame(nullptr) @@ -331,7 +324,6 @@ nsComputedDOMStyle::nsComputedDOMStyle(dom::Element* aElement, , mComputedStyleGeneration(0) , mExposeVisitedStyle(false) , mResolvedComputedStyle(false) - , mAnimationFlag(aFlag) { MOZ_ASSERT(aElement && aPresShell); MOZ_ASSERT(aPresShell->GetPresContext()); @@ -425,7 +417,7 @@ nsComputedDOMStyle::Length() // properties. UpdateCurrentStyleSources(false); if (mComputedStyle) { - length += Servo_GetCustomPropertiesCount(mComputedStyle->AsServo()); + length += Servo_GetCustomPropertiesCount(mComputedStyle); } ClearCurrentStyleSources(); @@ -511,16 +503,7 @@ nsComputedDOMStyle::DoGetComputedStyleNoFlush(Element* aElement, if (!presShell) { inDocWithShell = false; presShell = aPresShell; - if (!presShell) - return nullptr; - - // In some edge cases, the caller document might be using a different style - // backend than the callee. This causes problems because the cached parsed - // style attributes in the callee document will be a different format than - // the caller expects. Supporting this would be a pain, and we're already - // in edge-case-squared, so we just return. - if (presShell->GetDocument()->GetStyleBackendType() != - aElement->OwnerDoc()->GetStyleBackendType()) { + if (!presShell) { return nullptr; } } @@ -565,21 +548,16 @@ nsComputedDOMStyle::DoGetComputedStyleNoFlush(Element* aElement, // The existing style may have animation styles so check if we need to // remove them. if (aAnimationFlag == eWithoutAnimation) { - nsPresContext* presContext = presShell->GetPresContext(); - MOZ_ASSERT(presContext, "Should have a prescontext if we have a frame"); - if (presContext && presContext->StyleSet()->IsGecko()) { - MOZ_CRASH("old style system disabled"); - } else { - Element* elementOrPseudoElement = - EffectCompositor::GetElementToRestyle(aElement, pseudoType); - if (!elementOrPseudoElement) { - return nullptr; - } - return presContext->StyleSet()->AsServo()-> - GetBaseContextForElement(elementOrPseudoElement, - presContext, - result->AsServo()); + nsPresContext* presContext = frame->PresContext(); + Element* elementOrPseudoElement = + EffectCompositor::GetElementToRestyle(aElement, pseudoType); + if (!elementOrPseudoElement) { + return nullptr; } + return presContext->StyleSet()->AsServo()-> + GetBaseContextForElement(elementOrPseudoElement, + presContext, + result); } RefPtr ret = result; @@ -592,8 +570,9 @@ nsComputedDOMStyle::DoGetComputedStyleNoFlush(Element* aElement, // for the default style, so resolve the style ourselves. nsPresContext* presContext = presShell->GetPresContext(); - if (!presContext) + if (!presContext) { return nullptr; + } ServoStyleSet* styleSet = presShell->StyleSet()->AsServo(); @@ -760,6 +739,7 @@ nsComputedDOMStyle::GetCSSImageURLs(const nsAString& aPropertyName, } CollectImageURLsForProperty(prop, *mComputedStyle, aImageURLs); + ClearCurrentStyleSources(); } // nsDOMCSSDeclaration abstract methods which should never be called @@ -989,17 +969,12 @@ nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush) "should not have pseudo-element data"); } - if (mAnimationFlag == eWithoutAnimation) { - MOZ_CRASH("old style system disabled"); - } - // mExposeVisitedStyle is set to true only by testing APIs that // require chrome privilege. MOZ_ASSERT(!mExposeVisitedStyle || nsContentUtils::IsCallerChrome(), "mExposeVisitedStyle set incorrectly"); if (mExposeVisitedStyle && mComputedStyle->RelevantLinkVisited()) { - ComputedStyle *styleIfVisited = mComputedStyle->GetStyleIfVisited(); - if (styleIfVisited) { + if (ComputedStyle* styleIfVisited = mComputedStyle->GetStyleIfVisited()) { mComputedStyle = styleIfVisited; } } @@ -1047,19 +1022,6 @@ nsComputedDOMStyle::GetPropertyCSSValueWithoutWarning( needsLayoutFlush = false; getter = nullptr; } else { - // We don't (for now, anyway, though it may make sense to change it - // for all aliases, including those in nsCSSPropAliasList) want - // aliases to be enumerable (via GetLength and IndexedGetter), so - // handle them here rather than adding entries to - // GetQueryablePropertyMap. - if (prop != eCSSProperty_UNKNOWN && - nsCSSProps::PropHasFlags(prop, CSS_PROPERTY_IS_ALIAS)) { - const nsCSSPropertyID* subprops = nsCSSProps::SubpropertyEntryFor(prop); - MOZ_ASSERT(subprops[1] == eCSSProperty_UNKNOWN, - "must have list of length 1"); - prop = subprops[0]; - } - const ComputedStyleMap::Entry* propEntry = GetComputedStyleMap()->FindEntryForProperty(prop); @@ -1150,7 +1112,7 @@ nsComputedDOMStyle::IndexedGetter(uint32_t aIndex, if (index < count) { aFound = true; nsString varName; - Servo_GetCustomPropertyNameAt(mComputedStyle->AsServo(), index, &varName); + Servo_GetCustomPropertyNameAt(mComputedStyle, index, &varName); aPropName.AssignLiteral("--"); aPropName.Append(varName); } else { @@ -7168,8 +7130,7 @@ nsComputedDOMStyle::DoGetCustomProperty(const nsAString& aPropertyName) const nsAString& name = Substring(aPropertyName, CSS_CUSTOM_NAME_PREFIX_LENGTH); bool present = - Servo_GetCustomPropertyValue(mComputedStyle->AsServo(), &name, - &variableValue); + Servo_GetCustomPropertyValue(mComputedStyle, &name, &variableValue); if (!present) { return nullptr; } diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h index f3b150031094..380570c7d39e 100644 --- a/layout/style/nsComputedDOMStyle.h +++ b/layout/style/nsComputedDOMStyle.h @@ -94,8 +94,7 @@ public: nsComputedDOMStyle(mozilla::dom::Element* aElement, const nsAString& aPseudoElt, nsIPresShell* aPresShell, - StyleType aStyleType, - AnimationFlag aFlag = eWithAnimation); + StyleType aStyleType); virtual nsINode *GetParentObject() override { @@ -801,11 +800,6 @@ private: */ bool mResolvedComputedStyle; - /** - * Whether we include animation rules in the computed style. - */ - AnimationFlag mAnimationFlag; - #ifdef DEBUG bool mFlushedPendingReflows; #endif @@ -816,8 +810,6 @@ NS_NewComputedDOMStyle(mozilla::dom::Element* aElement, const nsAString& aPseudoElt, nsIPresShell* aPresShell, nsComputedDOMStyle::StyleType aStyleType = - nsComputedDOMStyle::eAll, - nsComputedDOMStyle::AnimationFlag aFlag = - nsComputedDOMStyle::eWithAnimation); + nsComputedDOMStyle::eAll); #endif /* nsComputedDOMStyle_h__ */ diff --git a/layout/style/nsStyleTransformMatrix.cpp b/layout/style/nsStyleTransformMatrix.cpp index d9cd6b29e17b..9ed7876f0fed 100644 --- a/layout/style/nsStyleTransformMatrix.cpp +++ b/layout/style/nsStyleTransformMatrix.cpp @@ -14,7 +14,6 @@ #include "nsPresContext.h" #include "nsSVGUtils.h" #include "nsCSSKeywords.h" -#include "mozilla/RuleNodeCacheConditions.h" #include "mozilla/ServoBindings.h" #include "mozilla/StyleAnimationValue.h" #include "gfxMatrix.h" diff --git a/layout/style/nsStyleTransformMatrix.h b/layout/style/nsStyleTransformMatrix.h index 2334c53941ab..14a76f29facf 100644 --- a/layout/style/nsStyleTransformMatrix.h +++ b/layout/style/nsStyleTransformMatrix.h @@ -23,9 +23,6 @@ class nsIFrame; class nsPresContext; struct gfxQuaternion; struct nsRect; -namespace mozilla { -class RuleNodeCacheConditions; -} // namespace mozilla /** * A helper to generate gfxMatrixes from css transform functions. diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index ae5376034d59..292cf5bfbbd6 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -734,19 +734,16 @@ nsTableFrame::AppendAnonymousColFrames(nsTableColGroupFrame* aColGroupFrame, int32_t lastIndex = startIndex + aNumColsToAdd - 1; for (int32_t childX = startIndex; childX <= lastIndex; childX++) { - nsIContent* iContent; - RefPtr styleContext; - // all anonymous cols that we create here use a pseudo style context of the // col group - iContent = aColGroupFrame->GetContent(); - styleContext = shell->StyleSet()-> + nsIContent* iContent = aColGroupFrame->GetContent(); + RefPtr computedStyle = shell->StyleSet()-> ResolveNonInheritingAnonymousBoxStyle(nsCSSAnonBoxes::tableCol); // ASSERTION to check for bug 54454 sneaking back in... NS_ASSERTION(iContent, "null content in CreateAnonymousColFrames"); // create the new col frame - nsIFrame* colFrame = NS_NewTableColFrame(shell, styleContext); + nsIFrame* colFrame = NS_NewTableColFrame(shell, computedStyle); ((nsTableColFrame *) colFrame)->SetColType(aColType); colFrame->Init(iContent, aColGroupFrame, nullptr); @@ -8185,9 +8182,9 @@ nsTableFrame::UpdateStyleOfOwnedAnonBoxesForTableWrapper( nsCSSAnonBoxes::tableWrapper, "What happened to our parent?"); - RefPtr newContext = + RefPtr newStyle = aRestyleState.StyleSet().ResolveInheritingAnonymousBoxStyle( - nsCSSAnonBoxes::tableWrapper, aOwningFrame->Style()->AsServo()); + nsCSSAnonBoxes::tableWrapper, aOwningFrame->Style()); // Figure out whether we have an actual change. It's important that we do // this, even though all the wrapper's changes are due to properties it @@ -8204,7 +8201,7 @@ nsTableFrame::UpdateStyleOfOwnedAnonBoxesForTableWrapper( // compared to the owner frame. uint32_t equalStructs, samePointerStructs; // Not used, actually. nsChangeHint wrapperHint = aWrapperFrame->Style()->CalcStyleDifference( - newContext, + newStyle, &equalStructs, &samePointerStructs, /* aIgnoreVariables = */ true); @@ -8222,7 +8219,7 @@ nsTableFrame::UpdateStyleOfOwnedAnonBoxesForTableWrapper( } for (nsIFrame* cur = aWrapperFrame; cur; cur = cur->GetNextContinuation()) { - cur->SetComputedStyle(newContext); + cur->SetComputedStyle(newStyle); } MOZ_ASSERT(!(aWrapperFrame->GetStateBits() & NS_FRAME_OWNS_ANON_BOXES), diff --git a/layout/xul/nsListBoxBodyFrame.cpp b/layout/xul/nsListBoxBodyFrame.cpp index abb6613265f2..7cf85528b922 100644 --- a/layout/xul/nsListBoxBodyFrame.cpp +++ b/layout/xul/nsListBoxBodyFrame.cpp @@ -714,17 +714,17 @@ nsListBoxBodyFrame::ComputeIntrinsicISize(nsBoxLayoutState& aBoxLayoutState) if (firstRowContent) { nsPresContext* presContext = aBoxLayoutState.PresContext(); - RefPtr styleContext = + RefPtr computedStyle = presContext->StyleSet()->ResolveStyleFor( firstRowContent->AsElement(), nullptr, LazyComputeBehavior::Allow); nscoord width = 0; nsMargin margin(0,0,0,0); - if (styleContext->StylePadding()->GetPadding(margin)) + if (computedStyle->StylePadding()->GetPadding(margin)) width += margin.LeftRight(); - width += styleContext->StyleBorder()->GetComputedBorder().LeftRight(); - if (styleContext->StyleMargin()->GetMargin(margin)) + width += computedStyle->StyleBorder()->GetComputedBorder().LeftRight(); + if (computedStyle->StyleMargin()->GetMargin(margin)) width += margin.LeftRight(); FlattenedChildIterator iter(mContent); @@ -741,7 +741,7 @@ nsListBoxBodyFrame::ComputeIntrinsicISize(nsBoxLayoutState& aBoxLayoutState) } RefPtr fm = - nsLayoutUtils::GetFontMetricsForComputedStyle(styleContext); + nsLayoutUtils::GetFontMetricsForComputedStyle(computedStyle); nscoord textWidth = nsLayoutUtils::AppUnitWidthOfStringBidi(value, this, *fm, diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index c6758cc3e502..6aac9e19670d 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1163,4 +1163,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1530430700215000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1530476950125000); diff --git a/security/manager/ssl/nsSTSPreloadList.errors b/security/manager/ssl/nsSTSPreloadList.errors index 04f6d5f42e07..cea7ca3cb2a6 100644 --- a/security/manager/ssl/nsSTSPreloadList.errors +++ b/security/manager/ssl/nsSTSPreloadList.errors @@ -16,6 +16,7 @@ 135vv.com: could not connect to host 13826145000.com: could not connect to host 16164f.com: could not connect to host +166166.com: could not connect to host 168bet9.com: could not connect to host 1888zr.com: could not connect to host 1912x.com: could not connect to host @@ -70,6 +71,7 @@ 99buffets.com: could not connect to host a-intel.com: could not connect to host a-ix.net: could not connect to host +a7m2.me: could not connect to host aaron.xin: could not connect to host abi-fvs.de: could not connect to host abigailstark.com: could not connect to host @@ -99,7 +101,6 @@ advaithnikhi.tk: could not connect to host advanced-online.eu: could not connect to host adventistdeploy.org: could not connect to host adzie.xyz: could not connect to host -aerobotz.com: could not connect to host aevpn.org: could not connect to host affiliateroyale.com: could not connect to host affily.io: could not connect to host @@ -152,6 +153,7 @@ amua.fr: could not connect to host amunoz.org: could not connect to host anadoluefessk.org: could not connect to host analyzemyfriends.com: could not connect to host +anassiriphotography.com: could not connect to host anastasia-shamara.ru: could not connect to host andreas-kluge.eu: could not connect to host andreaskluge.eu: could not connect to host @@ -168,10 +170,12 @@ angrydragonproductions.com: could not connect to host anitube-nocookie.ch: could not connect to host anivar.net: could not connect to host annetaan.fi: could not connect to host +another.ch: could not connect to host anotherfatgeek.net: could not connect to host anshumanbiswas.com: could not connect to host antimatiere.space: could not connect to host anyways.at: could not connect to host +aobogo.com: could not connect to host aojiao.org: could not connect to host apkoyunlar.club: could not connect to host appdrinks.com: could not connect to host @@ -197,7 +201,6 @@ articaexports.com: could not connect to host artisense.de: could not connect to host artisticedgegranite.net: could not connect to host artofeyes.nl: could not connect to host -aserver.co: could not connect to host ashleyadum.com: could not connect to host asphaltfruehling.de: could not connect to host asphyxia.su: could not connect to host @@ -206,6 +209,7 @@ asral7.com: could not connect to host assdecoeur.org: could not connect to host assetsupervision.com: could not connect to host assindia.nl: could not connect to host +asspinter.me: could not connect to host asthon.cn: could not connect to host astrath.net: could not connect to host astrea-voetbal-groningen.nl: could not connect to host @@ -218,8 +222,6 @@ atigerseye.com: could not connect to host atlas-5.site: could not connect to host aufmerksamkeitsstudie.com: could not connect to host augix.net: could not connect to host -aur.rocks: could not connect to host -auri.ga: could not connect to host ausec.ch: could not connect to host ausschreibungen-suedtirol.it: could not connect to host austinsutphin.com: could not connect to host @@ -234,7 +236,6 @@ autozane.com: could not connect to host avaq.fr: could not connect to host avdelivers.com: could not connect to host avenueeyecare.com: could not connect to host -avi9526.pp.ua: could not connect to host avmo.pw: could not connect to host avonlearningcampus.com: could not connect to host avso.pw: could not connect to host @@ -246,8 +247,6 @@ awxg.eu.org: could not connect to host axel-fischer.science: could not connect to host axxial.tk: could not connect to host b-landia.net: could not connect to host -b72.com: could not connect to host -b72.net: could not connect to host b9winner.com: could not connect to host babelfisch.eu: could not connect to host babystep.tv: could not connect to host @@ -291,7 +290,6 @@ benjamin-horvath.com: could not connect to host benjamin-suess.de: could not connect to host benjaminblack.net: could not connect to host benzou-space.com: could not connect to host -berdaguermontes.eu: could not connect to host berduri.com: could not connect to host berlin-kohlefrei.de: could not connect to host berry.cat: could not connect to host @@ -319,7 +317,6 @@ biocrafting.net: could not connect to host biou.me: could not connect to host biovalue.eu: could not connect to host bip.gov.sa: could not connect to host -bischoff-mathey.family: could not connect to host biscuits-rec.com: could not connect to host biscuits-shop.com: could not connect to host biswas.me: could not connect to host @@ -368,6 +365,7 @@ bragaweb.com.br: could not connect to host brage.info: could not connect to host braintensive.com: could not connect to host brandontaylor-black.com: could not connect to host +brendanscherer.com: could not connect to host brianmwaters.net: could not connect to host brideandgroomdirect.ie: could not connect to host bridgeout.com: could not connect to host @@ -377,7 +375,6 @@ brookframework.org: could not connect to host brrr.fr: could not connect to host brynnan.nl: could not connect to host bsalyzer.com: could not connect to host -bsg-aok-muenchen.de: could not connect to host bsktweetup.info: could not connect to host bslim-e-boutique.com: could not connect to host bsuess.de: could not connect to host @@ -421,7 +418,6 @@ calleveryday.com: could not connect to host callsigns.ca: could not connect to host calories.org: could not connect to host calypso-tour.net: could not connect to host -camarilloelectrical.com: could not connect to host camda.online: could not connect to host campaign-ad.com: could not connect to host campingcarlovers.com: could not connect to host @@ -442,7 +438,6 @@ casjay.us: could not connect to host catcontent.cloud: could not connect to host catsmagic.pp.ua: could not connect to host caughtredhanded.co.nz: could not connect to host -cbdev.de: could not connect to host ccayearbook.com: could not connect to host ccl-sti.ch: could not connect to host ccprwebsite.org: could not connect to host @@ -511,6 +506,7 @@ cmcc.network: could not connect to host cmrss.com: could not connect to host cms-weble.jp: could not connect to host cmweller.com: could not connect to host +cnaprograms.online: could not connect to host cnetw.xyz: could not connect to host cnlic.com: could not connect to host cnwage.com: could not connect to host @@ -531,9 +527,11 @@ collins.kg: could not connect to host coltonrb.com: could not connect to host com-in.de: could not connect to host com.cc: could not connect to host +comalia.com: could not connect to host combatshield.cz: could not connect to host comicrelief.com: could not connect to host comiq.io: could not connect to host +communityflow.info: could not connect to host compeuphoria.com: could not connect to host complex-organization.com: could not connect to host complt.xyz: could not connect to host @@ -542,7 +540,6 @@ conception.sk: could not connect to host conniesacademy.com: could not connect to host conrad.am: could not connect to host constructive.men: could not connect to host -consumeractionlawgroup.com: could not connect to host corecdn.org: could not connect to host corinnanese.de: could not connect to host correct.horse: could not connect to host @@ -644,7 +641,6 @@ detectefuite.ch: could not connect to host devdesco.com: could not connect to host developersclub.website: could not connect to host devops.moe: could not connect to host -dezet-ev.de: could not connect to host dezintranet.com: could not connect to host dfixit.com: could not connect to host dharamkot.com: could not connect to host @@ -693,6 +689,7 @@ dna.li: could not connect to host dnfc.rocks: could not connect to host dnmaze.com: could not connect to host dobrisan.ro: could not connect to host +docline.gov: could not connect to host doctafit.com: could not connect to host docubox.info: could not connect to host doesmycodehavebugs.today: could not connect to host @@ -726,9 +723,6 @@ drizz.com.br: could not connect to host drobniuch.pl: could not connect to host drogoz.moe: could not connect to host droomhuis-in-zuid-holland-kopen.nl: could not connect to host -dtg-fonds.com: could not connect to host -dtg-fonds.de: could not connect to host -dtg-fonds.net: could not connect to host duch.cloud: could not connect to host duckyubuntu.tk: could not connect to host duelsow.eu: could not connect to host @@ -739,7 +733,6 @@ duo.money: could not connect to host durangoenergyllc.com: could not connect to host dwnld.me: could not connect to host dynamic-networks.be: could not connect to host -dzet.de: could not connect to host e-mak.eu: could not connect to host e-wishlist.net: could not connect to host eagle-yard.de: could not connect to host @@ -752,6 +745,7 @@ eccux.com: could not connect to host ectora.com: could not connect to host ecupcafe.com: could not connect to host edgecustomersportal.com: could not connect to host +edp-collaborative.com: could not connect to host educatoys.com.br: could not connect to host eduif.nl: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 116" data: no] eeb98.com: could not connect to host @@ -768,11 +762,9 @@ ekobudisantoso.net: could not connect to host ekong366.com: could not connect to host electricalcontrolpanels.co.uk: could not connect to host elenorsmadness.org: could not connect to host -elepover.com: could not connect to host elevateandprosper.com: could not connect to host elexel.ru: could not connect to host elitesensual.com.br: could not connect to host -ellegaard.dk: could not connect to host elonbase.com: could not connect to host elsword.moe: could not connect to host eltransportquevolem.org: could not connect to host @@ -792,6 +784,7 @@ enoou.com: could not connect to host enpalmademallorca.info: could not connect to host enskat.de: could not connect to host enskatson-sippe.de: could not connect to host +enteente.com: could not connect to host envelope.co.nz: could not connect to host eolme.ml: could not connect to host epichouse.net: could not connect to host @@ -812,6 +805,7 @@ euexia.fr: could not connect to host eung.ga: could not connect to host euph.eu: could not connect to host eurostrategy.vn.ua: could not connect to host +eurotime.ua: could not connect to host evankurniawan.com: could not connect to host evasioncreole.com: could not connect to host eventaro.com: could not connect to host @@ -924,6 +918,7 @@ freshcode.nl: could not connect to host frickenate.com: could not connect to host friedhelm-wolf.de: could not connect to host frodriguez.xyz: could not connect to host +frogeye.fr: could not connect to host frolov.net: could not connect to host fromlemaytoz.com: could not connect to host frosty-gaming.xyz: could not connect to host @@ -982,7 +977,6 @@ generationnext.pl: could not connect to host geneve.guide: could not connect to host genia-life.de: could not connect to host genoog.com: could not connect to host -georgescarryout.com: could not connect to host gerardobsd.com: could not connect to host geri.be: could not connect to host gers-authentique.com: could not connect to host @@ -1015,7 +1009,6 @@ globalvisions-events.ch: could not connect to host glutenfreelife.co.nz: could not connect to host glyph.ws: could not connect to host gmanukyan.com: could not connect to host -gmind.ovh: could not connect to host gmpartsdb.com: could not connect to host gnom.me: could not connect to host gnosticjade.net: could not connect to host @@ -1050,6 +1043,7 @@ grusenmeyer.be: could not connect to host guendra.dedyn.io: could not connect to host gugaltika-ipb.org: could not connect to host guinea-pig.co: could not connect to host +gummibande.noip.me: could not connect to host gunhunter.com: could not connect to host gus.moe: could not connect to host gutuia.blue: could not connect to host @@ -1175,6 +1169,7 @@ iamsoareyou.se: could not connect to host ibron.co: could not connect to host ibsafrica.co.za: could not connect to host ibsglobal.co.za: could not connect to host +icebound.win: could not connect to host iceloch.com: could not connect to host ictpro.info: could not connect to host icusignature.com: could not connect to host @@ -1276,7 +1271,6 @@ jasonwindholz.com: could not connect to host javascriptlab.fr: could not connect to host jazzinutrecht.info: could not connect to host jbbd.fr: could not connect to host -jbrowndesign.me: could not connect to host jccars-occasions.be: could not connect to host jccrew.org: could not connect to host jcraft.us: could not connect to host @@ -1302,7 +1296,6 @@ jonathansanchez.pro: could not connect to host jonfor.net: could not connect to host jooto.com: could not connect to host jornadasciberdefensa2016.es: could not connect to host -joshharkema.com: could not connect to host jpod.cc: could not connect to host jsjyhzy.cc: could not connect to host juliaoantiguidades.com.br: could not connect to host @@ -1314,6 +1307,7 @@ just-pools.co.za: could not connect to host justinharrison.ca: could not connect to host justzz.xyz: could not connect to host juventusmania1897.com: could not connect to host +kabus.org: could not connect to host kaigojj.com: could not connect to host kaika-facilitymanagement.de: could not connect to host kainz.be: could not connect to host @@ -1322,7 +1316,6 @@ kaloix.de: could not connect to host kamalame.co: could not connect to host kamitech.ch: could not connect to host kancolle.me: could not connect to host -kandalife.com: could not connect to host kanganer.com: could not connect to host kangzaber.com: could not connect to host kapo.info: could not connect to host @@ -1337,7 +1330,6 @@ keezin.ga: could not connect to host kellyandantony.com: could not connect to host kelm.me: could not connect to host kermadec.com: could not connect to host -kerp.se: could not connect to host keshausconsulting.com: could not connect to host kevindekoninck.com: could not connect to host kevinfoley.cc: could not connect to host @@ -1475,7 +1467,6 @@ litcomphonors.com: could not connect to host littlelundgrenladies.com: could not connect to host liukang.tech: could not connect to host llvm.us: could not connect to host -lmtm.eu: could not connect to host loanstreet.be: could not connect to host lobosdomain.no-ip.info: could not connect to host locker3.com: could not connect to host @@ -1520,13 +1511,11 @@ maartenterpstra.xyz: could not connect to host mach-politik.ch: could not connect to host madeintucson.org: could not connect to host madnetwork.org: could not connect to host -magicball.co: could not connect to host magnacumlaude.co: could not connect to host maik-mahlow.de: could not connect to host mail4geek.com: could not connect to host mailon.ga: could not connect to host makeit-so.de: could not connect to host -makemejob.com: could not connect to host makeuplove.nl: could not connect to host malamutedoalasca.com.br: could not connect to host malesbdsm.com: could not connect to host @@ -1534,7 +1523,6 @@ malgraph.net: could not connect to host mamastore.eu: could not connect to host mannford.com: could not connect to host manova.cz: could not connect to host -manuel-schefczyk.de: could not connect to host marcelmarnitz.com: could not connect to host marche-nordic-jorat.ch: could not connect to host mardelcupon.com: could not connect to host @@ -1554,10 +1542,10 @@ mastodon.expert: could not connect to host mastodon.my: could not connect to host mat99.dk: could not connect to host matarrosabierzo.com: could not connect to host -matheo-schefczyk.de: could not connect to host mathijskingma.nl: could not connect to host matrix.ac: could not connect to host matthey.nl: could not connect to host +maxhoechtl.at: could not connect to host maxpl0it.com: could not connect to host maybeul.com: could not connect to host maynardnetworks.com: could not connect to host @@ -1586,7 +1574,6 @@ megadrol.com: could not connect to host meizufans.eu: could not connect to host melenchatsmelenchiens.fr: could not connect to host melhorproduto.com.br: could not connect to host -melina-schefczyk.de: could not connect to host melodic.com.au: could not connect to host melody-lyrics.com: could not connect to host melonstudios.net: could not connect to host @@ -1602,8 +1589,6 @@ metrix-money-ptc.com: could not connect to host metrix.design: could not connect to host mexior.nl: could not connect to host meyeraviation.com: could not connect to host -mhalfter.de: could not connect to host -michael-schefczyk.de: could not connect to host michaelcullen.name: could not connect to host michaelkuchta.me: could not connect to host michaelsulzer.com: could not connect to host @@ -1613,7 +1598,6 @@ michele.ml: could not connect to host microblading.pe: could not connect to host microlinks.org: could not connect to host mieterschutzkartei.de: could not connect to host -mikes.tk: could not connect to host mikeybot.com: could not connect to host millionairessecrets.com: could not connect to host minantavla.se: could not connect to host @@ -1622,6 +1606,7 @@ mingyueli.com: could not connect to host minhanossasenhora.com.br: could not connect to host minimaliston.com: could not connect to host minitruckin.net: could not connect to host +minnesotakinkyyouth.org: could not connect to host misconfigured.io: could not connect to host missycosmeticos.com.br: could not connect to host mixer.cash: could not connect to host @@ -1648,7 +1633,6 @@ moderntld.net: could not connect to host moe-max.jp: could not connect to host moefi.xyz: could not connect to host moeyi.xyz: could not connect to host -mokadev.com: could not connect to host mongla168.net: could not connect to host mongla88.net: could not connect to host monitori.ng: could not connect to host @@ -1664,7 +1648,6 @@ morganino.eu: could not connect to host morz.org: could not connect to host mosaique-lachenaie.fr: could not connect to host moskva.guide: could not connect to host -motezazer.fr: could not connect to host motherboard.services: could not connect to host motomorgen.com: could not connect to host motorbiketourhanoi.com: could not connect to host @@ -1685,11 +1668,9 @@ msgallery.tk: could not connect to host msz-fotografie.de: could not connect to host mtirc.co: could not connect to host mtn.cc: could not connect to host -muchohentai.com: could not connect to host muj-svet.cz: could not connect to host multivpn.fr: could not connect to host munduch.cz: could not connect to host -munpanel.com: could not connect to host murraycoin.org: could not connect to host murraycolin.org: could not connect to host murz.tv: could not connect to host @@ -1791,6 +1772,7 @@ nsdev.cn: could not connect to host nsmail.cn: could not connect to host nudel.ninja: could not connect to host nulltime.net: could not connect to host +number.me: could not connect to host nyanpasu.tv: could not connect to host oaksbloom.com: could not connect to host oatberry.me: could not connect to host @@ -1808,12 +1790,12 @@ office-ruru.com: could not connect to host oinky.ddns.net: could not connect to host oklahomamoversassociation.org: could not connect to host oklahomanotepro.com: could not connect to host -oldchaphome.nl: could not connect to host oldtimer-trifft-flugplatz.de: could not connect to host oliverspringer.eu: could not connect to host omnigon.network: could not connect to host oneazcu.com: could not connect to host onewebdev.info: could not connect to host +onlinestoreninjas.com: could not connect to host onsennuie.fr: could not connect to host onsite4u.de: could not connect to host onstud.com: could not connect to host @@ -1831,6 +1813,7 @@ oricejoc.com: could not connect to host oscarmashauri.com: could not connect to host oscillation-services.fr: could not connect to host oscsdp.cz: could not connect to host +osereso.tn: could not connect to host oshinagaki.jp: could not connect to host osmanlitorunu.com: could not connect to host ospree.me: could not connect to host @@ -1838,6 +1821,7 @@ otinane.eu: could not connect to host ourchoice2016.com: could not connect to host overkillshop.com: could not connect to host ovpn.to: could not connect to host +owensmith.website: could not connect to host owlscrap.ru: could not connect to host oxynux.xyz: could not connect to host pabloartea.ga: could not connect to host @@ -1912,8 +1896,8 @@ please-deny.me: could not connect to host plussizereviews.com: could not connect to host pmbremer.de: could not connect to host pogs.us: could not connect to host -polishtranslation.com: could not connect to host polit.im: could not connect to host +polytarian.com: could not connect to host pookl.com: could not connect to host poolinstallers.co.za: could not connect to host popkins.cf: could not connect to host @@ -1945,7 +1929,6 @@ prettytunesapp.com: could not connect to host prifo.se: could not connect to host princessbackpack.de: could not connect to host printsos.com: could not connect to host -priorityessays.com: could not connect to host prism-communication.com: could not connect to host privacyforjournalists.org.au: could not connect to host privacymanatee.com: could not connect to host @@ -1961,7 +1944,6 @@ projectasterk.com: could not connect to host projectte.ch: could not connect to host projectx.top: could not connect to host projekt-umbriel.de: could not connect to host -prok.pw: could not connect to host prokop.ovh: could not connect to host promhadan.com: could not connect to host promocao.email: could not connect to host @@ -2025,10 +2007,6 @@ reaiaer.com: could not connect to host real-compare.com: could not connect to host realcli.com: could not connect to host realnewhomes.com: could not connect to host -realum.com: could not connect to host -realum.de: could not connect to host -realum.eu: could not connect to host -realum.net: could not connect to host realwoo.com: could not connect to host recon-networks.com: could not connect to host reeson.at: could not connect to host @@ -2092,7 +2070,6 @@ royzez.com: could not connect to host rozalynne-dawn.ga: could not connect to host rpasafrica.com: could not connect to host rs-devdemo.host: could not connect to host -rsauget.fr: could not connect to host rsldb.com: could not connect to host rtc.fun: could not connect to host rtho.me: could not connect to host @@ -2136,10 +2113,6 @@ saxol-group.com: could not connect to host sbm.cloud: could not connect to host scalaire.fr: could not connect to host schaafenstrasse.koeln: could not connect to host -schefczyk.com: could not connect to host -schefczyk.de: could not connect to host -schefczyk.eu: could not connect to host -schefczyk.net: could not connect to host schmidttulskie.de: could not connect to host schnapke.name: could not connect to host schul-bar.de: could not connect to host @@ -2184,7 +2157,6 @@ selfmade4u.de: could not connect to host selfserverx.com: could not connect to host sellmoretires.com: could not connect to host seoscribe.net: could not connect to host -seproco.com: could not connect to host servecrypt.ru: could not connect to host serverlauget.no: could not connect to host servfefe.com: could not connect to host @@ -2216,7 +2188,6 @@ shurita.org: could not connect to host shuzicai.cn: could not connect to host shymeck.pw: could not connect to host siamega.com: could not connect to host -sickfile.com: could not connect to host siebens.net: could not connect to host signosquecombinam.com.br: could not connect to host siirtutkusu.com: could not connect to host @@ -2254,7 +2225,6 @@ smarthouse.de: could not connect to host smdavis.us: could not connect to host smith.is: could not connect to host sml.lc: could not connect to host -smmcab.ru: could not connect to host smuhelper.cn: could not connect to host sneed.company: could not connect to host snowdy.eu: could not connect to host @@ -2313,7 +2283,6 @@ static.hosting: could not connect to host staticisnoise.com: could not connect to host statusbot.io: could not connect to host staxflax.tk: could not connect to host -stb-schefczyk.de: could not connect to host steffi-in-australien.com: could not connect to host stevengoodpaster.com: could not connect to host stickswag.cf: could not connect to host @@ -2341,7 +2310,6 @@ sunbritetv.com: could not connect to host suneilpatel.com: could not connect to host sunfireshop.com.br: could not connect to host sunjaydhama.com: could not connect to host -sunriseafricarelief.com: could not connect to host sunxchina.com: could not connect to host supermil.ch: could not connect to host superpase.com: could not connect to host @@ -2466,7 +2434,6 @@ tofa-koeln.de: could not connect to host tokoindo.top: could not connect to host tollsjekk.no: could not connect to host tomharling.co.uk: could not connect to host -tonabor.ru: could not connect to host top10mountainbikes.info: could not connect to host topanlage.de: could not connect to host topdetoxcleanse.com: could not connect to host @@ -2477,11 +2444,9 @@ totallynotaserver.com: could not connect to host totch.de: could not connect to host touch-up-net.com: could not connect to host towaway.ru: could not connect to host -towywebdesigns.uk: could not connect to host toxicboot.com: could not connect to host toxicip.com: could not connect to host tpblist.xyz: could not connect to host -tracetracker.no: could not connect to host track.plus: could not connect to host trainhornforums.com: could not connect to host trainline.io: could not connect to host @@ -2540,6 +2505,7 @@ unefuite.ch: could not connect to host unhu.fr: could not connect to host uni2share.com: could not connect to host unicorn.li: could not connect to host +unleash.pw: could not connect to host uploadbro.com: could not connect to host upmchealthsecurity.us: could not connect to host upr.com.ua: could not connect to host @@ -2559,8 +2525,6 @@ valecnatechnika.cz: could not connect to host valenhub.com: could not connect to host valenhub.es: could not connect to host valis.sx: could not connect to host -valsk.is: could not connect to host -valskis.lt: could not connect to host vamosfalardesaude.pt: could not connect to host vanderstraeten.dynv6.net: could not connect to host vanessabalibridal.com: could not connect to host @@ -2578,22 +2542,14 @@ velen.io: could not connect to host venicecomputerrepair.com: could not connect to host venicefloridawebsitedesign.com: could not connect to host venturavwparts.com: could not connect to host -venturum.com: could not connect to host -venturum.de: could not connect to host -venturum.eu: could not connect to host -venturum.net: could not connect to host verdeandco.co.uk: could not connect to host versfin.net: could not connect to host -verzick.com: could not connect to host vgatest.nl: could not connect to host vicenage.com: could not connect to host viciousviscosity.xyz: could not connect to host -viclab.se: could not connect to host -victornilsson.pw: could not connect to host videorullen.se: could not connect to host -videospornogratis.pt: could not connect to host -vigoxatelier.tech: could not connect to host vikasbabyworld.de: could not connect to host +viladochurrasco.com.br: could not connect to host vilaydin.com: could not connect to host villainsclothing.com.au: could not connect to host villasenor.online: could not connect to host @@ -2630,6 +2586,7 @@ vynedmusic.com: could not connect to host vyshivanochka.in.ua: could not connect to host w10club.com: could not connect to host wabifoggynuts.com: could not connect to host +wahhoi.net: could not connect to host waixingrenfuli.vip: could not connect to host wan.pp.ua: could not connect to host wanashi.com: could not connect to host @@ -2682,7 +2639,6 @@ whereismyorigin.cf: could not connect to host wherephoto.com: could not connect to host whilsttraveling.com: could not connect to host whiskynerd.ca: could not connect to host -whitworth.nyc: could not connect to host whoneedstobeprimaried.today: could not connect to host whyy.eu.org: could not connect to host wibuw.com: could not connect to host @@ -2697,7 +2653,6 @@ winsufi.biz: could not connect to host wisak.eu: could not connect to host wishesbee.com: could not connect to host wissl.org: could not connect to host -witae.com: could not connect to host wizznab.tk: could not connect to host wk577.com: could not connect to host wlsme.org: could not connect to host @@ -2734,6 +2689,7 @@ xmiui.com: could not connect to host xn----7sbmucgqdbgwwc5e9b.xn--p1ai: could not connect to host xn--6x6a.life: could not connect to host xn--8mr166hf6s.xn--fiqs8s: could not connect to host +xn--98jm6m.jp: could not connect to host xn--c5w27q.ml: could not connect to host xn--gmq92k.nagoya: could not connect to host xn--grnderlehrstuhl-0vb.de: could not connect to host @@ -2744,6 +2700,9 @@ xn--tda.ml: could not connect to host xn--thorme-6uaf.ca: could not connect to host xn--u9jy16ncfao19mo8i.nagoya: could not connect to host xn--vck8crc010pu14e.biz: could not connect to host +xn--w22a.jp: could not connect to host +xn--wmq.jp: could not connect to host +xn--xz1a.jp: could not connect to host xn--y8j2eb5631a4qf5n0h.com: could not connect to host xn--yj8h0m.ws: could not connect to host xn--ykrp42k.com: could not connect to host @@ -2784,6 +2743,7 @@ yousite.by: could not connect to host yude.ml: could not connect to host yugege.cf: could not connect to host yum.beer: could not connect to host +yutang.vn: could not connect to host yux.fr: could not connect to host z-coder.com: could not connect to host z0rro.net: could not connect to host @@ -2807,6 +2767,7 @@ zhenmeish.com: could not connect to host zhikin.com: could not connect to host zhoujiashu.com: could not connect to host zikirakhirzaman.com: could not connect to host +znd.jp: could not connect to host zobraz.cz: could not connect to host zohar.shop: could not connect to host zokster.net: could not connect to host @@ -2829,7 +2790,7 @@ zzw.ca: could not connect to host 0005aa.com: could not connect to host 007sascha.de: did not receive HSTS header 020wifi.nl: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 116" data: no] -0222aa.com: could not connect to host +0222aa.com: did not receive HSTS header 023838.com: did not receive HSTS header 02dl.net: did not receive HSTS header 040fit.nl: did not receive HSTS header @@ -2877,7 +2838,7 @@ zzw.ca: could not connect to host 16packets.com: could not connect to host 173vpn.cn: could not connect to host 173vpns.com: did not receive HSTS header -173vpnv.com: could not connect to host +173vpnv.com: did not receive HSTS header 188betwarriors.co.uk: could not connect to host 188trafalgar.ca: did not receive HSTS header 189dv.com: did not receive HSTS header @@ -2921,7 +2882,7 @@ zzw.ca: could not connect to host 32ph.com: could not connect to host 33836.com: did not receive HSTS header 33drugstore.com: did not receive HSTS header -341.mg: did not receive HSTS header +341.mg: could not connect to host 3555aa.com: could not connect to host 35792.de: could not connect to host 360gradus.com: did not receive HSTS header @@ -2930,6 +2891,7 @@ zzw.ca: could not connect to host 3778xl.com: did not receive HSTS header 38sihu.com: could not connect to host 39sihu.com: could not connect to host +3ags.de: did not receive HSTS header 3chit.cf: could not connect to host 3click-loan.com: could not connect to host 3d-bastler.de: could not connect to host @@ -2970,7 +2932,6 @@ zzw.ca: could not connect to host 605508.com: could not connect to host 60ych.net: did not receive HSTS header 6120.eu: did not receive HSTS header -645ds.cn: did not receive HSTS header 64616e.xyz: could not connect to host 660011.com: max-age too low: 0 69square.com: could not connect to host @@ -3270,7 +3231,7 @@ amilx.org: could not connect to host amimoto-ami.com: max-age too low: 3153600 amishsecurity.com: could not connect to host amitse.com: did not receive HSTS header -amitube.com: did not receive HSTS header +amitube.com: could not connect to host amlvfs.net: could not connect to host ammoulianiapartments.com: did not receive HSTS header amo-entreprise-et-commerce.fr: could not connect to host @@ -3343,7 +3304,7 @@ anonymo.uk: could not connect to host anonymousstatecollegelulzsec.com: could not connect to host anook.com: max-age too low: 0 ansdell.info: could not connect to host -anshuman-chatterjee.com: did not receive HSTS header +anshuman-chatterjee.com: could not connect to host ansibeast.net: could not connect to host anstoncs.com.au: max-age too low: 86400 ant.land: could not connect to host @@ -3618,6 +3579,7 @@ balcan-underground.net: could not connect to host baldwinkoo.com: could not connect to host baleares.party: could not connect to host balihai.com: did not receive HSTS header +ballarin.cc: did not receive HSTS header balloonphp.com: could not connect to host ballparkbuns.com: max-age too low: 86400 balnearionaturaspa.com: did not receive HSTS header @@ -3844,24 +3806,6 @@ bizpare.com: did not receive HSTS header bizzartech.com: did not receive HSTS header bizzybeebouncers.co.uk: did not receive HSTS header bkb-skandal.ch: could not connect to host -blablacar.co.uk: did not receive HSTS header -blablacar.com: did not receive HSTS header -blablacar.com.tr: did not receive HSTS header -blablacar.com.ua: did not receive HSTS header -blablacar.de: did not receive HSTS header -blablacar.es: did not receive HSTS header -blablacar.fr: did not receive HSTS header -blablacar.hr: did not receive HSTS header -blablacar.hu: did not receive HSTS header -blablacar.in: did not receive HSTS header -blablacar.it: did not receive HSTS header -blablacar.mx: did not receive HSTS header -blablacar.nl: did not receive HSTS header -blablacar.pl: did not receive HSTS header -blablacar.pt: did not receive HSTS header -blablacar.ro: did not receive HSTS header -blablacar.rs: did not receive HSTS header -blablacar.ru: did not receive HSTS header black-armada.com: could not connect to host black-armada.com.pl: could not connect to host black-armada.pl: could not connect to host @@ -4549,7 +4493,7 @@ consejosdehogar.com: did not receive HSTS header console.python.org: did not receive HSTS header console.support: did not receive HSTS header construct-trust.com: did not receive HSTS header -consultorcr.net: did not receive HSTS header +consultorcr.net: could not connect to host contactbig.com: did not receive HSTS header contaimo.com: did not receive HSTS header container-lion.com: did not receive HSTS header @@ -4716,6 +4660,7 @@ cyanogenmod.xxx: could not connect to host cybercecurity.com: did not receive HSTS header cyberlab.kiev.ua: did not receive HSTS header cyberlab.team: did not receive HSTS header +cyberprey.com: did not receive HSTS header cyberpunk.ca: could not connect to host cybersafesolutions.com: did not receive HSTS header cybershambles.com: could not connect to host @@ -5164,7 +5109,6 @@ dv189.com: did not receive HSTS header dycem-ns.com: did not receive HSTS header dycontrol.de: could not connect to host dylanscott.com.au: did not receive HSTS header -dymersion.com: did not receive HSTS header dynamic-innovations.net: could not connect to host dynamize.solutions: did not receive HSTS header dzimejl.sk: did not receive HSTS header @@ -5767,7 +5711,7 @@ footballmapped.com: could not connect to host footlegende.fr: did not receive HSTS header forafifty.co.za: could not connect to host foraje-profesionale.ro: did not receive HSTS header -forbid.life: could not connect to host +forbid.life: did not receive HSTS header forbook.net: could not connect to host fordbydesign.com: could not connect to host foreignexchangeresource.com: did not receive HSTS header @@ -5832,7 +5776,6 @@ friendica.ch: could not connect to host friendlyfiregameshow.com: could not connect to host frimons.com: could not connect to host fringeintravel.com: did not receive HSTS header -frogatto.com: did not receive HSTS header froggstack.de: could not connect to host front-end.dog: could not connect to host frontisme.nl: did not receive HSTS header @@ -5949,7 +5892,7 @@ garfieldairlines.net: did not receive HSTS header gasser-daniel.ch: did not receive HSTS header gatorsa.es: could not connect to host gaussorgues.me: could not connect to host -gautham.it: could not connect to host +gautham.it: did not receive HSTS header gaycc.cc: could not connect to host gchoic.com: max-age too low: 7889238 gchp.ie: did not receive HSTS header @@ -6030,6 +5973,7 @@ ghi.gov: could not connect to host ghibli.studio: did not receive HSTS header ghid-pitesti.ro: did not receive HSTS header ghkim.net: could not connect to host +ghostblog.info: did not receive HSTS header giakki.eu: could not connect to host gianlucapartengo.photography: did not receive HSTS header gibraltar-firma.com: did not receive HSTS header @@ -6063,7 +6007,6 @@ gladystudio.com: did not receive HSTS header glasslikes.com: did not receive HSTS header glbg.eu: did not receive HSTS header glentakahashi.com: could not connect to host -glittersjabloon.nl: did not receive HSTS header glitzmirror.com: could not connect to host globalado.com: could not connect to host globalbridge-japan.com: did not receive HSTS header @@ -6412,9 +6355,6 @@ heribe-maruo.com: could not connect to host heritagedentistry.ca: did not receive HSTS header heroin.org.uk: did not receive HSTS header herrenfahrt.com: did not receive HSTS header -hetmer.com: did not receive HSTS header -hetmer.cz: did not receive HSTS header -hetmer.net: did not receive HSTS header heutger.net: did not receive HSTS header hex2013.com: did not receive HSTS header hexhu.com: could not connect to host @@ -6565,9 +6505,9 @@ hump.dk: could not connect to host humpi.at: could not connect to host humpteedumptee.in: did not receive HSTS header huodongweb.com: could not connect to host -hup.blue: could not connect to host +hup.blue: did not receive HSTS header huskybutt.dog: could not connect to host -hustlehope.com: did not receive HSTS header +huskyduvercors.com: did not receive HSTS header huzu.com: did not receive HSTS header hwcine.com: did not receive HSTS header hwpkasse.de: max-age too low: 2592000 @@ -7183,7 +7123,7 @@ kadioglumakina.com.tr: did not receive HSTS header kadmec.com: did not receive HSTS header kaela.design: could not connect to host kahopoon.net: could not connect to host -kai.cool: could not connect to host +kai.cool: did not receive HSTS header kaika-hms.de: did not receive HSTS header kainz.bayern: could not connect to host kaisers.de: could not connect to host @@ -7220,7 +7160,7 @@ katproxy.online: could not connect to host katproxy.site: could not connect to host katproxy.tech: could not connect to host katproxy.top: could not connect to host -katzen.me: did not receive HSTS header +katzen.me: could not connect to host kaufkraftkiel.de: could not connect to host kauplusprofesional.com: did not receive HSTS header kausch.at: could not connect to host @@ -7484,7 +7424,7 @@ lansinoh.co.uk: did not receive HSTS header lanzainc.xyz: did not receive HSTS header laobox.fr: could not connect to host laplaceduvillage.net: could not connect to host -laquack.com: could not connect to host +laquack.com: did not receive HSTS header laredsemanario.com: could not connect to host lasepiataca.com: did not receive HSTS header lasercloud.ml: could not connect to host @@ -7645,7 +7585,6 @@ linuxforyou.com: could not connect to host linuxgeek.ro: could not connect to host linuxmint.cz: could not connect to host linuxmonitoring.net: did not receive HSTS header -lipo.lol: did not receive HSTS header liquid.solutions: did not receive HSTS header liquorsanthe.in: could not connect to host lisaco.de: could not connect to host @@ -7867,6 +7806,7 @@ mammothmail.com: could not connect to host mammothmail.net: could not connect to host mammothmail.org: could not connect to host mammut.space: could not connect to host +mamospienas.lt: did not receive HSTS header manaboutahor.se: did not receive HSTS header manage.zenpayroll.com: did not receive HSTS header manage4all.com: could not connect to host @@ -7996,7 +7936,6 @@ maximov.space: could not connect to host maxmachine.ind.br: could not connect to host maxserver.com: did not receive HSTS header maya.mg: could not connect to host -maypolevilla.co.uk: did not receive HSTS header mazyun.com: max-age too low: 3600 mazz-tech.com: could not connect to host mbconsultancy.nu: did not receive HSTS header @@ -8027,6 +7966,7 @@ mediafinancelab.org: did not receive HSTS header mediamag.am: max-age too low: 0 mediawikicn.org: could not connect to host medienservice-fritz.de: did not receive HSTS header +medifab.online: did not receive HSTS header medirich.co: could not connect to host meditek-dv.ru: could not connect to host mediterenopmaandag.nl: did not receive HSTS header @@ -8286,7 +8226,7 @@ mondopoint.com: did not receive HSTS header mondwandler.de: could not connect to host moneromerchant.com: could not connect to host moneycrownmedia.com: could not connect to host -monika-sokol.de: did not receive HSTS header +monika-sokol.de: could not connect to host monitaure.io: could not connect to host monitman.com: could not connect to host montanacures.org: could not connect to host @@ -8295,6 +8235,8 @@ moon.lc: could not connect to host moonchart.co.uk: did not receive HSTS header moonless.net: could not connect to host moonloupe.com: could not connect to host +moonrhythm.info: did not receive HSTS header +moonrhythm.io: did not receive HSTS header moonysbouncycastles.co.uk: did not receive HSTS header moosemanstudios.com: could not connect to host moov.is: could not connect to host @@ -8373,7 +8315,7 @@ mullen.net.au: did not receive HSTS header multimarques.com: max-age too low: 86400 mundodapoesia.com: did not receive HSTS header munecoscabezones.com: did not receive HSTS header -munich-rage.de: could not connect to host +munich-rage.de: max-age too low: 0 munkiepus.com: did not receive HSTS header munuc.org: did not receive HSTS header munzee.com: did not receive HSTS header @@ -8512,6 +8454,7 @@ navjobs.com: did not receive HSTS header nbb.io: could not connect to host nbg-ha.de: could not connect to host ncc60205.info: could not connect to host +nchristo.com: did not receive HSTS header ncpc.gov: could not connect to host nct.org.uk: did not receive HSTS header nctx.co.uk: did not receive HSTS header @@ -8963,7 +8906,7 @@ oxygenabsorbers.com: did not receive HSTS header oxymc.com: did not receive HSTS header oxynux.fr: could not connect to host oyste.in: could not connect to host -ozoz.cc: could not connect to host +ozoz.cc: did not receive HSTS header p-rickroll-o.pw: could not connect to host p.linode.com: could not connect to host p1c.pw: could not connect to host @@ -9017,6 +8960,7 @@ parent5446.us: could not connect to host parentmail.co.uk: did not receive HSTS header parfum-baza.ru: did not receive HSTS header paris-cyber.fr: did not receive HSTS header +parisprovincedemenagements.fr: did not receive HSTS header parisvox.info: did not receive HSTS header parithy.net: could not connect to host parkingplus.co.il: could not connect to host @@ -9138,6 +9082,7 @@ petchart.net: could not connect to host peterkshultz.com: did not receive HSTS header peternagy.ie: did not receive HSTS header petersmark.com: did not receive HSTS header +pethelpers.org: did not receive HSTS header pethub.com: did not receive HSTS header petit.site: could not connect to host petplum.com: could not connect to host @@ -9148,7 +9093,7 @@ petrovsky.pro: could not connect to host petsittersservices.com: could not connect to host pettsy.com: could not connect to host peuterspeelzaalhoekvanholland.nl: did not receive HSTS header -pewboards.com: could not connect to host +pewboards.com: did not receive HSTS header pexieapp.com: did not receive HSTS header peytonfarrar.com: did not receive HSTS header pfgshop.com.br: could not connect to host @@ -9354,6 +9299,7 @@ presidentials2016.com: could not connect to host press-anime-nenkan.com: did not receive HSTS header pressenews.net: did not receive HSTS header pressfreedomfoundation.org: did not receive HSTS header +pretrialservices.gov: did not receive HSTS header prettygrouse.com: did not receive HSTS header prettyphotoart.de: did not receive HSTS header pretzlaff.info: did not receive HSTS header @@ -9403,7 +9349,6 @@ projetoresecia.com: could not connect to host prolan.pw: did not receive HSTS header promarketer.net: did not receive HSTS header promecon-gmbh.de: did not receive HSTS header -promedicalapplications.com: did not receive HSTS header prontocleaners.co.uk: did not receive HSTS header prontolight.com: did not receive HSTS header prontomovers.co.uk: could not connect to host @@ -9428,6 +9373,7 @@ prxio.date: could not connect to host prxio.site: could not connect to host ps-w.ru: did not receive HSTS header ps-x.ru: did not receive HSTS header +psa.gov: did not receive HSTS header pscleaningsolutions.co.uk: could not connect to host pshostpk.com: did not receive HSTS header psicologia.co.ve: could not connect to host @@ -9452,6 +9398,7 @@ pumpgames.net: could not connect to host punchkickinteractive.com: did not receive HSTS header punchr-kamikazee.rhcloud.com: could not connect to host punchunique.com: did not receive HSTS header +punte-juwelier.nl: did not receive HSTS header puppydns.com: did not receive HSTS header purewebmasters.com: could not connect to host purplez.pw: did not receive HSTS header @@ -9510,7 +9457,6 @@ quantenteranik.eu: could not connect to host quantum-cloud.xyz: could not connect to host quantum-ethics.com: could not connect to host quantumcourse.org: did not receive HSTS header -quarryhillrentals.com: did not receive HSTS header quebecmailbox.com: could not connect to host queenbrownie.com.br: could not connect to host quelmandataire.fr: did not receive HSTS header @@ -9841,7 +9787,6 @@ rugstorene.co.uk: did not receive HSTS header ruig.jp: could not connect to host ruitershoponline.nl: did not receive HSTS header ruja.dk: did not receive HSTS header -rumlager.de: max-age too low: 600000 rumoterra.com.br: could not connect to host runawebinar.nl: could not connect to host runhardt.eu: did not receive HSTS header @@ -9885,7 +9830,7 @@ saint-astier-triathlon.com: did not receive HSTS header saintjohnlutheran.church: did not receive HSTS header sairai.bid: could not connect to host sakaserver.com: did not receive HSTS header -sakib.ninja: could not connect to host +sakib.ninja: did not receive HSTS header sakurabuff.com: could not connect to host saleslift.pl: did not receive HSTS header salserocafe.com: did not receive HSTS header @@ -9984,9 +9929,8 @@ schwetz.net: could not connect to host scicasts.com: max-age too low: 7776000 scienceathome.org: did not receive HSTS header sciencebase.gov: did not receive HSTS header -scionasset.com: did not receive HSTS header scivillage.com: did not receive HSTS header -sckc.stream: did not receive HSTS header +sckc.stream: could not connect to host sclgroup.cc: did not receive HSTS header scooshonline.co.uk: did not receive HSTS header scopea.fr: max-age too low: 0 @@ -10098,6 +10042,7 @@ sensiblemn.org: could not connect to host sensibus.com: did not receive HSTS header seobot.com.au: could not connect to host seomobo.com: could not connect to host +seon.me: did not receive HSTS header seosanantonioinc.com: did not receive HSTS header seowarp.net: did not receive HSTS header sep23.ru: did not receive HSTS header @@ -10118,7 +10063,6 @@ servicevie.com: did not receive HSTS header servu.de: did not receive HSTS header seryo.moe: could not connect to host seryo.net: could not connect to host -setkit.net: did not receive HSTS header setphaserstostun.org: could not connect to host setuid.de: could not connect to host setuid.io: did not receive HSTS header @@ -10167,7 +10111,6 @@ shauncrowley.co.uk: could not connect to host shaunwheelhou.se: could not connect to host shawnbsmith.me: did not receive HSTS header shawnh.net: could not connect to host -shawnstarrcustomhomes.com: did not receive HSTS header shellsec.pw: did not receive HSTS header shep.co.il: did not receive HSTS header sheratan.web.id: did not receive HSTS header @@ -10233,7 +10176,6 @@ silicagelpackets.ca: did not receive HSTS header silver-drachenkrieger.de: did not receive HSTS header silverhome.ninja: could not connect to host silverpvp.com: could not connect to host -sim-sim.appspot.com: did not receive HSTS header simbast.com: could not connect to host simbihaiti.com: max-age too low: 7889238 simbol.id: did not receive HSTS header @@ -10479,7 +10421,7 @@ spititout.it: could not connect to host spokonline.com: could not connect to host sponsortobias.com: could not connect to host sportchirp-internal.azurewebsites.net: did not receive HSTS header -sporthit.ru: could not connect to host +sporthit.ru: did not receive HSTS header sportifik.com: did not receive HSTS header sportingoods.com.br: could not connect to host sportscollection.com.br: could not connect to host @@ -10644,9 +10586,9 @@ sumoscout.de: could not connect to host sun-wellness-online.com.vn: did not receive HSTS header suncountrymarine.com: did not receive HSTS header sundaycooks.com: max-age too low: 2592000 -sunflyer.cn: did not receive HSTS header sunlandsg.vn: did not receive HSTS header sunnyfruit.ru: could not connect to host +sunriseafricarelief.com: did not receive HSTS header sunshinepress.org: could not connect to host sunyanzi.tk: could not connect to host suos.io: could not connect to host @@ -10846,6 +10788,7 @@ tecnogaming.com: did not receive HSTS header tecture.de: did not receive HSTS header tedovo.com: did not receive HSTS header tedxkmitl.com: could not connect to host +teeplelaw.com: did not receive HSTS header tefl.io: did not receive HSTS header tegelsensanitaironline.nl: did not receive HSTS header tehotuotanto.net: did not receive HSTS header @@ -10855,6 +10798,7 @@ teknotes.co.uk: could not connect to host tekshrek.com: did not receive HSTS header tel-dithmarschen.de: did not receive HSTS header teleallarme.ch: could not connect to host +telecomwestland.nl: did not receive HSTS header telefisk.org: did not receive HSTS header telefonnummer.online: could not connect to host telefoonnummerinfo.nl: could not connect to host @@ -10879,7 +10823,6 @@ teodio.cl: could not connect to host teoleonie.com: did not receive HSTS header teos.online: could not connect to host terra.by: did not receive HSTS header -terra.fitness: did not receive HSTS header terrax.berlin: could not connect to host terrax.info: could not connect to host teru.com.br: could not connect to host @@ -10909,6 +10852,7 @@ thalmann.fr: did not receive HSTS header thatvizsla.life: did not receive HSTS header the-construct.com: could not connect to host the-delta.net.eu.org: could not connect to host +the-pcca.org: did not receive HSTS header the-sky-of-valkyries.com: could not connect to host the.ie: could not connect to host thealexandertechnique.co.uk: did not receive HSTS header @@ -10922,6 +10866,7 @@ thebeautifulmusic.net: did not receive HSTS header thebeginningisnye.com: could not connect to host theberkshirescompany.com: could not connect to host thebigfail.net: could not connect to host +thebreakhotel.com: did not receive HSTS header thebrightons.co.uk: did not receive HSTS header thebrightons.uk: could not connect to host thebrotherswarde.com: could not connect to host @@ -10937,7 +10882,7 @@ thedrop.pw: did not receive HSTS header thedystance.com: could not connect to host theelitebuzz.com: did not receive HSTS header theemasphere.com: did not receive HSTS header -theendofzion.com: did not receive HSTS header +theendofzion.com: could not connect to host theescapistswiki.com: could not connect to host theeyeopener.com: did not receive HSTS header thefarbeyond.com: could not connect to host @@ -11189,6 +11134,7 @@ tpe-edu.com: could not connect to host tpms4u.at: did not receive HSTS header tppdebate.org: did not receive HSTS header tracetracker.com: did not receive HSTS header +tracetracker.no: did not receive HSTS header tracker-gps.ch: could not connect to host trackingstream.com: did not receive HSTS header tracktivity.com.au: could not connect to host @@ -11221,7 +11167,7 @@ transdirect.com.au: did not receive HSTS header transformify.org: did not receive HSTS header transl8.eu: did not receive HSTS header transportal.sk: did not receive HSTS header -traumhuetten.de: could not connect to host +traumhuetten.de: did not receive HSTS header travality.ru: could not connect to host travel-kuban.ru: did not receive HSTS header travelinsightswriter.com: could not connect to host @@ -11522,7 +11468,6 @@ vanitynailworkz.com: could not connect to host vansieleghem.com: could not connect to host vapecraftinc.com: did not receive HSTS header vapeshopsupply.com: max-age too low: 7889238 -varunpriolkar.com: did not receive HSTS header vasa-webstranka.sk: did not receive HSTS header vasanth.org: could not connect to host vbest.net: could not connect to host @@ -11869,6 +11814,7 @@ wienholding.at: max-age too low: 0 wieninternational.at: did not receive HSTS header wificafehosting.com: did not receive HSTS header wifimapa.cz: could not connect to host +wifimask.com: did not receive HSTS header wiiforum.no: did not receive HSTS header wiire.me: could not connect to host wikiclash.info: could not connect to host @@ -11945,6 +11891,7 @@ work-and-jockel.de: did not receive HSTS header workfone.io: could not connect to host workpermit.com.vn: could not connect to host worldlist.org: could not connect to host +worldpovertysolutions.org: did not receive HSTS header worldsbeststory.com: did not receive HSTS header worldwhisperer.net: could not connect to host worshapp.com: could not connect to host @@ -11996,7 +11943,7 @@ www-8003.com: did not receive HSTS header www-88599.com: did not receive HSTS header www-9995.com: did not receive HSTS header www-djbet.com: did not receive HSTS header -www-jinshavip.com: did not receive HSTS header +www-jinshavip.com: could not connect to host www.cueup.com: could not connect to host www.cyveillance.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host @@ -12145,6 +12092,7 @@ yardbird.us: could not connect to host yarnhookup.com: did not receive HSTS header yasinaydin.net: did not receive HSTS header yasutomonodokoiko.com: did not receive HSTS header +ycaaz.com: did not receive HSTS header ycc.wtf: could not connect to host ycm2.wtf: could not connect to host ydy.jp: could not connect to host @@ -12183,7 +12131,7 @@ yoloseo.com: could not connect to host yomepre.com: could not connect to host yopers.com: did not receive HSTS header yoru.me: could not connect to host -youcaitian.com: did not receive HSTS header +youcaitian.com: could not connect to host youcontrol.ru: could not connect to host youfencun.com: did not receive HSTS header youlog.net: could not connect to host diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 7b54b62fd5af..0035859b6e07 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1532849887739000); +const PRTime gPreloadListExpirationTime = INT64_C(1532896136917000); %% 0-1.party, 1 0.me.uk, 1 @@ -558,7 +558,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1532849887739000); 394922.com, 1 396422.com, 1 398.info, 1 -3ags.de, 1 3bakayottu.com, 1 3bigking.com, 1 3c-d.de, 1 @@ -831,6 +830,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1532849887739000); 645722.com, 1 645822.com, 1 645922.com, 1 +645ds.cn, 1 646.io, 0 646022.com, 1 646322.com, 1 @@ -3703,7 +3703,6 @@ balist.es, 1 baliyano.com, 1 balkonien.org, 1 ball.holdings, 1 -ballarin.cc, 1 ballbusting-cbt.com, 1 ballejaune.com, 1 ballinarsl.com.au, 1 @@ -4740,6 +4739,24 @@ bl4ckb0x.eu, 1 bl4ckb0x.info, 1 bl4ckb0x.net, 1 bl4ckb0x.org, 1 +blablacar.co.uk, 1 +blablacar.com, 1 +blablacar.com.tr, 1 +blablacar.com.ua, 1 +blablacar.de, 1 +blablacar.es, 1 +blablacar.fr, 1 +blablacar.hr, 1 +blablacar.hu, 1 +blablacar.in, 1 +blablacar.it, 1 +blablacar.mx, 1 +blablacar.nl, 1 +blablacar.pl, 1 +blablacar.pt, 1 +blablacar.ro, 1 +blablacar.rs, 1 +blablacar.ru, 1 black-gay-porn.biz, 1 black-khat.com, 1 black-mail.nl, 1 @@ -7004,7 +7021,7 @@ cirugiasplasticas.com.mx, 1 cirujanooral.com, 1 cirurgicagervasio.com.br, 1 cirurgicalucena.com.br, 1 -ciscodude.net, 0 +ciscodude.net, 1 cisoaid.com, 1 ciss.ltd, 1 cisy.me, 1 @@ -8385,7 +8402,6 @@ cybermeldpunt.nl, 1 cyberoptic.de, 1 cyberpeace.nl, 1 cyberphaze.com, 1 -cyberprey.com, 1 cyberregister.nl, 1 cyberregister.org, 1 cyberscan.io, 1 @@ -10285,6 +10301,7 @@ dyktig.no, 1 dylanboudro.com, 1 dylankatz.com, 1 dylanknoll.ca, 1 +dymersion.com, 1 dyn-dnhensel.de, 1 dyn-nserve.net, 1 dyn.im, 1 @@ -13155,6 +13172,7 @@ frly.de, 1 frob.nl, 1 frodriguez.xyz, 1 froehlich.it, 1 +frogatto.com, 1 frogeye.fr, 1 froggitt.com, 1 frogsonamission.de, 1 @@ -13909,7 +13927,6 @@ gha.st, 1 ghaglund.se, 1 ghcif.de, 1 ghislainphu.fr, 1 -ghostblog.info, 1 ghostcir.com, 1 ghrelinblocker.info, 1 ghrelinblocker.org, 1 @@ -14056,6 +14073,7 @@ glicerina.online, 1 glidingshop.cz, 1 glidingshop.de, 1 glidingshop.eu, 1 +glittersjabloon.nl, 1 glloq.org, 1 glob-coin.com, 1 global-adult-webcams.com, 1 @@ -15300,6 +15318,9 @@ hestervanderheijden.nl, 1 hetene.nl, 1 hethely.ch, 1 hetmeisjeachterpauw.nl, 1 +hetmer.com, 1 +hetmer.cz, 1 +hetmer.net, 1 heute-kaufen.de, 1 heute.training, 1 heverhagen.rocks, 1 @@ -15963,11 +15984,11 @@ husakbau.at, 1 hushfile.it, 1 husic.net, 0 husky.xyz, 1 -huskyduvercors.com, 1 huskyinc.us, 1 hussam.eu.org, 1 hustle.com, 1 hustle.life, 1 +hustlehope.com, 1 hustunique.com, 1 huto.ml, 1 huutonauru.net, 1 @@ -20186,6 +20207,7 @@ lionlyrics.com, 1 lionsdeal.com, 1 lipartydepot.com, 1 lipex.com, 1 +lipo.lol, 1 lipoabaltimore.org, 1 liqd.net, 1 liquid.cz, 1 @@ -21076,7 +21098,6 @@ mammaw.com, 1 mammeitalianeavienna.com, 1 mammooc.org, 1 mamochka.org.ua, 1 -mamospienas.lt, 1 mamot.fr, 0 mamout.xyz, 1 mamuko.nl, 1 @@ -21531,6 +21552,7 @@ maynardnetworks.com, 0 mayomarquees.com, 1 mayopartyhire.com, 1 mayoristassexshop.com, 1 +maypolevilla.co.uk, 1 mayrhofer.eu.org, 1 mazda-mps.de, 1 mazda-thermote.com, 1 @@ -21704,7 +21726,6 @@ medicinskavranje.edu.rs, 1 medicocompetente.it, 1 medicoresponde.com.br, 1 medienweite.de, 1 -medifab.online, 1 medifi.com, 1 medigap-quote.net, 1 medinside.ch, 1 @@ -22647,8 +22668,6 @@ moonkin.eu, 1 moonmelo.com, 1 moonraptor.co.uk, 1 moonraptor.com, 1 -moonrhythm.info, 1 -moonrhythm.io, 1 moonshyne.org, 1 moonvpn.org, 1 moorewelliver.com, 1 @@ -23598,7 +23617,6 @@ ncconsumer.org, 1 ncdesigns-studio.com, 1 ncea.net.au, 1 nchangfong.com, 1 -nchristo.com, 1 nclvle.co.uk, 1 ncpw.gov, 1 ncrmnt.org, 1 @@ -25456,7 +25474,6 @@ parisfranceparking.de, 1 parisfranceparking.fr, 1 parisfranceparking.nl, 1 parishome.jp, 1 -parisprovincedemenagements.fr, 1 parkeren.in, 1 parkhillsbaptist.church, 1 parkinginparis.fr, 1 @@ -25909,7 +25926,6 @@ peterhuetz.com, 1 peterjohnson.io, 1 peterlew.is, 1 petersontoscano.com, 1 -pethelpers.org, 1 petit-archer.com, 1 petite-maison.ch, 1 petitsfrenchies.com, 1 @@ -26855,7 +26871,6 @@ prestonandsons.com.au, 1 prestonbrant.com, 1 pretachique.com.br, 1 pretix.eu, 1 -pretrialservices.gov, 1 pretty.hu, 1 prettytunesapp.com, 1 pretwolk.nl, 1 @@ -27040,6 +27055,7 @@ projektzentrisch.de, 1 projest.ch, 1 prok.pw, 1 prokop.ovh, 1 +promedicalapplications.com, 1 promesa.net, 1 prometheanfire.net, 1 prometheanfire.org, 1 @@ -27145,7 +27161,6 @@ przemas.pl, 1 ps-provider.co.jp, 1 ps-qa.com, 1 ps4all.nl, 1 -psa.gov, 1 psb.cloud, 1 psb1.org, 1 psb1911.com, 1 @@ -27252,7 +27267,6 @@ punkapoule.fr, 1 punkdns.top, 1 punknews.org, 1 puntacanalink.com, 1 -punte-juwelier.nl, 1 pupboss.com, 1 puppet.pl, 1 purahealthyliving.com, 1 @@ -27438,6 +27452,7 @@ quanwuji.com, 1 quanyin.eu.org, 1 quareal.ru, 1 quarkdose.de, 1 +quarryhillrentals.com, 1 quarterfull.com, 1 quartix.com, 1 quartzclinical.com, 1 @@ -28795,6 +28810,7 @@ rullzer.com, 1 rulu.co, 1 rulu.tv, 1 rulutv.com, 1 +rumlager.de, 1 rummel-platz.de, 1 rumplesinflatables.co.uk, 1 rumtaste.com, 1 @@ -29429,6 +29445,7 @@ scijinks.gov, 1 scimage.com, 1 scintilla.nl, 1 scintillating.stream, 1 +scionasset.com, 1 scis.com.ua, 1 scistarter.com, 1 scitopia.me, 1 @@ -29804,7 +29821,6 @@ seokay.com, 1 seolib.org, 1 seomarketingdeals.com, 1 seomen.biz, 1 -seon.me, 1 seoprovider.nl, 1 seoquake.com, 1 seoscribe.net, 1 @@ -29897,6 +29913,7 @@ setfix.de, 1 sethcaplan.com, 1 sethvargo.com, 1 seti-germany.de, 1 +setkit.net, 1 settberg.de, 1 setterirlandes.com.br, 1 settleapp.co, 1 @@ -30050,6 +30067,7 @@ shavegazette.com, 1 shavingks.com, 1 shawcentral.ca, 0 shawnhogan.com, 1 +shawnstarrcustomhomes.com, 1 shawnwilkerson.com, 1 shawnwilson.info, 1 shazbots.org, 1 @@ -30385,6 +30403,7 @@ silvobeat.blog, 1 silvobeat.com, 1 sim-karten.net, 1 sim-minaoshi.jp, 1 +sim-sim.appspot.com, 1 sim4seed.org, 1 simam.de, 1 simark.ca, 1 @@ -32025,12 +32044,12 @@ sundayfundayjapan.com, 1 suneilpatel.com, 1 sunfeathers.net, 1 sunfireshop.com.br, 1 +sunflyer.cn, 0 sunfox.cz, 1 sunfulong.blog, 1 sunfulong.me, 1 sunjaydhama.com, 1 sunn.ie, 1 -sunriseafricarelief.com, 1 sunsetwx.com, 1 sunshinesf.org, 1 sunsmartresorts.com, 1 @@ -32721,7 +32740,6 @@ teemperor.de, 1 teemulintula.fi, 1 teencounseling.com, 1 teenerotic.net, 1 -teeplelaw.com, 1 teesypeesy.com, 1 teeworlds-friends.de, 1 tefek.cz, 1 @@ -32749,7 +32767,6 @@ telecamera.pro, 0 telecharger-itunes.com, 1 telecharger-open-office.com, 1 telecharger-winrar.com, 1 -telecomwestland.nl, 1 teledivi.com, 1 telefon.report, 1 telefonabonnement.dk, 1 @@ -32827,6 +32844,7 @@ terminalvelocity.co.nz, 1 termitemounds.org, 1 termitinitus.org, 1 terra-x.net, 1 +terra.fitness, 1 terrab.de, 0 terracloud.de, 0 terraelectronica.ru, 1 @@ -32967,7 +32985,6 @@ the-gist.io, 1 the-hemingway-code.de, 1 the-mystery.org, 1 the-paddies.de, 1 -the-pcca.org, 1 the-webmaster.com, 1 the-zenti.de, 1 the2f.de, 1 @@ -32995,7 +33012,6 @@ thebodyprinciple.com, 1 thebouncedepartment.co.uk, 1 thebouncyman.co.uk, 1 theboxofcarlos.com, 1 -thebreakhotel.com, 1 thebreakroom.org, 1 thebte.com, 1 thebuffalotavern.com, 1 @@ -33980,7 +33996,6 @@ traceroute.guru, 1 traceroute.link, 1 traceroute.network, 1 traces.ml, 1 -tracetracker.no, 1 tracfinancialservices.com, 1 tracinsurance.com, 1 track.plus, 1 @@ -35006,7 +35021,7 @@ valorem-tax.ch, 1 valoremtax.ch, 1 valoremtax.com, 1 valshamar.is, 1 -valsk.is, 1 +valsk.is, 0 valskis.lt, 1 valtlai.fi, 1 valtoaho.com, 1 @@ -35073,6 +35088,7 @@ varimedoma.com, 1 varshathacker.com, 1 varta.io, 1 varunagw.com, 0 +varunpriolkar.com, 1 varvy.com, 1 vascomm.co.id, 1 vase-eroticke-povidky.cz, 1 @@ -35596,7 +35612,7 @@ vorodevops.com, 1 vos-fleurs.ch, 1 vos-fleurs.com, 1 vosgym.jp, 1 -voshod.org, 1 +voshod.org, 0 vosjesweb.nl, 1 vosky.fr, 1 vosn.de, 1 @@ -36378,7 +36394,6 @@ wienerwichtelchallenge.at, 1 wieobensounten.de, 1 wifi-hack.com, 1 wifi-names.com, 1 -wifimask.com, 1 wifipineapple.com, 1 wifirst.net, 1 wifree.lv, 1 @@ -36693,7 +36708,6 @@ worldofterra.net, 1 worldofvnc.net, 1 worldofwobble.co.uk, 1 worldpeacetechnology.com, 1 -worldpovertysolutions.org, 1 worldsgreatestazuredemo.com, 1 worldsoccerclips.com, 1 worldstone777.com, 1 @@ -37372,7 +37386,6 @@ ybresson.com, 1 ybscareers.co.uk, 1 ybsul.com, 1 ybti.net, 1 -ycaaz.com, 1 ych.art, 1 ycherbonnel.fr, 1 ychon.com, 1 diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js index 158085877939..9f132f0a0ea5 100644 --- a/testing/mochitest/tests/SimpleTest/EventUtils.js +++ b/testing/mochitest/tests/SimpleTest/EventUtils.js @@ -20,6 +20,7 @@ * synthesizeDragOver * synthesizeDropAfterDragOver * synthesizeDrop + * synthesizePlainDragAndDrop * * When adding methods to this file, please add a performance test for it. */ @@ -2691,6 +2692,91 @@ function synthesizeDrop(aSrcElement, aDestElement, aDragData, aDropEffect, aWind } } +/** + * Emulate a drag and drop by emulating a dragstart by mousedown and mousemove, + * and firing events dragenter, dragover, drop, and mouseup. + * This does not modify dataTransfer and tries to emulate the plain drag and + * drop as much as possible, compared to synthesizeDrop. + * + * @param aParams + * { + * srcElement: The element to start dragging + * destElement: The element to drop on + * srcX: The initial x coordinate inside srcElement + * srcY: The initial y coordinate inside srcElement + * stepX: The x-axis step for mousemove inside srcElement + * stepY: The y-axis step for mousemove inside srcElement + * destX: The x coordinate inside destElement + * destY: The x coordinate inside destElement + * srcWindow: The window for dispatching event on srcElement, + * defaults to the current window object + * destWindow: The window for dispatching event on destElement, + * defaults to the current window object + * } + */ +async function synthesizePlainDragAndDrop(aParams) +{ + let { + srcElement, + destElement, + srcX = 2, + srcY = 2, + stepX = 9, + stepY = 9, + destX = 2, + destY = 2, + srcWindow = window, + destWindow = window, + } = aParams; + + const ds = _EU_Cc["@mozilla.org/widget/dragservice;1"] + .getService(_EU_Ci.nsIDragService); + ds.startDragSession(); + + try { + let dataTransfer = null; + function trapDrag(aEvent) { + dataTransfer = aEvent.dataTransfer; + } + srcElement.addEventListener("dragstart", trapDrag, true); + synthesizeMouse(srcElement, srcX, srcY, { type: "mousedown" }, srcWindow); + + // Wait for the next event tick after each event dispatch, so that UI elements + // (e.g. menu) work like the real user input. + await new Promise(r => setTimeout(r, 0)); + + srcX += stepX; srcY += stepY; + synthesizeMouse(srcElement, srcX, srcY, { type: "mousemove" }, srcWindow); + + await new Promise(r => setTimeout(r, 0)); + + srcX += stepX; srcY += stepY; + synthesizeMouse(srcElement, srcX, srcY, { type: "mousemove" }, srcWindow); + + await new Promise(r => setTimeout(r, 0)); + + srcElement.removeEventListener("dragstart", trapDrag, true); + + await new Promise(r => setTimeout(r, 0)); + + let event = createDragEventObject("dragover", destElement, destWindow, + dataTransfer, {}); + sendDragEvent(event, destElement, destWindow); + + await new Promise(r => setTimeout(r, 0)); + + event = createDragEventObject("drop", destElement, destWindow, + dataTransfer, {}); + sendDragEvent(event, destElement, destWindow); + + await new Promise(r => setTimeout(r, 0)); + + synthesizeMouseAtCenter(destElement, { type: "mouseup" }, destWindow); + } finally { + ds.endDragSession(true, 0); + } +} + var PluginUtils = { withTestPlugin : function(callback) diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm index 5795934bcc95..cf2d8fe90e80 100644 --- a/toolkit/components/places/PlacesUtils.jsm +++ b/toolkit/components/places/PlacesUtils.jsm @@ -946,6 +946,11 @@ var PlacesUtils = { case this.TYPE_X_MOZ_URL: { if (aFeedURI || PlacesUtils.nodeIsURI(aNode)) return (aFeedURI || aNode.uri) + NEWLINE + aNode.title; + if (PlacesUtils.nodeIsContainer(aNode)) { + return PlacesUtils.getURLsForContainerNode(aNode) + .map(item => item.uri + "\n" + item.title) + .join("\n"); + } return ""; } case this.TYPE_HTML: { @@ -1382,7 +1387,11 @@ var PlacesUtils = { for (let i = 0; i < root.childCount; ++i) { let child = root.getChild(i); if (this.nodeIsURI(child)) - urls.push({uri: child.uri, isBookmark: this.nodeIsBookmark(child)}); + urls.push({ + uri: child.uri, + isBookmark: this.nodeIsBookmark(child), + title: child.title, + }); } if (!wasOpen) {