Attachment 138272 Details for Bug 84539 – +WebSecurityPolicy.h fix

[patch] +WebSecurityPolicy.h fix

bug-84539-20120422172430.patch (text/plain), 10.75 KB, created by Gavin Peters on 2012-04-22 14:24:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gavin Peters

Created: 2012-04-22 14:24:32 PDT

Size: 10.75 KB

patch

obsolete

>Subversion Revision: 114621
>diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
>index 7f933728171302b229f53d360a30187ccd8552bf..2267cdb1804136456b64c5f4a41533fbb89d18d1 100644
>--- a/Source/Platform/ChangeLog
>+++ b/Source/Platform/ChangeLog
>@@ -1,3 +1,14 @@
>+2012-04-21  Gavin Peters  <gavinp@chromium.org>
>+
>+        Move WebReferrerPolicy.h from WebKit to Platform
>+        https://bugs.webkit.org/show_bug.cgi?id=84539
>+
>+        Reviewed by Adam Barth.
>+
>+        * Platform.gypi:
>+        * chromium/public/WebReferrerPolicy.h: Copied from Source/WebKit/chromium/public/WebReferrerPolicy.h.
>+        (WebKit):
>+
> 2012-04-16  James Robinson  <jamesr@chromium.org>
> 
>         [chromium] Convert WebPluginContainerImpl over to use WebExternalTextureLayer
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 4d4a5cea934e61bdcb6c86cd629315813eb4903d..67e059970427b6e108346abb5a79817177613152 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,5 +1,20 @@
> 2012-04-21  Gavin Peters  <gavinp@chromium.org>
> 
>+        Move WebReferrerPolicy.h from WebKit to Platform
>+        https://bugs.webkit.org/show_bug.cgi?id=84539
>+
>+        Reviewed by Adam Barth.
>+
>+        * WebKit.gyp:
>+        * public/WebContextMenuData.h:
>+        * public/WebFrame.h:
>+        * public/WebReferrerPolicy.h:
>+        * public/WebSecurityPolicy.h:
>+        * public/platform/WebReferrerPolicy.h: Copied from Source/WebKit/chromium/public/WebReferrerPolicy.h.
>+        * src/AssertMatchingEnums.cpp:
>+
>+2012-04-21  Gavin Peters  <gavinp@chromium.org>
>+
>         Move ReferrerPolicy out of SecurityPolicy class into its own header in platform.
>         https://bugs.webkit.org/show_bug.cgi?id=84516
> 
>diff --git a/Source/Platform/Platform.gypi b/Source/Platform/Platform.gypi
>index db4453fd586ddfd78a9c81e9bc1a43b557c9f9c7..6376140e5d9e99f061e1a732f02732259800cb59 100644
>--- a/Source/Platform/Platform.gypi
>+++ b/Source/Platform/Platform.gypi
>@@ -75,6 +75,7 @@
>             'chromium/public/WebPrivateOwnPtr.h',
>             'chromium/public/WebPrivatePtr.h',
>             'chromium/public/WebRect.h',
>+            'chromium/public/WebReferrerPolicy.h',
>             'chromium/public/WebSessionDescriptionDescriptor.h',
>             'chromium/public/WebSize.h',
>             'chromium/public/WebSocketStreamError.h',
>diff --git a/Source/Platform/chromium/public/WebReferrerPolicy.h b/Source/Platform/chromium/public/WebReferrerPolicy.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..82710fb22349039cbb6df7dbe2a5e4bb1704080c
>--- /dev/null
>+++ b/Source/Platform/chromium/public/WebReferrerPolicy.h
>@@ -0,0 +1,45 @@
>+/*
>+ * Copyright (C) 2011 Google 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:
>+ *
>+ *     * Redistributions of source code must retain the above copyright
>+ * notice, this list of conditions and the following disclaimer.
>+ *     * 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.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
>+ * OWNER OR 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.
>+ */
>+
>+#ifndef WebReferrerPolicy_h
>+#define WebReferrerPolicy_h
>+
>+namespace WebKit {
>+
>+enum WebReferrerPolicy {
>+    WebReferrerPolicyAlways,
>+    WebReferrerPolicyDefault,
>+    WebReferrerPolicyNever,
>+    WebReferrerPolicyOrigin,
>+};
>+
>+} // namespace WebKit
>+
>+#endif
>diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
>index 43752f35afecb2dd4408487efa172a35b9b3a7f7..f180cf882cde1bec0c2dc4a3239bb57f24d17c37 100644
>--- a/Source/WebKit/chromium/WebKit.gyp
>+++ b/Source/WebKit/chromium/WebKit.gyp
>@@ -329,6 +329,7 @@
>                 'public/platform/WebPrivateOwnPtr.h',
>                 'public/platform/WebPrivatePtr.h',
>                 'public/platform/WebRect.h',
>+                'public/platform/WebReferrerPolicy.h',
>                 'public/platform/WebSerializedScriptValue.h',
>                 'public/platform/WebSize.h',
>                 'public/platform/WebSocketStreamError.h',
>diff --git a/Source/WebKit/chromium/public/WebContextMenuData.h b/Source/WebKit/chromium/public/WebContextMenuData.h
>index e72a434dbafcbfb2b67dd7ba28168c5bd174e3ac..a36372192690294925482c6910465fcd0e368d71 100644
>--- a/Source/WebKit/chromium/public/WebContextMenuData.h
>+++ b/Source/WebKit/chromium/public/WebContextMenuData.h
>@@ -34,8 +34,8 @@
> #include "WebHistoryItem.h"
> #include "WebMenuItemInfo.h"
> #include "WebNode.h"
>-#include "WebReferrerPolicy.h"
> #include "platform/WebPoint.h"
>+#include "platform/WebReferrerPolicy.h"
> #include "platform/WebString.h"
> #include "platform/WebURL.h"
> #include "platform/WebVector.h"
>diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h
>index 19a7c37029c57addc98e6716a806aa1c00292ebd..526d5ec86b7ba738909b00e16dfd3b527e86200a 100644
>--- a/Source/WebKit/chromium/public/WebFrame.h
>+++ b/Source/WebKit/chromium/public/WebFrame.h
>@@ -33,10 +33,10 @@
> 
> #include "WebIconURL.h"
> #include "WebNode.h"
>-#include "WebReferrerPolicy.h"
> #include "WebURLLoaderOptions.h"
> #include "platform/WebCanvas.h"
> #include "platform/WebFileSystem.h"
>+#include "platform/WebReferrerPolicy.h"
> #include "platform/WebURL.h"
> 
> struct NPObject;
>diff --git a/Source/WebKit/chromium/public/WebReferrerPolicy.h b/Source/WebKit/chromium/public/WebReferrerPolicy.h
>index 82710fb22349039cbb6df7dbe2a5e4bb1704080c..db57304cbc914381ee53868d67766976fbc67511 100644
>--- a/Source/WebKit/chromium/public/WebReferrerPolicy.h
>+++ b/Source/WebKit/chromium/public/WebReferrerPolicy.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2011 Google Inc. All rights reserved.
>+ * Copyright (C) 2012 Google Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions are
>@@ -28,18 +28,6 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef WebReferrerPolicy_h
>-#define WebReferrerPolicy_h
>-
>-namespace WebKit {
>-
>-enum WebReferrerPolicy {
>-    WebReferrerPolicyAlways,
>-    WebReferrerPolicyDefault,
>-    WebReferrerPolicyNever,
>-    WebReferrerPolicyOrigin,
>-};
>-
>-} // namespace WebKit
>-
>-#endif
>+// This forwarding header exists only for staging our file move into the chromium port.
>+// FIXME: Remove this forwarder after chrome issue http://codereview.chromium.org/10139023/ lands.
>+#include "platform/WebReferrerPolicy.h"
>diff --git a/Source/WebKit/chromium/public/WebSecurityPolicy.h b/Source/WebKit/chromium/public/WebSecurityPolicy.h
>index babd9bfba27f1a65d80f4d41e8b9fdf3ed09502e..5d9d3de0685adbda8411863d34479d087278aaff 100644
>--- a/Source/WebKit/chromium/public/WebSecurityPolicy.h
>+++ b/Source/WebKit/chromium/public/WebSecurityPolicy.h
>@@ -31,8 +31,8 @@
> #ifndef WebSecurityPolicy_h
> #define WebSecurityPolicy_h
> 
>-#include "WebReferrerPolicy.h"
> #include "platform/WebCommon.h"
>+#include "platform/WebReferrerPolicy.h"
> 
> namespace WebKit {
> 
>diff --git a/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h b/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..194c453741d176744f1fcc85b5e17e6b5d6ea927
>--- /dev/null
>+++ b/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h
>@@ -0,0 +1,31 @@
>+/*
>+ * Copyright (C) 2012 Google 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:
>+ *
>+ *     * Redistributions of source code must retain the above copyright
>+ * notice, this list of conditions and the following disclaimer.
>+ *     * 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.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
>+ * OWNER OR 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 "../../../../Platform/chromium/public/WebReferrerPolicy.h"
>diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
>index 938e18bc5841d32765a532a0c612292aaef6d9bd..f1fb229ee53ecd078daa1e6a73a2abc82312cfcc 100644
>--- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
>+++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
>@@ -90,7 +90,6 @@
> #include "WebMediaPlayerClient.h"
> #include "WebNotificationPresenter.h"
> #include "WebPageVisibilityState.h"
>-#include "WebReferrerPolicy.h"
> #include "WebScrollbar.h"
> #include "WebSettings.h"
> #include "WebStorageQuotaError.h"
>@@ -107,6 +106,7 @@
> #include "platform/WebPeerConnection00Handler.h"
> #include "platform/WebPeerConnection00HandlerClient.h"
> #include <public/WebFilterOperation.h>
>+#include <public/WebReferrerPolicy.h>
> #include <wtf/Assertions.h>
> #include <wtf/text/StringImpl.h>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 84539: 138251 | 138272