Update to Chromium revision 115322.

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

CHROMIUM_BUILD_COMPATIBILITY.txt

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

cef.gyp

@@ -371,6 +371,7 @@
         '../webkit/support/webkit_support.gyp:webkit_media',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_strings',
+        '../webkit/support/webkit_support.gyp:webkit_user_agent',
         'libcef_static',
       ],
       'defines': [
@@ -660,6 +661,7 @@
         '../webkit/support/webkit_support.gyp:webkit_media',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_strings',
+        '../webkit/support/webkit_support.gyp:webkit_user_agent',
       ],
       'sources': [
         '<@(includes_common)',

include/internal/cef_types.h

@@ -391,9 +391,14 @@ typedef struct _cef_browser_settings_t
   bool accelerated_2d_canvas_disabled;
 
   ///
-  // Set to true (1) to disable accelerated drawing.
+  // Set to true (1) to disable accelerated painting.
   ///
-  bool accelerated_drawing_disabled;
+  bool accelerated_painting_disabled;
+
+  ///
+  // Set to true (1) to disable accelerated filters.
+  ///
+  bool accelerated_filters_disabled;
 
   ///
   // Set to true (1) to disable accelerated plugins.

include/internal/cef_types_wrappers.h

@@ -413,7 +413,8 @@ struct CefBrowserSettingsTraits {
     target->accelerated_video_disabled = src->accelerated_video_disabled;
     target->accelerated_2d_canvas_disabled =
         src->accelerated_2d_canvas_disabled;
-    target->accelerated_drawing_disabled = src->accelerated_drawing_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;
     target->fullscreen_enabled = src->fullscreen_enabled;

libcef/browser_impl.cc

@@ -20,7 +20,7 @@
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHTTPBody.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"

libcef/browser_navigation_controller.h

@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHTTPBody.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
 
 #include "include/cef.h"
 

libcef/browser_persistent_cookie_store.cc

@@ -13,6 +13,7 @@
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -82,7 +83,7 @@ class BrowserPersistentCookieStore::Backend
   void DeleteCookie(const net::CookieMonster::CanonicalCookie& cc);
 
   // Commit pending operations as soon as possible.
-  void Flush(Task* completion_task);
+  void Flush(const base::Closure& callback);
 
   // Commit any pending operations and close the database.  This must be called
   // before the object is destructed.
@@ -310,7 +311,9 @@ bool BrowserPersistentCookieStore::Backend::InitializeDatabase() {
   DCHECK(CefThread::CurrentlyOn(CefThread::FILE));
 
   if (initialized_) {
-    return true;
+    // Return false if we were previously initialized but the DB has since been
+    // closed.
+    return db_.get() ? true : false;
   }
 
   const FilePath dir = path_.DirName();
@@ -333,8 +336,6 @@ bool BrowserPersistentCookieStore::Backend::InitializeDatabase() {
     return false;
   }
 
-  db_->Preload();
-
   // Retrieve all the domains
   sql::Statement smt(db_->GetUniqueStatement(
     "SELECT DISTINCT host_key FROM cookies"));
@@ -369,7 +370,10 @@ void BrowserPersistentCookieStore::Backend::ChainLoadCookies(
 
   bool load_success = true;
 
-  if (keys_to_load_.size() > 0) {
+  if (!db_.get()) {
+    // Close() has been called on this store.
+    load_success = false;
+  } else if (keys_to_load_.size() > 0) {
     // Load cookies for the first domain key.
     std::map<std::string, std::set<std::string> >::iterator
       it = keys_to_load_.begin();
@@ -398,19 +402,20 @@ bool BrowserPersistentCookieStore::Backend::LoadCookiesForDomains(
   const std::set<std::string>& domains) {
   DCHECK(CefThread::CurrentlyOn(CefThread::FILE));
 
-  const char* sql;
+  sql::Statement smt;
   if (restore_old_session_cookies_) {
-    sql =
+    smt.Assign(db_->GetCachedStatement(
-        "SELECT creation_utc, host_key, name, value, path, expires_utc, "
+      SQL_FROM_HERE,
-        "secure, httponly, last_access_utc, has_expires, persistent "
+      "SELECT creation_utc, host_key, name, value, path, expires_utc, "
-        "FROM cookies WHERE host_key = ?";
+      "secure, httponly, last_access_utc, has_expires, persistent "
+      "FROM cookies WHERE host_key = ?"));
   } else {
-    sql =
+    smt.Assign(db_->GetCachedStatement(
-        "SELECT creation_utc, host_key, name, value, path, expires_utc, "
+      SQL_FROM_HERE,
-        "secure, httponly, last_access_utc, has_expires, persistent "
+      "SELECT creation_utc, host_key, name, value, path, expires_utc, "
-        "FROM cookies WHERE host_key = ? AND persistent == 1";
+      "secure, httponly, last_access_utc, has_expires, persistent "
+      "FROM cookies WHERE host_key = ? AND persistent = 1"));
   }
-  sql::Statement smt(db_->GetCachedStatement(SQL_FROM_HERE, sql));
   if (!smt) {
     NOTREACHED() << "select statement prep failed";
     db_.reset();
@@ -681,20 +686,21 @@ void BrowserPersistentCookieStore::Backend::Commit() {
   transaction.Commit();
 }
 
-void BrowserPersistentCookieStore::Backend::Flush(Task* completion_task) {
+void BrowserPersistentCookieStore::Backend::Flush(
+    const base::Closure& callback) {
   DCHECK(!CefThread::CurrentlyOn(CefThread::FILE));
   CefThread::PostTask(
       CefThread::FILE, FROM_HERE, base::Bind(&Backend::Commit, this));
-  if (completion_task) {
+  if (!callback.is_null()) {
     // We want the completion task to run immediately after Commit() returns.
     // Posting it from here means there is less chance of another task getting
     // onto the message queue first, than if we posted it from Commit() itself.
-    CefThread::PostTask(CefThread::FILE, FROM_HERE, completion_task);
+    CefThread::PostTask(CefThread::FILE, FROM_HERE, callback);
   }
 }
 
 // Fire off a close message to the background thread.  We could still have a
-// pending commit timer that will be holding a reference on us, but if/when
+// pending commit timer or Load operations holding references on us, but if/when
 // this fires we will already have been cleaned up and it will be ignored.
 void BrowserPersistentCookieStore::Backend::Close() {
   if (CefThread::CurrentlyOn(CefThread::FILE)) {
@@ -779,9 +785,9 @@ void BrowserPersistentCookieStore::SetClearLocalStateOnExit(
     backend_->SetClearLocalStateOnExit(clear_local_state);
 }
 
-void BrowserPersistentCookieStore::Flush(Task* completion_task) {
+void BrowserPersistentCookieStore::Flush(const base::Closure& callback) {
   if (backend_.get())
-    backend_->Flush(completion_task);
+    backend_->Flush(callback);
-  else if (completion_task)
+  else if (!callback.is_null())
-    MessageLoop::current()->PostTask(FROM_HERE, completion_task);
+    MessageLoop::current()->PostTask(FROM_HERE, callback);
 }

libcef/browser_persistent_cookie_store.h

@@ -49,7 +49,7 @@ class BrowserPersistentCookieStore
 
   virtual void SetClearLocalStateOnExit(bool clear_local_state) OVERRIDE;
 
-  virtual void Flush(Task* completion_task) OVERRIDE;
+  virtual void Flush(const base::Closure& callback) OVERRIDE;
 
  private:
   class Backend;

libcef/browser_request_context.cc

@@ -70,8 +70,8 @@ public:
 
   virtual int GetProxyForURL(const GURL& url,
                              net::ProxyInfo* results,
-                             net::OldCompletionCallback* callback,
+                             const net::CompletionCallback& callback,
-                             ProxyResolver::RequestHandle* request,
+                             RequestHandle* request,
                              const net::BoundNetLog& net_log) OVERRIDE
   {
     CefProxyInfo proxy_info;
@@ -87,8 +87,8 @@ public:
   } 
 
   virtual int SetPacScript(
-      const scoped_refptr<net::ProxyResolverScriptData>& script_data,
+      const scoped_refptr<net::ProxyResolverScriptData>& pac_script,
-      net::OldCompletionCallback* callback) OVERRIDE
+      const net::CompletionCallback& callback) OVERRIDE
   {
     return net::OK;
   }
@@ -238,11 +238,18 @@ void BrowserRequestContext::Init(
       cache_path, 0, BrowserResourceLoaderBridge::GetCacheThread());
 
   net::HttpCache* cache =
-      new net::HttpCache(host_resolver(), cert_verifier(),
+      new net::HttpCache(host_resolver(),
-                         origin_bound_cert_service(), NULL, NULL,
+                         cert_verifier(),
-                         proxy_service(), ssl_config_service(),
+                         origin_bound_cert_service(),
-                         http_auth_handler_factory(), NULL,
+                         NULL, // transport_security_state
-                         http_server_properties(), NULL, backend);
+                         proxy_service(),
+                         "",  // ssl_session_cache_shard
+                         ssl_config_service(),
+                         http_auth_handler_factory(),
+                         NULL,  // network_delegate
+                         http_server_properties(),
+                         NULL,  // netlog
+                         backend);
 
   cache->set_mode(cache_mode);
   storage_.set_http_transaction_factory(cache);

libcef/browser_resource_loader_bridge.cc

@@ -376,7 +376,7 @@ class RequestProxy : public net::URLRequest::Delegate,
 
   void NotifyCompletedRequest(const net::URLRequestStatus& status,
                               const std::string& security_info,
-                              const base::Time& complete_time) {
+                              const base::TimeTicks& complete_time) {
 
     // Drain the content filter of all remaining data 
     if (content_filter_.get()) {
@@ -503,7 +503,7 @@ class RequestProxy : public net::URLRequest::Delegate,
           // cancel the resource load
           OnCompletedRequest(
               URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED),
-              std::string(), base::Time());
+              std::string(), base::TimeTicks());
         } else if (!redirectUrl.empty()) {
           // redirect to the specified URL
           handled = true;
@@ -559,7 +559,7 @@ class RequestProxy : public net::URLRequest::Delegate,
           if (handled) {
             OnCompletedRequest(
                 URLRequestStatus(URLRequestStatus::HANDLED_EXTERNALLY, net::OK),
-                std::string(), base::Time()); 
+                std::string(), base::TimeTicks()); 
           }
         }
       }
@@ -728,7 +728,7 @@ class RequestProxy : public net::URLRequest::Delegate,
 
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
-                                  const base::Time& complete_time) {
+                                  const base::TimeTicks& complete_time) {
     if (download_to_file_)
       file_stream_.Close();
 
@@ -836,7 +836,7 @@ class RequestProxy : public net::URLRequest::Delegate,
     if(resource_stream_.get()) {
       // Resource stream reads always complete successfully
       OnCompletedRequest(URLRequestStatus(URLRequestStatus::SUCCESS, 0),
-          std::string(), base::Time());
+          std::string(), base::TimeTicks());
       resource_stream_ = NULL;
     } else if(request_.get()) {
       if (upload_progress_timer_.IsRunning()) {
@@ -844,7 +844,7 @@ class RequestProxy : public net::URLRequest::Delegate,
         upload_progress_timer_.Stop();
       }
       DCHECK(request_.get());
-      OnCompletedRequest(request_->status(), std::string(), base::Time());
+      OnCompletedRequest(request_->status(), std::string(), base::TimeTicks());
       request_.reset();  // destroy on the io thread
     }
   }
@@ -987,7 +987,7 @@ class SyncRequestProxy : public RequestProxy {
 
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
-                                  const base::Time& complete_time) {
+                                  const base::TimeTicks& complete_time) {
     if (download_to_file_)
       file_stream_.Close();
     

libcef/browser_settings.cc

@@ -129,7 +129,8 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web)
   web.accelerated_layers_enabled = !cef.accelerated_layers_disabled;
   web.accelerated_video_enabled = !cef.accelerated_video_disabled;
   web.accelerated_2d_canvas_enabled = !cef.accelerated_2d_canvas_disabled;
-  web.accelerated_drawing_enabled = !cef.accelerated_drawing_disabled;
+  web.accelerated_painting_enabled = !cef.accelerated_painting_disabled;
+  web.accelerated_filters_enabled = !cef.accelerated_filters_disabled;
   web.accelerated_plugins_enabled = !cef.accelerated_plugins_disabled;
   web.memory_info_enabled = false;
   web.fullscreen_enabled = cef.fullscreen_enabled;

libcef/browser_webblobregistry_impl.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"

libcef/browser_webview_delegate.cc

@@ -16,6 +16,7 @@
 #include "browser_webstoragenamespace_impl.h"
 #include "browser_zoom_map.h"
 #include "cef_context.h"
+#include "cef_process_ui_thread.h"
 #include "dom_document_impl.h"
 #include "request_impl.h"
 #include "v8_impl.h"
@@ -44,7 +45,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
@@ -636,7 +637,8 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
       new media::FilterCollection());
 
   // Add the audio renderer.
-  collection->AddAudioRenderer(new media::ReferenceAudioRenderer());
+  collection->AddAudioRenderer(new media::ReferenceAudioRenderer(
+      _Context->process()->ui_thread()->audio_manager()));
 
   scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
       new webkit_media::WebMediaPlayerImpl(

libcef/browser_webview_delegate_win.cc

@@ -27,7 +27,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/gdi_util.h"

libcef/cef_process_ui_thread.cc

@@ -206,6 +206,14 @@ void CefProcessUIThread::CleanUp() {
   webkit_glue::CleanupResourceBundle();
 }
 
+AudioManager* CefProcessUIThread::audio_manager() {
+  DCHECK(CefThread::CurrentlyOn(CefThread::UI));
+  if (!audio_manager_)
+    audio_manager_ = AudioManager::Create();
+
+  return audio_manager_;
+}
+
 void CefProcessUIThread::OnOnlineStateChanged(bool online) {
   DCHECK(CefThread::CurrentlyOn(CefThread::UI));
   WebKit::WebNetworkStateNotifier::setOnLine(online);

libcef/cef_process_ui_thread.h

@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cef_thread.h"
+#include "media/audio/audio_manager.h"
 #include "net/base/network_change_notifier.h"
 
 class BrowserWebKitInit;
@@ -37,6 +38,8 @@ class CefProcessUIThread
   virtual void Init();
   virtual void CleanUp();
 
+  AudioManager* audio_manager();
+
  private:
   void PlatformInit();
   void PlatformCleanUp();
@@ -50,6 +53,7 @@ class CefProcessUIThread
   BrowserWebKitInit* webkit_init_;
 
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
+  scoped_refptr<AudioManager> audio_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(CefProcessUIThread);
 };

libcef/http_header_utils.h

@@ -5,7 +5,7 @@
 #ifndef _HTTP_HEADER_UTILS_H
 #define _HTTP_HEADER_UTILS_H
 
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHTTPHeaderVisitor.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 namespace HttpHeaderUtils {

libcef/request_impl.h

@@ -8,7 +8,7 @@
 #include "include/cef.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_request_headers.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHTTPBody.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 
 namespace net {

libcef/web_drag_source_win.cc

@@ -8,7 +8,7 @@
 #include "cef_thread.h"
 
 #include "base/task.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 using WebKit::WebDragOperationNone;

libcef/web_drop_target_win.cc

@@ -15,7 +15,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"

libcef/web_urlrequest_impl.cc

@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

patch/patches/base.patch

@@ -1,8 +1,8 @@
 Index: message_loop.cc
 ===================================================================
---- message_loop.cc	(revision 110703)
+--- message_loop.cc	(revision 115322)
 +++ message_loop.cc	(working copy)
-@@ -404,9 +404,13 @@
+@@ -395,9 +395,13 @@
  }
  
  void MessageLoop::AssertIdle() const {
@@ -19,9 +19,9 @@ Index: message_loop.cc
  bool MessageLoop::is_running() const {
 Index: message_loop.h
 ===================================================================
---- message_loop.h	(revision 110703)
+--- message_loop.h	(revision 115322)
 +++ message_loop.h	(working copy)
-@@ -363,6 +363,9 @@
+@@ -353,6 +353,9 @@
    // Asserts that the MessageLoop is "idle".
    void AssertIdle() const;
  

patch/patches/spi_webcore_364.patch

@@ -1,8 +1,8 @@
 Index: page/FrameView.cpp
 ===================================================================
---- page/FrameView.cpp	(revision 97950)
+--- page/FrameView.cpp	(revision 103399)
 +++ page/FrameView.cpp	(working copy)
-@@ -152,10 +152,12 @@
+@@ -176,10 +176,12 @@
              m_page = page;
              m_page->addScrollableArea(this);
  
@@ -17,7 +17,7 @@ Index: page/FrameView.cpp
  }
 Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
 ===================================================================
---- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 97950)
+--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
 +++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
 @@ -356,9 +356,13 @@
  

patch/patches/tools_gyp.patch

@@ -1,8 +1,8 @@
 Index: pylib/gyp/input.py
 ===================================================================
---- pylib/gyp/input.py	(revision 1051)
+--- pylib/gyp/input.py	(revision 1107)
 +++ pylib/gyp/input.py	(working copy)
-@@ -668,7 +668,8 @@
+@@ -666,7 +666,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.

patch/patches/webcore_cachedresource.patch

@@ -1,14 +1,14 @@
 Index: CachedResource.cpp
 ===================================================================
---- CachedResource.cpp	(revision 100508)
+--- CachedResource.cpp	(revision 103399)
 +++ CachedResource.cpp	(working copy)
-@@ -365,6 +365,9 @@
+@@ -366,6 +366,9 @@
  
  void CachedResource::addClient(CachedResourceClient* client)
  {
 +    if (isPurgeable())
 +        makePurgeable(false);
-+  
++
      addClientToSet(client);
      didAddClient(client);
  }

patch/patches/webcore_v8_custom.patch

@@ -1,8 +1,8 @@
 Index: V8DOMWindowCustom.cpp
 ===================================================================
---- V8DOMWindowCustom.cpp	(revision 101876)
+--- V8DOMWindowCustom.cpp	(revision 103399)
 +++ V8DOMWindowCustom.cpp	(working copy)
-@@ -289,8 +289,11 @@
+@@ -297,8 +297,11 @@
  static v8::Handle<v8::Value> handlePostMessageCallback(const v8::Arguments& args, bool extendedTransfer)
  {
      DOMWindow* window = V8DOMWindow::toNative(args.Holder());
@@ -14,4 +14,4 @@ Index: V8DOMWindowCustom.cpp
 +    DOMWindow* source = frame->domWindow();
      ASSERT(source->frame());
  
-     // This function has variable arguments and can either be:
+     // This function has variable arguments and can be:

tests/cefclient/cefclient.cpp

@@ -329,12 +329,16 @@ void AppGetBrowserSettings(CefBrowserSettings& settings)
       g_command_line->HasSwitch(cefclient::kAcceleratedVideoDisabled);
   settings.accelerated_2d_canvas_disabled =
       g_command_line->HasSwitch(cefclient::kAcceledated2dCanvasDisabled);
-  settings.accelerated_drawing_disabled =
+  settings.accelerated_painting_disabled =
-      g_command_line->HasSwitch(cefclient::kAcceleratedDrawingDisabled);
+      g_command_line->HasSwitch(cefclient::kAcceleratedPaintingDisabled);
+  settings.accelerated_filters_disabled =
+      g_command_line->HasSwitch(cefclient::kAcceleratedFiltersDisabled);
   settings.accelerated_plugins_disabled =
       g_command_line->HasSwitch(cefclient::kAcceleratedPluginsDisabled);
   settings.developer_tools_disabled =
       g_command_line->HasSwitch(cefclient::kDeveloperToolsDisabled);
+  settings.fullscreen_enabled =
+      g_command_line->HasSwitch(cefclient::kFullscreenEnabled);
 }
 
 static void ExecuteGetSource(CefRefPtr<CefFrame> frame)

tests/cefclient/cefclient_switches.cpp

@@ -72,9 +72,11 @@ const char kThreadedCompositingEnabled[] = "threaded-compositing-enabled";
 const char kAcceleratedLayersDisabled[] = "accelerated-layers-disabled";
 const char kAcceleratedVideoDisabled[] = "accelerated-video-disabled";
 const char kAcceledated2dCanvasDisabled[] = "accelerated-2d-canvas-disabled";
-const char kAcceleratedDrawingDisabled[] = "accelerated-drawing-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";
+const char kFullscreenEnabled[] = "fullscreen-enabled";
 
 // Other attributes.
 const char kProxyType[] = "proxy-type";

tests/cefclient/cefclient_switches.h

@@ -70,9 +70,11 @@ extern const char kThreadedCompositingEnabled[];
 extern const char kAcceleratedLayersDisabled[];
 extern const char kAcceleratedVideoDisabled[];
 extern const char kAcceledated2dCanvasDisabled[];
-extern const char kAcceleratedDrawingDisabled[];
+extern const char kAcceleratedPaintingDisabled[];
+extern const char kAcceleratedFiltersDisabled[];
 extern const char kAcceleratedPluginsDisabled[];
 extern const char kDeveloperToolsDisabled[];
+extern const char kFullscreenEnabled[];
 
 // Other attributes.
 extern const char kProxyType[];