Backed out changeset 2d21596af124 (bug 1337229) for developer's request

dom/animation/KeyframeEffectReadOnly.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/LookAndFeel.h" // For LookAndFeel::GetInt
 #include "mozilla/KeyframeUtils.h"
 #include "mozilla/ServoBindings.h"
+#include "mozilla/StyleAnimationValueInlines.h"
 #include "Layers.h" // For Layer
 #include "nsComputedDOMStyle.h" // nsComputedDOMStyle::GetStyleContextForElement
 #include "nsContentUtils.h"  // nsContentUtils::ReportToConsole

dom/animation/KeyframeEffectReadOnly.h

@@ -23,7 +23,7 @@
 #include "mozilla/KeyframeEffectParams.h"
 // RawServoDeclarationBlock and associated RefPtrTraits
 #include "mozilla/ServoBindingTypes.h"
-#include "mozilla/StyleAnimationValueInlines.h"
+#include "mozilla/StyleAnimationValue.h"
 #include "mozilla/dom/AnimationEffectReadOnly.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Element.h"

layout/style/ServoBindingList.h

@@ -130,9 +130,6 @@ SERVO_BINDING_FUNC(Servo_AnimationValue_GetOpacity, float,
 SERVO_BINDING_FUNC(Servo_AnimationValue_GetTransform, void,
                    RawServoAnimationValueBorrowed value,
                    RefPtr<nsCSSValueSharedList>* list)
-SERVO_BINDING_FUNC(Servo_AnimationValue_DeepEqual, bool,
-                   RawServoAnimationValueBorrowed,
-                   RawServoAnimationValueBorrowed)
 
 // Style attribute
 SERVO_BINDING_FUNC(Servo_ParseStyleAttribute, RawServoDeclarationBlockStrong,

layout/style/StyleAnimationValue.h

@@ -576,7 +576,11 @@ struct AnimationValue
   StyleAnimationValue mGecko;
   RefPtr<RawServoAnimationValue> mServo;
 
-  inline bool operator==(const AnimationValue& aOther) const;
+  bool operator==(const AnimationValue& aOther) const
+  {
+    // FIXME: Bug 1337229: add a deep == impl for RawServoAnimationValue.
+    return mGecko == aOther.mGecko && mServo == aOther.mServo;
+  }
 
   bool IsNull() const { return mGecko.IsNull() && !mServo; }
 

layout/style/StyleAnimationValueInlines.h

@@ -11,16 +11,6 @@
 
 namespace mozilla {
 
-bool
-AnimationValue::operator==(const AnimationValue& aOther) const
-{
-    // mGecko and mServo are mutual exclusive, one of them must be null
-    if (mServo) {
-      return Servo_AnimationValue_DeepEqual(mServo, aOther.mServo);
-    }
-    return mGecko == aOther.mGecko;
-}
-
 float
 AnimationValue::GetOpacity() const
 {

servo/ports/geckolib/glue.rs

@@ -343,16 +343,6 @@ pub extern "C" fn Servo_AnimationValue_Release(anim: RawServoAnimationValueBorro
     unsafe { AnimationValue::release(anim) };
 }
 
- #[no_mangle]
-pub extern "C" fn Servo_AnimationValue_DeepEqual(this: RawServoAnimationValueBorrowed,
-                                                 other: RawServoAnimationValueBorrowed)
-     -> bool
-{
-    let this_value = AnimationValue::as_arc(&this);
-    let other_value = AnimationValue::as_arc(&other);
-    this_value == other_value
-}
-
 #[no_mangle]
 pub extern "C" fn Servo_StyleWorkerThreadCount() -> u32 {
     *NUM_THREADS as u32