Index: third_party/WebKit/public/web/WebFrameOwnerProperties.h |
diff --git a/third_party/WebKit/public/web/WebFrameOwnerProperties.h b/third_party/WebKit/public/web/WebFrameOwnerProperties.h |
index f7f6e65147bec6d4744f124d5b64bbfe8bb7c1a6..ccf3d0930e246af7bf9c980db47d370985b49723 100644 |
--- a/third_party/WebKit/public/web/WebFrameOwnerProperties.h |
+++ b/third_party/WebKit/public/web/WebFrameOwnerProperties.h |
@@ -5,6 +5,7 @@ |
#ifndef WebFrameOwnerProperties_h |
#define WebFrameOwnerProperties_h |
+#include "../platform/WebString.h" |
Mike West
2016/09/29 11:50:14
Nit: Replace the leading `../` with `public/`. We
amalika
2016/09/29 12:56:46
Ahh. I just followed the examples in third-party/
|
#include "public/platform/WebVector.h" |
#include "public/platform/modules/permissions/WebPermissionType.h" |
#include <algorithm> |
@@ -23,6 +24,7 @@ struct WebFrameOwnerProperties { |
int marginWidth; |
int marginHeight; |
bool allowFullscreen; |
+ WebString csp; |
WebVector<WebPermissionType> delegatedPermissions; |
WebFrameOwnerProperties() |
@@ -34,11 +36,12 @@ struct WebFrameOwnerProperties { |
} |
#if INSIDE_BLINK |
- WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int marginHeight, bool allowFullscreen, const WebVector<WebPermissionType>& delegatedPermissions) |
+ WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int marginHeight, bool allowFullscreen, const WebString& csp, const WebVector<WebPermissionType>& delegatedPermissions) |
: scrollingMode(static_cast<ScrollingMode>(scrollingMode)) |
, marginWidth(marginWidth) |
, marginHeight(marginHeight) |
, allowFullscreen(allowFullscreen) |
+ , csp(csp) |
, delegatedPermissions(delegatedPermissions) |
{ |
} |