Android WebView save/restoreState Part 2

android_webview/native/aw_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
+#include "android_webview/native/state_serializer.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/pickle.h"
 #include "base/supports_user_data.h"
 #include "content/components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/x509_certificate.h"
@@ skipping 421 matching lines @@
   // passed here are the Java view size, NOT window size (which correctly maps
   // to the Compositor's "window" size).
   compositor_->SetWindowBounds(gfx::Size(w, h));
 }
 
 void AwContents::OnDetachedFromWindow(JNIEnv* env, jobject obj) {
   view_visible_ = false;
   // TODO(joth): Request a DrawGL (kModeProcess) call, to tell the compositor.
 }
 
+base::android::ScopedJavaLocalRef<jbyteArray>
+AwContents::GetOpaqueState(JNIEnv* env, jobject obj) {
+  Pickle pickle;
+  if (!WriteToPickle(*web_contents_, &pickle)) {
+    return ScopedJavaLocalRef<jbyteArray>();
+  } else {
+    return base::android::ToJavaByteArray(env,
+       reinterpret_cast<const uint8*>(pickle.data()), pickle.size());
+  }
+}
+
+jboolean AwContents::RestoreFromOpaqueState(
+    JNIEnv* env, jobject obj, jbyteArray state) {
+  // TODO(boliu): This copy can be optimized out if this is a performance
+  // problem.

[joth, 2012/11/21 00:56:14]

yeah guess this one's not too hard - just need to wrap
env->GetByteArrayElements() & env->ReleaseByteArrayElements() calls around this
function. (Pickle does not take a copy)

(of course, a ScopedJavaByteArrayGetter would make that even simpler...)

[boliu, 2012/11/21 01:22:03]

If I'm reading the jni docs correctly, GetByteArrayElements does not guarantee
it does not do a copy, but I assume it is the case for dalvik?

Anyway..not important right now, leaving this TODO as is for now.

+  std::vector<uint8> state_vector;
+  base::android::JavaByteArrayToByteVector(env, state, &state_vector);
+
+  Pickle pickle(reinterpret_cast<const char*>(state_vector.begin()),
+                state_vector.size());
+  PickleIterator iterator(pickle);
+
+  return RestoreFromPickle(&iterator, web_contents_.get());
+}
+
 }  // namespace android_webview