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

Side by Side Diff: cc/tiled_layer.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/tiled_layer.h" 5 #include "cc/tiled_layer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "cc/layer_impl.h" 9 #include "cc/layer_impl.h"
10 #include "cc/layer_tree_host.h" 10 #include "cc/layer_tree_host.h"
11 #include "cc/overdraw_metrics.h" 11 #include "cc/overdraw_metrics.h"
12 #include "cc/tiled_layer_impl.h" 12 #include "cc/tiled_layer_impl.h"
13 #include "third_party/khronos/GLES2/gl2.h" 13 #include "third_party/khronos/GLES2/gl2.h"
14 #include "ui/gfx/rect_conversions.h" 14 #include "ui/gfx/rect_conversions.h"
15 15
16 using namespace std; 16 using namespace std;
17 using WebKit::WebTransformationMatrix; 17 using gfx::Transform;
18 18
19 namespace cc { 19 namespace cc {
20 20
21 // Maximum predictive expansion of the visible area. 21 // Maximum predictive expansion of the visible area.
22 static const int maxPredictiveTilesCount = 2; 22 static const int maxPredictiveTilesCount = 2;
23 23
24 // Number of rows/columns of tiles to pre-paint. 24 // Number of rows/columns of tiles to pre-paint.
25 // We should increase these further as all textures are 25 // We should increase these further as all textures are
26 // prioritized and we insure performance doesn't suffer. 26 // prioritized and we insure performance doesn't suffer.
27 static const int prepaintRows = 4; 27 static const int prepaintRows = 4;
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 477
478 // Offset from paint rectangle to this tile's dirty rectangle. 478 // Offset from paint rectangle to this tile's dirty rectangle.
479 gfx::Vector2d paintOffset = sourceRect.origin() - paintRect.origin() ; 479 gfx::Vector2d paintOffset = sourceRect.origin() - paintRect.origin() ;
480 CHECK(paintOffset.x() >= 0); 480 CHECK(paintOffset.x() >= 0);
481 CHECK(paintOffset.y() >= 0); 481 CHECK(paintOffset.y() >= 0);
482 CHECK(paintOffset.x() + sourceRect.width() <= paintRect.width()); 482 CHECK(paintOffset.x() + sourceRect.width() <= paintRect.width());
483 CHECK(paintOffset.y() + sourceRect.height() <= paintRect.height()); 483 CHECK(paintOffset.y() + sourceRect.height() <= paintRect.height());
484 484
485 tile->updaterResource()->update(queue, sourceRect, destOffset, tile- >partialUpdate, stats); 485 tile->updaterResource()->update(queue, sourceRect, destOffset, tile- >partialUpdate, stats);
486 if (occlusion) 486 if (occlusion)
487 occlusion->overdrawMetrics().didUpload(WebTransformationMatrix() , sourceRect, tile->opaqueRect()); 487 occlusion->overdrawMetrics().didUpload(Transform(), sourceRect, tile->opaqueRect());
488 488
489 } 489 }
490 } 490 }
491 } 491 }
492 492
493 // This picks a small animated layer to be anything less than one viewport. This 493 // This picks a small animated layer to be anything less than one viewport. This
494 // is specifically for page transitions which are viewport-sized layers. The ext ra 494 // is specifically for page transitions which are viewport-sized layers. The ext ra
495 // tile of padding is due to these layers being slightly larger than the viewpor t 495 // tile of padding is due to these layers being slightly larger than the viewpor t
496 // in some cases. 496 // in some cases.
497 bool TiledLayer::isSmallAnimatedLayer() const 497 bool TiledLayer::isSmallAnimatedLayer() const
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 gfx::Rect prepaintRect = visibleContentRect(); 753 gfx::Rect prepaintRect = visibleContentRect();
754 prepaintRect.Inset(-m_tiler->tileSize().width() * prepaintColumns, 754 prepaintRect.Inset(-m_tiler->tileSize().width() * prepaintColumns,
755 -m_tiler->tileSize().height() * prepaintRows); 755 -m_tiler->tileSize().height() * prepaintRows);
756 gfx::Rect contentRect(gfx::Point(), contentBounds()); 756 gfx::Rect contentRect(gfx::Point(), contentBounds());
757 prepaintRect.Intersect(contentRect); 757 prepaintRect.Intersect(contentRect);
758 758
759 return prepaintRect; 759 return prepaintRect;
760 } 760 }
761 761
762 } // namespace cc 762 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698