Adjust fragment indices appropriately when pasting HTML on Windows.

ui/base/clipboard/clipboard_win.cc

Index: ui/base/clipboard/clipboard_win.cc
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 635b4795a48a7f695105a763ecf9607c35ed1783..e34f2969050c2103738a1bf993076dd79a9c7be1 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -18,6 +18,7 @@
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "base/utf_offset_string_conversions.h"

[tony, 2011/10/31 22:09:22]

Nit: alphabetize

[dcheng, 2011/10/31 23:41:44]

Done.

 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/wrapped_window_proc.h"
@@ -466,9 +467,13 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
   DCHECK((start_index - html_start) <= kuint32max);
   DCHECK((end_index - html_start) <= kuint32max);
 
-  markup->assign(UTF8ToWide(cf_html.data() + html_start));
-  *fragment_start = static_cast<uint32>(start_index - html_start);
-  *fragment_end = static_cast<uint32>(end_index - html_start);
+  std::vector<size_t> offsets;
+  offsets.push_back(start_index - html_start);
+  offsets.push_back(end_index - html_start);
+  markup->assign(UTF8ToUTF16AndAdjustOffsets(cf_html.data() + html_start,
+                                             &offsets));
+  *fragment_start = static_cast<uint32>(offsets[0]);
+  *fragment_end = static_cast<uint32>(offsets[1]);
 }
 
 SkBitmap Clipboard::ReadImage(Buffer buffer) const {