Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4045)

Unified Diff: cc/layers/picture_layer_impl.h

Issue 269633006: Revert of cc: Change required_for_activation bookkeeping. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index fc43b0797c286ec81a92a7226517a3e852cf6a7c..bf242518e7db0247c7fcd075a312e9c7ded64f68 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -140,14 +140,6 @@
WhichTree GetTree() const;
bool IsOnActiveOrPendingTree() const;
- // Return the count of tiles on this layer that meet both of the following
- // conditions:
- // 1. The tile is required for activation.
- // 2. The tile needs initialization (ie, it's not ready to draw).
- int UninitializedTilesRequiredForActivationCount() const {
- return uninitialized_tiles_required_for_activation_count_;
- }
-
protected:
friend class LayerRasterTileIterator;
@@ -171,13 +163,13 @@
float SnappedContentsScale(float new_contents_scale);
void UpdateLCDTextStatus(bool new_status);
void ResetRasterScale();
- void MarkVisibleResourcesAsRequired();
+ void MarkVisibleResourcesAsRequired() const;
bool MarkVisibleTilesAsRequired(
PictureLayerTiling* tiling,
const PictureLayerTiling* optional_twin_tiling,
float contents_scale,
const gfx::Rect& rect,
- const Region& missing_region);
+ const Region& missing_region) const;
void DoPostCommitInitializationIfNeeded() {
if (needs_post_commit_initialization_)
@@ -229,8 +221,6 @@
gfx::Size viewport_size_for_tile_priority_;
gfx::Transform screen_space_transform_for_tile_priority_;
- int uninitialized_tiles_required_for_activation_count_;
-
friend class PictureLayer;
DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
};
« no previous file with comments | « no previous file | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698