bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 107708. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@344 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-10-28 19:40:31 +00:00
parent acf7cf5738
commit 5147a4c7a0
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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': '106500', 'chromium_revision': '107708',
} }

2
libcef/browser_file_system.cc
View File

@ -231,6 +231,6 @@ FileSystemOperation* BrowserFileSystem::GetNewOperation(
new BrowserFileSystemCallbackDispatcher(AsWeakPtr(), callbacks); new BrowserFileSystemCallbackDispatcher(AsWeakPtr(), callbacks);
FileSystemOperation* operation = new FileSystemOperation( FileSystemOperation* operation = new FileSystemOperation(
dispatcher, base::MessageLoopProxy::current(), dispatcher, base::MessageLoopProxy::current(),
file_system_context_.get(), NULL); file_system_context_.get());
return operation; return operation;
} }

3
libcef/browser_file_writer.cc
View File

@ -128,8 +128,7 @@ class BrowserFileWriter::IOThreadProxy
FileSystemOperation* GetNewOperation() { FileSystemOperation* GetNewOperation() {
// The FileSystemOperation takes ownership of the CallbackDispatcher. // The FileSystemOperation takes ownership of the CallbackDispatcher.
return new FileSystemOperation(new CallbackDispatcher(this), return new FileSystemOperation(new CallbackDispatcher(this),
io_thread_, file_system_context_.get(), io_thread_, file_system_context_.get());
NULL);
} }
void DidSucceed() { void DidSucceed() {

13
libcef/browser_webview_delegate.cc
View File

@ -682,12 +682,13 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
collection->AddAudioRenderer(new media::ReferenceAudioRenderer()); collection->AddAudioRenderer(new media::ReferenceAudioRenderer());
scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
new webkit_glue::WebMediaPlayerImpl(client, new webkit_glue::WebMediaPlayerImpl(
NULL, client,
collection.release(), base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(),
message_loop_factory.release(), collection.release(),
NULL, message_loop_factory.release(),
new media::MediaLog())); NULL,
new media::MediaLog()));
if (!result->Initialize(frame, false, video_renderer)) if (!result->Initialize(frame, false, video_renderer))
return NULL; return NULL;
return result.release(); return result.release();

2
libcef/cef_process.cc
View File

@ -43,7 +43,7 @@ public:
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
Run(); Run();
#else #else
Run(NULL); RunWithDispatcher(NULL);
#endif #endif
} }

9
libcef/webwidget_host_win.cc
View File

@ -1084,7 +1084,14 @@ void WebWidgetHost::UpdateInputMethod(HWND view)
if (host->webwidget_) { if (host->webwidget_) {
new_type = host->webwidget_->textInputType(); new_type = host->webwidget_->textInputType();
new_caret_bounds = host->webwidget_->caretOrSelectionBounds();
WebKit::WebRect startRect, endRect;
if (host->webwidget_->selectionBounds(startRect, endRect)) {
new_caret_bounds.x = startRect.x;
new_caret_bounds.y = startRect.y;
new_caret_bounds.width = endRect.x + endRect.width - startRect.x;
new_caret_bounds.height = endRect.y + endRect.height - startRect.y;
}
} }
// Only sends text input type and caret bounds to the browser process if they // Only sends text input type and caret bounds to the browser process if they

6
patch/patches/base.patch
View File

@ -1,8 +1,8 @@
Index: message_loop.cc Index: message_loop.cc
=================================================================== ===================================================================
--- message_loop.cc (revision 106500) --- message_loop.cc (revision 107708)
+++ message_loop.cc (working copy) +++ message_loop.cc (working copy)
@@ -400,9 +400,13 @@ @@ -403,9 +403,13 @@
} }
void MessageLoop::AssertIdle() const { void MessageLoop::AssertIdle() const {
@ -19,7 +19,7 @@ Index: message_loop.cc
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Index: message_loop.h Index: message_loop.h
=================================================================== ===================================================================
--- message_loop.h (revision 106500) --- message_loop.h (revision 107708)
+++ message_loop.h (working copy) +++ message_loop.h (working copy)
@@ -367,6 +367,9 @@ @@ -367,6 +367,9 @@
// Asserts that the MessageLoop is "idle". // Asserts that the MessageLoop is "idle".