bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 130586.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@584 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-04-05 03:02:46 +00:00
parent 39727dd26f
commit 211a176537
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '129376', 'chromium_revision': '130586',
} }

5
cef1/libcef/simple_clipboard_impl.cc
View File

@@ -78,6 +78,11 @@ void SimpleClipboardClient::ReadHTML(ui::Clipboard::Buffer buffer,
*url = GURL(url_str); *url = GURL(url_str);
} }
void SimpleClipboardClient::ReadRTF(ui::Clipboard::Buffer buffer,
std::string* result) {
GetClipboard()->ReadRTF(buffer, result);
}
void SimpleClipboardClient::ReadImage(ui::Clipboard::Buffer buffer, void SimpleClipboardClient::ReadImage(ui::Clipboard::Buffer buffer,
std::string* data) { std::string* data) {
SkBitmap bitmap = GetClipboard()->ReadImage(buffer); SkBitmap bitmap = GetClipboard()->ReadImage(buffer);

2
cef1/libcef/simple_clipboard_impl.h
View File

@@ -32,6 +32,8 @@ class SimpleClipboardClient : public webkit_glue::ClipboardClient {
virtual void ReadHTML(ui::Clipboard::Buffer buffer, string16* markup, virtual void ReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
GURL* url, uint32* fragment_start, GURL* url, uint32* fragment_start,
uint32* fragment_end) OVERRIDE; uint32* fragment_end) OVERRIDE;
virtual void ReadRTF(ui::Clipboard::Buffer buffer,
std::string* result) OVERRIDE;
virtual void ReadImage(ui::Clipboard::Buffer buffer, virtual void ReadImage(ui::Clipboard::Buffer buffer,
std::string* data) OVERRIDE; std::string* data) OVERRIDE;
virtual void ReadCustomData(ui::Clipboard::Buffer buffer, virtual void ReadCustomData(ui::Clipboard::Buffer buffer,

6
cef1/patch/patches/base.patch
View File

@@ -1,8 +1,8 @@
Index: message_loop.cc Index: message_loop.cc
=================================================================== ===================================================================
--- message_loop.cc (revision 122508) --- message_loop.cc (revision 130586)
+++ message_loop.cc (working copy) +++ message_loop.cc (working copy)
@@ -362,9 +362,13 @@ @@ -361,9 +361,13 @@
} }
void MessageLoop::AssertIdle() const { void MessageLoop::AssertIdle() const {
@@ -19,7 +19,7 @@ Index: message_loop.cc
bool MessageLoop::is_running() const { bool MessageLoop::is_running() const {
Index: message_loop.h Index: message_loop.h
=================================================================== ===================================================================
--- message_loop.h (revision 122508) --- message_loop.h (revision 130586)
+++ message_loop.h (working copy) +++ message_loop.h (working copy)
@@ -350,6 +350,9 @@ @@ -350,6 +350,9 @@
// Asserts that the MessageLoop is "idle". // Asserts that the MessageLoop is "idle".