cc: Toggle LCD text at raster time instead of record time.

cc/layers/content_layer.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/layers/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 20 matching lines @@
                          ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);
 }
 
 scoped_refptr<ContentLayer> ContentLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new ContentLayer(client));
 }
 
 ContentLayer::ContentLayer(ContentLayerClient* client)
     : TiledLayer(),
       client_(client),
-      can_use_lcd_text_last_frame_(can_use_lcd_text()) {
+      can_use_lcd_text_for_update_(false),
+      ignore_lcd_text_change_(false) {
 }
 
 ContentLayer::~ContentLayer() {}
 
 void ContentLayer::ClearClient() {
   client_ = nullptr;
   UpdateDrawsContent(HasDrawableContent());
 }
 
 bool ContentLayer::HasDrawableContent() const {
@@ skipping 60 matching lines @@
       layer_tree_host()->GetRendererCapabilities().best_texture_format);
 }
 
 void ContentLayer::SetContentsOpaque(bool opaque) {
   Layer::SetContentsOpaque(opaque);
   if (updater_.get())
     updater_->SetOpaque(opaque);
 }
 
 void ContentLayer::UpdateCanUseLCDText() {
-  if (can_use_lcd_text_last_frame_ == can_use_lcd_text())
+  if (can_use_lcd_text_for_update_ == can_use_lcd_text())
+    return;
+  // Once LCD text decision has been made, only allow it to be disabled.
+  if (can_use_lcd_text() && ignore_lcd_text_change_)
     return;
 
-  can_use_lcd_text_last_frame_ = can_use_lcd_text();
-  if (client_)
-    client_->DidChangeLayerCanUseLCDText();
+  can_use_lcd_text_for_update_ = can_use_lcd_text();
+  ignore_lcd_text_change_ = true;
+  SetNeedsDisplay();
 }
 
 bool ContentLayer::SupportsLCDText() const {
   return true;
 }
 
 skia::RefPtr<SkPicture> ContentLayer::GetPicture() const {
   if (!DrawsContent())
     return skia::RefPtr<SkPicture>();
 
   int width = bounds().width();
   int height = bounds().height();
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = recorder.beginRecording(width, height, nullptr, 0);
   client_->PaintContents(canvas,
                          gfx::Rect(width, height),
                          ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);
   skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
   return picture;
 }
 
 void ContentLayer::OnOutputSurfaceCreated() {
   SetTextureFormat(
       layer_tree_host()->GetRendererCapabilities().best_texture_format);
   TiledLayer::OnOutputSurfaceCreated();
 }
 
 }  // namespace cc