Title: [211707] branches/safari-603-branch/Source/WebKit2
- Revision
- 211707
- Author
- matthew_han...@apple.com
- Date
- 2017-02-05 22:17:22 -0800 (Sun, 05 Feb 2017)
Log Message
Merge r211626. rdar://problem/26685576
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211706 => 211707)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 06:17:20 UTC (rev 211706)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 06:17:22 UTC (rev 211707)
@@ -1,5 +1,18 @@
2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211626. rdar://problem/26685576
+
+ 2017-02-03 Csaba Osztrogonác <o...@webkit.org>
+
+ [Mac][cmake] Unreviewed speculative buildfix after r211403.
+ https://bugs.webkit.org/show_bug.cgi?id=165478
+
+ * UIProcess/API/Cocoa/WKWebView.mm: WebBackgroundTaskController.h is an iOS specific
+ header in platform/ios directory which shouldn't and can't be included on non iOS build.
+
+
+2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211551. rdar://problem/26685576
2017-02-02 Yongjun Zhang <yongjun_zh...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211706 => 211707)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-06 06:17:20 UTC (rev 211706)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-06 06:17:22 UTC (rev 211707)
@@ -96,7 +96,6 @@
#import <WebCore/Settings.h>
#import <WebCore/TextStream.h>
#import <WebCore/ValidationBubble.h>
-#import <WebCore/WebBackgroundTaskController.h>
#import <WebCore/WebSQLiteDatabaseTrackerClient.h>
#import <WebCore/WritingMode.h>
#import <wtf/HashMap.h>
@@ -124,6 +123,7 @@
#import <WebCore/InspectorOverlay.h>
#import <WebCore/QuartzCoreSPI.h>
#import <WebCore/ScrollableArea.h>
+#import <WebCore/WebBackgroundTaskController.h>
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
#if __has_include(<AccessibilitySupport.h>)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
