Replace wstring with string16 in history. The only time wstring is used now in history is for bookmark-related stuff (the bookmarks system is still wstring-based).

The substantial change here is in RTL to make a string16 variant of the functions and in changing the WordIterator to use string16 (this cleaned up some weird utf-32 code).

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2808017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50597 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index fe0d3c1..37ea5a4 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -395,7 +395,8 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
     canvas->drawPaint(paint);
   }
 
-  webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
+  if (!OptimizedPluginPaintInRect(canvas, rect))
+    webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
 
   PaintDebugBorder(rect, canvas);
 
@@ -975,3 +976,8 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
     }
   }
 }
+
+bool RenderWidget::OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
+                                              const gfx::Rect& rect) {
+  return false;
+}