diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 21:12:03 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 21:12:03 +0000 |
commit | f6e59a6f478826a9a1d75b18f10f285487f18fac (patch) | |
tree | 0336e7be11b059b8e3cec7a2eef273fa0ef0994d /webkit/tools/test_shell/test_navigation_controller.h | |
parent | 7502d0224e51f54f1d65fbfce6d100e99dc819dc (diff) | |
download | chromium_src-f6e59a6f478826a9a1d75b18f10f285487f18fac.zip chromium_src-f6e59a6f478826a9a1d75b18f10f285487f18fac.tar.gz chromium_src-f6e59a6f478826a9a1d75b18f10f285487f18fac.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.
Finally, it was necessary to move DumpBackForwardList out of
webkit_glue.cc since it was using itemAtIndex to generate
those results, and now that we return synthetic URLs for
that function, the results were very wrong. The fix is to
move DumpBackForwardList into TestShell so that it can more
directly inspect the TestNavigationController. Now, it is
necessary for webkit_glue.h to expose a function to dump
a content state string (aka a WebCore::HistoryItem).
BUG=11423
R=mpcomplete
Review URL: http://codereview.chromium.org/113328
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_navigation_controller.h')
-rw-r--r-- | webkit/tools/test_shell/test_navigation_controller.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_navigation_controller.h b/webkit/tools/test_shell/test_navigation_controller.h index 07f42f8..d26e994 100644 --- a/webkit/tools/test_shell/test_navigation_controller.h +++ b/webkit/tools/test_shell/test_navigation_controller.h @@ -16,7 +16,6 @@ class GURL; class TestShell; -class WebHistoryItem; // Associated with browser-initated navigations to hold tracking data. class TestShellExtraRequestData : public WebRequest::ExtraData { @@ -67,7 +66,6 @@ class TestNavigationEntry { void SetPageID(int page_id) { page_id_ = page_id; } int32 GetPageID() const { return page_id_; } - WebHistoryItem* GetHistoryItem() const; const std::wstring& GetTargetFrame() const { return target_frame_; } private: @@ -79,8 +77,6 @@ class TestNavigationEntry { std::wstring title_; std::string state_; - mutable scoped_refptr<WebHistoryItem> cached_history_item_; - std::wstring target_frame_; DISALLOW_COPY_AND_ASSIGN(TestNavigationEntry); @@ -132,9 +128,9 @@ class TestNavigationController { // it is the pending_entry_index_. int GetCurrentEntryIndex() const; - // Returns the entry at the specified offset from current. Returns NULL - // if out of bounds. - TestNavigationEntry* GetEntryAtOffset(int offset) const; + // Returns the entry at the specified index. Returns NULL if out of + // bounds. + TestNavigationEntry* GetEntryAtIndex(int index) const; // Return the entry with the corresponding type and page_id, or NULL if // not found. |