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/ImageTexture.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/ImageTexture.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp index 6e4a82c..5098b4b 100644 --- a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp @@ -150,8 +150,8 @@ int ImageTexture::nbTextures() // TODO: take in account the visible clip (need to maintain // a list of the clients layer, etc.) - IntRect visibleArea(0, 0, m_image->width(), m_image->height()); - int nbTextures = m_tileGrid->nbTextures(visibleArea, 1.0); + IntRect visibleContentArea(0, 0, m_image->width(), m_image->height()); + int nbTextures = m_tileGrid->nbTextures(visibleContentArea, 1.0); ALOGV("ImageTexture %p, %d x %d needs %d textures", this, m_image->width(), m_image->height(), nbTextures); @@ -184,8 +184,8 @@ bool ImageTexture::prepareGL(GLWebViewState* state) if (!m_tileGrid) return false; - IntRect unclippedArea(0, 0, m_image->width(), m_image->height()); - m_tileGrid->prepareGL(state, 1.0, unclippedArea, unclippedArea, this); + IntRect fullContentArea(0, 0, m_image->width(), m_image->height()); + m_tileGrid->prepareGL(state, 1.0, fullContentArea, fullContentArea, this); if (m_tileGrid->isReady()) { m_tileGrid->swapTiles(); return false; @@ -198,7 +198,7 @@ const TransformationMatrix* ImageTexture::transform() if (!m_layer) return 0; - IntRect layerArea = m_layer->unclippedArea(); + IntRect layerArea = m_layer->fullContentArea(); float scaleW = static_cast<float>(layerArea.width()) / static_cast<float>(m_image->width()); float scaleH = static_cast<float>(layerArea.height()) / static_cast<float>(m_image->height()); TransformationMatrix d = *(m_layer->drawTransform()); @@ -239,8 +239,8 @@ void ImageTexture::drawGL(LayerAndroid* layer, float opacity) // transform and opacity, so we need to set m_layer m_layer = layer; if (m_tileGrid) { - IntRect visibleArea = m_layer->visibleArea(); - m_tileGrid->drawGL(visibleArea, opacity, transform()); + IntRect visibleContentArea = m_layer->visibleContentArea(); + m_tileGrid->drawGL(visibleContentArea, opacity, transform()); } m_layer = 0; } |