Removing command line switch to disable deferred 2d canvas.

content/shell/webkit_test_controller.cc

 // Copyright (c) 2012 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 "content/shell/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 276 matching lines @@
     webkit_glue::WebPreferences* prefs) {
   if (should_override_prefs_) {
     *prefs = prefs_;
   } else {
     ApplyLayoutTestDefaultPreferences(prefs);
     if (is_compositing_test_) {
       CommandLine& command_line = *CommandLine::ForCurrentProcess();
       if (command_line.HasSwitch(switches::kEnableSoftwareCompositing))
         prefs->accelerated_2d_canvas_enabled = true;
       prefs->accelerated_compositing_for_video_enabled = true;
-      prefs->deferred_2d_canvas_enabled = true;

[jochen (gone - plz use gerrit), 2013/03/15 13:52:44]

did you already remove the option from DumpRenderTree? If not, can you please do
that first?

[Justin Novosad, 2013/03/20 20:00:55]

Done: http://trac.webkit.org/changeset/146351

       prefs->mock_scrollbars_enabled = true;
     }
   }
 }
 
 bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestController, message)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_PrintMessage, OnPrintMessage)
@@ skipping 280 matching lines @@
   DevToolsManager::GetInstance()->CloseAllClientHosts();
   std::vector<Shell*> open_windows(Shell::windows());
   for (size_t i = 0; i < open_windows.size(); ++i) {
     if (open_windows[i] != main_window_)
       open_windows[i]->Close();
   }
   MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace content