diff options
| -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()) |