diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-01-13 11:27:04 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-01-13 11:27:04 -0800 |
| commit | 2c6a54e2748be2c78f059761f711cdc02cd062fa (patch) | |
| tree | cd3a4ae14c2122e33dfb24f8e25069adccc6b068 | |
| parent | 2affce26ab8f173609de60771c0fbc1ae23a6126 (diff) | |
| download | external_webkit-2c6a54e2748be2c78f059761f711cdc02cd062fa.zip external_webkit-2c6a54e2748be2c78f059761f711cdc02cd062fa.tar.gz external_webkit-2c6a54e2748be2c78f059761f711cdc02cd062fa.tar.bz2 | |
Code clean up.
There should be no functionality change.
Change-Id: Ifc05a776ebb0a2a00b3aff194e138847ed1201cf
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/TiledPage.cpp | 3 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/TiledPage.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 7527fac..f71ee88 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -196,7 +196,7 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) else transparency = m_glWebViewState->transparency(currentTime); - nextTiledPage->draw(newTilesTransparency, viewport, viewportTileBounds); + nextTiledPage->draw(newTilesTransparency, viewportTileBounds); // The transition between the two pages is finished, swap them if (currentTime > transitionTime) { @@ -211,7 +211,7 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) tiledPage->setScale(m_glWebViewState->currentScale()); const SkIRect& preZoomBounds = m_glWebViewState->preZoomBounds(); tiledPage->prepare(goingDown, goingLeft, preZoomBounds); - tiledPage->draw(transparency, viewport, preZoomBounds); + tiledPage->draw(transparency, preZoomBounds); bool ret = false; if (m_glWebViewState->scaleRequestState() != GLWebViewState::kNoScaleRequest diff --git a/WebCore/platform/graphics/android/TiledPage.cpp b/WebCore/platform/graphics/android/TiledPage.cpp index 1d2754d..868a870 100644 --- a/WebCore/platform/graphics/android/TiledPage.cpp +++ b/WebCore/platform/graphics/android/TiledPage.cpp @@ -301,7 +301,7 @@ bool TiledPage::ready(const SkIRect& tileBounds) return true; } -void TiledPage::draw(float transparency, SkRect& viewport, const SkIRect& tileBounds) +void TiledPage::draw(float transparency, const SkIRect& tileBounds) { if (!m_glWebViewState) return; @@ -320,7 +320,6 @@ void TiledPage::draw(float transparency, SkRect& viewport, const SkIRect& tileBo rect.fRight = rect.fLeft + tileWidth; rect.fBottom = rect.fTop + tileHeight; - TilesManager::instance()->shader()->setViewport(viewport); tile.draw(transparency, rect); } } diff --git a/WebCore/platform/graphics/android/TiledPage.h b/WebCore/platform/graphics/android/TiledPage.h index ad88bc4..72e20cd 100644 --- a/WebCore/platform/graphics/android/TiledPage.h +++ b/WebCore/platform/graphics/android/TiledPage.h @@ -64,7 +64,7 @@ public: // check to see if the page is ready for display bool ready(const SkIRect& tileBounds); // draw the page on the screen - void draw(float transparency, SkRect& viewport, const SkIRect& tileBounds); + void draw(float transparency, const SkIRect& tileBounds); // used by individual tiles to generate the bitmap for their tile unsigned int paintBaseLayerContent(SkCanvas*); |