third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 | « third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.cpp ('k') | third_party/WebKit/Source/modules/filesystem/DirectoryEntrySync.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

diff --git a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

index 37fabb2c86624548c396ee764794748f847cf246..3a49a417ec5012ede51447b71c05e825ce9d619c 100644

--- a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

+++ b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

@@ -51,10 +51,10 @@ void DOMWindowFileSystem::webkitRequestFileSystem(DOMWindow& windowArg, int type

if (!document)

return;

- if (SchemeRegistry::schemeShouldBypassContentSecurityPolicy(document->securityOrigin()->protocol()))

+ if (SchemeRegistry::schemeShouldBypassContentSecurityPolicy(document->getSecurityOrigin()->protocol()))

UseCounter::count(document, UseCounter::RequestFileSystemNonWebbyOrigin);

- if (!document->securityOrigin()->canAccessFileSystem()) {

+ if (!document->getSecurityOrigin()->canAccessFileSystem()) {

DOMFileSystem::scheduleCallback(document, errorCallback, FileError::create(FileError::SECURITY_ERR));

return;

}

@@ -78,7 +78,7 @@ void DOMWindowFileSystem::webkitResolveLocalFileSystemURL(DOMWindow& windowArg,

if (!document)

return;

- SecurityOrigin* securityOrigin = document->securityOrigin();

+ SecurityOrigin* securityOrigin = document->getSecurityOrigin();

KURL completedURL = document->completeURL(url);

if (!securityOrigin->canAccessFileSystem() || !securityOrigin->canRequest(completedURL)) {

DOMFileSystem::scheduleCallback(document, errorCallback, FileError::create(FileError::SECURITY_ERR));