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

cc/layers/picture_layer.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/picture_layer.h"
 
 #include "base/auto_reset.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 
 scoped_refptr<PictureLayer> PictureLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new PictureLayer(client));
 }
 
 PictureLayer::PictureLayer(ContentLayerClient* client)
     : client_(client),
       recording_source_(new PicturePile),
       instrumentation_object_tracker_(id()),
       update_source_frame_number_(-1),
-      can_use_lcd_text_last_frame_(can_use_lcd_text()) {
+      can_use_lcd_text_for_update_(true) {
 }
 
 PictureLayer::~PictureLayer() {
 }
 
 scoped_ptr<LayerImpl> PictureLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
   return PictureLayerImpl::Create(tree_impl, id());
 }
 
 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
@@ skipping 83 matching lines @@
     // Workaround for http://crbug.com/235910 - to retain backwards compat
     // the full page content must always be provided in the picture layer.
     visible_layer_rect = gfx::Rect(layer_size);
   }
 
   // UpdateAndExpandInvalidation will give us an invalidation that covers
   // anything not explicitly recorded in this frame. We give this region
   // to the impl side so that it drops tiles that may not have a recording
   // for them.
   DCHECK(client_);
+  bool can_use_lcd_text =
+      can_use_lcd_text_for_update_ == LCD_TEXT_STATE_ALLOWED;

[enne (OOO), 2014/11/12 21:47:30]

Er, isn't can_use_lcd_text_for_update_ now a bool?

[danakj, 2014/11/12 21:47:52]

Er, how did this compile?

   updated |= recording_source_->UpdateAndExpandInvalidation(
       client_, &recording_invalidation_, SafeOpaqueBackgroundColor(),
-      contents_opaque(), client_->FillsBoundsCompletely(), layer_size,
-      visible_layer_rect, update_source_frame_number_,
+      contents_opaque(), client_->FillsBoundsCompletely(), can_use_lcd_text,
+      layer_size, visible_layer_rect, update_source_frame_number_,
       Picture::RECORD_NORMALLY);
   last_updated_visible_content_rect_ = visible_content_rect();
 
   if (updated) {
     SetNeedsPushProperties();
   } else {
     // If this invalidation did not affect the pile, then it can be cleared as
     // an optimization.
     recording_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   recording_source_->SetIsMask(is_mask);
 }
 
 bool PictureLayer::SupportsLCDText() const {
   return true;
 }
 
 void PictureLayer::UpdateCanUseLCDText() {
-  if (can_use_lcd_text_last_frame_ == can_use_lcd_text())
+  if (!can_use_lcd_text_for_update_)
+    return;  // Don't allow the LcdTextState to change once disabled.
+  if (can_use_lcd_text_for_update_ == can_use_lcd_text())
     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();
+  client_->DidChangeLayerCanUseLcdText();
 }
 
 skia::RefPtr<SkPicture> PictureLayer::GetPicture() const {
   // We could either flatten the PicturePile into a single SkPicture,
   // or paint a fresh one depending on what we intend to do with the
   // picture. For now we just paint a fresh one to get consistent results.
   if (!DrawsContent())
     return skia::RefPtr<SkPicture>();
 
   int width = bounds().width();
@@ skipping 19 matching lines @@
 
 bool PictureLayer::HasDrawableContent() const {
   return client_ && Layer::HasDrawableContent();
 }
 
 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) {
   benchmark->RunOnLayer(this);
 }
 
 }  // namespace cc