3 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebKit/android/RenderSkinNinePatch.cpp b/Source/WebKit/android/RenderSkinNinePatch.cpp
index 0c915c0..074a65a 100644
--- a/Source/WebKit/android/RenderSkinNinePatch.cpp
+++ b/Source/WebKit/android/RenderSkinNinePatch.cpp
@@ -48,8 +48,8 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni
 
     SkImageDecoder::Mode mode = SkImageDecoder::kDecodePixels_Mode;
     SkBitmap::Config prefConfig = SkBitmap::kNo_Config;
-    SkStream* stream = new SkMemoryStream(asset->getBuffer(false), asset->getLength());
-    SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
+    SkMemoryStream stream(asset->getBuffer(false), asset->getLength());
+    SkImageDecoder* decoder = SkImageDecoder::Factory(&stream);
     if (!decoder) {
         asset->close();
         LOGE("RenderSkinNinePatch::Failed to create an image decoder");
@@ -65,7 +65,7 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni
     SkAutoTDelete<SkImageDecoder> add(decoder);
 
     decoder->setPeeker(&peeker);
-    if (!decoder->decode(stream, &ninepatch->m_bitmap, prefConfig, mode, true)) {
+    if (!decoder->decode(&stream, &ninepatch->m_bitmap, prefConfig, mode, true)) {
         asset->close();
         LOGE("RenderSkinNinePatch::Failed to decode nine patch asset");
         return false;
diff --git a/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp b/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp
index d5270a9..260c76e 100644
--- a/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "WebViewClientError.h"
 
+#include <cutils/log.h>
+
 using namespace net;
 
 namespace android {
@@ -121,9 +123,11 @@ WebViewClientError ToWebViewClientError(net::Error error) {
         case ERR_CERT_INVALID:
         case ERR_CERT_WEAK_SIGNATURE_ALGORITHM:
         case ERR_CERT_NOT_IN_DNS:
+        case ERR_CERT_NON_UNIQUE_NAME:
             return ERROR_OK;
 
         default:
+            android_printLog(ANDROID_LOG_DEBUG, "chromium", "Unknown chromium error: %d", error);
             return ERROR_UNKNOWN;
     }
 }
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index a883075..1c51b14 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -437,7 +437,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     // Static initialisation of certain important V8 static data gets performed at system startup when
     // libwebcore gets loaded. We now need to associate the WebCore thread with V8 to complete
     // initialisation.
-    WebCore::ScriptController::setFlags("--nocrankshaft", strlen("--nocrankshaft"));
     v8::V8::Initialize();
 #endif
 }