Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/StorageClientImpl.cpp

Index: third_party/WebKit/Source/web/StorageClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/StorageClientImpl.cpp b/third_party/WebKit/Source/web/StorageClientImpl.cpp
index f0527cc0da9e92e0fdc8366134b5dccb0c2d3ff2..05133b42963d7e21b4c71e91306f4e94244866f2 100644
--- a/third_party/WebKit/Source/web/StorageClientImpl.cpp
+++ b/third_party/WebKit/Source/web/StorageClientImpl.cpp
@@ -25,17 +25,24 @@
 
 #include "web/StorageClientImpl.h"
 
+#include <memory>
+#include "core/frame/ContentSettingsClient.h"
 #include "modules/storage/StorageNamespace.h"
 #include "public/platform/WebStorageNamespace.h"
-#include "public/web/WebContentSettingsClient.h"
 #include "public/web/WebViewClient.h"
-#include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
+#define STATIC_ASSERT_MATCHING_ENUM(enum_name1, enum_name2)                   \
+  static_assert(static_cast<int>(enum_name1) == static_cast<int>(enum_name2), \
+                "mismatching enums: " #enum_name1)
+STATIC_ASSERT_MATCHING_ENUM(LocalStorage,
+                            ContentSettingsClient::StorageType::kLocal);
+STATIC_ASSERT_MATCHING_ENUM(SessionStorage,
+                            ContentSettingsClient::StorageType::kSession);

[haraken, 2017/04/04 11:25:32]

Can we make this change in a separate CL? I think it's nicer to add the macro to
wtf/.

[kinuko, 2017/04/04 14:50:57]

I could try adding these macros in a separate CL.  Or do you mean you want to
keep ContentSettingsClient::canAccessStorage take boolean instead of enum?

+
 StorageClientImpl::StorageClientImpl(WebViewImpl* webView)
     : m_webView(webView) {}
 
@@ -49,9 +56,9 @@ StorageClientImpl::createSessionStorageNamespace() {
 
 bool StorageClientImpl::canAccessStorage(LocalFrame* frame,
                                          StorageType type) const {
-  WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
-  return !webFrame->contentSettingsClient() ||
-         webFrame->contentSettingsClient()->allowStorage(type == LocalStorage);
+  DCHECK(frame->contentSettingsClient());
+  return frame->contentSettingsClient()->allowStorage(
+      static_cast<ContentSettingsClient::StorageType>(type));

[haraken, 2017/04/04 11:25:32]

Shouldn't this be type == LocalStorage ?

[kinuko, 2017/04/04 14:50:57]

ContentSettingsClient's allowStorage does that inside. (I wanted to make it take
enum instead bool)

 }
 
 }  // namespace blink