diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 22:43:58 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 22:43:58 +0000 |
| commit | 536bb9e1c8ec31f5d8b84ac4be23e35b102c2eb4 (patch) | |
| tree | d4ec223bbe7ae478460edd3364617577b2209694 /webkit | |
| parent | b08eebe85809832b301e8e7c22c9165179b79293 (diff) | |
| download | chromium_src-536bb9e1c8ec31f5d8b84ac4be23e35b102c2eb4.zip chromium_src-536bb9e1c8ec31f5d8b84ac4be23e35b102c2eb4.tar.gz chromium_src-536bb9e1c8ec31f5d8b84ac4be23e35b102c2eb4.tar.bz2 | |
Take 2 at fixing relativeanchor-{basic,frames}.html.
The new fix is to record the content state given the value of
GetCurrentHistoryState when initially creating a NavigationEntry.
This renders my previous change to add similar code to LocationChangeDone
unnecessary (I believe), so I have removed it.
BUG=11924
R=dglazkov
Review URL: http://codereview.chromium.org/115486
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 15 |
2 files changed, 4 insertions, 14 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 241c0ad..9b5a588 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2598,7 +2598,6 @@ BUG11613 MAC : LayoutTests/fast/forms/text-control-intrinsic-widths.html = FAIL BUG11613 MAC : LayoutTests/http/tests/security/cross-frame-access-call.html = FAIL BUG11613 WIN : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL BUG11613 WIN : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL -BUG11613 WIN : LayoutTests/http/tests/navigation/relativeanchor-frames.html = FAIL // These tests were broken by skia r171: // These ones seem to be mask/opacity-related: @@ -2652,8 +2651,6 @@ BUG11909 : LayoutTests/http/tests/security/aboutBlank/security-context-grandchil BUG11909 : LayoutTests/http/tests/security/aboutBlank/security-context-grandchildren-write-lexical.html = FAIL BUG11909 : LayoutTests/http/tests/security/aboutBlank/security-context-grandchildren-writeln-lexical.html = FAIL -BUG11924 WIN : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL - BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-1.html = FAIL BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-2.html = FAIL diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 9b7a328..6fb1b56 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -794,17 +794,6 @@ void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) { if (frame == top_loading_frame_) { top_loading_frame_ = NULL; - // It is important to update the content state for the current navigation - // entry in case we are done with the test and need to dump the back/ - // forward list. - std::string state; - if (shell_->webView()->GetMainFrame()->GetCurrentHistoryState(&state)) { - TestNavigationEntry* entry = - shell_->navigation_controller()->GetLastCommittedEntry(); - if (entry) - entry->SetContentState(state); - } - if (shell_->layout_test_mode()) shell_->layout_test_controller()->LocationChangeDone(); } @@ -864,6 +853,10 @@ void TestWebViewDelegate::UpdateURL(WebFrame* frame) { entry->SetURL(GURL(request.GetURL())); } + std::string state; + if (frame->GetCurrentHistoryState(&state)) + entry->SetContentState(state); + shell_->navigation_controller()->DidNavigateToEntry(entry.release()); last_page_id_updated_ = std::max(last_page_id_updated_, page_id_); |