Title: [193852] tags/Safari-602.1.13.2/Source/WebKit/mac
- Revision
- 193852
- Author
- bshaf...@apple.com
- Date
- 2015-12-09 11:58:50 -0800 (Wed, 09 Dec 2015)
Log Message
Merged r193676. rdar://problem/23639610
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog (193851 => 193852)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-09 19:58:28 UTC (rev 193851)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-09 19:58:50 UTC (rev 193852)
@@ -1,5 +1,15 @@
2015-12-09 Babak Shafiei <bshaf...@apple.com>
+ Merge r193676.
+
+ 2015-12-07 Alex Christensen <achristen...@webkit.org>
+
+ Build fix after r193675.
+
+ * WebView/WebViewData.h:
+
+2015-12-09 Babak Shafiei <bshaf...@apple.com>
+
Merge r193675.
2015-12-07 Alex Christensen <achristen...@webkit.org>
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h (193851 => 193852)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-09 19:58:28 UTC (rev 193851)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-09 19:58:50 UTC (rev 193852)
@@ -97,7 +97,7 @@
class WebSelectionServiceController;
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebViewDataAdditionsDeclarations.h>
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
