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

ui/compositor/layer_animation_sequence.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animation_sequence.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/debug/trace_event.h"
@@ skipping 165 matching lines @@
 }
 
 bool LayerAnimationSequence::HasConflictingProperty(
     const LayerAnimationElement::AnimatableProperties& other) const {
   LayerAnimationElement::AnimatableProperties intersection;
   std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii(
       intersection, intersection.begin());
   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 {
   if (!elements_.empty())
     return elements_[0]->IsThreaded();
 
   return false;
 }
 
 void LayerAnimationSequence::AddObserver(LayerAnimationObserver* observer) {
@@ skipping 62 matching lines @@
 
 LayerAnimationElement* LayerAnimationSequence::CurrentElement() {
   if (elements_.empty())
     return NULL;
 
   size_t current_index = last_element_ % elements_.size();
   return elements_[current_index].get();
 }
 
 }  // namespace ui