Title: [160339] tags/Safari-538.8.1/Source/WebKit/mac
- Revision
- 160339
- Author
- lforsch...@apple.com
- Date
- 2013-12-09 15:48:59 -0800 (Mon, 09 Dec 2013)
Log Message
Merge 160326 for <rdar://problem/15615561>.
Modified Paths
Diff
Modified: tags/Safari-538.8.1/Source/WebKit/mac/ChangeLog (160338 => 160339)
--- tags/Safari-538.8.1/Source/WebKit/mac/ChangeLog 2013-12-09 23:45:03 UTC (rev 160338)
+++ tags/Safari-538.8.1/Source/WebKit/mac/ChangeLog 2013-12-09 23:48:59 UTC (rev 160339)
@@ -1,3 +1,16 @@
+2013-12-09 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r160326
+
+ 2013-12-09 Sam Weinig <s...@webkit.org>
+
+ Fix the build of projects including <WebKit/WebUIDelegatePrivate.h>
+
+ Rubber-stamped by Dan Bernstein.
+
+ * WebView/WebAllowDenyPolicyListener.h:
+ Use TARGET_OS_IPHONE rather than PLATFORM(IOS) in an exposed header.
+
2013-12-04 Andy Estes <aes...@apple.com>
[iOS] Build projects with $(ARCHS_STANDARD_32_64_BIT)
Modified: tags/Safari-538.8.1/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h (160338 => 160339)
--- tags/Safari-538.8.1/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h 2013-12-09 23:45:03 UTC (rev 160338)
+++ tags/Safari-538.8.1/Source/WebKit/mac/WebView/WebAllowDenyPolicyListener.h 2013-12-09 23:48:59 UTC (rev 160339)
@@ -28,7 +28,8 @@
@protocol WebAllowDenyPolicyListener <NSObject>
- (void)allow;
- (void)deny;
-#if PLATFORM(IOS)
+
+#if TARGET_OS_IPHONE
- (void)denyOnlyThisRequest;
- (BOOL)shouldClearCache;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
