Fix for bug 3398340

Removed a variable that was never set, but still used

Change-Id: I180f631472a02ed512f6071a0760913c8ddf6e84

4 files changed, 3 insertions, 10 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 135bacc..0259242 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -932,7 +932,6 @@ static void AddLayer(CachedFrame* frame, size_t index, const IntPoint& location,
     DBG_NAV_LOGD("frame=%p index=%d loc=(%d,%d) id=%d", frame, index,
         location.x(), location.y(), id);
     CachedLayer cachedLayer;
-    cachedLayer.reset();
     cachedLayer.setCachedNodeIndex(index);
     cachedLayer.setOffset(location);
     cachedLayer.setUniqueId(id);
diff --git a/WebKit/android/nav/CachedFrame.cpp b/WebKit/android/nav/CachedFrame.cpp
index 55a7c0e..b18cdf1 100644
--- a/WebKit/android/nav/CachedFrame.cpp
+++ b/WebKit/android/nav/CachedFrame.cpp
@@ -1070,10 +1070,6 @@ void CachedFrame::resetClippedOut()
 void CachedFrame::resetLayers()
 {
 #if USE(ACCELERATED_COMPOSITING)
-    for (CachedLayer* test = mCachedLayers.begin(); test != mCachedLayers.end();
-            test++) {
-        test->reset();
-    }
     for (CachedFrame* frame = mCachedFrames.begin(); frame != mCachedFrames.end();
             frame++) {
         frame->resetLayers();
diff --git a/WebKit/android/nav/CachedLayer.cpp b/WebKit/android/nav/CachedLayer.cpp
index 7780250..c8220b3 100644
--- a/WebKit/android/nav/CachedLayer.cpp
+++ b/WebKit/android/nav/CachedLayer.cpp
@@ -119,9 +119,9 @@ FloatPoint CachedLayer::getGlobalPosition(const LayerAndroid* aLayer) const
 
 const LayerAndroid* CachedLayer::layer(const LayerAndroid* root) const
 {
-    if (!root || mLayer)
-        return mLayer;
-    return mLayer = root->findById(mUniqueId);
+    if (!root)
+        return 0;
+    return root->findById(mUniqueId);
 }
 
 // return bounds relative to the layer as recorded when walking the dom
diff --git a/WebKit/android/nav/CachedLayer.h b/WebKit/android/nav/CachedLayer.h
index db7bfb1..0a382fd 100644
--- a/WebKit/android/nav/CachedLayer.h
+++ b/WebKit/android/nav/CachedLayer.h
@@ -58,7 +58,6 @@ public:
     IntRect localBounds(const LayerAndroid* root, const IntRect& bounds) const;
     SkPicture* picture(const LayerAndroid* root) const;
     void toLocal(const LayerAndroid* root, int* xPtr, int* yPtr) const;
-    void reset() { mLayer = 0; }
     void setCachedNodeIndex(int index) { mCachedNodeIndex = index; }
     // Set the global position of the layer.  This is recorded by the nav cache
     // and corresponds to RenderLayer::absoluteBoundingBox() which is in
@@ -69,7 +68,6 @@ public:
     int uniqueId() const { return mUniqueId; }
 private:
     int mCachedNodeIndex;
-    mutable const LayerAndroid* mLayer;
     IntPoint mOffset;
     int mUniqueId;