diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-03 11:07:04 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-03 17:52:14 -0700 |
commit | 9e3ead124cc10fcc888a8be7df9949d3d4ba1bb7 (patch) | |
tree | ae9d86cf880ca90e66fe7fd7aa029adcda2895de /Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | |
parent | e859a34171f2a36877d95197d118d962078f8aa0 (diff) | |
download | external_webkit-9e3ead124cc10fcc888a8be7df9949d3d4ba1bb7.zip external_webkit-9e3ead124cc10fcc888a8be7df9949d3d4ba1bb7.tar.gz external_webkit-9e3ead124cc10fcc888a8be7df9949d3d4ba1bb7.tar.bz2 |
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
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 52a8e44..b26be03 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -154,7 +154,7 @@ void SurfaceCollectionManager::updateScrollableLayer(int layerId, int x, int y) } int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, - SkRect& visibleRect, float scale, + SkRect& visibleContentRect, float scale, bool enterFastSwapMode, bool* collectionsSwappedPtr, bool* newCollectionHasAnimPtr, TexturesResult* texturesResultPtr, bool shouldDraw) @@ -171,7 +171,7 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, m_paintingCollection->evaluateAnimations(currentTime); - m_paintingCollection->prepareGL(visibleRect); + m_paintingCollection->prepareGL(visibleContentRect); m_paintingCollection->computeTexturesAmount(texturesResultPtr); if (!TilesManager::instance()->useDoubleBuffering() || m_paintingCollection->isReady()) { @@ -186,7 +186,7 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, } } else if (m_drawingCollection) { ALOGV("preparing drawing collection %p", m_drawingCollection); - m_drawingCollection->prepareGL(visibleRect); + m_drawingCollection->prepareGL(visibleContentRect); m_drawingCollection->computeTexturesAmount(texturesResultPtr); } @@ -254,7 +254,7 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, GLUtils::clearBackgroundIfOpaque(&background); } - if (m_drawingCollection && m_drawingCollection->drawGL(visibleRect)) + if (m_drawingCollection && m_drawingCollection->drawGL(visibleContentRect)) returnFlags |= uirenderer::DrawGlInfo::kStatusDraw; ALOGV("returnFlags %d, m_paintingCollection %d ", returnFlags, m_paintingCollection); |