summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-18 15:10:34 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-24 10:32:03 +0200
commit9d96ad90dda81f202826cb6ec1535561f14218db (patch)
treef8b9c3328fd3a59ab5d5fe5effe0f6ed2f0a49d2
parentb064c95231d34eddf350bb5624faa2c60c659630 (diff)
downloadUXP-9d96ad90dda81f202826cb6ec1535561f14218db.tar
UXP-9d96ad90dda81f202826cb6ec1535561f14218db.tar.gz
UXP-9d96ad90dda81f202826cb6ec1535561f14218db.tar.lz
UXP-9d96ad90dda81f202826cb6ec1535561f14218db.tar.xz
UXP-9d96ad90dda81f202826cb6ec1535561f14218db.zip
Issue #80 - De-unify dom/animation
KeyFrameEffect and KeyFrameEffectReadOnly are still built unified as buddies because they have some complex interdependency that couldn't easily be resolved without linking failures.
-rw-r--r--dom/animation/AnimationComparator.h2
-rw-r--r--dom/animation/AnimationEffectReadOnly.cpp1
-rw-r--r--dom/animation/AnimationPerformanceWarning.h3
-rw-r--r--dom/animation/CSSPseudoElement.cpp1
-rw-r--r--dom/animation/KeyframeEffect.cpp1
-rw-r--r--dom/animation/KeyframeEffectReadOnly.cpp2
-rw-r--r--dom/animation/moz.build7
7 files changed, 15 insertions, 2 deletions
diff --git a/dom/animation/AnimationComparator.h b/dom/animation/AnimationComparator.h
index ff665e82a..730d62f48 100644
--- a/dom/animation/AnimationComparator.h
+++ b/dom/animation/AnimationComparator.h
@@ -7,6 +7,8 @@
#ifndef mozilla_AnimationComparator_h
#define mozilla_AnimationComparator_h
+#include "mozilla/dom/Animation.h"
+
namespace mozilla {
// Although this file is called AnimationComparator, we don't actually
diff --git a/dom/animation/AnimationEffectReadOnly.cpp b/dom/animation/AnimationEffectReadOnly.cpp
index 63d633c2f..7eb0880c7 100644
--- a/dom/animation/AnimationEffectReadOnly.cpp
+++ b/dom/animation/AnimationEffectReadOnly.cpp
@@ -6,6 +6,7 @@
#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h"
+#include "mozilla/dom/Animation.h"
#include "mozilla/AnimationUtils.h"
#include "mozilla/FloatingPoint.h"
diff --git a/dom/animation/AnimationPerformanceWarning.h b/dom/animation/AnimationPerformanceWarning.h
index 025857e0c..a1ac35cba 100644
--- a/dom/animation/AnimationPerformanceWarning.h
+++ b/dom/animation/AnimationPerformanceWarning.h
@@ -9,6 +9,9 @@
#include <initializer_list>
+#include "mozilla/Maybe.h"
+#include "nsTArray.h"
+
class nsXPIDLString;
namespace mozilla {
diff --git a/dom/animation/CSSPseudoElement.cpp b/dom/animation/CSSPseudoElement.cpp
index a4dede0b3..0283eb59e 100644
--- a/dom/animation/CSSPseudoElement.cpp
+++ b/dom/animation/CSSPseudoElement.cpp
@@ -7,6 +7,7 @@
#include "mozilla/dom/CSSPseudoElement.h"
#include "mozilla/dom/CSSPseudoElementBinding.h"
#include "mozilla/dom/Element.h"
+#include "mozilla/dom/KeyFrameEffectBinding.h" // for ElementOrCSSPseudoElement class
#include "mozilla/AnimationComparator.h"
namespace mozilla {
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index decbf6305..32f6bd1a1 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -11,6 +11,7 @@
#include "mozilla/dom/AnimationEffectTiming.h"
#include "mozilla/dom/KeyframeEffectBinding.h"
#include "mozilla/KeyframeUtils.h"
+#include "nsContentUtils.h"
#include "nsDOMMutationObserver.h" // For nsAutoAnimationMutationBatch
#include "nsIScriptError.h"
diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp
index 639e0b2b0..95f657449 100644
--- a/dom/animation/KeyframeEffectReadOnly.cpp
+++ b/dom/animation/KeyframeEffectReadOnly.cpp
@@ -6,6 +6,7 @@
#include "mozilla/dom/KeyframeEffectReadOnly.h"
+#include "mozilla/dom/Animation.h"
#include "mozilla/dom/KeyframeAnimationOptionsBinding.h"
// For UnrestrictedDoubleOrKeyframeAnimationOptions;
#include "mozilla/dom/CSSPseudoElement.h"
@@ -25,6 +26,7 @@
#include "nsCSSPseudoElements.h" // For CSSPseudoElementType
#include "nsIPresShell.h"
#include "nsIScriptError.h"
+#include "nsRefreshDriver.h"
namespace mozilla {
diff --git a/dom/animation/moz.build b/dom/animation/moz.build
index bd8c93707..356980f00 100644
--- a/dom/animation/moz.build
+++ b/dom/animation/moz.build
@@ -37,6 +37,11 @@ EXPORTS.mozilla += [
]
UNIFIED_SOURCES += [
+ 'KeyframeEffect.cpp',
+ 'KeyframeEffectReadOnly.cpp',
+]
+
+SOURCES += [
'Animation.cpp',
'AnimationEffectReadOnly.cpp',
'AnimationEffectTiming.cpp',
@@ -50,9 +55,7 @@ UNIFIED_SOURCES += [
'DocumentTimeline.cpp',
'EffectCompositor.cpp',
'EffectSet.cpp',
- 'KeyframeEffect.cpp',
'KeyframeEffectParams.cpp',
- 'KeyframeEffectReadOnly.cpp',
'KeyframeUtils.cpp',
'PendingAnimationTracker.cpp',
'TimingParams.cpp',