Bug 1380133 - Part 2: Take a ServoStyleContext* in Gecko_CalcStyleDifference. r=emilio

MozReview-Commit-ID: DJnuUAmm1Fh
---
 layout/style/ServoBindings.cpp | 14 +++++++-------
 layout/style/ServoBindings.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

--HG--
extra : rebase_source : c4df8f13546511b504aefb0fa481d5f4171955ee

layout/style/ServoBindings.cpp

@@ -398,18 +398,18 @@ Gecko_GetImplementedPseudo(RawGeckoElementBorrowed aElement)
 }
 
 nsChangeHint
-Gecko_CalcStyleDifference(nsStyleContext* aOldStyleContext,
-                          ServoComputedValuesBorrowed aComputedValues,
+Gecko_CalcStyleDifference(nsStyleContext* aOldStyleFromFrame,
+                          const ServoStyleContext* aNewStyle,
                           bool* aAnyStyleChanged)
 {
-  MOZ_ASSERT(aOldStyleContext);
-  MOZ_ASSERT(aComputedValues);
+  MOZ_ASSERT(aOldStyleFromFrame);
+  MOZ_ASSERT(aNewStyle);
 
   uint32_t equalStructs, samePointerStructs;
   nsChangeHint result =
-    aOldStyleContext->CalcStyleDifference(aComputedValues,
-                                          &equalStructs,
-                                          &samePointerStructs);
+    aOldStyleFromFrame->CalcStyleDifference(aNewStyle->ComputedValues(),
+                                            &equalStructs,
+                                            &samePointerStructs);
   *aAnyStyleChanged = equalStructs != NS_STYLE_INHERIT_MASK;
   return result;
 }

layout/style/ServoBindings.h

@@ -378,8 +378,8 @@ void Gecko_SetOwnerDocumentNeedsStyleFlush(RawGeckoElementBorrowed element);
 nsStyleContext* Gecko_GetStyleContext(RawGeckoElementBorrowed element,
                                       nsIAtom* aPseudoTagOrNull);
 mozilla::CSSPseudoElementType Gecko_GetImplementedPseudo(RawGeckoElementBorrowed element);
-nsChangeHint Gecko_CalcStyleDifference(nsStyleContext* oldstyle,
-                                       ServoComputedValuesBorrowed newstyle,
+nsChangeHint Gecko_CalcStyleDifference(nsStyleContext* old_style_from_frame,
+                                       const mozilla::ServoStyleContext* new_style,
                                        bool* any_style_changed);
 nsChangeHint Gecko_HintsHandledForDescendants(nsChangeHint aHint);