From 5147a4c7a093ac9313731e9ab7371952961dba70 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 28 Oct 2011 19:40:31 +0000
Subject: [PATCH] Update to Chromium revision 107708.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@344 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 CHROMIUM_BUILD_COMPATIBILITY.txt   |  2 +-
 libcef/browser_file_system.cc      |  2 +-
 libcef/browser_file_writer.cc      |  3 +--
 libcef/browser_webview_delegate.cc | 13 +++++++------
 libcef/cef_process.cc              |  2 +-
 libcef/webwidget_host_win.cc       |  9 ++++++++-
 patch/patches/base.patch           |  6 +++---
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index 8db649da0..a87a9f85f 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '106500',
+  'chromium_revision': '107708',
 }
diff --git a/libcef/browser_file_system.cc b/libcef/browser_file_system.cc
index 92342c39c..1425bfab4 100644
--- a/libcef/browser_file_system.cc
+++ b/libcef/browser_file_system.cc
@@ -231,6 +231,6 @@ FileSystemOperation* BrowserFileSystem::GetNewOperation(
       new BrowserFileSystemCallbackDispatcher(AsWeakPtr(), callbacks);
   FileSystemOperation* operation = new FileSystemOperation(
       dispatcher, base::MessageLoopProxy::current(),
-      file_system_context_.get(), NULL);
+      file_system_context_.get());
   return operation;
 }
diff --git a/libcef/browser_file_writer.cc b/libcef/browser_file_writer.cc
index 1b6a45186..4b4c33065 100644
--- a/libcef/browser_file_writer.cc
+++ b/libcef/browser_file_writer.cc
@@ -128,8 +128,7 @@ class BrowserFileWriter::IOThreadProxy
   FileSystemOperation* GetNewOperation() {
     // The FileSystemOperation takes ownership of the CallbackDispatcher.
     return new FileSystemOperation(new CallbackDispatcher(this),
-                                   io_thread_, file_system_context_.get(),
-                                   NULL);
+                                   io_thread_, file_system_context_.get());
   }
 
   void DidSucceed() {
diff --git a/libcef/browser_webview_delegate.cc b/libcef/browser_webview_delegate.cc
index 9cb9f87f4..69fff5c1f 100644
--- a/libcef/browser_webview_delegate.cc
+++ b/libcef/browser_webview_delegate.cc
@@ -682,12 +682,13 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
   collection->AddAudioRenderer(new media::ReferenceAudioRenderer());
 
   scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
-      new webkit_glue::WebMediaPlayerImpl(client,
-                                          NULL,
-                                          collection.release(),
-                                          message_loop_factory.release(),
-                                          NULL,
-                                          new media::MediaLog()));
+      new webkit_glue::WebMediaPlayerImpl(
+          client,
+          base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(),
+          collection.release(),
+          message_loop_factory.release(),
+          NULL,
+          new media::MediaLog()));
   if (!result->Initialize(frame, false, video_renderer))
     return NULL;
   return result.release();
diff --git a/libcef/cef_process.cc b/libcef/cef_process.cc
index e56e8cbb3..dc3e46135 100644
--- a/libcef/cef_process.cc
+++ b/libcef/cef_process.cc
@@ -43,7 +43,7 @@ public:
 #if defined(OS_MACOSX)
     Run();
 #else
-    Run(NULL);
+    RunWithDispatcher(NULL);
 #endif
   }
 
diff --git a/libcef/webwidget_host_win.cc b/libcef/webwidget_host_win.cc
index 5fd84736f..de59d76ec 100644
--- a/libcef/webwidget_host_win.cc
+++ b/libcef/webwidget_host_win.cc
@@ -1084,7 +1084,14 @@ void WebWidgetHost::UpdateInputMethod(HWND view)
 
   if (host->webwidget_) {
     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
diff --git a/patch/patches/base.patch b/patch/patches/base.patch
index c7f2467c2..15c893153 100644
--- a/patch/patches/base.patch
+++ b/patch/patches/base.patch
@@ -1,8 +1,8 @@
 Index: message_loop.cc
 ===================================================================
---- message_loop.cc	(revision 106500)
+--- message_loop.cc	(revision 107708)
 +++ message_loop.cc	(working copy)
-@@ -400,9 +400,13 @@
+@@ -403,9 +403,13 @@
  }
  
  void MessageLoop::AssertIdle() const {
@@ -19,7 +19,7 @@ Index: message_loop.cc
  //------------------------------------------------------------------------------
 Index: message_loop.h
 ===================================================================
---- message_loop.h	(revision 106500)
+--- message_loop.h	(revision 107708)
 +++ message_loop.h	(working copy)
 @@ -367,6 +367,9 @@
    // Asserts that the MessageLoop is "idle".