webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 90 insertions, 13 deletions

diff --git a/Source/WebKit2/Shared/WebPageCreationParameters.cpp b/Source/WebKit2/Shared/WebPageCreationParameters.cpp
index 0003489d7..d98d0ebd2 100644
--- a/Source/WebKit2/Shared/WebPageCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebPageCreationParameters.cpp
@@ -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
@@ -30,48 +30,73 @@
 
 namespace WebKit {
 
-void WebPageCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
+void WebPageCreationParameters::encode(IPC::Encoder& encoder) const
 {
     encoder << viewSize;
-    encoder << viewState;
+    encoder << activityState;
 
     encoder << store;
     encoder.encodeEnum(drawingAreaType);
     encoder << pageGroupData;
     encoder << drawsBackground;
-    encoder << drawsTransparentBackground;
+    encoder << isEditable;
     encoder << underlayColor;
-    encoder << areMemoryCacheClientCallsEnabled;
     encoder << useFixedLayout;
     encoder << fixedLayoutSize;
     encoder.encodeEnum(paginationMode);
     encoder << paginationBehavesLikeColumns;
     encoder << pageLength;
     encoder << gapBetweenPages;
+    encoder << paginationLineGridEnabled;
     encoder << userAgent;
-    encoder << sessionState;
+    encoder << itemStates;
+    encoder << sessionID;
     encoder << highestUsedBackForwardItemID;
+    encoder << userContentControllerID;
+    encoder << visitedLinkTableID;
+    encoder << websiteDataStoreID;
     encoder << canRunBeforeUnloadConfirmPanel;
     encoder << canRunModal;
     encoder << deviceScaleFactor;
+    encoder << viewScaleFactor;
+    encoder << topContentInset;
     encoder << mediaVolume;
+    encoder << muted;
     encoder << mayStartMediaWhenInWindow;
     encoder << minimumLayoutSize;
     encoder << autoSizingShouldExpandToViewHeight;
     encoder.encodeEnum(scrollPinningBehavior);
+    encoder << scrollbarOverlayStyle;
     encoder << backgroundExtendsBeyondPage;
     encoder.encodeEnum(layerHostingMode);
+    encoder << mimeTypesWithCustomContentProviders;
+    encoder << controlledByAutomation;
 
+#if ENABLE(REMOTE_INSPECTOR)
+    encoder << allowsRemoteInspection;
+    encoder << remoteInspectionNameOverride;
+#endif
 #if PLATFORM(MAC)
     encoder << colorSpace;
 #endif
+#if PLATFORM(IOS)
+    encoder << screenSize;
+    encoder << availableScreenSize;
+    encoder << textAutosizingWidth;
+    encoder << ignoresViewportScaleLimits;
+#endif
+    encoder << appleMailPaginationQuirkEnabled;
+    encoder << shouldScaleViewToFitDocument;
+    encoder.encodeEnum(userInterfaceLayoutDirection);
+    encoder.encodeEnum(observedLayoutMilestones);
+    encoder << overrideContentSecurityPolicy;
 }
 
-bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
+bool WebPageCreationParameters::decode(IPC::Decoder& decoder, WebPageCreationParameters& parameters)
 {
     if (!decoder.decode(parameters.viewSize))
         return false;
-    if (!decoder.decode(parameters.viewState))
+    if (!decoder.decode(parameters.activityState))
         return false;
     if (!decoder.decode(parameters.store))
         return false;
@@ -81,12 +106,10 @@ bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCre
         return false;
     if (!decoder.decode(parameters.drawsBackground))
         return false;
-    if (!decoder.decode(parameters.drawsTransparentBackground))
+    if (!decoder.decode(parameters.isEditable))
         return false;
     if (!decoder.decode(parameters.underlayColor))
         return false;
-    if (!decoder.decode(parameters.areMemoryCacheClientCallsEnabled))
-        return false;
     if (!decoder.decode(parameters.useFixedLayout))
         return false;
     if (!decoder.decode(parameters.fixedLayoutSize))
@@ -99,20 +122,36 @@ bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCre
         return false;
     if (!decoder.decode(parameters.gapBetweenPages))
         return false;
+    if (!decoder.decode(parameters.paginationLineGridEnabled))
+        return false;
     if (!decoder.decode(parameters.userAgent))
         return false;
-    if (!decoder.decode(parameters.sessionState))
+    if (!decoder.decode(parameters.itemStates))
+        return false;
+    if (!decoder.decode(parameters.sessionID))
         return false;
     if (!decoder.decode(parameters.highestUsedBackForwardItemID))
         return false;
+    if (!decoder.decode(parameters.userContentControllerID))
+        return false;
+    if (!decoder.decode(parameters.visitedLinkTableID))
+        return false;
+    if (!decoder.decode(parameters.websiteDataStoreID))
+        return false;
     if (!decoder.decode(parameters.canRunBeforeUnloadConfirmPanel))
         return false;
     if (!decoder.decode(parameters.canRunModal))
         return false;
     if (!decoder.decode(parameters.deviceScaleFactor))
         return false;
+    if (!decoder.decode(parameters.viewScaleFactor))
+        return false;
+    if (!decoder.decode(parameters.topContentInset))
+        return false;
     if (!decoder.decode(parameters.mediaVolume))
         return false;
+    if (!decoder.decode(parameters.muted))
+        return false;
     if (!decoder.decode(parameters.mayStartMediaWhenInWindow))
         return false;
     if (!decoder.decode(parameters.minimumLayoutSize))
@@ -121,16 +160,54 @@ bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCre
         return false;
     if (!decoder.decodeEnum(parameters.scrollPinningBehavior))
         return false;
+    if (!decoder.decode(parameters.scrollbarOverlayStyle))
+        return false;
     if (!decoder.decode(parameters.backgroundExtendsBeyondPage))
         return false;
     if (!decoder.decodeEnum(parameters.layerHostingMode))
         return false;
-    
+    if (!decoder.decode(parameters.mimeTypesWithCustomContentProviders))
+        return false;
+    if (!decoder.decode(parameters.controlledByAutomation))
+        return false;
+
+#if ENABLE(REMOTE_INSPECTOR)
+    if (!decoder.decode(parameters.allowsRemoteInspection))
+        return false;
+    if (!decoder.decode(parameters.remoteInspectionNameOverride))
+        return false;
+#endif
+
 #if PLATFORM(MAC)
     if (!decoder.decode(parameters.colorSpace))
         return false;
 #endif
 
+#if PLATFORM(IOS)
+    if (!decoder.decode(parameters.screenSize))
+        return false;
+    if (!decoder.decode(parameters.availableScreenSize))
+        return false;
+    if (!decoder.decode(parameters.textAutosizingWidth))
+        return false;
+    if (!decoder.decode(parameters.ignoresViewportScaleLimits))
+        return false;
+#endif
+
+    if (!decoder.decode(parameters.appleMailPaginationQuirkEnabled))
+        return false;
+
+    if (!decoder.decode(parameters.shouldScaleViewToFitDocument))
+        return false;
+
+    if (!decoder.decodeEnum(parameters.userInterfaceLayoutDirection))
+        return false;
+    if (!decoder.decodeEnum(parameters.observedLayoutMilestones))
+        return false;
+
+    if (!decoder.decode(parameters.overrideContentSecurityPolicy))
+        return false;
+
     return true;
 }