summaryrefslogtreecommitdiffstats
path: root/android_webview/native
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 18:05:12 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 18:05:12 +0000
commitde57b49266801b7da3d481bb8b6ec1a75ae4a4b4 (patch)
tree682e2ce3f392feaafb17d25b18cb0383cbe8ac06 /android_webview/native
parentcb4ee9a9d0caa72e743fc79cb8edafb8358e58ef (diff)
downloadchromium_src-de57b49266801b7da3d481bb8b6ec1a75ae4a4b4.zip
chromium_src-de57b49266801b7da3d481bb8b6ec1a75ae4a4b4.tar.gz
chromium_src-de57b49266801b7da3d481bb8b6ec1a75ae4a4b4.tar.bz2
Some required fixes for HTMLViewer rotate
* View system calls onDetachedFromWindow after HTMLViewer already calle destroy so need a check in onDetachedFromWindow. * PageID in restored entries needs to be reset (0-indexed). * Need to call NavigationController::LoadIfNecessary after calling Restore to actually load the restored page. * Need to call onTitleUpdated callback since title is restored and the callback is optimized out inside chromium. BUG= TBR=joth@chromium.org Android only change. Ran through android trybots. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11428070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
-rw-r--r--android_webview/native/state_serializer.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc
index 8482769..656b2d0 100644
--- a/android_webview/native/state_serializer.cc
+++ b/android_webview/native/state_serializer.cc
@@ -98,6 +98,8 @@ bool RestoreFromPickle(PickleIterator* iterator,
if (!internal::RestoreNavigationEntryFromPickle(iterator,
restored_entries[i]))
return false;
+
+ restored_entries[i]->SetPageID(i);
}
// |web_contents| takes ownership of these entries after this call.