Replace StyleRange with BreakList; update RenderText, etc.

ui/gfx/canvas_skia.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/gfx/canvas.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/range/range.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/text_utils.h"
 
+namespace gfx {
+
 namespace {
 
 // If necessary, wraps |text| with RTL/LTR directionality characters based on
 // |flags| and |text| content.
 // Returns true if the text will be rendered right-to-left.
 // TODO(msw): Nix this, now that RenderTextWin supports directionality directly.
 bool AdjustStringDirection(int flags, string16* text) {
   // TODO(msw): FORCE_LTR_DIRECTIONALITY does not work for RTL text now.
 
   // If the string is empty or LTR was forced, simply return false since the
   // default RenderText directionality is already LTR.
-  if (text->empty() || (flags & gfx::Canvas::FORCE_LTR_DIRECTIONALITY))
+  if (text->empty() || (flags & Canvas::FORCE_LTR_DIRECTIONALITY))
     return false;
 
   // If RTL is forced, apply it to the string.
-  if (flags & gfx::Canvas::FORCE_RTL_DIRECTIONALITY) {
+  if (flags & Canvas::FORCE_RTL_DIRECTIONALITY) {
     base::i18n::WrapStringWithRTLFormatting(text);
     return true;
   }
 
   // If a direction wasn't forced but the UI language is RTL and there were
   // strong RTL characters, ensure RTL is applied.
   if (base::i18n::IsRTL() && base::i18n::StringContainsStrongRTLChars(*text)) {
     base::i18n::WrapStringWithRTLFormatting(text);
     return true;
   }
@@ skipping 31 matching lines @@
       *bitmap.getAddr32(x, y + 1) != halo_color &&
       *bitmap.getAddr32(x, y + 1) != 0)
     return true;  // Touched pixel below.
   return false;
 }
 
 // Strips accelerator character prefixes in |text| if needed, based on |flags|.
 // Returns a range in |text| to underline or ui::Range::InvalidRange() if
 // underlining is not needed.
 ui::Range StripAcceleratorChars(int flags, string16* text) {
-  if (flags & (gfx::Canvas::SHOW_PREFIX | gfx::Canvas::HIDE_PREFIX)) {
+  if (flags & (Canvas::SHOW_PREFIX | Canvas::HIDE_PREFIX)) {
     int char_pos = -1;
     int char_span = 0;
-    *text = gfx::RemoveAcceleratorChar(*text, '&', &char_pos, &char_span);
-    if ((flags & gfx::Canvas::SHOW_PREFIX) && char_pos != -1)
+    *text = RemoveAcceleratorChar(*text, '&', &char_pos, &char_span);
+    if ((flags & Canvas::SHOW_PREFIX) && char_pos != -1)
       return ui::Range(char_pos, char_pos + char_span);
   }
   return ui::Range::InvalidRange();
 }
 
 // Elides |text| and adjusts |range| appropriately. If eliding causes |range|
 // to no longer point to the same character in |text|, |range| is made invalid.
-void ElideTextAndAdjustRange(const gfx::Font& font,
+void ElideTextAndAdjustRange(const Font& font,
                              int width,
                              string16* text,
                              ui::Range* range) {
   const char16 start_char = (range->IsValid() ? text->at(range->start()) : 0);
   *text = ui::ElideText(*text, font, width, ui::ELIDE_AT_END);
   if (!range->IsValid())
     return;
   if (range->start() >= text->length() ||
       text->at(range->start()) != start_char) {
     *range = ui::Range::InvalidRange();
   }
 }
 
 // Updates |render_text| from the specified parameters.
-void UpdateRenderText(const gfx::Rect& rect,
+void UpdateRenderText(const Rect& rect,
                       const string16& text,
-                      const gfx::Font& font,
+                      const Font& font,
                       int flags,
                       SkColor color,
-                      gfx::RenderText* render_text) {
+                      RenderText* render_text) {
   render_text->SetFont(font);
   render_text->SetText(text);
   render_text->SetCursorEnabled(false);
 
-  gfx::Rect display_rect = rect;
+  Rect display_rect = rect;
   display_rect.set_height(font.GetHeight());
   render_text->SetDisplayRect(display_rect);
 
   // Set the text alignment explicitly based on the directionality of the UI,
   // if not specified.
-  if (!(flags & (gfx::Canvas::TEXT_ALIGN_CENTER |
-                 gfx::Canvas::TEXT_ALIGN_RIGHT |
-                 gfx::Canvas::TEXT_ALIGN_LEFT))) {
-    flags |= gfx::Canvas::DefaultCanvasTextAlignment();
+  if (!(flags & (Canvas::TEXT_ALIGN_CENTER |
+                 Canvas::TEXT_ALIGN_RIGHT |
+                 Canvas::TEXT_ALIGN_LEFT))) {
+    flags |= Canvas::DefaultCanvasTextAlignment();
   }
 
-  if (flags & gfx::Canvas::TEXT_ALIGN_RIGHT)
-    render_text->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  else if (flags & gfx::Canvas::TEXT_ALIGN_CENTER)
-    render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  if (flags & Canvas::TEXT_ALIGN_RIGHT)
+    render_text->SetHorizontalAlignment(ALIGN_RIGHT);
+  else if (flags & Canvas::TEXT_ALIGN_CENTER)
+    render_text->SetHorizontalAlignment(ALIGN_CENTER);
   else
-    render_text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    render_text->SetHorizontalAlignment(ALIGN_LEFT);
 
-  if (flags & gfx::Canvas::NO_SUBPIXEL_RENDERING)
+  if (flags & Canvas::NO_SUBPIXEL_RENDERING)
     render_text->set_background_is_transparent(true);
 
-  gfx::StyleRange style;
-  style.foreground = color;
-  style.font_style = font.GetStyle();
-  if (font.GetStyle() & gfx::Font::UNDERLINED)
-    style.underline = true;
-  render_text->set_default_style(style);
-  render_text->ApplyDefaultStyle();
-}
-
-// Adds an underline style to |render_text| over |range|.
-void ApplyUnderlineStyle(const ui::Range& range, gfx::RenderText* render_text) {
-  gfx::StyleRange style = render_text->default_style();
-  if (range.IsValid() && !style.underline) {
-    style.range = range;
-    style.underline = true;
-    render_text->ApplyStyleRange(style);
-  }
+  render_text->SetColor(color);
+  render_text->SetStyle(BOLD, (font.GetStyle() & Font::BOLD) != 0);
+  render_text->SetStyle(ITALIC, (font.GetStyle() & Font::ITALIC) != 0);
+  render_text->SetStyle(UNDERLINE, (font.GetStyle() & Font::UNDERLINE) != 0);
 }
 
 // Returns updated |flags| to match platform-specific expected behavior.
 int AdjustPlatformSpecificFlags(const string16& text, int flags) {
 #if defined(OS_LINUX)
   // TODO(asvitkine): ash/tooltips/tooltip_controller.cc adds \n's to the string
   //                  without passing MULTI_LINE.
   if (text.find('\n') != string16::npos)
-    flags |= gfx::Canvas::MULTI_LINE;
+    flags |= Canvas::MULTI_LINE;
 #endif
 
   return flags;
 }
 
 }  // namespace
 
-namespace gfx {
-
 // static
 void Canvas::SizeStringInt(const string16& text,
-                           const gfx::Font& font,
+                           const Font& font,
                            int* width, int* height,
                            int flags) {
   DCHECK_GE(*width, 0);
   DCHECK_GE(*height, 0);
 
   flags = AdjustPlatformSpecificFlags(text, flags);
 
   string16 adjusted_text = text;
 #if defined(OS_WIN)
   AdjustStringDirection(flags, &adjusted_text);
 #endif
 
   if ((flags & MULTI_LINE) && *width != 0) {
     ui::WordWrapBehavior wrap_behavior = ui::TRUNCATE_LONG_WORDS;
     if (flags & CHARACTER_BREAK)
       wrap_behavior = ui::WRAP_LONG_WORDS;
     else if (!(flags & NO_ELLIPSIS))
       wrap_behavior = ui::ELIDE_LONG_WORDS;
 
-    gfx::Rect rect(*width, INT_MAX);
+    Rect rect(*width, INT_MAX);
     std::vector<string16> strings;
     ui::ElideRectangleText(adjusted_text, font, rect.width(), rect.height(),
                            wrap_behavior, &strings);
     scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
     UpdateRenderText(rect, string16(), font, flags, 0, render_text.get());
 
     int h = 0;
     int w = 0;
     for (size_t i = 0; i < strings.size(); ++i) {
       StripAcceleratorChars(flags, &strings[i]);
       render_text->SetText(strings[i]);
       const Size string_size = render_text->GetStringSize();
       w = std::max(w, string_size.width());
       h += string_size.height();
     }
     *width = w;
     *height = h;
   } else {
     // If the string is too long, the call by |RenderTextWin| to |ScriptShape()|
     // will inexplicably fail with result E_INVALIDARG. Guard against this.
     const size_t kMaxRenderTextLength = 5000;
     if (adjusted_text.length() >= kMaxRenderTextLength) {
       *width = adjusted_text.length() * font.GetAverageCharacterWidth();
       *height = font.GetHeight();
     } else {
       scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-      gfx::Rect rect(*width, *height);
+      Rect rect(*width, *height);
       StripAcceleratorChars(flags, &adjusted_text);
       UpdateRenderText(rect, adjusted_text, font, flags, 0, render_text.get());
       const Size string_size = render_text->GetStringSize();
       *width = string_size.width();
       *height = string_size.height();
     }
   }
 }
 
 void Canvas::DrawStringWithShadows(const string16& text,
-                                   const gfx::Font& font,
+                                   const Font& font,
                                    SkColor color,
-                                   const gfx::Rect& text_bounds,
+                                   const Rect& text_bounds,
                                    int flags,
                                    const ShadowValues& shadows) {
   if (!IntersectsClipRect(text_bounds))
     return;
 
   flags = AdjustPlatformSpecificFlags(text, flags);
 
-  gfx::Rect clip_rect(text_bounds);
+  Rect clip_rect(text_bounds);
   clip_rect.Inset(ShadowValue::GetMargin(shadows));
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(clip_rect);
 
-  gfx::Rect rect(text_bounds);
+  Rect rect(text_bounds);
   string16 adjusted_text = text;
 
 #if defined(OS_WIN)
   AdjustStringDirection(flags, &adjusted_text);
 #endif
 
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   render_text->SetTextShadows(shadows);
 
   if (flags & MULTI_LINE) {
@@ skipping 13 matching lines @@
     for (size_t i = 0; i < strings.size(); i++) {
       ui::Range range = StripAcceleratorChars(flags, &strings[i]);
       UpdateRenderText(rect, strings[i], font, flags, color, render_text.get());
       const int line_height = render_text->GetStringSize().height();
 
       // TODO(msw|asvitkine): Center Windows multi-line text: crbug.com/107357
 #if !defined(OS_WIN)
       if (i == 0) {
         // TODO(msw|asvitkine): Support multi-line text with varied heights.
         const int aggregate_height = strings.size() * line_height;
-        rect += gfx::Vector2d(0, (text_bounds.height() - aggregate_height) / 2);
+        rect += Vector2d(0, (text_bounds.height() - aggregate_height) / 2);
       }
 #endif
 
       rect.set_height(line_height);
 
-      ApplyUnderlineStyle(range, render_text.get());
+      render_text->ApplyStyle(UNDERLINE, true, range);

[Alexei Svitkine (slow), 2013/01/22 19:20:21]

Only do this if range.IsValid(). See comment for StripAcceleratorChars().

[msw, 2013/01/22 22:27:24]

Done.

       render_text->SetDisplayRect(rect);
       render_text->Draw(this);
-      rect += gfx::Vector2d(0, line_height);
+      rect += Vector2d(0, line_height);
     }
   } else {
     ui::Range range = StripAcceleratorChars(flags, &adjusted_text);
     bool elide_text = ((flags & NO_ELLIPSIS) == 0);
 
 #if defined(OS_LINUX)
     // On Linux, eliding really means fading the end of the string. But only
     // for LTR text. RTL text is still elided (on the left) with "...".
     if (elide_text) {
       render_text->SetText(adjusted_text);
       if (render_text->GetTextDirection() == base::i18n::LEFT_TO_RIGHT) {
         render_text->set_fade_tail(true);
         elide_text = false;
       }
     }
 #endif
 
     if (elide_text) {
       ElideTextAndAdjustRange(font,
                               text_bounds.width(),
                               &adjusted_text,
                               &range);
     }
 
     UpdateRenderText(rect, adjusted_text, font, flags, color,
                      render_text.get());
 
     const int line_height = render_text->GetStringSize().height();
     // Center the text vertically.
-    rect += gfx::Vector2d(0, (text_bounds.height() - line_height) / 2);
+    rect += Vector2d(0, (text_bounds.height() - line_height) / 2);
     rect.set_height(line_height);
     render_text->SetDisplayRect(rect);
-
-    ApplyUnderlineStyle(range, render_text.get());
+    render_text->ApplyStyle(UNDERLINE, true, range);

[Alexei Svitkine (slow), 2013/01/22 19:20:21]

Only do this if range.IsValid(). See comment for StripAcceleratorChars().

[msw, 2013/01/22 22:27:24]

Done.

     render_text->Draw(this);
   }
 
   canvas_->restore();
 }
 
 void Canvas::DrawStringWithHalo(const string16& text,
-                                const gfx::Font& font,
+                                const Font& font,
                                 SkColor text_color,
                                 SkColor halo_color_in,
                                 int x, int y, int w, int h,
                                 int flags) {
   // Some callers will have semitransparent halo colors, which we don't handle
   // (since the resulting image can have 1-bit transparency only).
   SkColor halo_color = SkColorSetA(halo_color_in, 0xFF);
 
   // Create a temporary buffer filled with the halo color. It must leave room
   // for the 1-pixel border around the text.
   Size size(w + 2, h + 2);
   Canvas text_canvas(size, scale_factor(), true);
   SkPaint bkgnd_paint;
   bkgnd_paint.setColor(halo_color);
-  text_canvas.DrawRect(gfx::Rect(size), bkgnd_paint);
+  text_canvas.DrawRect(Rect(size), bkgnd_paint);
 
   // Draw the text into the temporary buffer. This will have correct
   // ClearType since the background color is the same as the halo color.
   text_canvas.DrawStringInt(text, font, text_color, 1, 1, w, h, flags);
 
   uint32_t halo_premul = SkPreMultiplyColor(halo_color);
   SkBitmap& text_bitmap = const_cast<SkBitmap&>(
       skia::GetTopDevice(*text_canvas.sk_canvas())->accessBitmap(true));
 
   for (int cur_y = 0; cur_y < text_bitmap.height(); cur_y++) {
     uint32_t* text_row = text_bitmap.getAddr32(0, cur_y);
     for (int cur_x = 0; cur_x < text_bitmap.width(); cur_x++) {
       if (text_row[cur_x] == halo_premul) {
         // This pixel was not touched by the text routines. See if it borders
         // a touched pixel in any of the 4 directions (not diagonally).
         if (!PixelShouldGetHalo(text_bitmap, cur_x, cur_y, halo_premul))
           text_row[cur_x] = 0;  // Make transparent.
       } else {
         text_row[cur_x] |= 0xff << SK_A32_SHIFT;  // Make opaque.
       }
     }
   }
 
   // Draw the halo bitmap with blur.
-  gfx::ImageSkia text_image = gfx::ImageSkia(gfx::ImageSkiaRep(text_bitmap,
+  ImageSkia text_image = ImageSkia(ImageSkiaRep(text_bitmap,
       text_canvas.scale_factor()));
   DrawImageInt(text_image, x - 1, y - 1);
 }
 
 void Canvas::DrawFadeTruncatingString(
       const string16& text,
       TruncateFadeMode truncate_mode,
       size_t desired_characters_to_truncate_from_head,
-      const gfx::Font& font,
+      const Font& font,
       SkColor color,
-      const gfx::Rect& display_rect) {
+      const Rect& display_rect) {
   int flags = NO_ELLIPSIS;
 
   // If the whole string fits in the destination then just draw it directly.
   if (GetStringWidth(text, font) <= display_rect.width()) {
     DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
                   display_rect.width(), display_rect.height(), flags);
     return;
   }
 
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
@@ skipping 30 matching lines @@
 
       render_text->set_fade_tail(true);
       render_text->set_fade_head(true);
       break;
   }
 
   // Default to left alignment unless right alignment was chosen above.
   if (!(flags & TEXT_ALIGN_RIGHT))
     flags |= TEXT_ALIGN_LEFT;
 
-  gfx::Rect rect = display_rect;
+  Rect rect = display_rect;
   UpdateRenderText(rect, clipped_text, font, flags, color, render_text.get());
 
   const int line_height = render_text->GetStringSize().height();
   // Center the text vertically.
-  rect += gfx::Vector2d(0, (display_rect.height() - line_height) / 2);
+  rect += Vector2d(0, (display_rect.height() - line_height) / 2);
   rect.set_height(line_height);
   render_text->SetDisplayRect(rect);
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(display_rect);
   render_text->Draw(this);
   canvas_->restore();
 }
 
 }  // namespace gfx