Bug 1447483: Merge nsStyleContext and ServoStyleContext, rename to ComputedStyle. r=jwatt

MozReview-Commit-ID: JPopq0LudD
This commit is contained in:
Emilio Cobos Álvarez
2018-03-22 19:20:41 +01:00
parent 89cb511b3c
commit 1f5d8de5cc
395 changed files with 3457 additions and 4952 deletions

View File

@@ -19,8 +19,8 @@ class nsHTMLButtonControlFrame : public nsContainerFrame,
public nsIFormControlFrame
{
public:
explicit nsHTMLButtonControlFrame(nsStyleContext* aContext)
: nsHTMLButtonControlFrame(aContext, kClassID)
explicit nsHTMLButtonControlFrame(ComputedStyle* aStyle)
: nsHTMLButtonControlFrame(aStyle, kClassID)
{}
~nsHTMLButtonControlFrame();
@@ -57,9 +57,9 @@ public:
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow) override;
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const override;
virtual void SetAdditionalStyleContext(int32_t aIndex,
nsStyleContext* aStyleContext) override;
ComputedStyle* GetAdditionalComputedStyle(int32_t aIndex) const override;
void SetAdditionalComputedStyle(int32_t aIndex,
ComputedStyle* aComputedStyle) override;
#ifdef DEBUG
virtual void AppendFrames(ChildListID aListID,
@@ -102,7 +102,7 @@ public:
void AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult) override;
protected:
nsHTMLButtonControlFrame(nsStyleContext* aContext, nsIFrame::ClassID aID);
nsHTMLButtonControlFrame(ComputedStyle* aStyle, nsIFrame::ClassID aID);
virtual bool IsInput() { return false; }