From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebKit2/Shared/WebPageCreationParameters.h | 65 ++++++++++++++++++----- 1 file changed, 53 insertions(+), 12 deletions(-) (limited to 'Source/WebKit2/Shared/WebPageCreationParameters.h') diff --git a/Source/WebKit2/Shared/WebPageCreationParameters.h b/Source/WebKit2/Shared/WebPageCreationParameters.h index bdca723df..a6244b876 100644 --- a/Source/WebKit2/Shared/WebPageCreationParameters.h +++ b/Source/WebKit2/Shared/WebPageCreationParameters.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2011, 2015 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,11 +32,16 @@ #include "WebCoreArgumentCoders.h" #include "WebPageGroupData.h" #include "WebPreferencesStore.h" +#include #include +#include #include +#include +#include #include #include -#include +#include +#include #include #if PLATFORM(MAC) @@ -44,31 +49,29 @@ #endif namespace IPC { - class ArgumentDecoder; - class ArgumentEncoder; +class Decoder; +class Encoder; } namespace WebKit { struct WebPageCreationParameters { - void encode(IPC::ArgumentEncoder&) const; - static bool decode(IPC::ArgumentDecoder&, WebPageCreationParameters&); + void encode(IPC::Encoder&) const; + static bool decode(IPC::Decoder&, WebPageCreationParameters&); WebCore::IntSize viewSize; - WebCore::ViewState::Flags viewState; + WebCore::ActivityState::Flags activityState; WebPreferencesStore store; DrawingAreaType drawingAreaType; WebPageGroupData pageGroupData; bool drawsBackground; - bool drawsTransparentBackground; + bool isEditable; WebCore::Color underlayColor; - bool areMemoryCacheClientCallsEnabled; - bool useFixedLayout; WebCore::IntSize fixedLayoutSize; @@ -78,18 +81,27 @@ struct WebPageCreationParameters { bool paginationBehavesLikeColumns; double pageLength; double gapBetweenPages; - + bool paginationLineGridEnabled; + String userAgent; - SessionState sessionState; + Vector itemStates; + WebCore::SessionID sessionID; uint64_t highestUsedBackForwardItemID; + uint64_t userContentControllerID; + uint64_t visitedLinkTableID; + uint64_t websiteDataStoreID; bool canRunBeforeUnloadConfirmPanel; bool canRunModal; float deviceScaleFactor; + float viewScaleFactor; + + float topContentInset; float mediaVolume; + WebCore::MediaProducer::MutedStateFlags muted; bool mayStartMediaWhenInWindow; WebCore::IntSize minimumLayoutSize; @@ -97,13 +109,42 @@ struct WebPageCreationParameters { WebCore::ScrollPinningBehavior scrollPinningBehavior; + // FIXME: This should be std::optional, but we would need to + // correctly handle enums inside Optionals when encoding and decoding. + std::optional scrollbarOverlayStyle; + bool backgroundExtendsBeyondPage; LayerHostingMode layerHostingMode; + Vector mimeTypesWithCustomContentProviders; + + bool controlledByAutomation; + +#if ENABLE(REMOTE_INSPECTOR) + bool allowsRemoteInspection; + String remoteInspectionNameOverride; +#endif + #if PLATFORM(MAC) ColorSpaceData colorSpace; #endif +#if PLATFORM(IOS) + WebCore::FloatSize screenSize; + WebCore::FloatSize availableScreenSize; + float textAutosizingWidth; + bool ignoresViewportScaleLimits; +#endif +#if PLATFORM(COCOA) + bool smartInsertDeleteEnabled; +#endif + bool appleMailPaginationQuirkEnabled; + bool shouldScaleViewToFitDocument; + + WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection; + WebCore::LayoutMilestones observedLayoutMilestones; + + String overrideContentSecurityPolicy; }; } // namespace WebKit -- cgit v1.2.1