Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/modules/webdatabase/DatabaseClient.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 13 matching lines @@
  * 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 "modules/webdatabase/DatabaseClient.h"
 
 #include "core/dom/Document.h"
+#include "core/frame/ContentSettingsClient.h"
+#include "core/frame/LocalFrame.h"
 #include "core/page/Page.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/InspectorDatabaseAgent.h"
 
 namespace blink {
 
 DatabaseClient::DatabaseClient() : m_inspectorAgent(nullptr) {}
 
 DEFINE_TRACE(DatabaseClient) {
   visitor->trace(m_inspectorAgent);
   Supplement<Page>::trace(visitor);
 }
 
 DatabaseClient* DatabaseClient::fromPage(Page* page) {
   return static_cast<DatabaseClient*>(
       Supplement<Page>::from(page, supplementName()));
 }
 
 DatabaseClient* DatabaseClient::from(ExecutionContext* context) {
   return DatabaseClient::fromPage(toDocument(context)->page());
 }
 
 const char* DatabaseClient::supplementName() {
   return "DatabaseClient";
 }
 
+bool DatabaseClient::allowDatabase(ExecutionContext* context,
+                                   const String& name,
+                                   const String& displayName,
+                                   unsigned estimatedSize) {
+  DCHECK(context->isContextThread());
+  Document* document = toDocument(context);
+  if (document->frame()->contentSettingsClient()) {

[dcheng, 2017/04/02 05:26:19]

Do we need to null-check that frame is not null?

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

I think we do, done.

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

Btw, I didn't trace this back far enough: the only callstack that calls into
this seems to be:
  DatabaseClient::allowDatabase()
  DatabaseTracker::canEstablishConnection()
  DatabaseManager::openDatabaseInternal()
  DatabaseManager::openDatabase()
  DOMWindowWebDatabase::openDatabase()

and DOMWindowWebDatabase::openDatabase() checks
DOMWindow::isCurrentlyDisplayedInFrame(), which checks that frame is not null.

So we actually don't need this...

(Maybe we can do a DCHECK? Up to you)

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

Thanks for looking!  I turned this into DCHECK.

+    return document->frame()->contentSettingsClient()->allowDatabase(
+        name, displayName, estimatedSize);
+  }
+  return true;
+}

[kinuko, 2017/03/31 16:13:12]

Moved the impl from DatabaseClientImpl and removed DatabaseClientImpl

+
 void DatabaseClient::didOpenDatabase(blink::Database* database,
                                      const String& domain,
                                      const String& name,
                                      const String& version) {
   if (m_inspectorAgent)
     m_inspectorAgent->didOpenDatabase(database, domain, name, version);
 }
 
 void DatabaseClient::setInspectorAgent(InspectorDatabaseAgent* agent) {
   // TODO(dgozman): we should not set agent twice, but it's happening in OOPIF
   // case.
   m_inspectorAgent = agent;
 }
 
 void provideDatabaseClientTo(Page& page, DatabaseClient* client) {
   page.provideSupplement(DatabaseClient::supplementName(), client);
 }
 
 }  // namespace blink