Update to Chromium revision 187216.

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

cef1/CHROMIUM_BUILD_COMPATIBILITY.txt

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

cef1/cef.gyp

@@ -443,7 +443,6 @@
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
@@ -624,7 +623,6 @@
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',

cef1/include/internal/cef_types.h

@@ -471,11 +471,6 @@ typedef struct _cef_browser_settings_t {
   ///
   bool accelerated_2d_canvas_disabled;
 
-  ///
-  // Set to true (1) to disable accelerated painting.
-  ///
-  bool accelerated_painting_disabled;
-
   ///
   // Set to true (1) to disable accelerated filters.
   ///

cef1/include/internal/cef_types_wrappers.h

@@ -403,7 +403,6 @@ struct CefBrowserSettingsTraits {
     target->accelerated_video_disabled = src->accelerated_video_disabled;
     target->accelerated_2d_canvas_disabled =
         src->accelerated_2d_canvas_disabled;
-    target->accelerated_painting_disabled = src->accelerated_painting_disabled;
     target->accelerated_filters_disabled = src->accelerated_filters_disabled;
     target->accelerated_plugins_disabled = src->accelerated_plugins_disabled;
     target->developer_tools_disabled = src->developer_tools_disabled;

cef1/libcef/browser_dom_storage_system.cc

@@ -10,9 +10,9 @@
 #include "base/path_service.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageArea.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 #include "webkit/database/database_util.h"
 #include "webkit/dom_storage/dom_storage_area.h"
 #include "webkit/dom_storage/dom_storage_host.h"

cef1/libcef/browser_request_context.cc

@@ -317,7 +317,12 @@ void BrowserRequestContext::SetCookieStoragePath(const base::FilePath& path) {
       base::FilePath cookie_path =
           new_path.Append(FILE_PATH_LITERAL("Cookies"));
       persistent_store =
-          new SQLitePersistentCookieStore(cookie_path, false, NULL);
+          new SQLitePersistentCookieStore(
+              cookie_path,
+              CefThread::GetMessageLoopProxyForThread(CefThread::IO),
+              CefThread::GetMessageLoopProxyForThread(CefThread::FILE),
+              false,
+              NULL);
     }
   }
 

cef1/libcef/browser_resource_loader_bridge.cc

@@ -1109,6 +1109,9 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge,
     proxy_->SetDefersLoading(value);
   }
 
+  virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE {
+  }
+
   virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE {
     DCHECK(CalledOnValidThread());
     DCHECK(!proxy_);

cef1/libcef/browser_settings.cc

@@ -141,7 +141,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
       cef.universal_access_from_file_urls_allowed;
   web.allow_file_access_from_file_urls = cef.file_access_from_file_urls_allowed;
   web.experimental_webgl_enabled = !cef.webgl_disabled;
-  web.show_composited_layer_borders = false;
   web.accelerated_compositing_enabled = cef.accelerated_compositing_enabled;
   web.accelerated_compositing_for_3d_transforms_enabled =
       !cef.accelerated_layers_disabled;
@@ -150,7 +149,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
   web.accelerated_compositing_for_video_enabled =
       !cef.accelerated_video_disabled;
   web.accelerated_2d_canvas_enabled = !cef.accelerated_2d_canvas_disabled;
-  web.accelerated_painting_enabled = !cef.accelerated_painting_disabled;
   web.accelerated_filters_enabled = !cef.accelerated_filters_disabled;
   web.accelerated_compositing_for_plugins_enabled =
       !cef.accelerated_plugins_disabled;

cef1/libcef/browser_webkit_init.cc

@@ -114,8 +114,7 @@ bool BrowserWebKitInit::sandboxEnabled() {
   return false;
 }
 
-WebKit::WebKitPlatformSupport::FileHandle
+WebKit::Platform::FileHandle BrowserWebKitInit::databaseOpenFile(
-BrowserWebKitInit::databaseOpenFile(
     const WebKit::WebString& vfs_file_name, int desired_flags) {
   return BrowserDatabaseSystem::GetInstance()->OpenFile(
       vfs_file_name, desired_flags);

cef1/libcef/browser_webkit_init.h

@@ -42,7 +42,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
   virtual WebKit::WebCookieJar* cookieJar() OVERRIDE;
   virtual WebKit::WebFileSystem* fileSystem() OVERRIDE;
   virtual bool sandboxEnabled() OVERRIDE;
-  virtual WebKit::WebKitPlatformSupport::FileHandle databaseOpenFile(
+  virtual WebKit::Platform::FileHandle databaseOpenFile(
       const WebKit::WebString& vfs_file_name, int desired_flags) OVERRIDE;
   virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
                                  bool sync_dir) OVERRIDE;

cef1/libcef/browser_webview_delegate.cc

@@ -195,17 +195,6 @@ WebStorageNamespace* BrowserWebViewDelegate::createSessionStorageNamespace(
   return BrowserDomStorageSystem::instance().CreateSessionStorageNamespace();
 }
 
-WebKit::WebGraphicsContext3D* BrowserWebViewDelegate::createGraphicsContext3D(
-    const WebKit::WebGraphicsContext3D::Attributes& attributes) {
-  WebKit::WebView* web_view = browser_->UIT_GetWebView();
-  if (!web_view)
-    return NULL;
-
-  const CefSettings& settings = _Context->settings();
-  return webkit_glue::CreateGraphicsContext3D(settings.graphics_implementation,
-      attributes, web_view, true);
-}
-
 void BrowserWebViewDelegate::didAddMessageToConsole(
     const WebConsoleMessage& message, const WebString& source_name,
     unsigned source_line) {
@@ -550,11 +539,6 @@ void BrowserWebViewDelegate::didScrollRect(int dx, int dy,
     host->ScrollRect(dx, dy, clip_rect);
 }
 
-void BrowserWebViewDelegate::scheduleComposite() {
-  if (WebWidgetHost* host = GetWidgetHost())
-    host->ScheduleComposite();
-}
-
 void BrowserWebViewDelegate::scheduleAnimation() {
   if (WebWidgetHost* host = GetWidgetHost())
     host->ScheduleAnimation();

cef1/libcef/browser_webview_delegate.h

@@ -81,8 +81,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
   virtual void didStopLoading() OVERRIDE;
   virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
       unsigned quota) OVERRIDE;
-  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
-      const WebKit::WebGraphicsContext3D::Attributes& attributes) OVERRIDE;
   virtual void didAddMessageToConsole(
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name, unsigned source_line) OVERRIDE;
@@ -143,7 +141,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
   virtual void didInvalidateRect(const WebKit::WebRect& rect) OVERRIDE;
   virtual void didScrollRect(int dx, int dy,
                              const WebKit::WebRect& clip_rect) OVERRIDE;
-  virtual void scheduleComposite() OVERRIDE;
   virtual void scheduleAnimation() OVERRIDE;
   virtual void didFocus() OVERRIDE;
   virtual void didBlur() OVERRIDE;

cef1/libcef/cookie_manager_impl.cc

@@ -234,7 +234,12 @@ bool CefCookieManagerImpl::SetStoragePath(const CefString& path) {
       } else {
         base::FilePath cookie_path = new_path.Append(FILE_PATH_LITERAL("Cookies"));
         persistent_store =
-            new SQLitePersistentCookieStore(cookie_path, false, NULL);
+            new SQLitePersistentCookieStore(
+                cookie_path,
+                CefThread::GetMessageLoopProxyForThread(CefThread::IO),
+                CefThread::GetMessageLoopProxyForThread(CefThread::FILE),
+                false,
+                NULL);
       }
     }
 

cef1/libcef/cookie_store_proxy.cc

@@ -34,14 +34,6 @@ void CefCookieStoreProxy::GetCookiesWithOptionsAsync(
   cookie_store->GetCookiesWithOptionsAsync(url, options, callback);
 }
 
-void CefCookieStoreProxy::GetCookiesWithInfoAsync(
-    const GURL& url,
-    const net::CookieOptions& options,
-    const GetCookieInfoCallback& callback) {
-  scoped_refptr<net::CookieStore> cookie_store = GetCookieStore();
-  cookie_store->GetCookiesWithInfoAsync(url, options, callback);
-}
-
 void CefCookieStoreProxy::DeleteCookieAsync(
     const GURL& url,
     const std::string& cookie_name,

cef1/libcef/cookie_store_proxy.h

@@ -24,10 +24,6 @@ class CefCookieStoreProxy : public net::CookieStore {
   virtual void GetCookiesWithOptionsAsync(
       const GURL& url, const net::CookieOptions& options,
       const GetCookiesCallback& callback) OVERRIDE;
-  void GetCookiesWithInfoAsync(
-      const GURL& url,
-      const net::CookieOptions& options,
-      const GetCookieInfoCallback& callback) OVERRIDE;
   virtual void DeleteCookieAsync(const GURL& url,
                                  const std::string& cookie_name,
                                  const base::Closure& callback) OVERRIDE;

cef1/libcef/nplugin_impl.cc

@@ -7,7 +7,7 @@
 #include "libcef/cef_thread.h"
 
 #include "base/bind.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 

cef1/libcef/scheme_impl.cc

@@ -197,7 +197,7 @@ class CefUrlRequestJob : public net::URLRequestJob {
   void DoLoadCookies() {
     net::CookieOptions options;
     options.set_include_httponly();
-    request_->context()->cookie_store()->GetCookiesWithInfoAsync(
+    request_->context()->cookie_store()->GetCookiesWithOptionsAsync(
         request_->url(), options,
         base::Bind(&CefUrlRequestJob::OnCookiesLoaded,
                    weak_factory_.GetWeakPtr()));
@@ -212,8 +212,7 @@ class CefUrlRequestJob : public net::URLRequestJob {
   }
 
   void OnCookiesLoaded(
-      const std::string& cookie_line,
+      const std::string& cookie_line) {
-      const std::vector<net::CookieStore::CookieInfo>& cookie_infos) {
     if (!cookie_line.empty()) {
       CefRequest::HeaderMap headerMap;
       cef_request_->GetHeaderMap(headerMap);

cef1/libcef/v8_impl.cc

@@ -85,7 +85,9 @@ class CefV8TrackManager {
     } else {
       if (context_state_key_.IsEmpty()) {
         context_state_key_ =
-            v8::Persistent<v8::String>::New(v8::String::New(kCefContextState));
+            v8::Persistent<v8::String>::New(
+                v8::Isolate::GetCurrent(),
+                v8::String::New(kCefContextState));
       }
 
       v8::Handle<v8::Object> object = context->Global();
@@ -300,11 +302,13 @@ class CefV8MakeWeakParam {
 };
 
 // Callback for weak persistent reference destruction.
-void TrackDestructor(v8::Persistent<v8::Value> object, void* parameter) {
+void TrackDestructor(v8::Isolate* isolate,
+                     v8::Persistent<v8::Value> object,
+                     void* parameter) {
   if (parameter)
     delete static_cast<CefV8MakeWeakParam*>(parameter);
 
-  object.Dispose();
+  object.Dispose(isolate);
   object.Clear();
 }
 
@@ -602,6 +606,8 @@ bool CefRegisterExtension(const CefString& extension_name,
 // CefV8HandleBase
 
 CefV8HandleBase::CefV8HandleBase(v8::Handle<v8::Context> context) {
+  isolate_ =
+      context.IsEmpty() ? v8::Isolate::GetCurrent() : context->GetIsolate();
   context_state_ = g_v8_tracker.Pointer()->GetContextState(context);
 }
 
@@ -825,17 +831,17 @@ WebKit::WebFrame* CefV8ContextImpl::GetWebFrame() {
 // CefV8ValueImpl::Handle
 
 CefV8ValueImpl::Handle::~Handle() {
-  // Persist the |tracker_| object (call MakeWeak) if:
+  // Persist the handle (call MakeWeak) if:
-  // A. The value represents an Object or Function, and
+  // A. The handle has been passed into a V8 function or used as a return value
-  // B. The handle has been passed into a V8 function or used as a return value
   //    from a V8 callback, and
-  // C. The associated context, if any, is still valid.
+  // B. The associated context, if any, is still valid.
-  if (tracker_ && tracker_should_persist_
+  if (should_persist_ && (!context_state_.get() || context_state_->IsValid())) {
-      && (!context_state_.get() || context_state_->IsValid())) {
+    handle_.MakeWeak(
-    handle_.MakeWeak(new CefV8MakeWeakParam(context_state_, tracker_),
+        isolate(),
-                     TrackDestructor);
+        (tracker_ ? new CefV8MakeWeakParam(context_state_, tracker_) : NULL),
+        TrackDestructor);
   } else {
-    handle_.Dispose();
+    handle_.Dispose(isolate());
     handle_.Clear();
 
     if (tracker_)

cef1/libcef/v8_impl.h

@@ -64,12 +64,14 @@ class CefV8HandleBase :
     return (!context_state_.get() || context_state_->IsValid());
   }
 
+  v8::Isolate* isolate() const { return isolate_; }
+
  protected:
   // |context| is the context that owns this handle. If empty the current
   // context will be used.
   explicit CefV8HandleBase(v8::Handle<v8::Context> context);
 
- protected:
+  v8::Isolate* isolate_;
   scoped_refptr<CefV8ContextState> context_state_;
 };
 
@@ -83,10 +85,10 @@ class CefV8Handle : public CefV8HandleBase {
 
   CefV8Handle(v8::Handle<v8::Context> context, handleType v)
       : CefV8HandleBase(context),
-        handle_(persistentType::New(v)) {
+        handle_(persistentType::New(isolate(), v)) {
   }
   virtual ~CefV8Handle() {
-    handle_.Dispose();
+    handle_.Dispose(isolate());
     handle_.Clear();
   }
 
@@ -214,16 +216,16 @@ class CefV8ValueImpl : public CefV8Value {
 
     Handle(v8::Handle<v8::Context> context, handleType v, CefTrackNode* tracker)
         : CefV8HandleBase(context),
-          handle_(persistentType::New(v)),
+          handle_(persistentType::New(isolate(), v)),
           tracker_(tracker),
-          tracker_should_persist_(false) {
+          should_persist_(false) {
     }
     virtual ~Handle();
 
     handleType GetHandle(bool should_persist) {
       DCHECK(IsValid());
-      if (should_persist && tracker_ && !tracker_should_persist_)
+      if (should_persist && !should_persist_)
-        tracker_should_persist_ = true;
+        should_persist_ = true;
       return handle_;
     }
 
@@ -234,9 +236,8 @@ class CefV8ValueImpl : public CefV8Value {
     // internal data or function handler objects that are reference counted.
     CefTrackNode* tracker_;
 
-    // True if the |tracker_| object needs to persist due to an Object or
+    // True if the handle needs to persist due to it being passed into V8.
-    // Function type being passed into V8.
+    bool should_persist_;
-    bool tracker_should_persist_;
 
     DISALLOW_COPY_AND_ASSIGN(Handle);
   };

cef1/libcef/webwidget_host.cc

@@ -37,10 +37,6 @@ void WebWidgetHost::InvalidateRect(const gfx::Rect& rect) {
     ScheduleTimer();
 }
 
-void WebWidgetHost::ScheduleComposite() {
-  ScheduleTimer();
-}
-
 void WebWidgetHost::ScheduleAnimation() {
   ScheduleTimer();
 }

cef1/libcef/webwidget_host.h

@@ -80,9 +80,6 @@ class WebWidgetHost {
 
   void ScrollRect(int dx, int dy, const gfx::Rect& clip_rect);
 
-  // Called for accelerated content like WebGL.
-  void ScheduleComposite();
-
   // Called for requestAnimationFrame animations.
   void ScheduleAnimation();
 

cef1/tests/cefclient/cefclient.cpp

@@ -385,8 +385,6 @@ void AppGetBrowserSettings(CefBrowserSettings& settings) {
       g_command_line->HasSwitch(cefclient::kAcceleratedVideoDisabled);
   settings.accelerated_2d_canvas_disabled =
       g_command_line->HasSwitch(cefclient::kAcceledated2dCanvasDisabled);
-  settings.accelerated_painting_disabled =
-      g_command_line->HasSwitch(cefclient::kAcceleratedPaintingDisabled);
   settings.accelerated_filters_disabled =
       g_command_line->HasSwitch(cefclient::kAcceleratedFiltersDisabled);
   settings.accelerated_plugins_disabled =

cef1/tests/cefclient/cefclient_switches.cpp

@@ -82,7 +82,6 @@ const char kAcceleratedCompositingEnabled[] = "accelerated-compositing-enabled";
 const char kAcceleratedLayersDisabled[] = "accelerated-layers-disabled";
 const char kAcceleratedVideoDisabled[] = "accelerated-video-disabled";
 const char kAcceledated2dCanvasDisabled[] = "accelerated-2d-canvas-disabled";
-const char kAcceleratedPaintingDisabled[] = "accelerated-painting-disabled";
 const char kAcceleratedFiltersDisabled[] = "accelerated-filters-disabled";
 const char kAcceleratedPluginsDisabled[] = "accelerated-plugins-disabled";
 const char kDeveloperToolsDisabled[] = "developer-tools-disabled";

cef1/tests/cefclient/cefclient_switches.h

@@ -79,7 +79,6 @@ extern const char kAcceleratedCompositingEnabled[];
 extern const char kAcceleratedLayersDisabled[];
 extern const char kAcceleratedVideoDisabled[];
 extern const char kAcceledated2dCanvasDisabled[];
-extern const char kAcceleratedPaintingDisabled[];
 extern const char kAcceleratedFiltersDisabled[];
 extern const char kAcceleratedPluginsDisabled[];
 extern const char kDeveloperToolsDisabled[];