Revert 71167 - Remove wstring from gfx....

gfx/canvas_skia_linux.cc

 // Copyright (c) 2009 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 "gfx/canvas_skia.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 144 matching lines @@
     pango_layout_set_text(layout, utf8.data(), utf8.size());
   } else {
     pango_layout_set_text(layout, utf8.data(), utf8.size());
   }
 }
 
 // A class to encapsulate string drawing params and operations.
 class DrawStringContext {
  public:
   DrawStringContext(gfx::CanvasSkia* canvas,
-                    const string16& text,
+                    const std::wstring& text,
                     const gfx::Font& font,
                     const gfx::Rect& bounds,
                     const gfx::Rect& clip,
                     int flags);
   ~DrawStringContext();
 
   void Draw(const SkColor& text_color);
   void DrawWithHalo(const SkColor& text_color,
                           const SkColor& halo_color);
 
  private:
   const gfx::Rect& bounds_;
   int flags_;
   const gfx::Font& font_;
 
   gfx::CanvasSkia* canvas_;
   cairo_t* cr_;
   PangoLayout* layout_;
 
   int text_x_;
   int text_y_;
   int text_width_;
   int text_height_;
 
   DISALLOW_COPY_AND_ASSIGN(DrawStringContext);
 };
 
 DrawStringContext::DrawStringContext(gfx::CanvasSkia* canvas,
-                                     const string16& text,
+                                     const std::wstring& text,
                                      const gfx::Font& font,
                                      const gfx::Rect& bounds,
                                      const gfx::Rect& clip,
                                      int flags)
     : bounds_(bounds),
       flags_(flags),
       font_(font),
       canvas_(canvas),
       cr_(NULL),
       layout_(NULL),
       text_x_(bounds.x()),
       text_y_(bounds.y()),
       text_width_(0),
       text_height_(0) {
   DCHECK(!bounds_.IsEmpty());
 
   cr_ = canvas_->beginPlatformPaint();
   layout_ = pango_cairo_create_layout(cr_);
 
-  SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);
+  SetupPangoLayout(layout_, WideToUTF16Hack(text), font, bounds_.width(),
+                   flags_);
 
   pango_layout_set_height(layout_, bounds_.height() * PANGO_SCALE);
 
   cairo_save(cr_);
 
   cairo_rectangle(cr_, clip.x(), clip.y(), clip.width(), clip.height());
   cairo_clip(cr_);
 
   pango_layout_get_pixel_size(layout_, &text_width_, &text_height_);
 
@@ skipping 113 matching lines @@
     // asked for. See the loop in pango-layout.c process_item that determines
     // where to wrap.
     *width = org_width;
   }
 
   g_object_unref(layout);
   cairo_destroy(cr);
   cairo_surface_destroy(surface);
 }
 
-void CanvasSkia::DrawStringWithHalo(const string16& text,
+void CanvasSkia::DrawStringWithHalo(const std::wstring& text,
                                     const gfx::Font& font,
                                     const SkColor& text_color,
                                     const SkColor& halo_color,
                                     int x, int y, int w, int h,
                                     int flags) {
   if (w <= 0 || h <= 0)
     return;
 
   gfx::Rect bounds(x, y, w, h);
   gfx::Rect clip(x - 1, y - 1, w + 2, h + 2);  // Bigger clip for halo
   DrawStringContext context(this, text, font, bounds, clip,flags);
   context.DrawWithHalo(text_color, halo_color);
 }
 
-void CanvasSkia::DrawStringInt(const string16& text,
+void CanvasSkia::DrawStringInt(const std::wstring& text,
                                const gfx::Font& font,
                                const SkColor& color,
                                int x, int y, int w, int h,
                                int flags) {
   if (w <= 0 || h <= 0)
     return;
 
   gfx::Rect bounds(x, y, w, h);
   DrawStringContext context(this, text, font, bounds, bounds, flags);
   context.Draw(color);
 }
 
 void CanvasSkia::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
   if (!pixbuf) {
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx