From d357bb0b80c7de602142bd36a16e0a9cdd549d6f Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 24 Jul 2013 22:40:07 +0000
Subject: [PATCH] Update to Chromium revision 213078.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1339 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/browser/text_input_client_osr_mac.mm | 10 +++++-----
 libcef/renderer/browser_impl.cc             |  1 +
 libcef/renderer/content_renderer_client.cc  |  1 +
 libcef/renderer/v8_impl.cc                  |  1 -
 tests/unittests/download_unittest.cc        |  7 ++-----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libcef/browser/text_input_client_osr_mac.mm b/libcef/browser/text_input_client_osr_mac.mm
index 27870bb67..2e86469cf 100644
--- a/libcef/browser/text_input_client_osr_mac.mm
+++ b/libcef/browser/text_input_client_osr_mac.mm
@@ -100,7 +100,7 @@ extern "C" {
     ui::Range replacement_range(replacementRange);
 
     renderWidgetHostView_->get_render_widget_host_impl()->ImeConfirmComposition(
-        base::SysNSStringToUTF16(im_text), replacement_range);
+        base::SysNSStringToUTF16(im_text), replacement_range, false);
   }
 
   // Inserting text will delete all marked text automatically.
@@ -185,7 +185,7 @@ extern "C" {
   // called in keyEvent: method.
   if (!handlingKeyDown_) {
     renderWidgetHostView_->get_render_widget_host_impl()->
-        ImeConfirmComposition();
+        ImeConfirmComposition(string16(), ui::Range::InvalidRange(), false);
   } else {
     unmarkTextCalled_ = YES;
   }
@@ -305,7 +305,7 @@ extern "C" {
   // text.
 
   if (!hasMarkedText_ && !oldHasMarkedText_ &&
-      !textToBeInserted_.length() <= 1) {
+      textToBeInserted_.length() <= 1) {
     content::NativeWebKeyboardEvent event(keyEvent);
     if (textToBeInserted_.length() == 1) {
       event.type = WebKit::WebInputEvent::Type::Char;
@@ -319,7 +319,7 @@ extern "C" {
   if (textToBeInserted_.length() >
     ((hasMarkedText_ || oldHasMarkedText_) ? 0u : 1u)) {
     renderWidgetHostView_->get_render_widget_host_impl()->ImeConfirmComposition(
-       textToBeInserted_);
+       textToBeInserted_, ui::Range::InvalidRange(), false);
     textToBeInserted_ = YES;
   }
 
@@ -336,7 +336,7 @@ extern "C" {
   } else if (oldHasMarkedText_ && !hasMarkedText_ && !textInserted) {
     if (unmarkTextCalled_) {
       renderWidgetHostView_->get_render_widget_host_impl()->
-          ImeConfirmComposition();
+          ImeConfirmComposition(string16(), ui::Range::InvalidRange(), false);
     } else {
       renderWidgetHostView_->get_render_widget_host_impl()->
           ImeCancelComposition();
diff --git a/libcef/renderer/browser_impl.cc b/libcef/renderer/browser_impl.cc
index 8641415c7..dbb6cb793 100644
--- a/libcef/renderer/browser_impl.cc
+++ b/libcef/renderer/browser_impl.cc
@@ -19,6 +19,7 @@
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
diff --git a/libcef/renderer/content_renderer_client.cc b/libcef/renderer/content_renderer_client.cc
index 0887fbf12..d7ee949d4 100644
--- a/libcef/renderer/content_renderer_client.cc
+++ b/libcef/renderer/content_renderer_client.cc
@@ -10,6 +10,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "bindings/v8/V8RecursionScope.h"
 #include "bindings/v8/V8Utilities.h"
 MSVC_POP_WARNING();
+#undef ceil
 #undef LOG
 
 #include "libcef/renderer/content_renderer_client.h"
diff --git a/libcef/renderer/v8_impl.cc b/libcef/renderer/v8_impl.cc
index b01305f4d..c707d4b58 100644
--- a/libcef/renderer/v8_impl.cc
+++ b/libcef/renderer/v8_impl.cc
@@ -1002,7 +1002,6 @@ CefV8ValueImpl::Handle::~Handle() {
   // B. The associated context, if any, is still valid.
   if (should_persist_ && (!context_state_.get() || context_state_->IsValid())) {
     handle_.MakeWeak(
-        isolate(),
         (tracker_ ? new CefV8MakeWeakParam(context_state_, tracker_) : NULL),
         TrackDestructor);
   } else {
diff --git a/tests/unittests/download_unittest.cc b/tests/unittests/download_unittest.cc
index dbd619d29..bd3d6c2a3 100644
--- a/tests/unittests/download_unittest.cc
+++ b/tests/unittests/download_unittest.cc
@@ -158,17 +158,14 @@ class DownloadTestHandler : public TestHandler {
     EXPECT_TRUE(callback.get());
 
     download_id_ = download_item->GetId();
-    EXPECT_LT(0, download_id_);
+    EXPECT_LT(0U, download_id_);
     
     EXPECT_TRUE(download_item->IsValid());
     EXPECT_TRUE(download_item->IsInProgress());
     EXPECT_FALSE(download_item->IsComplete());
     EXPECT_FALSE(download_item->IsCanceled());
-    EXPECT_EQ(0LL, download_item->GetCurrentSpeed());
-    EXPECT_EQ(0, download_item->GetPercentComplete());
     EXPECT_EQ(static_cast<int64>(sizeof(kTestContent)-1),
         download_item->GetTotalBytes());
-    EXPECT_EQ(0LL, download_item->GetReceivedBytes());
     EXPECT_EQ(0UL, download_item->GetFullPath().length());
     EXPECT_STREQ(kTestDownloadUrl, download_item->GetURL().ToString().c_str());
     EXPECT_EQ(0UL, download_item->GetSuggestedFileName().length());
@@ -248,7 +245,7 @@ class DownloadTestHandler : public TestHandler {
  private:
   base::ScopedTempDir temp_dir_;
   base::FilePath test_path_;
-  int download_id_;
+  uint32 download_id_;
 
   TrackCallback got_download_request_;
   TrackCallback got_on_before_download_;