corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1447483: Merge nsStyleContext and ServoStyleContext, rename to ComputedStyle. r=jwatt on a CLOSED TREE

Browse Source 
MozReview-Commit-ID: JPopq0LudD
This commit is contained in:
Emilio Cobos Álvarez
2018-03-22 19:20:41 +01:00
parent 97286b35c8
commit 1d4859a89a
395 changed files with 3690 additions and 4142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -20,16 +20,16 @@
using namespace mozilla;
nsContainerFrame*
NS_NewHTMLButtonControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
NS_NewHTMLButtonControlFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle)
{
return new (aPresShell) nsHTMLButtonControlFrame(aContext);
return new (aPresShell) nsHTMLButtonControlFrame(aStyle);
}
NS_IMPL_FRAMEARENA_HELPERS(nsHTMLButtonControlFrame)
nsHTMLButtonControlFrame::nsHTMLButtonControlFrame(nsStyleContext* aContext,
nsHTMLButtonControlFrame::nsHTMLButtonControlFrame(ComputedStyle* aStyle,
nsIFrame::ClassID aID)
: nsContainerFrame(aContext, aID)
: nsContainerFrame(aStyle, aID)
{
}
@@ -190,7 +190,7 @@ nsHTMLButtonControlFrame::Reflow(nsPresContext* aPresContext,
MOZ_ASSERT(firstKid, "Button should have a child frame for its contents");
MOZ_ASSERT(!firstKid->GetNextSibling(),
"Button should have exactly one child frame");
MOZ_ASSERT(firstKid->StyleContext()->GetPseudo() ==
MOZ_ASSERT(firstKid->Style()->GetPseudo() ==
nsCSSAnonBoxes::buttonContent,
"Button's child frame has unexpected pseudo type!");
@@ -382,17 +382,17 @@ nsresult nsHTMLButtonControlFrame::SetFormProperty(nsAtom* aName, const nsAStrin
return NS_OK;
}
nsStyleContext*
nsHTMLButtonControlFrame::GetAdditionalStyleContext(int32_t aIndex) const
ComputedStyle*
nsHTMLButtonControlFrame::GetAdditionalComputedStyle(int32_t aIndex) const
{
return mRenderer.GetStyleContext(aIndex);
return mRenderer.GetComputedStyle(aIndex);
}
void
nsHTMLButtonControlFrame::SetAdditionalStyleContext(int32_t aIndex,
nsStyleContext* aStyleContext)
nsHTMLButtonControlFrame::SetAdditionalComputedStyle(int32_t aIndex,
ComputedStyle* aComputedStyle)
{
mRenderer.SetStyleContext(aIndex, aStyleContext);
mRenderer.SetComputedStyle(aIndex, aComputedStyle);
}
void