Update from chromium https://crrev.com/301725/

cc/layers/solid_color_layer_impl.cc

 // Copyright 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/layers/solid_color_layer_impl.h"
 
 #include <algorithm>
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ skipping 18 matching lines @@
 
 void SolidColorLayerImpl::AppendSolidQuads(
     RenderPass* render_pass,
     const Occlusion& occlusion_in_content_space,
     SharedQuadState* shared_quad_state,
     const gfx::Rect& visible_content_rect,
     SkColor color,
     AppendQuadsData* append_quads_data) {
   // We create a series of smaller quads instead of just one large one so that
   // the culler can reduce the total pixels drawn.
-  int width = visible_content_rect.width();
-  int height = visible_content_rect.height();
+  int right = visible_content_rect.right();
+  int bottom = visible_content_rect.bottom();
   for (int x = visible_content_rect.x(); x < visible_content_rect.right();
        x += kSolidQuadTileSize) {
     for (int y = visible_content_rect.y(); y < visible_content_rect.bottom();
          y += kSolidQuadTileSize) {
       gfx::Rect quad_rect(x,
                           y,
-                          std::min(width - x, kSolidQuadTileSize),
-                          std::min(height - y, kSolidQuadTileSize));
+                          std::min(right - x, kSolidQuadTileSize),
+                          std::min(bottom - y, kSolidQuadTileSize));
       gfx::Rect visible_quad_rect =
           occlusion_in_content_space.GetUnoccludedContentRect(quad_rect);
       if (visible_quad_rect.IsEmpty())
         continue;
 
       append_quads_data->visible_content_area +=
           visible_quad_rect.width() * visible_quad_rect.height();
 
       SolidColorDrawQuad* quad =
           render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
@@ skipping 22 matching lines @@
                    gfx::Rect(content_bounds()),
                    background_color(),
                    append_quads_data);
 }
 
 const char* SolidColorLayerImpl::LayerTypeAsString() const {
   return "cc::SolidColorLayerImpl";
 }
 
 }  // namespace cc