Removing command line switch to disable deferred 2d canvas.

webkit/glue/webpreferences.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 "webkit/glue/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
@@ skipping 75 matching lines @@
       threaded_html_parser(true),
       show_paint_rects(false),
       asynchronous_spell_checking_enabled(true),
       unified_textchecker_enabled(false),
       accelerated_compositing_enabled(false),
       force_compositing_mode(false),
       accelerated_compositing_for_3d_transforms_enabled(false),
       accelerated_compositing_for_animation_enabled(false),
       accelerated_compositing_for_video_enabled(false),
       accelerated_2d_canvas_enabled(false),
-      deferred_2d_canvas_enabled(false),
       antialiased_2d_canvas_disabled(false),
       accelerated_filters_enabled(false),
       gesture_tap_highlight_enabled(false),
       accelerated_compositing_for_plugins_enabled(false),
       memory_info_enabled(false),
       fullscreen_enabled(false),
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       password_echo_enabled(false),
       should_print_backgrounds(false),
@@ skipping 259 matching lines @@
   // overlay of rects, if requested on the command line.
   settings->setShowPaintRects(show_paint_rects);
 
   // Enable gpu-accelerated compositing if requested on the command line.
   settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
 
   // Enable gpu-accelerated 2d canvas if requested on the command line.
   settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled);
 
   // Enable deferred 2d canvas if requested on the command line.
-  settings->setDeferred2dCanvasEnabled(deferred_2d_canvas_enabled);
+  settings->setDeferred2dCanvasEnabled(true);

[jamesr, 2013/03/18 01:20:54]

Are you planning to remove this value from WebSettings, etc, as well?

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

Yes. In http://trac.webkit.org/changeset/146351 this method was made a stub, to
avoid blocking the WebKit roll. In the new patch I removed this line. As long as
this patch lands after the rolling WK past 146351, there will be no change in
default behavior on the chromium trunk. Once this patch lands, I will go back in
WK to remove the stub (and roll chromium DEPS if necessary).

 
   // Disable antialiasing for 2d canvas if requested on the command line.
   settings->setAntialiased2dCanvasEnabled(!antialiased_2d_canvas_disabled);
 
   // Enable gpu-accelerated filters if requested on the command line.
   settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled);
 
   // Enable gesture tap highlight if requested on the command line.
   settings->setGestureTapHighlightEnabled(gesture_tap_highlight_enabled);
 
@@ skipping 89 matching lines @@
     WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_ANDROID,
     WebSettings::EditingBehaviorAndroid);
 
 }  // namespace webkit_glue