1 files changed, 36 insertions, 110 deletions

diff --git a/chromium/cc/resources/tile_priority.cc b/chromium/cc/resources/tile_priority.cc
index 9cf4634f7d5..3bf29680766 100644
--- a/chromium/cc/resources/tile_priority.cc
+++ b/chromium/cc/resources/tile_priority.cc
@@ -7,62 +7,17 @@
 #include "base/values.h"
 #include "cc/base/math_util.h"
 
-namespace {
-
-// TODO(qinmin): modify ui/range/Range.h to support template so that we
-// don't need to define this.
-struct Range {
-  Range(float start, float end) : start_(start), end_(end) {}
-  bool IsEmpty();
-  float start_;
-  float end_;
-};
-
-bool Range::IsEmpty() {
-  return start_ >= end_;
-}
-
-inline void IntersectNegativeHalfplane(Range* out,
-                                       float previous,
-                                       float current,
-                                       float target,
-                                       float time_delta) {
-  float time_per_dist = time_delta / (current - previous);
-  float t = (target - current) * time_per_dist;
-  if (time_per_dist > 0.0f)
-    out->start_ = std::max(out->start_, t);
-  else
-    out->end_ = std::min(out->end_, t);
-}
-
-inline void IntersectPositiveHalfplane(Range* out,
-                                       float previous,
-                                       float current,
-                                       float target,
-                                       float time_delta) {
-  float time_per_dist = time_delta / (current - previous);
-  float t = (target - current) * time_per_dist;
-  if (time_per_dist < 0.0f)
-    out->start_ = std::max(out->start_, t);
-  else
-    out->end_ = std::min(out->end_, t);
-}
-
-}  // namespace
-
 namespace cc {
 
 scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree) {
   switch (tree) {
   case ACTIVE_TREE:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
-          "ACTIVE_TREE"));
+      return scoped_ptr<base::Value>(new base::StringValue("ACTIVE_TREE"));
   case PENDING_TREE:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
-          "PENDING_TREE"));
+      return scoped_ptr<base::Value>(new base::StringValue("PENDING_TREE"));
   default:
       DCHECK(false) << "Unrecognized WhichTree value " << tree;
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "<unknown WhichTree value>"));
   }
 }
@@ -71,87 +26,59 @@ scoped_ptr<base::Value> TileResolutionAsValue(
     TileResolution resolution) {
   switch (resolution) {
   case LOW_RESOLUTION:
-    return scoped_ptr<base::Value>(base::Value::CreateStringValue(
-        "LOW_RESOLUTION"));
+    return scoped_ptr<base::Value>(new base::StringValue("LOW_RESOLUTION"));
   case HIGH_RESOLUTION:
-    return scoped_ptr<base::Value>(base::Value::CreateStringValue(
-        "HIGH_RESOLUTION"));
+    return scoped_ptr<base::Value>(new base::StringValue("HIGH_RESOLUTION"));
   case NON_IDEAL_RESOLUTION:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
         "NON_IDEAL_RESOLUTION"));
   }
   DCHECK(false) << "Unrecognized TileResolution value " << resolution;
-  return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+  return scoped_ptr<base::Value>(new base::StringValue(
       "<unknown TileResolution value>"));
 }
 
+scoped_ptr<base::Value> TilePriorityBinAsValue(TilePriority::PriorityBin bin) {
+  switch (bin) {
+    case TilePriority::NOW:
+      return scoped_ptr<base::Value>(base::Value::CreateStringValue("NOW"));
+    case TilePriority::SOON:
+      return scoped_ptr<base::Value>(base::Value::CreateStringValue("SOON"));
+    case TilePriority::EVENTUALLY:
+      return scoped_ptr<base::Value>(
+          base::Value::CreateStringValue("EVENTUALLY"));
+  }
+  DCHECK(false) << "Unrecognized TilePriority::PriorityBin value " << bin;
+  return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      "<unknown TilePriority::PriorityBin value>"));
+}
+
 scoped_ptr<base::Value> TilePriority::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   state->Set("resolution", TileResolutionAsValue(resolution).release());
-  state->Set("time_to_visible_in_seconds",
-             MathUtil::AsValueSafely(time_to_visible_in_seconds).release());
-  state->Set("distance_to_visible_in_pixels",
-             MathUtil::AsValueSafely(distance_to_visible_in_pixels).release());
+  state->Set("priority_bin", TilePriorityBinAsValue(priority_bin).release());
+  state->Set("distance_to_visible",
+             MathUtil::AsValueSafely(distance_to_visible).release());
   return state.PassAs<base::Value>();
 }
 
-float TilePriority::TimeForBoundsToIntersect(const gfx::RectF& previous_bounds,
-                                             const gfx::RectF& current_bounds,
-                                             float time_delta,
-                                             const gfx::RectF& target_bounds) {
-  // Perform an intersection test explicitly between current and target.
-  if (current_bounds.x() < target_bounds.right() &&
-      current_bounds.y() < target_bounds.bottom() &&
-      target_bounds.x() < current_bounds.right() &&
-      target_bounds.y() < current_bounds.bottom())
-    return 0.0f;
-
-  const float kMaxTimeToVisibleInSeconds =
-      std::numeric_limits<float>::infinity();
-
-  if (time_delta == 0.0f)
-    return kMaxTimeToVisibleInSeconds;
-
-  // As we are trying to solve the case of both scaling and scrolling, using
-  // a single coordinate with velocity is not enough. The logic here is to
-  // calculate the velocity for each edge. Then we calculate the time range that
-  // each edge will stay on the same side of the target bounds. If there is an
-  // overlap between these time ranges, the bounds must have intersect with
-  // each other during that period of time.
-  Range range(0.0f, kMaxTimeToVisibleInSeconds);
-  IntersectPositiveHalfplane(
-      &range, previous_bounds.x(), current_bounds.x(),
-      target_bounds.right(), time_delta);
-  IntersectNegativeHalfplane(
-      &range, previous_bounds.right(), current_bounds.right(),
-      target_bounds.x(), time_delta);
-  IntersectPositiveHalfplane(
-      &range, previous_bounds.y(), current_bounds.y(),
-      target_bounds.bottom(), time_delta);
-  IntersectNegativeHalfplane(
-      &range, previous_bounds.bottom(), current_bounds.bottom(),
-      target_bounds.y(), time_delta);
-  return range.IsEmpty() ? kMaxTimeToVisibleInSeconds : range.start_;
-}
-
 scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
     TileMemoryLimitPolicy policy) {
   switch (policy) {
   case ALLOW_NOTHING:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
-          "ALLOW_NOTHING"));
+      return scoped_ptr<base::Value>(new base::StringValue("ALLOW_NOTHING"));
   case ALLOW_ABSOLUTE_MINIMUM:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "ALLOW_ABSOLUTE_MINIMUM"));
   case ALLOW_PREPAINT_ONLY:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "ALLOW_PREPAINT_ONLY"));
   case ALLOW_ANYTHING:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "ALLOW_ANYTHING"));
   default:
       DCHECK(false) << "Unrecognized policy value";
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "<unknown>"));
   }
 }
@@ -159,17 +86,17 @@ scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
 scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio) {
   switch (prio) {
   case SAME_PRIORITY_FOR_BOTH_TREES:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "SAME_PRIORITY_FOR_BOTH_TREES"));
   case SMOOTHNESS_TAKES_PRIORITY:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "SMOOTHNESS_TAKES_PRIORITY"));
   case NEW_CONTENT_TAKES_PRIORITY:
-      return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+      return scoped_ptr<base::Value>(new base::StringValue(
           "NEW_CONTENT_TAKES_PRIORITY"));
   }
   DCHECK(false) << "Unrecognized priority value " << prio;
-  return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+  return scoped_ptr<base::Value>(new base::StringValue(
       "<unknown>"));
 }
 
@@ -177,9 +104,8 @@ scoped_ptr<base::Value> GlobalStateThatImpactsTilePriority::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   state->Set("memory_limit_policy",
              TileMemoryLimitPolicyAsValue(memory_limit_policy).release());
-  state->SetInteger("memory_limit_in_bytes", memory_limit_in_bytes);
-  state->SetInteger("unused_memory_limit_in_bytes",
-                    unused_memory_limit_in_bytes);
+  state->SetInteger("soft_memory_limit_in_bytes", soft_memory_limit_in_bytes);
+  state->SetInteger("hard_memory_limit_in_bytes", hard_memory_limit_in_bytes);
   state->SetInteger("num_resources_limit", num_resources_limit);
   state->Set("tree_priority", TreePriorityAsValue(tree_priority).release());
   return state.PassAs<base::Value>();