Merge ui::Layer's concept of position with cc::Layer's

ui/compositor/layer_animation_sequence.cc

Index: ui/compositor/layer_animation_sequence.cc
diff --git a/ui/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc
index 8414f4289168cdc073a769cd3fa4461a4e7b4ad9..371e54092194557b4933c0d038b2be131609a51c 100644
--- a/ui/compositor/layer_animation_sequence.cc
+++ b/ui/compositor/layer_animation_sequence.cc
@@ -183,18 +183,7 @@ bool LayerAnimationSequence::HasConflictingProperty(
   std::set_intersection(properties_.begin(), properties_.end(),
                         other.begin(), other.end(),
                         ii);
-  if (intersection.size() > 0)
-    return true;
-
-  if (properties_.find(LayerAnimationElement::TRANSFORM) != properties_.end() &&
-      other.find(LayerAnimationElement::BOUNDS) != other.end())
-    return true;
-
-  if (properties_.find(LayerAnimationElement::BOUNDS) != properties_.end() &&
-      other.find(LayerAnimationElement::TRANSFORM) != other.end())
-    return true;
-
-  return false;
+  return (intersection.size() > 0);
 }
 
 bool LayerAnimationSequence::IsFirstElementThreaded() const {