Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/LocalFileSystemClient.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 {
 
 std::unique_ptr<FileSystemClient> LocalFileSystemClient::create() {
   return WTF::wrapUnique(
       static_cast<FileSystemClient*>(new LocalFileSystemClient()));
 }
 
 LocalFileSystemClient::~LocalFileSystemClient() {}
 
@@ skipping 13 matching lines @@
 void LocalFileSystemClient::requestFileSystemAccessAsync(
     ExecutionContext* context,
     std::unique_ptr<ContentSettingCallbacks> callbacks) {
   DCHECK(context);
   if (!context->isDocument()) {
     NOTREACHED();
     return;
   }
 
   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 (I'm not sure why we can assume
that though?), then we shouldn't need to check that we have a settings client

[kinuko, 2017/04/03 15:15:06]

Added frame nullcheck, and removed contentSettingsClient nullcheck.

[dcheng, 2017/04/03 19:28:23]

Similarly, I did some more tracing back and the only Document caller is from
DOMWindowFileSystem::webkitRequestFileSystem, which also checks
DOMWindow::isCurrentlyDisplayedInFrame(). So we can also DCHECK this.

[kinuko, 2017/04/04 03:26:23]

Done.

     callbacks->onAllowed();
     return;
   }
-  webFrame->contentSettingsClient()->requestFileSystemAccessAsync(
+  document->frame()->contentSettingsClient()->requestFileSystemAccessAsync(
       std::move(callbacks));
 }
 
 LocalFileSystemClient::LocalFileSystemClient() {}
 
 }  // namespace blink