Bug 1431295 - Drop 'undef None' macro in dom/animation/. r=boris
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Thu, 18 Jan 2018 14:12:51 +0900
changeset 454243 ff8efa46c4602fa06bf9e1876e11ecde61d4338d
parent 454242 e53c7df917c70e98fb2f31879a932c3833736a56
child 454244 25d33cd4ed83d2f8abe6a8c46165e957b0ea5030
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersboris
bugs1431295
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1431295 - Drop 'undef None' macro in dom/animation/. r=boris MozReview-Commit-ID: BkV6vCc4rmt
dom/animation/ComputedTiming.h
dom/animation/KeyframeEffectParams.h
dom/animation/TimingParams.h
--- a/dom/animation/ComputedTiming.h
+++ b/dom/animation/ComputedTiming.h
@@ -6,20 +6,16 @@
 
 #ifndef mozilla_ComputedTiming_h
 #define mozilla_ComputedTiming_h
 
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/StickyTimeDuration.h"
 #include "mozilla/ComputedTimingFunction.h"
 
-// X11 has a #define for None
-#ifdef None
-#undef None
-#endif
 #include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // FillMode
 
 namespace mozilla {
 
 /**
  * Stores the results of calculating the timing properties of an animation
  * at a given sample time.
  */
--- a/dom/animation/KeyframeEffectParams.h
+++ b/dom/animation/KeyframeEffectParams.h
@@ -2,20 +2,16 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_KeyframeEffectParams_h
 #define mozilla_KeyframeEffectParams_h
 
-// X11 has a #define for None
-#ifdef None
-#undef None
-#endif
 #include "mozilla/dom/KeyframeEffectBinding.h" // IterationCompositeOperation
 
 namespace mozilla {
 
 struct KeyframeEffectParams
 {
   dom::IterationCompositeOperation mIterationComposite =
     dom::IterationCompositeOperation::Replace;
--- a/dom/animation/TimingParams.h
+++ b/dom/animation/TimingParams.h
@@ -10,20 +10,16 @@
 #include "nsStringFwd.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/UnionTypes.h" // For OwningUnrestrictedDoubleOrString
 #include "mozilla/ComputedTimingFunction.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/StickyTimeDuration.h"
 #include "mozilla/TimeStamp.h" // for TimeDuration
 
-// X11 has a #define for None
-#ifdef None
-#undef None
-#endif
 #include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for FillMode
                                                         // and PlaybackDirection
 
 class nsIDocument;
 
 namespace mozilla {
 
 namespace dom {