Merge 194269

cc/base/switches.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 "cc/base/switches.h"
 
 #include "base/command_line.h"
 
 namespace cc {
 namespace switches {
@@ skipping 68 matching lines @@
 
 // Causes overlay scrollbars to appear when zoomed in ChromeOS/Windows.
 const char kEnablePinchZoomScrollbars[]     = "enable-pinch-zoom-scrollbars";
 const char kDisablePinchZoomScrollbars[]    = "disable-pinch-zoom-scrollbars";
 
 // Causes the compositor to render to textures which are then sent to the parent
 // through the texture mailbox mechanism.
 // Requires --enable-compositor-frame-message.
 const char kCompositeToMailbox[] = "composite-to-mailbox";
 
+// Check that property changes during paint do not occur.
+const char kStrictLayerPropertyChangeChecking[] =
+    "strict-layer-property-change-checking";
+
 const char kEnablePartialSwap[] = "enable-partial-swap";
 // Disable partial swap which is needed for some OpenGL drivers / emulators.
 const char kUIDisablePartialSwap[] = "ui-disable-partial-swap";
 
 const char kEnablePerTilePainting[] = "enable-per-tile-painting";
 const char kUIEnablePerTilePainting[] = "ui-enable-per-tile-painting";
 
 // Renders a border around compositor layers to help debug and study
 // layer compositing.
 const char kShowCompositedLayerBorders[] = "show-composited-layer-borders";
@@ skipping 48 matching lines @@
 
 #if defined(OS_ANDROID)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace switches
 }  // namespace cc