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

Unified Diff: webkit/fileapi/file_system_url.cc

Issue 15754005: Fix dependency: make file_system_util not depend on FileSystemURL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months 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 | « webkit/fileapi/file_system_url.h ('k') | webkit/fileapi/file_system_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_url.cc
diff --git a/webkit/fileapi/file_system_url.cc b/webkit/fileapi/file_system_url.cc
index 8071aaf08bb862c931992f0e41cbae0a2faa253f..3427ec8f309e769944c99a362814b37e155b9675 100644
--- a/webkit/fileapi/file_system_url.cc
+++ b/webkit/fileapi/file_system_url.cc
@@ -155,12 +155,16 @@ std::string FileSystemURL::DebugString() const {
}
bool FileSystemURL::IsParent(const FileSystemURL& child) const {
- return origin() == child.origin() &&
- type() == child.type() &&
- filesystem_id() == child.filesystem_id() &&
+ return IsInSameFileSystem(child) &&
path().IsParent(child.path());
}
+bool FileSystemURL::IsInSameFileSystem(const FileSystemURL& other) const {
+ return origin() == other.origin() &&
+ type() == other.type() &&
+ filesystem_id() == other.filesystem_id();
+}
+
bool FileSystemURL::operator==(const FileSystemURL& that) const {
return origin_ == that.origin_ &&
type_ == that.type_ &&
« no previous file with comments | « webkit/fileapi/file_system_url.h ('k') | webkit/fileapi/file_system_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698