Prevent test shell editing events from getting to the webview delegate after ...

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8_proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 
@@ skipping 108 matching lines @@
 
 TestShell::~TestShell() {
   // Navigate to an empty page to fire all the destruction logic for the
   // current page.
   LoadURL(L"about:blank");
 
   // Call GC twice to clean up garbage.
   CallJSGC();
   CallJSGC();
 
+  webView()->SetDelegate(NULL);
   PlatformCleanUp();
 
   StatsTable *table = StatsTable::current();
   if (dump_stats_table_on_exit_) {
     // Dump the stats table.
     printf("<stats>\n");
     if (table != NULL) {
       int counter_max = table->GetMaxCounters();
       for (int index=0; index < counter_max; index++) {
         std::string name(table->GetRowName(index));
@@ skipping 13 matching lines @@
   bool rv = shell->Initialize(startingURL);
   if (rv) {
     if (result)
       *result = shell;
     TestShell::windowList()->push_back(shell->m_mainWnd);
   }
   return rv;
 }
 
 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 crazy every time i looked at the
file

[Evan Stade, 2009/04/07 22:28:24]

there's plenty more 4-space tabs where these came from D:

+  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
 void TestShell::Dump(TestShell* shell) {
   const TestParams* params = NULL;
   if ((shell == NULL) || ((params = shell->test_params()) == NULL))
     return;
 
   WebCore::V8Proxy::ProcessConsoleMessages();
   // Echo the url in the output so we know we're not getting out of sync.
@@ skipping 258 matching lines @@
         return NULL;
 
     return new_win->webView();
 }
 
 void TestShell::SizeToSVG() {
   SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
 }
 
 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_);
 }
 
 void TestShell::LoadURL(const wchar_t* url) {
     LoadURLForFrame(url, NULL);
 }
 
 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
@@ skipping 141 matching lines @@
 
 bool IsDefaultPluginEnabled() {
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue