Commit cc740ca2 authored by Butkovits Atila's avatar Butkovits Atila
Browse files

Backed out changeset f6e3d050b3e7 (bug 1832173) for causing bustages at... 

Backed out changeset f6e3d050b3e7 (bug 1832173) for causing bustages at CanvasRenderingContext2D.cpp. CLOSED TREE
parent f9c09229

dom/animation/Keyframe.h

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#include "mozilla/Maybe.h"

#include "mozilla/RefPtr.h"



struct RawServoDeclarationBlock;

namespace mozilla {

struct StyleLockedDeclarationBlock;



/**

 * A property-value pair specified on a keyframe.
@@ -25,7 +25,7 @@ struct PropertyValuePair { 
  explicit PropertyValuePair(nsCSSPropertyID aProperty)

      : mProperty(aProperty) {}

  PropertyValuePair(nsCSSPropertyID aProperty,

                    RefPtr<StyleLockedDeclarationBlock>&& aValue)

                    RefPtr<RawServoDeclarationBlock>&& aValue)

      : mProperty(aProperty), mServoDeclarationBlock(std::move(aValue)) {

    MOZ_ASSERT(mServoDeclarationBlock, "Should be valid property value");

  }
@@ -33,7 +33,7 @@ struct PropertyValuePair { 
  nsCSSPropertyID mProperty;



  // The specified value when using the Servo backend.

  RefPtr<StyleLockedDeclarationBlock> mServoDeclarationBlock;

  RefPtr<RawServoDeclarationBlock> mServoDeclarationBlock;



#ifdef DEBUG

  // Flag to indicate that when we call StyleAnimationValue::ComputeValues on

dom/animation/KeyframeEffect.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ void KeyframeEffect::GetKeyframes(JSContext* aCx, nsTArray<JSObject*>& aResult, 
      return;

    }



    RefPtr<StyleLockedDeclarationBlock> customProperties;

    RefPtr<RawServoDeclarationBlock> customProperties;

    // A workaround for CSS Animations in servo backend, custom properties in

    // keyframe are stored in a servo's declaration block. Find the declaration

    // block to resolve CSS variables in the keyframe.

dom/animation/KeyframeEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "mozilla/Keyframe.h"

#include "mozilla/KeyframeEffectParams.h"

#include "mozilla/PostRestyleMode.h"

// StyleLockedDeclarationBlock and associated RefPtrTraits

// RawServoDeclarationBlock and associated RefPtrTraits

#include "mozilla/ServoBindingTypes.h"

#include "mozilla/StyleAnimationValue.h"

#include "mozilla/dom/AnimationEffect.h"

dom/animation/KeyframeUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static Maybe<PropertyValuePair> MakePropertyValuePair( 


  ServoCSSParser::ParsingEnvironment env =

      ServoCSSParser::GetParsingEnvironment(aDocument);

  RefPtr<StyleLockedDeclarationBlock> servoDeclarationBlock =

  RefPtr<RawServoDeclarationBlock> servoDeclarationBlock =

      ServoCSSParser::ParseProperty(aProperty, aStringValue, env);



  if (servoDeclarationBlock) {

dom/animation/KeyframeUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


struct JSContext;

class JSObject;

struct StyleLockedDeclarationBlock;

struct RawServoDeclarationBlock;



namespace mozilla {

struct AnimationProperty;