Diff
Modified: trunk/Source/WebKit/ChangeLog (159830 => 159831)
--- trunk/Source/WebKit/ChangeLog 2013-11-28 02:25:46 UTC (rev 159830)
+++ trunk/Source/WebKit/ChangeLog 2013-11-28 03:14:43 UTC (rev 159831)
@@ -1,3 +1,9 @@
+2013-11-27 Sam Weinig <s...@webkit.org>
+
+ Fix the iOS build.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2013-11-25 pe...@outlook.com <pe...@outlook.com>
[Win] WebKit version in user agent string is incorrect.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (159830 => 159831)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-11-28 02:25:46 UTC (rev 159830)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-11-28 03:14:43 UTC (rev 159831)
@@ -138,6 +138,7 @@
7C01CB86173435C900C5D807 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */; };
7C01CB87173435C900C5D807 /* SearchPopupMenuMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C01CB83173435C900C5D807 /* SearchPopupMenuMac.h */; };
7C01CB88173435C900C5D807 /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */; };
+ 7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.mm */; };
9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9304B2FF0B02341500F7850D /* WebIconDatabaseInternal.h */; };
@@ -647,6 +648,7 @@
7C01CB82173435C900C5D807 /* PopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopupMenuMac.mm; sourceTree = "<group>"; };
7C01CB83173435C900C5D807 /* SearchPopupMenuMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPopupMenuMac.h; sourceTree = "<group>"; };
7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchPopupMenuMac.mm; sourceTree = "<group>"; };
+ 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAllowDenyPolicyListener.h; sourceTree = "<group>"; };
7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptDebugDelegate.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
830E81E005853AC000AD0891 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
@@ -1390,6 +1392,7 @@
F834AAD60E64B1C700E2737C /* WebTextIterator.mm */,
515E27CC0458C86500CA2D3A /* WebUIDelegate.h */,
65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */,
+ 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */,
51A8B579042834F700CA2D3A /* WebView.h */,
51A8B57A042834F700CA2D3A /* WebView.mm */,
BC2E464B0FD8A96800A9D9DE /* WebViewData.h */,
@@ -1909,6 +1912,7 @@
939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */,
939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */,
939810370824BF01008DF038 /* WebPluginController.h in Headers */,
+ 7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */,
939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */,
939810390824BF01008DF038 /* WebPluginPackage.h in Headers */,
225F881509F97E8A00423A40 /* WebPluginPrivate.h in Headers */,
Modified: trunk/Source/WebKit/mac/ChangeLog (159830 => 159831)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-28 02:25:46 UTC (rev 159830)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-28 03:14:43 UTC (rev 159831)
@@ -1,3 +1,11 @@
+2013-11-27 Sam Weinig <s...@webkit.org>
+
+ Fix the iOS build.
+
+ * WebView/WebAllowDenyPolicyListener.h: Added.
+ * WebView/WebUIDelegatePrivate.h:
+ Move the WebAllowDenyPolicyListener protocol to its own file.
+
2013-11-21 Mark Rowe <mr...@apple.com>
<https://webkit.org/b/124702> Stop overriding VALID_ARCHS.
Added: trunk/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h (0 => 159831)
--- trunk/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h (rev 0)
+++ trunk/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h 2013-11-28 03:14:43 UTC (rev 159831)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol WebAllowDenyPolicyListener <NSObject>
+- (void)allow;
+- (void)deny;
+#if PLATFORM(IOS)
+- (void)denyOnlyThisRequest;
+- (BOOL)shouldClearCache;
+#endif
+@end
Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (159830 => 159831)
--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2013-11-28 02:25:46 UTC (rev 159830)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2013-11-28 03:14:43 UTC (rev 159831)
@@ -26,6 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <WebKit/WebAllowDenyPolicyListener.h>
#import <WebKit/WebUIDelegate.h>
#if !defined(ENABLE_DASHBOARD_SUPPORT)
@@ -125,11 +126,6 @@
@class DOMNode;
@class WebSecurityOrigin;
-@protocol WebAllowDenyPolicyListener <NSObject>
-- (void)allow;
-- (void)deny;
-@end
-
#if ENABLE_FULLSCREEN_API
@protocol WebKitFullScreenListener<NSObject>
- (void)webkitWillEnterFullScreen;
