cc: Pass priority rect information from iterators to tilings.

cc/resources/tiling_set_raster_queue_all.h

 // Copyright 2014 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_TILING_SET_RASTER_QUEUE_ALL_H_
 #define CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
 
 #include "base/containers/stack_container.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/picture_layer_tiling_set.h"
@@ skipping 14 matching lines @@
   const Tile* Top() const;
   void Pop();
   bool IsEmpty() const;
 
  private:
   // Helper base class for individual region iterators.
   class OnePriorityRectIterator {
    public:
     OnePriorityRectIterator();
     OnePriorityRectIterator(PictureLayerTiling* tiling,
-                            TilingData* tiling_data);
+                            TilingData* tiling_data,
+                            PictureLayerTiling::PriorityRect priority_rect);
 
     bool done() const { return !tile_; }
     Tile* operator*() const { return tile_; }
 
    protected:
     ~OnePriorityRectIterator() = default;
     bool TileNeedsRaster(Tile* tile) const {
       return tile->NeedsRaster() && !tiling_->IsTileOccluded(tile);
     }
 
     template <typename TilingIteratorType>
     void AdvanceToNextTile(TilingIteratorType* iterator);
     template <typename TilingIteratorType>
     bool GetFirstTileAndCheckIfValid(TilingIteratorType* iterator);
 
     Tile* tile_;
     PictureLayerTiling* tiling_;
+    const PictureLayerTiling* pending_twin_tiling_;
     TilingData* tiling_data_;
+    PictureLayerTiling::PriorityRect priority_rect_;
   };
 
   // Iterates over visible rect only, left to right top to bottom order.
   class VisibleTilingIterator : public OnePriorityRectIterator {
    public:
     VisibleTilingIterator() = default;
     VisibleTilingIterator(PictureLayerTiling* tiling, TilingData* tiling_data);
 
     VisibleTilingIterator& operator++();
 
@@ skipping 16 matching lines @@
   // Iterates over skewport only, spiral around the visible rect.
   class SkewportTilingIterator : public OnePriorityRectIterator {
    public:
     SkewportTilingIterator() = default;
     SkewportTilingIterator(PictureLayerTiling* tiling, TilingData* tiling_data);
 
     SkewportTilingIterator& operator++();
 
    private:
     TilingData::SpiralDifferenceIterator iterator_;
-    gfx::Rect pending_visible_rect_;
   };
 
   // Iterates over soon border only, spiral around the visible rect.
   class SoonBorderTilingIterator : public OnePriorityRectIterator {
    public:
     SoonBorderTilingIterator() = default;
     SoonBorderTilingIterator(PictureLayerTiling* tiling,
                              TilingData* tiling_data);
 
     SoonBorderTilingIterator& operator++();
 
    private:
     TilingData::SpiralDifferenceIterator iterator_;
-    gfx::Rect pending_visible_rect_;
   };
 
   // Iterates over eventually rect only, spiral around the soon rect.
   class EventuallyTilingIterator : public OnePriorityRectIterator {
    public:
     EventuallyTilingIterator() = default;
     EventuallyTilingIterator(PictureLayerTiling* tiling,
                              TilingData* tiling_data);
 
     EventuallyTilingIterator& operator++();
 
    private:
     TilingData::SpiralDifferenceIterator iterator_;
-    gfx::Rect pending_visible_rect_;
   };
 
   // Iterates over all of the above phases in the following order: visible,
   // skewport, soon border, eventually.
   class TilingIterator {
    public:
     TilingIterator();
     explicit TilingIterator(PictureLayerTiling* tiling,
                             TilingData* tiling_data);
     ~TilingIterator();
 
     bool done() const { return current_tile_ == nullptr; }
     const Tile* operator*() const { return current_tile_; }
     Tile* operator*() { return current_tile_; }
     TilePriority::PriorityBin type() const {
       switch (phase_) {
-        case VISIBLE_RECT:
+        case Phase::VISIBLE_RECT:
           return TilePriority::NOW;
-        case PENDING_VISIBLE_RECT:
-        case SKEWPORT_RECT:
-        case SOON_BORDER_RECT:
+        case Phase::PENDING_VISIBLE_RECT:
+        case Phase::SKEWPORT_RECT:
+        case Phase::SOON_BORDER_RECT:
           return TilePriority::SOON;
-        case EVENTUALLY_RECT:
+        case Phase::EVENTUALLY_RECT:
           return TilePriority::EVENTUALLY;
       }
       NOTREACHED();
       return TilePriority::EVENTUALLY;
     }
 
     TilingIterator& operator++();
 
    private:
     // PENDING VISIBLE RECT refers to the visible rect that will become current

[vmpstr, 2015/05/05 18:04:02]

Can you move this comment to where the enum is actually defined now?

[USE eero AT chromium.org, 2015/05/06 12:05:20]

Done.

     // upon activation (ie, the pending tree's visible rect). Tiles in this
     // region that are not part of the current visible rect are all handled
     // here. Note that when processing a pending tree, this rect is the same as
     // the visible rect so no tiles are processed in this case.
-    enum Phase {
-      VISIBLE_RECT,
-      PENDING_VISIBLE_RECT,
-      SKEWPORT_RECT,
-      SOON_BORDER_RECT,
-      EVENTUALLY_RECT
-    };
+    typedef PictureLayerTiling::PriorityRect Phase;

[vmpstr, 2015/05/05 18:04:02]

nit: using Phase = PictureLayerTiling::PriorityRect;

[USE eero AT chromium.org, 2015/05/06 12:05:20]

I knew that such a statement exists but I could not find it while looking for
using declaration syntax (because it is not a using declaration but a type
alias). Thanks.

 
     void AdvancePhase();
 
     PictureLayerTiling* tiling_;
     TilingData* tiling_data_;
 
     Phase phase_;
 
     Tile* current_tile_;
     VisibleTilingIterator visible_iterator_;
@@ skipping 24 matching lines @@
 
   // The max number of stages is 6: 1 low res, 3 high res, and 2 active non
   // ideal pending high res.
   base::StackVector<IterationStage, 6> stages_;
   TilingIterator iterators_[NUM_ITERATORS];
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_