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/glue/webkit_glue.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/glue/webkit_glue.h')
-rw-r--r-- | webkit/glue/webkit_glue.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index e9f5ed8..2e7e4e3 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -54,9 +54,10 @@ std::wstring DumpRenderer(WebFrame* web_frame); // Returns a dump of the scroll position of the webframe. std::wstring DumpFrameScrollPosition(WebFrame* web_frame, bool recursive); -// Returns a representation of the back/forward list. -void DumpBackForwardList(WebView* view, void* previous_history_item, - std::wstring* result); +// Returns a dump of the given history state suitable for implementing the +// dumpBackForwardList command of the layoutTestController. +std::wstring DumpHistoryState(const std::string& history_state, int indent, + bool is_current); // Cleans up state left over from the previous test run. void ResetBeforeTestRun(WebView* view); |