diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 19:36:17 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 19:36:17 +0000 |
| commit | ca948a21e18cdac84a933ce9ebd72be4152d8a32 (patch) | |
| tree | 2c4fa33bc742c0a9a5e144128a8e277f16620409 /webkit/tools/test_shell/test_shell.cc | |
| parent | f8646f7f53d9f48139b37588953170c3a882509f (diff) | |
| download | chromium_src-ca948a21e18cdac84a933ce9ebd72be4152d8a32.zip chromium_src-ca948a21e18cdac84a933ce9ebd72be4152d8a32.tar.gz chromium_src-ca948a21e18cdac84a933ce9ebd72be4152d8a32.tar.bz2 | |
Hook up WebHistoryItem and push HistoryItem serialization out of WebFrame.
WebHistoryItem is a copy-on-write wrapper for a WebCore::HistoryItem.
Pushing history item serialization out of WebFrame allows us to avoid a
dependency on base/pickle from WebFrame. This helps get us closer to
being able to move WebFrame into the WebKit API.
BUG=10043
TEST=none
R=dglazkov,sky
Review URL: http://codereview.chromium.org/146075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index f141d75..e18c2b6 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -36,6 +36,7 @@ #include "webkit/api/public/WebURL.h" #include "webkit/api/public/WebURLRequest.h" #include "webkit/api/public/WebURLResponse.h" +#include "webkit/glue/glue_serialize.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" @@ -516,7 +517,8 @@ bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) { // Otherwise, we give it the state to navigate to. if (!reload && !entry.GetContentState().empty()) { DCHECK(entry.GetPageID() != -1); - frame->LoadHistoryState(entry.GetContentState()); + frame->LoadHistoryItem( + webkit_glue::HistoryItemFromString(entry.GetContentState())); } else { WebURLRequest::CachePolicy cache_policy; if (reload) { |