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

Unified Diff: third_party/WebKit/Source/web/LocalFileSystemClient.cpp

Issue 2786673002: Separate ContentSettingsClient out from LocalFrameClient (Closed)
Patch Set: fix Created 3 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
Index: third_party/WebKit/Source/web/LocalFileSystemClient.cpp
diff --git a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
index 30dced4a000aeba15bde9206ebb89490ead2b3e8..ec93147c2b8d225e23d75923f3ec304ad2a7a3db 100644
--- a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
+++ b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
@@ -30,17 +30,16 @@
#include "web/LocalFileSystemClient.h"
+#include <memory>
#include "core/dom/Document.h"
+#include "core/frame/ContentSettingsClient.h"
#include "core/workers/WorkerGlobalScope.h"
#include "platform/ContentSettingCallbacks.h"
#include "platform/weborigin/SecurityOrigin.h"
-#include "public/platform/WebContentSettingCallbacks.h"
-#include "public/web/WebContentSettingsClient.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WorkerContentSettingsClient.h"
#include "wtf/PtrUtil.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
@@ -74,12 +73,11 @@ void LocalFileSystemClient::requestFileSystemAccessAsync(
}
Document* document = toDocument(context);
- WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
- if (!webFrame->contentSettingsClient()) {
+ if (!document->frame()->contentSettingsClient()) {
dcheng 2017/04/02 05:26:19 Ditto: if we are assuming frame is not null here (
kinuko 2017/04/03 15:15:06 Added frame nullcheck, and removed contentSettings
dcheng 2017/04/03 19:28:23 Similarly, I did some more tracing back and the on
kinuko 2017/04/04 03:26:23 Done.
callbacks->onAllowed();
return;
}
- webFrame->contentSettingsClient()->requestFileSystemAccessAsync(
+ document->frame()->contentSettingsClient()->requestFileSystemAccessAsync(
std::move(callbacks));
}

Powered by Google App Engine
This is Rietveld 408576698