Diff
Modified: trunk/Source/Platform/ChangeLog (115199 => 115200)
--- trunk/Source/Platform/ChangeLog 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/Platform/ChangeLog 2012-04-25 14:02:08 UTC (rev 115200)
@@ -1,3 +1,14 @@
+2012-04-25 Gavin Peters <gav...@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-24 Yuzhu Shen <yzs...@chromium.org>
[chromium] Add a description field in WebURLError and show failure description in the inspector network tab.
Modified: trunk/Source/Platform/Platform.gypi (115199 => 115200)
--- trunk/Source/Platform/Platform.gypi 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/Platform/Platform.gypi 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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',
Copied: trunk/Source/Platform/chromium/public/WebReferrerPolicy.h (from rev 115199, trunk/Source/WebKit/chromium/public/WebReferrerPolicy.h) (0 => 115200)
--- trunk/Source/Platform/chromium/public/WebReferrerPolicy.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebReferrerPolicy.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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
Modified: trunk/Source/WebKit/chromium/ChangeLog (115199 => 115200)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-25 14:02:08 UTC (rev 115200)
@@ -1,3 +1,18 @@
+2012-04-25 Gavin Peters <gav...@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-24 Dana Jansens <dan...@chromium.org>
[chromium] Unbounded draws should use clip to limit their damage to opaque tracking
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (115199 => 115200)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-04-25 14:02:08 UTC (rev 115200)
@@ -327,6 +327,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',
Modified: trunk/Source/WebKit/chromium/public/WebContextMenuData.h (115199 => 115200)
--- trunk/Source/WebKit/chromium/public/WebContextMenuData.h 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/public/WebContextMenuData.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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"
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (115199 => 115200)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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;
Modified: trunk/Source/WebKit/chromium/public/WebReferrerPolicy.h (115199 => 115200)
--- trunk/Source/WebKit/chromium/public/WebReferrerPolicy.h 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/public/WebReferrerPolicy.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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"
Modified: trunk/Source/WebKit/chromium/public/WebSecurityPolicy.h (115199 => 115200)
--- trunk/Source/WebKit/chromium/public/WebSecurityPolicy.h 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/public/WebSecurityPolicy.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -31,8 +31,8 @@
#ifndef WebSecurityPolicy_h
#define WebSecurityPolicy_h
-#include "WebReferrerPolicy.h"
#include "platform/WebCommon.h"
+#include "platform/WebReferrerPolicy.h"
namespace WebKit {
Copied: trunk/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h (from rev 115199, trunk/Source/WebKit/chromium/public/WebReferrerPolicy.h) (0 => 115200)
--- trunk/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/platform/WebReferrerPolicy.h 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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"
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (115199 => 115200)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-04-25 13:59:20 UTC (rev 115199)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-04-25 14:02:08 UTC (rev 115200)
@@ -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>
