Merge "removed unused vars/functions"

5 files changed, 1 insertions, 12 deletions

diff --git a/Source/WebCore/platform/graphics/android/GradientAndroid.cpp b/Source/WebCore/platform/graphics/android/GradientAndroid.cpp
index b8dc9dd..6007a0a 100644
--- a/Source/WebCore/platform/graphics/android/GradientAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GradientAndroid.cpp
@@ -113,7 +113,6 @@ SkShader* Gradient::getShader(SkShader::TileMode mode)
 
 void Gradient::fill(GraphicsContext* context, const FloatRect& rect)
 {
-    SkRect r;
     SkPaint paint;
     // we don't care about the mode, so try to use the existing one
     SkShader::TileMode mode = m_gradient ? m_gradient->m_tileMode :
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
index 83fb414..b4e20e8 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -321,8 +321,6 @@ void LayerAndroid::setBackgroundColor(SkColor color)
     m_backgroundColor = color;
 }
 
-static int gDebugChildLevel;
-
 FloatPoint LayerAndroid::translation() const
 {
     TransformationMatrix::DecomposedType tDecomp;
@@ -612,8 +610,6 @@ void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentM
     IntSize layerSize(getSize().width(), getSize().height());
     FloatPoint anchorPoint(getAnchorPoint().fX, getAnchorPoint().fY);
     FloatPoint position(getPosition().fX - m_offset.x(), getPosition().fY - m_offset.y());
-    float centerOffsetX = (0.5f - anchorPoint.x()) * layerSize.width();
-    float centerOffsetY = (0.5f - anchorPoint.y()) * layerSize.height();
     float originX = anchorPoint.x() * layerSize.width();
     float originY = anchorPoint.y() * layerSize.height();
     TransformationMatrix localMatrix;
diff --git a/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp b/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp
index 241cbef..902fa1e 100644
--- a/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp
+++ b/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp
@@ -69,7 +69,6 @@ void PerformanceMonitor::stop(const String &tag)
 
     float mtime = (seconds * 1000.0) + (useconds/1000.0);
 
-    float avg = 0;
     if (item->average_ms) {
         item->average_ms = (item->average_ms + mtime) / 2;
     } else
diff --git a/Source/WebCore/platform/graphics/android/TiledPage.cpp b/Source/WebCore/platform/graphics/android/TiledPage.cpp
index 7aac242..cd23a7f 100644
--- a/Source/WebCore/platform/graphics/android/TiledPage.cpp
+++ b/Source/WebCore/platform/graphics/android/TiledPage.cpp
@@ -246,11 +246,6 @@ void TiledPage::prepare(bool goingDown, bool goingLeft, const SkIRect& tileBound
     int nbTilesWidth = tileBounds.width();
     int nbTilesHeight = tileBounds.height();
 
-    // Expand number of tiles to allow tiles outside of viewport to be prepared for
-    // smoother scrolling.
-    int nTilesToPrepare = nbTilesWidth * nbTilesHeight;
-    int nMaxTilesPerPage = m_baseTileSize / 2;
-
     if (bounds == ExpandedBounds) {
         // prepare tiles outside of the visible bounds
         int expandX = m_glWebViewState->expandedTileBoundsX();
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
index 2d5be64..35a36dd 100644
--- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp
+++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
@@ -494,7 +494,7 @@ bool TransferQueue::tryUpdateQueueWithBitmap(const TileRenderInfo* renderInfo,
             return false;
 
         uint8_t* img = (uint8_t*)buffer.bits;
-        int row, col;
+        int row;
         int bpp = 4; // Now we only deal with RGBA8888 format.
         int width = TilesManager::instance()->tileWidth();
         int height = TilesManager::instance()->tileHeight();