<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159831] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159831">159831</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-11-27 19:14:43 -0800 (Wed, 27 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the iOS build.
../WebKit:
* WebKit.xcodeproj/project.pbxproj:
../WebKit/mac:
* WebView/WebAllowDenyPolicyListener.h: Added.
* WebView/WebUIDelegatePrivate.h:
Move the WebAllowDenyPolicyListener protocol to its own file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebViewWebAllowDenyPolicyListenerh">trunk/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (159830 => 159831)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2013-11-27 Sam Weinig <sam@webkit.org>
+
+ Fix the iOS build.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-11-25 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] WebKit version in user agent string is incorrect.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (159830 => 159831)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> 7C01CB86173435C900C5D807 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */; };
</span><span class="cx"> 7C01CB87173435C900C5D807 /* SearchPopupMenuMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C01CB83173435C900C5D807 /* SearchPopupMenuMac.h */; };
</span><span class="cx"> 7C01CB88173435C900C5D807 /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */; };
</span><ins>+ 7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.mm */; };
</span><span class="cx"> 9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9304B2FF0B02341500F7850D /* WebIconDatabaseInternal.h */; };
</span><span class="lines">@@ -647,6 +648,7 @@
</span><span class="cx"> 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopupMenuMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7C01CB83173435C900C5D807 /* SearchPopupMenuMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPopupMenuMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchPopupMenuMac.mm; sourceTree = "<group>"; };
</span><ins>+ 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAllowDenyPolicyListener.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptDebugDelegate.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 830E81E005853AC000AD0891 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
</span><span class="lines">@@ -1390,6 +1392,7 @@
</span><span class="cx"> F834AAD60E64B1C700E2737C /* WebTextIterator.mm */,
</span><span class="cx"> 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */,
</span><span class="cx"> 65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */,
</span><ins>+ 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */,
</ins><span class="cx"> 51A8B579042834F700CA2D3A /* WebView.h */,
</span><span class="cx"> 51A8B57A042834F700CA2D3A /* WebView.mm */,
</span><span class="cx"> BC2E464B0FD8A96800A9D9DE /* WebViewData.h */,
</span><span class="lines">@@ -1909,6 +1912,7 @@
</span><span class="cx"> 939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */,
</span><span class="cx"> 939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */,
</span><span class="cx"> 939810370824BF01008DF038 /* WebPluginController.h in Headers */,
</span><ins>+ 7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */,
</ins><span class="cx"> 939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */,
</span><span class="cx"> 939810390824BF01008DF038 /* WebPluginPackage.h in Headers */,
</span><span class="cx"> 225F881509F97E8A00423A40 /* WebPluginPrivate.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (159830 => 159831)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2013-11-27 Sam Weinig <sam@webkit.org>
+
+ Fix the iOS build.
+
+ * WebView/WebAllowDenyPolicyListener.h: Added.
+ * WebView/WebUIDelegatePrivate.h:
+ Move the WebAllowDenyPolicyListener protocol to its own file.
+
</ins><span class="cx"> 2013-11-21 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/124702> Stop overriding VALID_ARCHS.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebAllowDenyPolicyListenerh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h (0 => 159831)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (159830 => 159831)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <WebKit/WebAllowDenyPolicyListener.h>
</ins><span class="cx"> #import <WebKit/WebUIDelegate.h>
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="lines">@@ -125,11 +126,6 @@
</span><span class="cx"> @class DOMNode;
</span><span class="cx"> @class WebSecurityOrigin;
</span><span class="cx">
</span><del>-@protocol WebAllowDenyPolicyListener <NSObject>
-- (void)allow;
-- (void)deny;
-@end
-
</del><span class="cx"> #if ENABLE_FULLSCREEN_API
</span><span class="cx"> @protocol WebKitFullScreenListener<NSObject>
</span><span class="cx"> - (void)webkitWillEnterFullScreen;
</span></span></pre>
</div>
</div>
</body>
</html>