Title: [238856] tags/Safari-607.1.16/Source/WebKit
- Revision
- 238856
- Author
- kocsen_ch...@apple.com
- Date
- 2018-12-04 09:38:03 -0800 (Tue, 04 Dec 2018)
Log Message
Revert r238852. rdar://problem/46427844
Modified Paths
Diff
Modified: tags/Safari-607.1.16/Source/WebKit/ChangeLog (238855 => 238856)
--- tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 17:17:19 UTC (rev 238855)
+++ tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 17:38:03 UTC (rev 238856)
@@ -1,5 +1,9 @@
2018-12-04 Kocsen Chung <kocsen_ch...@apple.com>
+ Revert r238852. rdar://problem/46427844
+
+2018-12-04 Kocsen Chung <kocsen_ch...@apple.com>
+
Cherry-pick r238849. rdar://problem/46427844
Fix the watchOS build; stop unnecessarily linking CorePDF
Modified: tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig (238855 => 238856)
--- tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 17:17:19 UTC (rev 238855)
+++ tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 17:38:03 UTC (rev 238856)
@@ -53,9 +53,8 @@
WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME));
WK_CARBON_LDFLAGS_macosx = -framework Carbon;
-WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_CORE_PDF_LDFLAGS_iphoneos = -framework CorePDF;
-WK_CORE_PDF_LDFLAGS_iphonesimulator = -framework CorePDF;
+WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_COCOA_TOUCH));
+WK_CORE_PDF_LDFLAGS_cocoatouch = -framework CorePDF;
WK_CORE_PREDICTION_LDFLAGS = $(WK_CORE_PREDICTION_LDFLAGS_$(WK_HAVE_CORE_PREDICTION));
WK_CORE_PREDICTION_LDFLAGS_YES = $(WK_MACOS_WEAK_FRAMEWORK) CorePrediction;
Modified: tags/Safari-607.1.16/Source/WebKit/Platform/spi/ios/CorePDFSPI.h (238855 => 238856)
--- tags/Safari-607.1.16/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 17:17:19 UTC (rev 238855)
+++ tags/Safari-607.1.16/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 17:38:03 UTC (rev 238856)
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
-
#import <CoreGraphics/CoreGraphics.h>
#import <UIKit/UIKit.h>
@@ -141,5 +139,3 @@
@end
#endif
-
-#endif // ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
