From 9e3ead124cc10fcc888a8be7df9949d3d4ba1bb7 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Thu, 3 May 2012 11:07:04 -0700 Subject: Unify the naming of rectangles used for draw. The rects are referring to the same rect under different coordinates, so we just prefix the coordinates' name to differentiate the rects. This is pure refactor, no functional change. bug:6338456 Change-Id: Ic072a4f5aa56a25751e0151a697c0e31bca94ef5 --- .../graphics/android/rendering/SurfaceCollection.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp') diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp index cf59044..0bdbf38 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp @@ -83,9 +83,9 @@ SurfaceCollection::~SurfaceCollection() #endif } -void SurfaceCollection::prepareGL(const SkRect& visibleRect) +void SurfaceCollection::prepareGL(const SkRect& visibleContentRect) { - updateLayerPositions(visibleRect); + updateLayerPositions(visibleContentRect); bool layerTilesDisabled = m_compositedRoot->state()->layersRenderingMode() > GLWebViewState::kClippedTextures; bool updateWithBlit = true; @@ -109,14 +109,14 @@ static inline bool compareSurfaceZ(const Surface* a, const Surface* b) return (la->zValue() > lb->zValue()) && (la->getParent() == lb->getParent()); } -bool SurfaceCollection::drawGL(const SkRect& visibleRect) +bool SurfaceCollection::drawGL(const SkRect& visibleContentRect) { #ifdef DEBUG_COUNT ClassTracker::instance()->show(); #endif bool needsRedraw = false; - updateLayerPositions(visibleRect); + updateLayerPositions(visibleContentRect); bool layerTilesDisabled = m_compositedRoot->state()->layersRenderingMode() > GLWebViewState::kClippedTextures; @@ -231,10 +231,10 @@ void SurfaceCollection::updateScrollableLayer(int layerId, int x, int y) static_cast(layer)->scrollTo(x, y); } -void SurfaceCollection::updateLayerPositions(const SkRect& visibleRect) +void SurfaceCollection::updateLayerPositions(const SkRect& visibleContentRect) { TransformationMatrix ident; - m_compositedRoot->updateLayerPositions(visibleRect); + m_compositedRoot->updateLayerPositions(visibleContentRect); FloatRect clip(0, 0, 1e10, 1e10); m_compositedRoot->updateGLPositionsAndScale( ident, clip, 1, m_compositedRoot->state()->scale()); -- cgit v1.1