bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Update to Chromium revision 85305.

Browse Source 
- Use the angle library for GL support (issue #136).
- Add a workaround for the SyncRequestProxy deadlock problem (issue #192).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@233 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-05-16 16:56:12 +00:00
parent 2c0f941830
commit abfc77abd1
30 changed files with 256 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
libcef/browser_webblobregistry_impl.cc
View File

@ -1,12 +1,14 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "browser_webblobregistry_impl.h"
#include "base/message_loop.h"
#include "base/task.h"
#include "googleurl/src/gurl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "webkit/blob/blob_data.h"
@ -21,6 +23,17 @@ namespace {
MessageLoop* g_io_thread;
webkit_blob::BlobStorageController* g_blob_storage_controller;
// WebURL contains a WebCString object that is ref-counted,
// but not thread-safe ref-counted.
// "Normal" copying of WebURL results in a copy that is not thread-safe.
// This method creates a deep copy of WebURL.
WebURL GetWebURLThreadsafeCopy(const WebURL& source) {
const WebKit::WebCString spec(source.spec());
const url_parse::Parsed& parsed(source.parsed());
const bool is_valid = source.isValid();
return WebURL(spec, parsed, is_valid);
}
} // namespace
/* static */
@ -42,34 +55,55 @@ BrowserWebBlobRegistryImpl::BrowserWebBlobRegistryImpl() {
void BrowserWebBlobRegistryImpl::registerBlobURL(
const WebURL& url, WebBlobData& data) {
DCHECK(g_io_thread);
// Note: BlobData is not refcounted thread safe.
scoped_refptr<webkit_blob::BlobData> blob_data(
CancelableTask* task;
{
scoped_refptr<webkit_blob::BlobData> blob_data(
new webkit_blob::BlobData(data));
g_io_thread->PostTask(
FROM_HERE,
WebURL url_copy = GetWebURLThreadsafeCopy(url);
task =
NewRunnableMethod(
this, &BrowserWebBlobRegistryImpl::DoRegisterBlobUrl, url,
blob_data));
this, &BrowserWebBlobRegistryImpl::DoRegisterBlobUrl, url_copy,
blob_data);
// After this block exits, url_copy is disposed, and
// the underlying WebCString will have a refcount=1 and will
// only be accessible from the task object.
}
g_io_thread->PostTask(FROM_HERE, task);
}
void BrowserWebBlobRegistryImpl::registerBlobURL(
const WebURL& url, const WebURL& src_url) {
DCHECK(g_io_thread);
g_io_thread->PostTask(
FROM_HERE,
CancelableTask* task;
{
WebURL url_copy = GetWebURLThreadsafeCopy(url);
WebURL src_url_copy = GetWebURLThreadsafeCopy(src_url);
task =
NewRunnableMethod(this,
&BrowserWebBlobRegistryImpl::DoRegisterBlobUrlFrom,
url,
src_url));
url_copy,
src_url_copy);
// After this block exits, url_copy and src_url_copy are disposed, and
// the underlying WebCStrings will have a refcount=1 and will
// only be accessible from the task object.
}
g_io_thread->PostTask(FROM_HERE, task);
}
void BrowserWebBlobRegistryImpl::unregisterBlobURL(const WebURL& url) {
DCHECK(g_io_thread);
g_io_thread->PostTask(
FROM_HERE,
CancelableTask* task;
{
WebURL url_copy = GetWebURLThreadsafeCopy(url);
task =
NewRunnableMethod(this,
&BrowserWebBlobRegistryImpl::DoUnregisterBlobUrl,
url));
url_copy);
// After this block exits, url_copy is disposed, and
// the underlying WebCString will have a refcount=1 and will
// only be accessible from the task object.
}
g_io_thread->PostTask(FROM_HERE, task);
}
void BrowserWebBlobRegistryImpl::DoRegisterBlobUrl(