cc: Scale checkerboard quads by the device scale factor.

cc/output/gl_renderer.cc

 // Copyright 2010 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/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 541 matching lines @@
   SetUseProgram(program->program());
 
   SkColor color = quad->color;
   GLC(gl_,
       gl_->Uniform4f(program->fragment_shader().color_location(),
                      SkColorGetR(color) * (1.0f / 255.0f),
                      SkColorGetG(color) * (1.0f / 255.0f),
                      SkColorGetB(color) * (1.0f / 255.0f),
                      1));
 
-  const int checkerboard_width = 16;
-  float frequency = 1.0f / checkerboard_width;
+  const int kCheckerboardWidth = 16;
+  float frequency = 1.0f / kCheckerboardWidth;
 
   gfx::Rect tile_rect = quad->rect;
-  float tex_offset_x = tile_rect.x() % checkerboard_width;
-  float tex_offset_y = tile_rect.y() % checkerboard_width;
-  float tex_scale_x = tile_rect.width();
-  float tex_scale_y = tile_rect.height();
+  float tex_offset_x =
+      static_cast<int>(tile_rect.x() / quad->scale) % kCheckerboardWidth;
+  float tex_offset_y =

[vmpstr, 2015/03/04 00:53:56]

Should the type of this be int as well?

[danakj, 2015/03/04 17:06:57]

It gets converted to a float when passed to Uniform4f, so I don't think it
matters.. kinda prefer to leave it?

+      static_cast<int>(tile_rect.y() / quad->scale) % kCheckerboardWidth;
+  float tex_scale_x = tile_rect.width() / quad->scale;
+  float tex_scale_y = tile_rect.height() / quad->scale;
   GLC(gl_,
       gl_->Uniform4f(program->fragment_shader().tex_transform_location(),
                      tex_offset_x,
                      tex_offset_y,
                      tex_scale_x,
                      tex_scale_y));
 
   GLC(gl_,
       gl_->Uniform1f(program->fragment_shader().frequency_location(),
                      frequency));
@@ skipping 2675 matching lines @@
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order,
         overlay.transform,
         pending_overlay_resources_.back()->texture_id(),
         overlay.display_rect,
         overlay.uv_rect);
   }
 }
 
 }  // namespace cc