diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 18:26:53 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 18:26:53 +0000 |
| commit | 0a1c4330c8d08ca95468e9aba2d5ef59b2f759c4 (patch) | |
| tree | ce09d7f47987222dede61d631c6eee718a070ec6 /webkit | |
| parent | 4f48b36fefd3f3d9c33a1a09e4f7bf1cbd1c4c29 (diff) | |
| download | chromium_src-0a1c4330c8d08ca95468e9aba2d5ef59b2f759c4.zip chromium_src-0a1c4330c8d08ca95468e9aba2d5ef59b2f759c4.tar.gz chromium_src-0a1c4330c8d08ca95468e9aba2d5ef59b2f759c4.tar.bz2 | |
rollback r16300
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 39999e4..b0fbaa0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2650,6 +2650,8 @@ 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 + // Need LINUX/Mac rebaselines after WebKit Update 437150:43770 BUG12054 MAC LINUX : LayoutTests/fast/canvas/canvas-bg-zoom.html = FAIL BUG12054 MAC LINUX : LayoutTests/editing/execCommand/outdent-blockquote-test1.html = FAIL diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index c2f1956..9b7a328 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -392,8 +392,6 @@ void TestWebViewDelegate::DidChangeLocationWithinPageForFrame( } UpdateForCommittedLoad(frame, is_new_navigation); - - LocationChangeDone(frame); } void TestWebViewDelegate::DidReceiveIconForFrame(WebView* webview, @@ -793,9 +791,7 @@ void TestWebViewDelegate::UpdateAddressBar(WebView* webView) { } void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) { - // A navigation to an URL with a reference fragment might just be a command - // to scroll the page. In such cases, there will be no top loading frame. - if (frame == top_loading_frame_ || !top_loading_frame_) { + if (frame == top_loading_frame_) { top_loading_frame_ = NULL; // It is important to update the content state for the current navigation |