Consider occluded tiles during eviction with occluded as Tile property.

cc/resources/tile.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_H_
 #define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 30 matching lines @@
   }
 
   TilePriority priority_for_tree_priority(TreePriority tree_priority) const {
     switch (tree_priority) {
       case SMOOTHNESS_TAKES_PRIORITY:
         return priority_[ACTIVE_TREE];
       case NEW_CONTENT_TAKES_PRIORITY:
         return priority_[PENDING_TREE];
       case SAME_PRIORITY_FOR_BOTH_TREES:
         return combined_priority();
+      default:
+        NOTREACHED();
+        return TilePriority();
     }
-    NOTREACHED();
-    return TilePriority();
   }
 
   TilePriority combined_priority() const {
     return TilePriority(priority_[ACTIVE_TREE],
                         priority_[PENDING_TREE]);
   }
 
   void SetPriority(WhichTree tree, const TilePriority& priority);
 
+  void set_is_occluded(WhichTree tree, bool is_occluded) {
+    is_occluded_[tree] = is_occluded;
+  }
+
+  bool is_occluded(WhichTree tree) const { return is_occluded_[tree]; }
+
+  bool is_occluded_for_tree_priority(TreePriority tree_priority) const {
+    switch (tree_priority) {
+      case SMOOTHNESS_TAKES_PRIORITY:
+        return is_occluded_[ACTIVE_TREE];
+      case NEW_CONTENT_TAKES_PRIORITY:
+        return is_occluded_[PENDING_TREE];
+      case SAME_PRIORITY_FOR_BOTH_TREES:
+        return is_occluded_[ACTIVE_TREE] && is_occluded_[PENDING_TREE];
+      default:
+        NOTREACHED();
+        return false;
+    }
+  }
+
   void MarkRequiredForActivation();
 
   bool required_for_activation() const {
     return priority_[PENDING_TREE].required_for_activation;
   }
 
   bool use_picture_analysis() const {
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
@@ skipping 50 matching lines @@
   RasterMode DetermineOverallRasterMode() const;
 
   // Functionality used in tests.
   RasterMode GetRasterModeForTesting() const {
     return managed_state().raster_mode;
   }
   ManagedTileState::TileVersion& GetTileVersionForTesting(RasterMode mode) {
     return managed_state_.tile_versions[mode];
   }
 
-  void set_is_occluded(WhichTree tree, bool is_occluded) {
-    is_occluded_[tree] = is_occluded;
-  }
-
-  bool is_occluded(WhichTree tree) const { return is_occluded_[tree]; }
-
  private:
   friend class TileManager;
   friend class PrioritizedTileSet;
   friend class FakeTileManager;
   friend class BinComparator;
   friend class FakePictureLayerImpl;
 
   // Methods called by by tile manager.
   Tile(TileManager* tile_manager,
        PicturePileImpl* picture_pile,
@@ skipping 26 matching lines @@
 
   Id id_;
   static Id s_next_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Tile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_H_