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

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 63091: Prevent test shell editing events from getting to the webview delegate after ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.cc
===================================================================
--- webkit/tools/test_shell/test_shell.cc (revision 13283)
+++ webkit/tools/test_shell/test_shell.cc (working copy)
@@ -126,6 +126,7 @@
CallJSGC();
CallJSGC();
+ webView()->SetDelegate(NULL);
PlatformCleanUp();
StatsTable *table = StatsTable::current();
@@ -159,15 +160,15 @@
}
void TestShell::ShutdownTestShell() {
- PlatformShutdown();
- SimpleResourceLoaderBridge::Shutdown();
- delete window_list_;
- delete TestShell::web_prefs_;
+ PlatformShutdown();
Evan Martin 2009/04/07 22:07:29 thanks for fixing these, they were driving me craz
Evan Stade 2009/04/07 22:28:24 there's plenty more 4-space tabs where these came
+ SimpleResourceLoaderBridge::Shutdown();
+ delete window_list_;
+ delete TestShell::web_prefs_;
}
// All fatal log messages (e.g. DCHECK failures) imply unit test failures
static void UnitTestAssertHandler(const std::string& str) {
- FAIL() << str;
+ FAIL() << str;
}
// static
@@ -446,13 +447,13 @@
}
void TestShell::SizeToDefault() {
- SizeTo(kTestWindowWidth, kTestWindowHeight);
+ SizeTo(kTestWindowWidth, kTestWindowHeight);
}
void TestShell::ResetTestController() {
layout_test_controller_->Reset();
event_sending_controller_->Reset();
-
+
// Reset state in the test webview delegate.
delegate_ = new TestWebViewDelegate(this);
webView()->SetDelegate(delegate_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698