Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 2582463002: Fix webkitGetEntry for non-native files. (Closed)
Patch Set: . Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/common/drag_traits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index f10b0f4205242307a0db4756917a2ca728b3e17e..6cae7abf89dfddb96ae4e3cd8a81821a2597a47d 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -245,6 +245,7 @@ void WriteFileSystemFilesToPickle(
for (size_t i = 0; i < file_system_files.size(); ++i) {
pickle->WriteString(file_system_files[i].url.spec());
pickle->WriteInt64(file_system_files[i].size);
+ pickle->WriteString(file_system_files[i].filesystem_id);
}
}
@@ -262,8 +263,11 @@ bool ReadFileSystemFilesFromPickle(
for (uint32_t i = 0; i < num_files; ++i) {
std::string url_string;
int64_t size = 0;
- if (!iter.ReadString(&url_string) || !iter.ReadInt64(&size))
+ std::string filesystem_id;
+ if (!iter.ReadString(&url_string) || !iter.ReadInt64(&size) ||
+ !iter.ReadString(&filesystem_id)) {
return false;
+ }
GURL url(url_string);
if (!url.is_valid())
@@ -271,6 +275,7 @@ bool ReadFileSystemFilesFromPickle(
(*file_system_files)[i].url = url;
(*file_system_files)[i].size = size;
+ (*file_system_files)[i].filesystem_id = filesystem_id;
}
return true;
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/common/drag_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698