cc: Adding support for RGBA_4444 tile textures

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 144 matching lines @@
       is_backbuffer_discarded_(false),
       discard_backbuffer_when_not_visible_(false),
       is_using_bind_uniform_(false),
       visible_(true),
       is_scissor_enabled_(false),
       stencil_shadow_(false),
       blend_shadow_(false),
       highp_threshold_min_(highp_threshold_min),
       highp_threshold_cache_(0),
       offscreen_context_labelled_(false),
-      on_demand_tile_raster_resource_id_(0) {
+      on_demand_tile_raster_resource_id_(0),
+      use_16_bit_resources_(resource_provider->use_16bit_textures()) {
   DCHECK(context_);
 }
 
 bool GLRenderer::Initialize() {
   if (!context_->makeContextCurrent())
     return false;
 
   std::string unique_context_name = base::StringPrintf(
       "%s-%p",
       Settings().compositor_name.c_str(),
@@ skipping 1521 matching lines @@
         GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
         ResourceProvider::TextureUsageAny);
   }
 
   SkBitmapDevice device(on_demand_tile_raster_bitmap_);
   SkCanvas canvas(&device);
 
   quad->picture_pile->RasterToBitmap(&canvas, quad->content_rect,
                                      quad->contents_scale, NULL);
 
+  uint8_t* bitmap_pixels = NULL;

[Sami, 2013/09/05 14:13:26]

Nit: const uint8_t*

[kaanb, 2013/09/06 02:05:54]

Done.

+  if (use_16_bit_resources_) {
+    SkBitmap bitmap_16;

[enne (OOO), 2013/09/05 02:01:19]

This should probably be a member along with on_demand_tile_raster_bitmap_.  I
suspect the goal of making it a member is to not have to reallocate the buffer
if it ends up being the same size.

[Sami, 2013/09/05 14:13:26]

Furthermore, since bitmap_16 is on the stack, bitmap_pixels will point to free'd
memory as soon as we leave this block. Maybe that explains the corruption you
were seeing.

[kaanb, 2013/09/06 02:05:54]

Done.

[kaanb, 2013/09/06 02:05:54]

Great point. The overscroll glow is fixed now.

+    on_demand_tile_raster_bitmap_.copyTo(
+        &bitmap_16, SkBitmap::kARGB_4444_Config);
+    bitmap_pixels = reinterpret_cast<uint8_t*>(bitmap_16.getPixels());
+  } else {
+    bitmap_pixels = reinterpret_cast<uint8_t*>(
+        on_demand_tile_raster_bitmap_.getPixels());
+  }
+
   resource_provider_->SetPixels(
       on_demand_tile_raster_resource_id_,
-      reinterpret_cast<uint8_t*>(on_demand_tile_raster_bitmap_.getPixels()),
+      bitmap_pixels,
       gfx::Rect(quad->texture_size),
       gfx::Rect(quad->texture_size),
       gfx::Vector2d());
 
   DrawContentQuad(frame, quad, on_demand_tile_raster_resource_id_);
 }
 
 struct TextureProgramBinding {
   template <class Program>
   void Set(Program* program, WebKit::WebGraphicsContext3D* context) {
@@ skipping 1430 matching lines @@
   std::string unique_context_name = base::StringPrintf(
       "%s-Offscreen-%p",
       Settings().compositor_name.c_str(),
       context_);
   offscreen_context_provider->Context3d()->pushGroupMarkerEXT(
       unique_context_name.c_str());
 }
 
 
 }  // namespace cc