3 files changed, 3 insertions, 16 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index afabde8..db85357 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1307,7 +1307,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi
         PassRefPtr<JavaInstance> addedObject = WeakJavaInstance::create(javascriptObj);
         const char* name = getCharactersFromJStringInEnv(env, interfaceName);
         // Pass ownership of the added object to bindToWindowObject.
-        NPObject* npObject = JavaInstanceToNPObject(addedObject.releaseRef());
+        NPObject* npObject = JavaInstanceToNPObject(addedObject);
         pFrame->script()->bindToWindowObject(pFrame, name, npObject);
         // bindToWindowObject calls NPN_RetainObject on the
         // returned one (see createV8ObjectForNPObject in V8NPObject.cpp).
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index ad7b32e..46c40a5 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -147,15 +147,8 @@ static void WebHistoryRestoreIndex(JNIEnv* env, jobject obj, jint frame, jint in
     LOG_ASSERT(frame, "RestoreState needs a valid Frame pointer!");
     WebCore::Frame* pFrame = (WebCore::Frame*)frame;
     WebCore::Page* page = pFrame->page();
-
-    // Set the current index in the list.
-    WebCore::BackForwardList* list = page->backForwardList();
-    WebCore::HistoryItem* currentItem = list->entries()[index].get();
-    list->goToItem(currentItem);
-
-    // Update the current and previous history item.
-    WebCore::FrameLoader* loader = pFrame->loader();
-    loader->history()->setCurrentItem(currentItem);
+    WebCore::HistoryItem* currentItem =
+            page->backForwardList()->entries()[index].get();
 
     // load the current page with FrameLoadTypeIndexedBackForward so that it
     // will use cache when it is possible
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 57bc11c..6cae287 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1331,12 +1331,6 @@ void WebViewCore::updateCacheOnNodeChange()
 
 void WebViewCore::updateFrameCache()
 {
-#if USE(ACCELERATED_COMPOSITING)
-    ChromeClientAndroid* chromeC = static_cast<ChromeClientAndroid*>(
-                                       mainFrame()->page()->chrome()->client());
-    chromeC->scheduleCompositingLayerSync();
-#endif
-
     if (!m_frameCacheOutOfDate) {
         DBG_NAV_LOG("!m_frameCacheOutOfDate");
         return;