Index: third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp |
diff --git a/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp b/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp |
similarity index 98% |
rename from third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp |
rename to third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp |
index 9355fee81ed4a4edbaf79af053c3b0182ad0cbab..7c305a6b7f18f80a51b72689931ed6e8eb5244c0 100644 |
--- a/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp |
@@ -2,13 +2,14 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "core/animation/css/CSSPropertyEquality.h" |
+#include "core/css/CSSPropertyEquality.h" |
-#include "core/animation/css/CSSAnimations.h" |
-#include "core/style/DataEquivalency.h" |
#include "core/style/ComputedStyle.h" |
+#include "core/style/DataEquivalency.h" |
#include "core/style/ShadowList.h" |
+// TODO(ikilpatrick): generate this file. |
+ |
namespace blink { |
namespace { |
@@ -40,7 +41,7 @@ bool fillLayersEqual(const FillLayer& aLayers, const FillLayer& bLayers) |
return false; |
break; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return true; |
} |
@@ -332,7 +333,7 @@ bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const ComputedStyl |
case CSSPropertyZIndex: |
return a.hasAutoZIndex() == b.hasAutoZIndex() && (a.hasAutoZIndex() || a.zIndex() == b.zIndex()); |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return true; |
} |
} |