webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 53 insertions, 12 deletions

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 <WebCore/ActivityState.h>
 #include <WebCore/Color.h>
+#include <WebCore/FloatSize.h>
 #include <WebCore/IntSize.h>
+#include <WebCore/LayoutMilestones.h>
+#include <WebCore/MediaProducer.h>
 #include <WebCore/Pagination.h>
 #include <WebCore/ScrollTypes.h>
-#include <WebCore/ViewState.h>
+#include <WebCore/SessionID.h>
+#include <WebCore/UserInterfaceLayoutDirection.h>
 #include <wtf/text/WTFString.h>
 
 #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<BackForwardListItemState> 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<WebCore::ScrollbarOverlayStyle>, but we would need to
+    // correctly handle enums inside Optionals when encoding and decoding. 
+    std::optional<uint32_t> scrollbarOverlayStyle;
+
     bool backgroundExtendsBeyondPage;
 
     LayerHostingMode layerHostingMode;
 
+    Vector<String> 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