| OLD | NEW |
| 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/tools/test_shell/test_webview_delegate.h" | 5 #include "webkit/tools/test_shell/test_webview_delegate.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 #include "base/gfx/point.h" | 8 #include "base/gfx/point.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 DCHECK_NE(disposition, CURRENT_TAB); // No code for this | 78 DCHECK_NE(disposition, CURRENT_TAB); // No code for this |
| 79 if (disposition == SUPPRESS_OPEN) | 79 if (disposition == SUPPRESS_OPEN) |
| 80 return; | 80 return; |
| 81 TestShell* shell = NULL; | 81 TestShell* shell = NULL; |
| 82 if (TestShell::CreateNewWindow(UTF8ToWide(url.spec()), &shell)) | 82 if (TestShell::CreateNewWindow(UTF8ToWide(url.spec()), &shell)) |
| 83 shell->Show(shell->webView(), disposition); | 83 shell->Show(shell->webView(), disposition); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void TestWebViewDelegate::DidStartLoading(WebView* webview) { | 86 void TestWebViewDelegate::DidStartLoading(WebView* webview) { |
| 87 if (page_is_loading_) { | 87 if (page_is_loading_) { |
| 88 // When we started including stderr in layout-test output, a number of | 88 LOG(ERROR) << "DidStartLoading called while loading"; |
| 89 // number of tests began failing. The vast majority of the new failures | |
| 90 // were due to either this error message or the one in DidStopLoading. | |
| 91 // This is being disabled temporarily so we can keep running the tests. | |
| 92 // See http://code.google.com/p/chromium/issues/detail?id=3937 | |
| 93 // TODO(pamg): Remove this when the underlying bug is fixed. | |
| 94 //LOG(ERROR) << "DidStartLoading called while loading"; | |
| 95 return; | 89 return; |
| 96 } | 90 } |
| 97 page_is_loading_ = true; | 91 page_is_loading_ = true; |
| 98 } | 92 } |
| 99 | 93 |
| 100 void TestWebViewDelegate::DidStopLoading(WebView* webview) { | 94 void TestWebViewDelegate::DidStopLoading(WebView* webview) { |
| 101 if (!page_is_loading_) { | 95 if (!page_is_loading_) { |
| 102 // When we started including stderr in layout-test output, a number of | 96 LOG(ERROR) << "DidStopLoading called while not loading"; |
| 103 // number of tests began failing. The vast majority of the new failures | |
| 104 // were due to either this error message or the one in DidStartLoading. | |
| 105 // This is being disabled temporarily so we can keep running the tests. | |
| 106 // See http://code.google.com/p/chromium/issues/detail?id=3937 | |
| 107 // TODO(pamg): Remove this when the underlying bug is fixed. | |
| 108 //LOG(ERROR) << "DidStopLoading called while not loading"; | |
| 109 return; | 97 return; |
| 110 } | 98 } |
| 111 page_is_loading_ = false; | 99 page_is_loading_ = false; |
| 112 } | 100 } |
| 113 | 101 |
| 114 void TestWebViewDelegate::WindowObjectCleared(WebFrame* webframe) { | 102 void TestWebViewDelegate::WindowObjectCleared(WebFrame* webframe) { |
| 115 shell_->BindJSObjectsToWindow(webframe); | 103 shell_->BindJSObjectsToWindow(webframe); |
| 116 } | 104 } |
| 117 | 105 |
| 118 WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction( | 106 WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction( |
| (...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 return L"main frame \"" + name + L"\""; | 834 return L"main frame \"" + name + L"\""; |
| 847 else | 835 else |
| 848 return L"main frame"; | 836 return L"main frame"; |
| 849 } else { | 837 } else { |
| 850 if (name.length()) | 838 if (name.length()) |
| 851 return L"frame \"" + name + L"\""; | 839 return L"frame \"" + name + L"\""; |
| 852 else | 840 else |
| 853 return L"frame (anonymous)"; | 841 return L"frame (anonymous)"; |
| 854 } | 842 } |
| 855 } | 843 } |
| OLD | NEW |