Move occlusion info to TilePriority.

cc/resources/tile_priority.h

 // Copyright 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.
 
 #ifndef CC_RESOURCES_TILE_PRIORITY_H_
 #define CC_RESOURCES_TILE_PRIORITY_H_
 
 #include <algorithm>
 #include <limits>
 
@@ skipping 28 matching lines @@
 };
 scoped_ptr<base::Value> TileResolutionAsValue(
     TileResolution resolution);
 
 struct CC_EXPORT TilePriority {
   enum PriorityBin { NOW, SOON, EVENTUALLY };
 
   TilePriority()
       : resolution(NON_IDEAL_RESOLUTION),
         required_for_activation(false),
+        is_occluded(false),
         priority_bin(EVENTUALLY),
         distance_to_visible(std::numeric_limits<float>::infinity()) {}
 
   TilePriority(TileResolution resolution,
+               bool is_occluded,
                PriorityBin bin,
                float distance_to_visible)
       : resolution(resolution),
         required_for_activation(false),
+        is_occluded(is_occluded),
         priority_bin(bin),
         distance_to_visible(distance_to_visible) {}
 
   TilePriority(const TilePriority& active, const TilePriority& pending) {
     if (active.resolution == HIGH_RESOLUTION ||
         pending.resolution == HIGH_RESOLUTION)
       resolution = HIGH_RESOLUTION;
     else if (active.resolution == LOW_RESOLUTION ||
              pending.resolution == LOW_RESOLUTION)
       resolution = LOW_RESOLUTION;
     else
       resolution = NON_IDEAL_RESOLUTION;
 
     required_for_activation =
         active.required_for_activation || pending.required_for_activation;
 
+    is_occluded = active.is_occluded && pending.is_occluded;
+
     if (active.priority_bin < pending.priority_bin) {
       priority_bin = active.priority_bin;
       distance_to_visible = active.distance_to_visible;
     } else if (active.priority_bin > pending.priority_bin) {
       priority_bin = pending.priority_bin;
       distance_to_visible = pending.distance_to_visible;
     } else {
       priority_bin = active.priority_bin;
       distance_to_visible =
           std::min(active.distance_to_visible, pending.distance_to_visible);
     }
   }
 
   scoped_ptr<base::Value> AsValue() const;
 
   bool operator ==(const TilePriority& other) const {
     return resolution == other.resolution &&
            priority_bin == other.priority_bin &&
            distance_to_visible == other.distance_to_visible &&
-           required_for_activation == other.required_for_activation;
+           required_for_activation == other.required_for_activation &&
+           is_occluded == other.is_occluded;
   }
 
   bool operator !=(const TilePriority& other) const {
     return !(*this == other);
   }
 
   bool IsHigherPriorityThan(const TilePriority& other) const {
     return priority_bin < other.priority_bin ||
            (priority_bin == other.priority_bin &&
             distance_to_visible < other.distance_to_visible);
   }
 
   TileResolution resolution;
   bool required_for_activation;
+  bool is_occluded;
   PriorityBin priority_bin;
   float distance_to_visible;
 };
 
 scoped_ptr<base::Value> TilePriorityBinAsValue(TilePriority::PriorityBin bin);
 
 enum TileMemoryLimitPolicy {
   // Nothing.
   ALLOW_NOTHING = 0,
 
@@ skipping 50 matching lines @@
   bool operator!=(const GlobalStateThatImpactsTilePriority& other) const {
     return !(*this == other);
   }
 
   scoped_ptr<base::Value> AsValue() const;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_PRIORITY_H_