Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 10616: Roll back Rietveld issue 8778 (r5183, appending stderr to layout-test output)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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 // This file contains the implementation of TestWebViewDelegate, which serves 5 // This file contains the implementation of TestWebViewDelegate, which serves
6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to 6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to
7 // have initialized a MessageLoop before these methods are called. 7 // have initialized a MessageLoop before these methods are called.
8 8
9 #include "webkit/tools/test_shell/test_webview_delegate.h" 9 #include "webkit/tools/test_shell/test_webview_delegate.h"
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 DCHECK_NE(disposition, CURRENT_TAB); // No code for this 75 DCHECK_NE(disposition, CURRENT_TAB); // No code for this
76 if (disposition == SUPPRESS_OPEN) 76 if (disposition == SUPPRESS_OPEN)
77 return; 77 return;
78 TestShell* shell = NULL; 78 TestShell* shell = NULL;
79 if (TestShell::CreateNewWindow(UTF8ToWide(url.spec()), &shell)) 79 if (TestShell::CreateNewWindow(UTF8ToWide(url.spec()), &shell))
80 shell->Show(shell->webView(), disposition); 80 shell->Show(shell->webView(), disposition);
81 } 81 }
82 82
83 void TestWebViewDelegate::DidStartLoading(WebView* webview) { 83 void TestWebViewDelegate::DidStartLoading(WebView* webview) {
84 if (page_is_loading_) { 84 if (page_is_loading_) {
85 // When we started including stderr in layout-test output, a number of 85 LOG(ERROR) << "DidStartLoading called while loading";
86 // number of tests began failing. The vast majority of the new failures
87 // were due to either this error message or the one in DidStopLoading.
88 // This is being disabled temporarily so we can keep running the tests.
89 // See http://code.google.com/p/chromium/issues/detail?id=3937
90 // TODO(pamg): Remove this when the underlying bug is fixed.
91 //LOG(ERROR) << "DidStartLoading called while loading";
92 return; 86 return;
93 } 87 }
94 page_is_loading_ = true; 88 page_is_loading_ = true;
95 } 89 }
96 90
97 void TestWebViewDelegate::DidStopLoading(WebView* webview) { 91 void TestWebViewDelegate::DidStopLoading(WebView* webview) {
98 if (!page_is_loading_) { 92 if (!page_is_loading_) {
99 // When we started including stderr in layout-test output, a number of 93 LOG(ERROR) << "DidStopLoading called while not loading";
100 // number of tests began failing. The vast majority of the new failures
101 // were due to either this error message or the one in DidStartLoading.
102 // This is being disabled temporarily so we can keep running the tests.
103 // See http://code.google.com/p/chromium/issues/detail?id=3937
104 // TODO(pamg): Remove this when the underlying bug is fixed.
105 //LOG(ERROR) << "DidStopLoading called while not loading";
106 return; 94 return;
107 } 95 }
108 page_is_loading_ = false; 96 page_is_loading_ = false;
109 } 97 }
110 98
111 void TestWebViewDelegate::WindowObjectCleared(WebFrame* webframe) { 99 void TestWebViewDelegate::WindowObjectCleared(WebFrame* webframe) {
112 shell_->BindJSObjectsToWindow(webframe); 100 shell_->BindJSObjectsToWindow(webframe);
113 } 101 }
114 102
115 WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction( 103 WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction(
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 else 790 else
803 return L"main frame"; 791 return L"main frame";
804 } else { 792 } else {
805 if (name.length()) 793 if (name.length())
806 return L"frame \"" + name + L"\""; 794 return L"frame \"" + name + L"\"";
807 else 795 else
808 return L"frame (anonymous)"; 796 return L"frame (anonymous)";
809 } 797 }
810 } 798 }
811 799
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698