mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
- Update to Chromium revision 105051.
- Enable use of clang compiler on Mac. - Add CefSettings.threaded_compositing_enabled option. - Begin converting NewRunnable usage to base::Bind. - Avoid assertion when an empty message is passed to OnConsoleMessage(). - Add an "--allow-partial" option to the make_distrib tool. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@316 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
||||
// 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.
|
||||
|
||||
@@ -56,9 +56,11 @@ void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) {
|
||||
}
|
||||
|
||||
void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
|
||||
GURL* url) {
|
||||
GURL* url, uint32* fragment_start,
|
||||
uint32* fragment_end) {
|
||||
std::string url_str;
|
||||
ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL);
|
||||
ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL,
|
||||
fragment_start, fragment_end);
|
||||
if (url)
|
||||
*url = GURL(url_str);
|
||||
}
|
||||
|
Reference in New Issue
Block a user