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 f08a90f857ba1713d2af03b7e4b58783936d9a57..ba6ccef5480d638629a8f79dcf65d361f46d6316 100644 |
--- a/third_party/WebKit/public/web/WebFrameOwnerProperties.h |
+++ b/third_party/WebKit/public/web/WebFrameOwnerProperties.h |
@@ -5,6 +5,10 @@ |
#ifndef WebFrameOwnerProperties_h |
#define WebFrameOwnerProperties_h |
+#include "public/platform/WebVector.h" |
+#include "public/platform/modules/permissions/WebPermissionType.h" |
+#include <algorithm> |
+ |
namespace blink { |
struct WebFrameOwnerProperties { |
@@ -19,6 +23,7 @@ struct WebFrameOwnerProperties { |
int marginWidth; |
int marginHeight; |
bool allowFullscreen; |
+ WebVector<WebPermissionType> delegatedPermissions; |
WebFrameOwnerProperties() |
: scrollingMode(ScrollingMode::Auto) |
@@ -29,11 +34,12 @@ struct WebFrameOwnerProperties { |
} |
#if INSIDE_BLINK |
- WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int marginHeight, bool allowFullscreen) |
+ WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int marginHeight, bool allowFullscreen, const WebVector<WebPermissionType>& delegatedPermissions) |
: scrollingMode(static_cast<ScrollingMode>(scrollingMode)) |
, marginWidth(marginWidth) |
, marginHeight(marginHeight) |
, allowFullscreen(allowFullscreen) |
+ , delegatedPermissions(delegatedPermissions) |
{ |
} |
#endif |
@@ -43,7 +49,10 @@ struct WebFrameOwnerProperties { |
return scrollingMode == other.scrollingMode |
&& marginWidth == other.marginWidth |
&& marginHeight == other.marginHeight |
- && allowFullscreen == other.allowFullscreen; |
+ && allowFullscreen == other.allowFullscreen |
+ && std::equal(delegatedPermissions.begin(), |
+ delegatedPermissions.end(), |
+ other.delegatedPermissions.begin()); |
} |
bool operator!=(const WebFrameOwnerProperties& other) const |