| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/tiled_layer.h" | 5 #include "cc/layers/tiled_layer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 UpdatableTile* tile = TileAt(i, j); | 373 UpdatableTile* tile = TileAt(i, j); |
| 374 DCHECK(tile); // Did SetTexturePriorities get skipped? | 374 DCHECK(tile); // Did SetTexturePriorities get skipped? |
| 375 // TODO(enne): This should not ever be null. | 375 // TODO(enne): This should not ever be null. |
| 376 if (!tile) | 376 if (!tile) |
| 377 continue; | 377 continue; |
| 378 // Did ResetUpdateState get skipped? Are we doing more than one occlusion | 378 // Did ResetUpdateState get skipped? Are we doing more than one occlusion |
| 379 // pass? | 379 // pass? |
| 380 DCHECK(!tile->occluded); | 380 DCHECK(!tile->occluded); |
| 381 gfx::Rect visible_tile_rect = gfx::IntersectRects( | 381 gfx::Rect visible_tile_rect = gfx::IntersectRects( |
| 382 tiler_->tile_bounds(i, j), visible_content_rect()); | 382 tiler_->tile_bounds(i, j), visible_content_rect()); |
| 383 if (occlusion && occlusion->Occluded(render_target(), | 383 if (!draw_transform_is_animating() && occlusion && |
| 384 visible_tile_rect, | 384 occlusion->Occluded( |
| 385 draw_transform(), | 385 render_target(), visible_tile_rect, draw_transform())) { |
| 386 draw_transform_is_animating())) { | |
| 387 tile->occluded = true; | 386 tile->occluded = true; |
| 388 occluded_tile_count++; | 387 occluded_tile_count++; |
| 389 } else { | 388 } else { |
| 390 succeeded &= tile->managed_resource()->RequestLate(); | 389 succeeded &= tile->managed_resource()->RequestLate(); |
| 391 } | 390 } |
| 392 } | 391 } |
| 393 } | 392 } |
| 394 | 393 |
| 395 if (!succeeded) | 394 if (!succeeded) |
| 396 return; | 395 return; |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 gfx::Rect prepaint_rect = visible_content_rect(); | 913 gfx::Rect prepaint_rect = visible_content_rect(); |
| 915 prepaint_rect.Inset(-tiler_->tile_size().width() * kPrepaintColumns, | 914 prepaint_rect.Inset(-tiler_->tile_size().width() * kPrepaintColumns, |
| 916 -tiler_->tile_size().height() * kPrepaintRows); | 915 -tiler_->tile_size().height() * kPrepaintRows); |
| 917 gfx::Rect content_rect(content_bounds()); | 916 gfx::Rect content_rect(content_bounds()); |
| 918 prepaint_rect.Intersect(content_rect); | 917 prepaint_rect.Intersect(content_rect); |
| 919 | 918 |
| 920 return prepaint_rect; | 919 return prepaint_rect; |
| 921 } | 920 } |
| 922 | 921 |
| 923 } // namespace cc | 922 } // namespace cc |
| OLD | NEW |