Merge "Removed navcache from scrollToFrame() and nativeFindAll()."

1 files changed, 11 insertions, 13 deletions

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index dede152..1501a12 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -305,7 +305,7 @@ void scrollToCurrentMatch()
     }
 
     SkRect matchBounds = m_findOnPage.currentMatchBounds();
-    LayerAndroid* rootLayer = getFrameCache(DontAllowNewer)->rootLayer();
+    LayerAndroid* rootLayer = compositeRoot();
     if (!rootLayer)
         return;
 
@@ -2314,8 +2314,9 @@ static int nativeFindAll(JNIEnv *env, jobject obj, jstring findLower,
     }
     WebView* view = GET_NATIVE_VIEW(env, obj);
     ALOG_ASSERT(view, "view not set in nativeFindAll");
-    CachedRoot* root = view->getFrameCache(WebView::AllowNewer);
-    if (!root) {
+    BaseLayerAndroid* baseLayer = view->getBaseLayer();
+    android::PictureSet* pictureSet = baseLayer ? baseLayer->content() : 0;
+    if (!pictureSet) {
         env->ReleaseStringChars(findLower, findLowerChars);
         env->ReleaseStringChars(findUpper, findUpperChars);
         checkException(env);
@@ -2330,8 +2331,8 @@ static int nativeFindAll(JNIEnv *env, jobject obj, jstring findLower,
         checkException(env);
         return 0;
     }
-    int width = root->documentWidth();
-    int height = root->documentHeight();
+    int width = pictureSet->width();
+    int height = pictureSet->height();
     // Create a FindCanvas, which allows us to fake draw into it so we can
     // figure out where our search string is rendered (and how many times).
     FindCanvas canvas(width, height, (const UChar*) findLowerChars,
@@ -2340,14 +2341,11 @@ static int nativeFindAll(JNIEnv *env, jobject obj, jstring findLower,
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     canvas.setBitmapDevice(bitmap);
     FindOnPage& findOnPage = view->findOnPage();
-    BaseLayerAndroid* baseLayer = view->getBaseLayer();
-    if (baseLayer) {
-        canvas.setLayerId(-1);
-        unsigned matchesBegin = canvas.found();
-        baseLayer->drawCanvas(&canvas);
-        findOnPage.setLayerMatchRange(-1,
-            std::pair<unsigned, unsigned>(matchesBegin, canvas.found()));
-    }
+    canvas.setLayerId(-1);
+    unsigned matchesBegin = canvas.found();
+    baseLayer->drawCanvas(&canvas);
+    findOnPage.setLayerMatchRange(-1,
+        std::pair<unsigned, unsigned>(matchesBegin, canvas.found()));
 #if USE(ACCELERATED_COMPOSITING)
     LayerAndroid* compositeLayer = view->compositeRoot();
     if (compositeLayer)