test_shell command line switch enable-accelerated-compositing added

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2009 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 97 matching lines @@
 // Initialize static member variable
 WindowList* TestShell::window_list_;
 WebPreferences* TestShell::web_prefs_ = NULL;
 bool TestShell::developer_extras_enabled_ = false;
 bool TestShell::layout_test_mode_ = false;
 bool TestShell::allow_external_pages_ = false;
 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
 bool TestShell::test_is_preparing_ = false;
 bool TestShell::test_is_pending_ = false;
 bool TestShell::accelerated_2d_canvas_enabled_ = false;
+bool TestShell::accelerated_compositing_enabled_ = false;
 
 TestShell::TestShell()
     : m_mainWnd(NULL),
       m_editWnd(NULL),
       m_webViewHost(NULL),
       m_popupHost(NULL),
       m_focusedWidgetHost(NULL),
 #if defined(OS_WIN)
       default_edit_wnd_proc_(0),
 #endif
@@ skipping 315 matching lines @@
   if (web_prefs_)
     web_prefs_->allow_scripts_to_close_windows = true;
 }
 
 // static
 void TestShell::SetAccelerated2dCanvasEnabled(bool enabled) {
   accelerated_2d_canvas_enabled_ = enabled;
 }
 
 // static
+void TestShell::SetAcceleratedCompositingEnabled(bool enabled) {
+  accelerated_compositing_enabled_ = enabled;
+}
+
+// static
 void TestShell::ResetWebPreferences() {
     DCHECK(web_prefs_);
 
     // Match the settings used by Mac DumpRenderTree, with the exception of
     // fonts.
     if (web_prefs_) {
         *web_prefs_ = WebPreferences();
 
 #if defined(OS_MACOSX)
         web_prefs_->serif_font_family = L"Times";
@@ skipping 43 matching lines @@
         web_prefs_->remote_fonts_enabled = true;
         web_prefs_->local_storage_enabled = true;
         web_prefs_->application_cache_enabled = true;
         web_prefs_->databases_enabled = true;
         web_prefs_->allow_file_access_from_file_urls = true;
         // LayoutTests were written with Safari Mac in mind which does not allow
         // tabbing to links by default.
         web_prefs_->tabs_to_links = false;
         web_prefs_->accelerated_2d_canvas_enabled =
             accelerated_2d_canvas_enabled_;
-
+        web_prefs_->accelerated_compositing_enabled =
+            accelerated_compositing_enabled_;
         // Allow those layout tests running as local files, i.e. under
         // LayoutTests/http/tests/local, to access http server.
         if (layout_test_mode_)
           web_prefs_->allow_universal_access_from_file_urls = true;
     }
 }
 
 // static
 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) {
   WindowList::iterator entry =
@@ skipping 318 matching lines @@
   return -1;
 }
 
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length) {
   return false;
 }
 #endif
 
 }  // namespace webkit_glue