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 66269.

Browse Source 
- Fixes a crash with Flash-related JavaScript (issue #115).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@138 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-11-16 16:01:14 +00:00
parent 8c47cd961a
commit 239a283e02
10 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libcef/browser_file_system.cc
View File

@ -24,26 +24,6 @@ using WebKit::WebVector;
namespace {
WebKit::WebFileError PlatformFileErrorToWebFileError(
base::PlatformFileError error_code) {
switch (error_code) {
case base::PLATFORM_FILE_ERROR_NOT_FOUND:
return WebKit::WebFileErrorNotFound;
case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
case base::PLATFORM_FILE_ERROR_EXISTS:
case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
return WebKit::WebFileErrorInvalidModification;
case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
return WebKit::WebFileErrorNoModificationAllowed;
case base::PLATFORM_FILE_ERROR_FAILED:
return WebKit::WebFileErrorInvalidState;
case base::PLATFORM_FILE_ERROR_ABORT:
return WebKit::WebFileErrorAbort;
default:
return WebKit::WebFileErrorInvalidModification;
}
}
class BrowserFileSystemCallbackDispatcher
: public fileapi::FileSystemCallbackDispatcher {
public:
@ -73,10 +53,10 @@ class BrowserFileSystemCallbackDispatcher
}
virtual void DidReadDirectory(
const std::vector<base::file_util_proxy::Entry>& entries,
const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
std::vector<WebFileSystemEntry> web_entries_vector;
for (std::vector<base::file_util_proxy::Entry>::const_iterator it =
for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
entries.begin(); it != entries.end(); ++it) {
WebFileSystemEntry entry;
entry.name = webkit_glue::FilePathStringToWebString(it->name);
@ -94,7 +74,8 @@ class BrowserFileSystemCallbackDispatcher
}
virtual void DidFail(base::PlatformFileError error_code) {
callbacks_->didFail(PlatformFileErrorToWebFileError(error_code));
callbacks_->didFail(
webkit_glue::PlatformFileErrorToWebFileError(error_code));
file_system_->RemoveCompletedOperation(request_id_);
}