Prepare to use gfx::RenderText in views::Label.

ui/app_list/views/app_list_item_view.cc

 // Copyright (c) 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 "ui/app_list/views/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 169 matching lines @@
       layer()->SetTransform(gfx::GetScaleTransform(
           bounds.CenterPoint(),
           kDraggingIconScale));
       break;
     }
     case UI_STATE_DROPPING_IN_FOLDER:
       break;
   }
 #endif  // !OS_WIN
 
+  SetTitleSubpixelAA();
   SchedulePaint();
 }
 
 void AppListItemView::SetTouchDragging(bool touch_dragging) {
   if (touch_dragging_ == touch_dragging)
     return;
 
   touch_dragging_ = touch_dragging;
   SetUIState(touch_dragging_ ? UI_STATE_DRAGGING : UI_STATE_NORMAL);
 }
 
 void AppListItemView::OnMouseDragTimer() {
   DCHECK(apps_grid_view_->IsDraggedView(this));
   SetUIState(UI_STATE_DRAGGING);
 }
 
 void AppListItemView::SetTitleSubpixelAA() {
   // TODO(tapted): Enable AA for folders as well, taking care to play nice with
   // the folder bubble animation.
   bool enable_aa = !item_->IsInFolder() && ui_state_ == UI_STATE_NORMAL &&
                    !item_->highlighted() &&
                    !apps_grid_view_->IsSelectedView(this) &&
                    !apps_grid_view_->IsAnimatingView(this);

[tapted, 2014/07/15 00:52:38]

the hook was in a SchedulePaint override because the animating->not animating
transition was really hard to catch. This is when you release an item during
drag & drop and it snaps back to the grid (and it's a different animation on
CrOS/Linux vs Windows due to interaction with the OS drag and drop).

I'll patch this in and try it out, since it's not clear this is still handled.

If the schedule paint override is now a deal-breaker the app list might need a
change to each of the gfx::AnimationDelegates in apps_grid_view.cc

[msw, 2014/07/15 01:29:31]

Removing the SchedulePaint from Label::RecalculateColors seems wrong. If
AppListItemView really needs to change Label colors when paints are scheduled, I
could do a nontrivial amount of work to only SchedulePaint in
Label::RecalculateColors when the Label color values change (need to add
RenderText accessors and some label temporary values to check the
foreground/background colors and the subpixel_rendering_enabled_ flag). That
would probably alleviate the infinite loop. Changing the AnimationDelegates to
update the title label colors when the animation ends seems like a better
solution. Let me know what you think.

 
-  bool currently_enabled = title_->background() != NULL;
-  if (currently_enabled == enable_aa)
-    return;
-
+  title_->SetSubpixelRenderingEnabled(enable_aa);
   if (enable_aa) {
     title_->SetBackgroundColor(app_list::kContentsBackgroundColor);
     title_->set_background(views::Background::CreateSolidBackground(
         app_list::kContentsBackgroundColor));
   } else {
     // In other cases, keep the background transparent to ensure correct
     // interactions with animations. This will temporarily disable subpixel AA.
     title_->SetBackgroundColor(0);
     title_->set_background(NULL);
   }
@@ skipping 43 matching lines @@
   SetAccessibleName(item_->GetItemType() == AppListFolderItem::kItemType
                         ? l10n_util::GetStringFUTF16(
                               IDS_APP_LIST_FOLDER_BUTTON_ACCESSIBILE_NAME,
                               base::UTF8ToUTF16(item_->name()))
                         : base::UTF8ToUTF16(item_->name()));
   Layout();
 }
 
 void AppListItemView::ItemHighlightedChanged() {
   apps_grid_view_->EnsureViewVisible(this);
+  SetTitleSubpixelAA();
   SchedulePaint();
 }
 
 void AppListItemView::ItemIsInstallingChanged() {
   if (item_->is_installing())
     apps_grid_view_->EnsureViewVisible(this);
   title_->SetVisible(!item_->is_installing());
   progress_bar_->SetVisible(item_->is_installing());
+  SetTitleSubpixelAA();
   SchedulePaint();
 }
 
 void AppListItemView::ItemPercentDownloadedChanged() {
   // A percent_downloaded() of -1 can mean it's not known how much percent is
   // completed, or the download hasn't been marked complete, as is the case
   // while an extension is being installed after being downloaded.
   if (item_->percent_downloaded() == -1)
     return;
   progress_bar_->SetValue(item_->percent_downloaded() / 100.0);
@@ skipping 12 matching lines @@
   const int y = rect.y();
 
   icon_->SetBoundsRect(GetIconBoundsForTargetViewBounds(GetContentsBounds()));
   const gfx::Size title_size = title_->GetPreferredSize();
   gfx::Rect title_bounds(rect.x() + (rect.width() - title_size.width()) / 2,
                          y + icon_size_.height() + kIconTitleSpacing,
                          title_size.width(),
                          title_size.height());
   title_bounds.Intersect(rect);
   title_->SetBoundsRect(title_bounds);
+  SetTitleSubpixelAA();
 
   gfx::Rect progress_bar_bounds(progress_bar_->GetPreferredSize());
   progress_bar_bounds.set_x(GetContentsBounds().x() +
                             kProgressBarHorizontalPadding);
   progress_bar_bounds.set_y(title_bounds.y());
   progress_bar_->SetBoundsRect(progress_bar_bounds);
 }
 
-void AppListItemView::SchedulePaintInRect(const gfx::Rect& r) {
-  SetTitleSubpixelAA();
-  views::CustomButton::SchedulePaintInRect(r);
-}
-
 void AppListItemView::OnPaint(gfx::Canvas* canvas) {
   if (apps_grid_view_->IsDraggedView(this))
     return;
 
   gfx::Rect rect(GetContentsBounds());
   if (item_->highlighted() && !item_->is_installing()) {
     canvas->FillRect(rect, kHighlightedColor);
     return;
   }
   if (apps_grid_view_->IsSelectedView(this))
@@ skipping 40 matching lines @@
   if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
     if (!is_folder_ui_enabled)
       apps_grid_view_->SetSelectedView(this);
     title_->SetEnabledColor(kGridTitleHoverColor);
   } else {
     if (!is_folder_ui_enabled)
       apps_grid_view_->ClearSelectedView(this);
     item_->SetHighlighted(false);
     title_->SetEnabledColor(kGridTitleColor);
   }
-  title_->Invalidate();
+  SetTitleSubpixelAA();
 }
 
 bool AppListItemView::ShouldEnterPushedState(const ui::Event& event) {
   // Don't enter pushed state for ET_GESTURE_TAP_DOWN so that hover gray
   // background does not show up during scroll.
   if (event.type() == ui::ET_GESTURE_TAP_DOWN)
     return false;
 
   return views::CustomButton::ShouldEnterPushedState(event);
 }
@@ skipping 119 matching lines @@
   const int left_right_padding =
       title_->font_list().GetExpectedTextWidth(kLeftRightPaddingChars);
   rect.Inset(left_right_padding, kTopPadding, left_right_padding, 0);
 
   gfx::Rect icon_bounds(rect.x(), rect.y(), rect.width(), icon_size_.height());
   icon_bounds.Inset(gfx::ShadowValue::GetMargin(icon_shadows_));
   return icon_bounds;
 }
 
 }  // namespace app_list