| Index: cc/layer_tree_settings.cc
 | 
| diff --git a/cc/layer_tree_settings.cc b/cc/layer_tree_settings.cc
 | 
| index 4221167c29fa139a0ed67d473ea6deccda6bc79e..f8b964307a539c30527ac2d1701c903def2912a8 100644
 | 
| --- a/cc/layer_tree_settings.cc
 | 
| +++ b/cc/layer_tree_settings.cc
 | 
| @@ -26,6 +26,7 @@ LayerTreeSettings::LayerTreeSettings()
 | 
|      , showOverdrawInTracing(false)
 | 
|      , canUseLCDText(true)
 | 
|      , shouldClearRootRenderPass(true)
 | 
| +    , useLinearFadeScrollbarAnimator(false)
 | 
|      , refreshRate(0)
 | 
|      , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
 | 
|      , numRasterThreads(1)
 | 
| @@ -46,6 +47,16 @@ LayerTreeSettings::LayerTreeSettings()
 | 
|      canUseLCDText = false;
 | 
|  #endif
 | 
|  
 | 
| +#if defined(OS_ANDROID)
 | 
| +    // TODO(danakj): Move this out to the android code.
 | 
| +    maxPartialTextureUpdates = 0;
 | 
| +#endif
 | 
| +
 | 
| +#if defined(OS_ANDROID)
 | 
| +    // TODO(danakj): Move this out to the android code.
 | 
| +    useLinearFadeScrollbarAnimator = true;
 | 
| +#endif
 | 
| +
 | 
|      initialDebugState.showPropertyChangedRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowPropertyChangedRects);
 | 
|      initialDebugState.showSurfaceDamageRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowSurfaceDamageRects);
 | 
|      initialDebugState.showScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowScreenSpaceRects);
 | 
| 
 |