Adjust fragment indices appropriately when pasting HTML on Windows.

ui/base/clipboard/clipboard_win.cc

 // Copyright (c) 2011 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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "ui/base/clipboard/clipboard.h"
 
 #include <shlobj.h>
 #include <shellapi.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/stl_util.h"
 #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"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 
@@ skipping 428 matching lines @@
   if (start_index == std::string::npos ||
       end_index == std::string::npos ||
       html_start == std::string::npos)
     return;
 
   DCHECK(start_index - html_start >= 0);
   DCHECK(end_index - html_start >= 0);
   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 {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return SkBitmap();
 
@@ skipping 254 matching lines @@
     clipboard_owner_ = ::CreateWindow(L"ClipboardOwnerWindowClass",
                                       L"ClipboardOwnerWindow",
                                       0, 0, 0, 0, 0,
                                       HWND_MESSAGE,
                                       0, 0, 0);
   }
   return clipboard_owner_;
 }
 
 }  // namespace ui