Index: cc/scheduler_state_machine.h |
diff --git a/cc/scheduler_state_machine.h b/cc/scheduler_state_machine.h |
index b2c97f4e349e050ad4765f4c2931adf1429e618e..3c2e80f557549dce9350e26655140c86ec03097e 100644 |
--- a/cc/scheduler_state_machine.h |
+++ b/cc/scheduler_state_machine.h |
@@ -60,7 +60,7 @@ public: |
ACTION_NONE, |
ACTION_BEGIN_FRAME, |
ACTION_COMMIT, |
- ACTION_CHECK_FOR_NEW_TEXTURES, |
+ ACTION_CHECK_FOR_COMPLETED_TILE_UPLOADS, |
ACTION_ACTIVATE_PENDING_TREE_IF_NEEDED, |
ACTION_DRAW_IF_POSSIBLE, |
ACTION_DRAW_FORCED, |
@@ -90,9 +90,9 @@ public: |
// we are not visible. |
void setNeedsForcedRedraw(); |
- // Indicates that a redraw is required because we are currently rendererd |
+ // Indicates that a redraw is required because we are currently rendering |
// with a low resolution or checkerboarded tile. |
- void didSwapUseIncompleteTexture(); |
+ void didSwapUseIncompleteTile(); |
// Indicates whether ACTION_DRAW_IF_POSSIBLE drew to the screen or not. |
void didDrawIfPossibleCompleted(bool success); |
@@ -153,10 +153,10 @@ protected: |
bool shouldDraw() const; |
bool shouldAttemptTreeActivation() const; |
bool shouldAcquireLayerTexturesForMainThread() const; |
- bool shouldCheckForCompletedTextures() const; |
+ bool shouldCheckForCompletedTileUploads() const; |
bool hasDrawnThisFrame() const; |
bool hasAttemptedTreeActivationThisFrame() const; |
- bool hasCheckedForCompletedTexturesThisFrame() const; |
+ bool hasCheckedForCompletedTileUploadsThisFrame() const; |
const SchedulerSettings m_settings; |
@@ -165,11 +165,11 @@ protected: |
int m_currentFrameNumber; |
int m_lastFrameNumberWhereDrawWasCalled; |
int m_lastFrameNumberWhereTreeActivationAttempted; |
- int m_lastFrameNumberWhereCheckForCompletedTexturesCalled; |
+ int m_lastFrameNumberWhereCheckForCompletedTileUploadsCalled; |
int m_consecutiveFailedDraws; |
int m_maximumNumberOfFailedDrawsBeforeDrawIsForced; |
bool m_needsRedraw; |
- bool m_swapUsedIncompleteTexture; |
+ bool m_swapUsedIncompleteTile; |
bool m_needsForcedRedraw; |
bool m_needsForcedRedrawAfterNextCommit; |
bool m_needsCommit; |