Update to Chromium revision 190564.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1168 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

CHROMIUM_BUILD_COMPATIBILITY.txt

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

cef.gyp

@@ -487,10 +487,10 @@
           },
           'sources': [
             '<@(includes_win)',
-            # TODO(cef): Remove webkit_unscaled_resources.rc once custom cursor
+            # TODO(cef): Remove ui_unscaled_resources.rc once custom cursor
             # resources can be loaded via ResourceBundle. See crbug.com/147663.
             '$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc',
-            '$(OutDir)/obj/global_intermediate/webkit/webkit_unscaled_resources.rc',
+            '$(OutDir)/obj/global_intermediate/ui/ui_resources/ui_unscaled_resources.rc',
             'libcef_dll/libcef_dll.rc',
           ],
           'link_settings': {

include/capi/cef_download_handler_capi.h

@@ -106,6 +106,7 @@ typedef struct _cef_download_handler_t {
 
   ///
   // Called when a download's status or progress information has been updated.
+  // This may be called multiple times before and after on_before_download().
   // Execute |callback| either asynchronously or in this function to cancel the
   // download if desired. Do not keep a reference to |download_item| outside of
   // this function.

include/cef_download_handler.h

@@ -97,6 +97,7 @@ class CefDownloadHandler : public virtual CefBase {
 
   ///
   // Called when a download's status or progress information has been updated.
+  // This may be called multiple times before and after OnBeforeDownload().
   // Execute |callback| either asynchronously or in this method to cancel the
   // download if desired. Do not keep a reference to |download_item| outside of
   // this method.

libcef/browser/browser_host_impl.cc

@@ -1598,6 +1598,7 @@ bool CefBrowserHostImpl::ShouldCreateWebContents(
 void CefBrowserHostImpl::WebContentsCreated(
     content::WebContents* source_contents,
     int64 source_frame_id,
+    const string16& frame_name,
     const GURL& target_url,
     content::WebContents* new_contents) {
   scoped_ptr<PendingPopupInfo> pending_popup_info;

libcef/browser/browser_host_impl.h

@@ -298,6 +298,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
       const GURL& target_url) OVERRIDE;
   virtual void WebContentsCreated(content::WebContents* source_contents,
                                   int64 source_frame_id,
+                                  const string16& frame_name,
                                   const GURL& target_url,
                                   content::WebContents* new_contents) OVERRIDE;
   virtual void DidNavigateMainFramePostCommit(

libcef/browser/chrome_scheme_handler.cc

@@ -448,7 +448,7 @@ void OnChromeTracingProcessMessage(CefRefPtr<CefBrowser> browser,
   if (action == "tracingControllerInitialized") {
     // Send the client info to the tracingController.
   } else if (action == "beginTracing") {
-    if (!arguments || arguments->GetSize() != 2) {
+    if (!arguments || arguments->GetSize() != 3) {
       NOTREACHED() << "Invalid arguments to " << action.c_str();
       return;
     }

libcef/browser/devtools_delegate.cc

@@ -74,7 +74,7 @@ content::DevToolsAgentHost* CefDevToolsBindingHandler::ForIdentifier(
       if (GetIdentifier(host) == identifier) {
         // May create a new agent host.
         scoped_refptr<content::DevToolsAgentHost> agent_host(
-            content::DevToolsAgentHost::GetFor(host));
+            content::DevToolsAgentHost::GetOrCreateFor(host));
         agents_map_[identifier] = agent_host;
         return agent_host;
       }
@@ -163,6 +163,10 @@ content::DevToolsHttpHandlerDelegate::TargetType
   return kTargetTypeTab;
 }
 
+std::string CefDevToolsDelegate::GetViewDescription(content::RenderViewHost*) {
+  return std::string();
+}
+
 std::string CefDevToolsDelegate::GetDevToolsURL(content::RenderViewHost* rvh,
                                                 bool http_scheme) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();

libcef/browser/devtools_delegate.h

@@ -62,6 +62,7 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
   virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
   virtual content::RenderViewHost* CreateNewTarget() OVERRIDE;
   virtual TargetType GetTargetType(content::RenderViewHost*) OVERRIDE;
+  virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE;
 
   // Returns the DevTools URL for the specified RenderViewHost.
   std::string GetDevToolsURL(content::RenderViewHost* rvh, bool http_scheme);

libcef/browser/media_capture_devices_dispatcher.cc

@@ -135,7 +135,8 @@ void CefMediaCaptureDevicesDispatcher::GetRequestedDevice(
 void CefMediaCaptureDevicesDispatcher::OnCaptureDevicesOpened(
     int render_process_id,
     int render_view_id,
-    const content::MediaStreamDevices& devices) {
+    const content::MediaStreamDevices& devices,
+    const base::Closure& close_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 

libcef/browser/media_capture_devices_dispatcher.h

@@ -76,7 +76,8 @@ class CefMediaCaptureDevicesDispatcher : public content::MediaObserver {
   virtual void OnCaptureDevicesOpened(
       int render_process_id,
       int render_view_id,
-      const content::MediaStreamDevices& devices) OVERRIDE;
+      const content::MediaStreamDevices& devices,
+      const base::Closure& close_callback) OVERRIDE;
   virtual void OnCaptureDevicesClosed(
       int render_process_id,
       int render_view_id,

libcef/browser/resource_request_job.cc

@@ -181,12 +181,6 @@ void CefResourceRequestJob::Start() {
         changed = true;
       }
 
-      if (SetHeaderIfMissing(headerMap,
-                             net::HttpRequestHeaders::kAcceptCharset,
-                             ua_settings->GetAcceptCharset())) {
-        changed = true;
-      }
-
       if (SetHeaderIfMissing(headerMap,
                              net::HttpRequestHeaders::kUserAgent,
                              ua_settings->GetUserAgent(request_->url()))) {

libcef/browser/url_request_context_getter.cc

@@ -31,16 +31,16 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/cert_verifier.h"
-#include "net/base/default_server_bound_cert_store.h"
-#include "net/base/host_resolver.h"
-#include "net/base/server_bound_cert_service.h"
-#include "net/base/ssl_config_service_defaults.h"
 #include "net/cookies/cookie_monster.h"
+#include "net/dns/host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_service.h"
+#include "net/ssl/default_server_bound_cert_store.h"
+#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
@@ -94,8 +94,7 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
         new net::DefaultServerBoundCertStore(NULL),
         base::WorkerPool::GetTaskRunner(true)));
     storage_->set_http_user_agent_settings(
-        new net::StaticHttpUserAgentSettings(
+        new net::StaticHttpUserAgentSettings("en-us,en", EmptyString()));
-            "en-us,en", "iso-8859-1,*,utf-8", EmptyString()));
 
     storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
@@ -105,6 +104,7 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
         ProxyServiceFactory::CreateProxyService(
             NULL,
             url_request_context_.get(),
+            url_request_context_->network_delegate(),
             _Context->proxy_config_service().release(),
             command_line));
     storage_->set_proxy_service(system_proxy_service.release());

libcef/browser/web_contents_view_osr.cc

@@ -80,6 +80,9 @@ void CefWebContentsViewOSR::RenderViewCreated(content::RenderViewHost* host) {
 void CefWebContentsViewOSR::RenderViewSwappedIn(content::RenderViewHost* host) {
 }
 
+void CefWebContentsViewOSR::SetOverscrollControllerEnabled(bool enabled) {
+}
+
 void CefWebContentsViewOSR::Focus() {
 }
 

libcef/browser/web_contents_view_osr.h

@@ -43,6 +43,7 @@ class CefWebContentsViewOSR : public content::WebContentsViewPort,
   virtual void SizeContents(const gfx::Size& size) OVERRIDE;
   virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
   virtual void RenderViewSwappedIn(content::RenderViewHost* host) OVERRIDE;
+  virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE;
   virtual void Focus() OVERRIDE;
   virtual void SetInitialFocus() OVERRIDE;
   virtual void StoreFocus() OVERRIDE;

patch/patch.cfg

@@ -16,11 +16,6 @@ patches = [
     'name': 'build',
     'path': '../build/',
   },
-  {
-    # http://code.google.com/p/gyp/issues/detail?id=223
-    'name': 'tools_gyp',
-    'path': '../tools/gyp/',
-  },
   {
     # http://code.google.com/p/chromiumembedded/issues/detail?id=496
     'name': 'zlib',
@@ -42,6 +37,11 @@ patches = [
     'name': 'webkit_features',
     'path': '../third_party/WebKit/Source/WebKit/chromium/',
   },
+  {
+    # http://code.google.com/p/chromiumembedded/issues/detail?id=933
+    'name': 'webkit_933',
+    'path': '../third_party/WebKit/Source/WebKit/chromium/src/',
+  },
   {
     # http://code.google.com/p/chromiumembedded/issues/detail?id=364
     'name': 'spi_webcore_364',

patch/patches/spi_webcore_364.patch

@@ -1,8 +1,8 @@
 Index: page/FrameView.cpp
 ===================================================================
---- page/FrameView.cpp	(revision 143980)
+--- page/FrameView.cpp	(revision 146842)
 +++ page/FrameView.cpp	(working copy)
-@@ -208,10 +208,12 @@
+@@ -209,10 +209,12 @@
      if (!page)
          return;
  
@@ -17,7 +17,7 @@ Index: page/FrameView.cpp
  PassRefPtr<FrameView> FrameView::create(Frame* frame)
 Index: platform/mac/NSScrollerImpDetails.mm
 ===================================================================
---- platform/mac/NSScrollerImpDetails.mm	(revision 143980)
+--- platform/mac/NSScrollerImpDetails.mm	(revision 146842)
 +++ platform/mac/NSScrollerImpDetails.mm	(working copy)
 @@ -34,6 +34,7 @@
  #if PLATFORM(CHROMIUM)

patch/patches/tools_gyp.patch

@@ -1,14 +0,0 @@
-Index: pylib/gyp/input.py
-===================================================================
---- pylib/gyp/input.py	(revision 1583)
-+++ pylib/gyp/input.py	(working copy)
-@@ -843,7 +843,8 @@
-           # that don't load quickly, this can be faster than
-           # <!(python modulename param eters). Do this in |build_file_dir|.
-           oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
--          os.chdir(build_file_dir)
-+          if not build_file_dir is None:
-+            os.chdir(build_file_dir)
-           try:
- 
-             parsed_contents = shlex.split(contents)

patch/patches/webkit_933.patch

@@ -0,0 +1,13 @@
+Index: WebNode.cpp
+===================================================================
+--- WebNode.cpp	(revision 146842)
++++ WebNode.cpp	(working copy)
+@@ -181,7 +181,7 @@
+ void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
+ {
+     // Please do not add more eventTypes to this list without an API review.
+-    RELEASE_ASSERT(eventType == "mousedown");
++    //RELEASE_ASSERT(eventType == "mousedown");
+ 
+     EventListenerWrapper* listenerWrapper = listener->createEventListenerWrapper(eventType, useCapture, m_private.get());
+     // The listenerWrapper is only referenced by the actual Node.  Once it goes

tests/cefclient/client_handler.cpp

@@ -60,7 +60,11 @@ ClientHandler::ClientHandler()
   if (m_StartupURL.empty())
     m_StartupURL = "http://www.google.com/";
 
-  m_bExternalDevTools = command_line->HasSwitch(cefclient::kExternalDevTools);
+  // Also use external dev tools if off-screen rendering is enabled since we
+  // disallow popup windows.
+  m_bExternalDevTools =
+      command_line->HasSwitch(cefclient::kExternalDevTools) ||
+      AppIsOffScreenRenderingEnabled();
 }
 
 ClientHandler::~ClientHandler() {

tests/unittests/download_unittest.cc

@@ -149,7 +149,6 @@ class DownloadTestHandler : public TestHandler {
       CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE {
     EXPECT_TRUE(CefCurrentlyOn(TID_UI));
     EXPECT_FALSE(got_on_before_download_);
-    EXPECT_FALSE(got_on_download_updated_);
 
     got_on_before_download_.yes();
 
@@ -185,7 +184,6 @@ class DownloadTestHandler : public TestHandler {
       CefRefPtr<CefDownloadItem> download_item,
       CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE {
     EXPECT_TRUE(CefCurrentlyOn(TID_UI));
-    EXPECT_TRUE(got_on_before_download_);
 
     got_on_download_updated_.yes();
 
@@ -193,14 +191,14 @@ class DownloadTestHandler : public TestHandler {
     EXPECT_TRUE(download_item.get());
     EXPECT_TRUE(callback.get());
 
-    EXPECT_EQ(download_id_, download_item->GetId());
+    if (got_on_before_download_)
+      EXPECT_EQ(download_id_, download_item->GetId());
+
+    EXPECT_LE(0LL, download_item->GetCurrentSpeed());
+    EXPECT_LE(0, download_item->GetPercentComplete());
 
     EXPECT_TRUE(download_item->IsValid());
     EXPECT_FALSE(download_item->IsCanceled());
-    EXPECT_LT(0LL, download_item->GetCurrentSpeed());
-    EXPECT_LT(0, download_item->GetPercentComplete());
-    EXPECT_EQ(static_cast<int64>(sizeof(kTestContent)-1),
-        download_item->GetTotalBytes());
     EXPECT_STREQ(kTestDownloadUrl, download_item->GetURL().ToString().c_str());
     EXPECT_STREQ(kTestContentDisposition,
         download_item->GetContentDisposition().ToString().c_str());
@@ -219,11 +217,13 @@ class DownloadTestHandler : public TestHandler {
       EXPECT_EQ(100, download_item->GetPercentComplete());
       EXPECT_EQ(static_cast<int64>(sizeof(kTestContent)-1),
           download_item->GetReceivedBytes());
+      EXPECT_EQ(static_cast<int64>(sizeof(kTestContent)-1),
+          download_item->GetTotalBytes());
 
       DestroyTest();
     } else {
       EXPECT_TRUE(download_item->IsInProgress());
-      EXPECT_LT(0LL, download_item->GetReceivedBytes());
+      EXPECT_LE(0LL, download_item->GetReceivedBytes());
     }
   }