Title: [193775] tags/Safari-602.1.13.2/Source/WebKit/mac
- Revision
- 193775
- Author
- bshaf...@apple.com
- Date
- 2015-12-08 13:02:15 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r193675. rdar://problem/23639610
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog (193774 => 193775)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-08 21:00:53 UTC (rev 193774)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-08 21:02:15 UTC (rev 193775)
@@ -1,5 +1,17 @@
2015-12-08 Babak Shafiei <bshaf...@apple.com>
+ Merge r193675.
+
+ 2015-12-07 Alex Christensen <achristen...@webkit.org>
+
+ Build fix after r193661.
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebViewData.h:
+
+2015-12-08 Babak Shafiei <bshaf...@apple.com>
+
Merge r193661.
2015-12-07 Beth Dakin <bda...@apple.com>
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h (193774 => 193775)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-08 21:00:53 UTC (rev 193774)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-08 21:02:15 UTC (rev 193775)
@@ -97,6 +97,10 @@
class WebSelectionServiceController;
#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#import <WebKitAdditions/WebViewDataAdditionsDeclarations.h>
+#endif
+
class WebViewLayerFlushScheduler : public WebCore::LayerFlushScheduler {
public:
WebViewLayerFlushScheduler(LayerFlushController*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
