Record SkPicture with correct LCD text setting.

webkit/renderer/compositor_bindings/web_content_layer_impl.cc

 // Copyright 2011 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 "webkit/renderer/compositor_bindings/web_content_layer_impl.h"
 
 #include "cc/layers/content_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "third_party/WebKit/public/platform/WebContentLayerClient.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ skipping 37 matching lines @@
 
 void WebContentLayerImpl::PaintContents(
     SkCanvas* canvas,
     const gfx::Rect& clip,
     gfx::RectF* opaque,
     ContentLayerClient::GraphicsContextStatus graphics_context_status) {
   if (!client_)
     return;
 
   blink::WebFloatRect web_opaque;
-  // For picture layers, always record with LCD text.  PictureLayerImpl
-  // will turn this off later during rasterization.
-  bool use_lcd_text = WebLayerImpl::UsingPictureLayer() || can_use_lcd_text_;
   client_->paintContents(
       canvas,
       clip,
-      use_lcd_text,
+      can_use_lcd_text_,
       web_opaque,
       graphics_context_status == ContentLayerClient::GRAPHICS_CONTEXT_ENABLED
           ? blink::WebContentLayerClient::GraphicsContextEnabled
           : blink::WebContentLayerClient::GraphicsContextDisabled);
   *opaque = web_opaque;
 }
 
 void WebContentLayerImpl::DidChangeLayerCanUseLCDText() {
   // It is important to make this comparison because the LCD text status
   // here can get out of sync with that in the layer.
   if (can_use_lcd_text_ == layer_->layer()->can_use_lcd_text())
     return;
 
   // LCD text cannot be enabled once disabled.
   if (layer_->layer()->can_use_lcd_text() && ignore_lcd_text_change_)
     return;
 
   can_use_lcd_text_ = layer_->layer()->can_use_lcd_text();
   ignore_lcd_text_change_ = true;
   layer_->invalidate();
 }
 
 bool WebContentLayerImpl::FillsBoundsCompletely() const { return false; }
 
 }  // namespace webkit