diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 22:58:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 22:58:35 +0000 |
| commit | 641fec5f991cd63fd55fca98a4e07f0534d4340b (patch) | |
| tree | 2de725c993826a7ebdc65830ac3108949676fab0 /webkit/tools | |
| parent | ad9e33a84b8b77cd08ee0d0a057b60625a7bfe7c (diff) | |
| download | chromium_src-641fec5f991cd63fd55fca98a4e07f0534d4340b.zip chromium_src-641fec5f991cd63fd55fca98a4e07f0534d4340b.tar.gz chromium_src-641fec5f991cd63fd55fca98a4e07f0534d4340b.tar.bz2 | |
Fix document-location-click-timeout.html crash on linux.
A rare combination of events results in there being no last committed
entry. Adding a NULL check prevents the crash.
BUG=11935
Review URL: http://codereview.chromium.org/113419
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0c16e15..6ff3cd3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2722,4 +2722,3 @@ BUG11933 WIN LINUX : LayoutTests/fast/frames/content-opacity-2.html = FAIL // Note: This was already failing in a different way. See BUG10316, above, so be // sure to uncomment/recheck that when this is removed. BUG11935 MAC : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = CRASH -BUG11935 LINUX : LayoutTests/http/tests/navigation/document-location-click-timeout.html = CRASH diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index d886f4d..9b7a328 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -801,7 +801,8 @@ void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) { if (shell_->webView()->GetMainFrame()->GetCurrentHistoryState(&state)) { TestNavigationEntry* entry = shell_->navigation_controller()->GetLastCommittedEntry(); - entry->SetContentState(state); + if (entry) + entry->SetContentState(state); } if (shell_->layout_test_mode()) |