Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 47 insertions, 0 deletions

diff --git a/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp b/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp
new file mode 100644
index 000000000..cc8487555
--- /dev/null
+++ b/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkLoadParameters.h"
+
+#include "NetworkResourceLoadParameters.h"
+
+namespace WebKit {
+
+NetworkLoadParameters::NetworkLoadParameters(const NetworkResourceLoadParameters& parameters)
+    : webPageID(parameters.webPageID)
+    , webFrameID(parameters.webFrameID)
+    , sessionID(parameters.sessionID)
+    , request(parameters.request)
+    , contentSniffingPolicy(parameters.contentSniffingPolicy)
+    , allowStoredCredentials(parameters.allowStoredCredentials)
+    , clientCredentialPolicy(parameters.clientCredentialPolicy)
+    , shouldClearReferrerOnHTTPSToHTTPRedirect(parameters.shouldClearReferrerOnHTTPSToHTTPRedirect)
+    , defersLoading(parameters.defersLoading)
+    , needsCertificateInfo(parameters.needsCertificateInfo)
+{
+}
+
+} // namespace WebKit