diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
| commit | efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4 (patch) | |
| tree | 717f7caca9e5b8191c0f1ff4cb1f3b00c0281e75 /webkit/tools/test_shell/test_navigation_controller.cc | |
| parent | 235df3ac876638d8f09eb62c6b8504446e19b63b (diff) | |
| download | chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.zip chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.gz chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.bz2 | |
Re-do r15244 again.
Originally reviewed at http://codereview.chromium.org/100353
Eliminate webkit/glue/webhistoryitem* in favor of adding a
NavigateBackForwardSoon method WebViewDelegate. This moves
all of the hacky details of how we intercept "history.{back,
forward,go}" into the webkit layer. My eventual plan is to
teach WebCore how to make this not hacky.
In this version of the CL, TestWebViewDelegate performs the
back/forward navigation directly in NavigateBackForwardSoon
instead of using PostTask to delay it. I'm doing this to
minimize regressions so that I can hopefully get the rest of
this CL landed.
I also already made the changes to WebKit to force history.
{back,forward,go} to be processed asynchronously.
BUG=11423
TBR=mpcomplete
Review URL: http://codereview.chromium.org/115288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_navigation_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_navigation_controller.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/webkit/tools/test_shell/test_navigation_controller.cc b/webkit/tools/test_shell/test_navigation_controller.cc index ff4a753..cf26baf 100644 --- a/webkit/tools/test_shell/test_navigation_controller.cc +++ b/webkit/tools/test_shell/test_navigation_controller.cc @@ -5,7 +5,6 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "base/logging.h" -#include "webkit/glue/webhistoryitem.h" #include "webkit/tools/test_shell/test_shell.h" // ---------------------------------------------------------------------------- @@ -29,21 +28,9 @@ TestNavigationEntry::~TestNavigationEntry() { } void TestNavigationEntry::SetContentState(const std::string& state) { - cached_history_item_ = NULL; // invalidate our cached item state_ = state; } -WebHistoryItem* TestNavigationEntry::GetHistoryItem() const { - if (!cached_history_item_) { - TestShellExtraRequestData* extra_data = - new TestShellExtraRequestData(GetPageID()); - cached_history_item_ = - WebHistoryItem::Create(GetURL(), GetTitle(), GetContentState(), - extra_data); - } - return cached_history_item_; -} - // ---------------------------------------------------------------------------- // TestNavigationController |