6 files changed, 10 insertions, 18 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 5e121e6..c258d79 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -77,7 +77,7 @@ void ChromeClientAndroid::syncTimerFired(Timer<ChromeClientAndroid>* client)
 void ChromeClientAndroid::scheduleCompositingLayerSync()
 {
     if (!m_syncTimer.isActive())
-        m_syncTimer.startOneShot(0.001); // 1ms
+        m_syncTimer.startOneShot(0);
 }
 
 void ChromeClientAndroid::setNeedsOneShotDrawingSynchronization()
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;
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index 139bd2c..5f02888 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -553,7 +553,12 @@ void FindOnPage::draw(SkCanvas* canvas, LayerAndroid* layer) {
     if (matchInfo.layerId() == layerId) {
         drawMatch(currentMatchRegion, canvas, true);
         // Now draw the picture, so that it shows up on top of the rectangle
+        int saveCount = canvas->save();
+        SkPath matchPath;
+        currentMatchRegion.getBoundaryPath(&matchPath);
+        canvas->clipPath(matchPath);
         canvas->drawPicture(*matchInfo.getPicture());
+        canvas->restoreToCount(saveCount);
     }
     // Draw the rest
     unsigned numberOfMatches = m_matches->size();
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 690c1a4..cec254e 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -47,7 +47,7 @@
 
 #define PLUGIN_DEBUG_LOCAL 0 // controls the printing of log messages
 #define DEBUG_EVENTS 0 // logs event contents, return value, and processing time
-#define DEBUG_VISIBLE_RECTS 1 // temporary debug printfs and fixes
+#define DEBUG_VISIBLE_RECTS 0 // temporary debug printfs and fixes
 
 // this include statement must follow the declaration of PLUGIN_DEBUG_LOCAL
 #include "PluginDebugAndroid.h"