[merge-m52] Do not SchedulePaint() inside views::Label::OnPaint()

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ skipping 158 matching lines @@
   void MaybeBuildRenderTextLines();
 
   gfx::Rect GetFocusBounds();
 
   // Get the text broken into lines as needed to fit the given |width|.
   std::vector<base::string16> GetLinesForWidth(int width) const;
 
   // Get the text size for the current layout.
   gfx::Size GetTextSize() const;
 
+  // Updates |actual_{enabled,disabled}_color_| from requested colors.
   void RecalculateColors();
 
+  // Applies |actual_{enabled,disabled}_color_| to |lines_|.
+  void ApplyTextColors();
+
   // Updates any colors that have not been explicitly set from the theme.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
 
   bool ShouldShowDefaultTooltip() const;
 
   // An un-elided and single-line RenderText object used for preferred sizing.
   std::unique_ptr<gfx::RenderText> render_text_;
 
   // The RenderText instances used to display elided and multi-line text.
   std::vector<std::unique_ptr<gfx::RenderText>> lines_;
@@ skipping 24 matching lines @@
   // TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is
   // closed.
   bool is_first_paint_text_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_