- Update to Chromium revision 85305.

- 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

View File

@ -43,7 +43,7 @@ class BrowserFileWriter::IOThreadProxy
virtual ~IOThreadProxy() {
}
void Truncate(const FilePath& path, int64 offset) {
void Truncate(const GURL& path, int64 offset) {
if (!io_thread_->BelongsToCurrentThread()) {
io_thread_->PostTask(FROM_HERE, NewRunnableMethod(
this, &IOThreadProxy::Truncate, path, offset));
@ -54,7 +54,7 @@ class BrowserFileWriter::IOThreadProxy
operation_->Truncate(path, offset);
}
void Write(const FilePath& path, const GURL& blob_url, int64 offset) {
void Write(const GURL& path, const GURL& blob_url, int64 offset) {
if (!io_thread_->BelongsToCurrentThread()) {
io_thread_->PostTask(FROM_HERE, NewRunnableMethod(
this, &IOThreadProxy::Write, path, blob_url, offset));
@ -94,6 +94,10 @@ class BrowserFileWriter::IOThreadProxy
proxy_->DidSucceed();
}
virtual void DidGetLocalPath(const FilePath& local_path) {
NOTREACHED();
}
virtual void DidFail(base::PlatformFileError error_code) {
proxy_->DidFail(error_code);
}
@ -116,7 +120,7 @@ class BrowserFileWriter::IOThreadProxy
virtual void DidOpenFileSystem(
const std::string& name,
const FilePath& root_path) {
const GURL& root) {
NOTREACHED();
}
@ -179,7 +183,7 @@ class BrowserFileWriter::IOThreadProxy
BrowserFileWriter::BrowserFileWriter(
const WebString& path,
const GURL& path,
WebFileWriterClient* client,
FileSystemContext* file_system_context)
: WebFileWriterBase(path, client),
@ -189,12 +193,12 @@ BrowserFileWriter::BrowserFileWriter(
BrowserFileWriter::~BrowserFileWriter() {
}
void BrowserFileWriter::DoTruncate(const FilePath& path, int64 offset) {
void BrowserFileWriter::DoTruncate(const GURL& path, int64 offset) {
io_thread_proxy_->Truncate(path, offset);
}
void BrowserFileWriter::DoWrite(
const FilePath& path, const GURL& blob_url, int64 offset) {
const GURL& path, const GURL& blob_url, int64 offset) {
io_thread_proxy_->Write(path, blob_url, offset);
}