Title: [238852] tags/Safari-607.1.16/Source/WebKit
- Revision
- 238852
- Author
- kocsen_ch...@apple.com
- Date
- 2018-12-04 08:01:58 -0800 (Tue, 04 Dec 2018)
Log Message
Cherry-pick r238849. rdar://problem/46427844
Fix the watchOS build; stop unnecessarily linking CorePDF
https://bugs.webkit.org/show_bug.cgi?id=192356
<rdar://problem/46427844>
Reviewed by Wenson Hsieh.
* Configurations/WebKit.xcconfig:
* Platform/spi/ios/CorePDFSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.16/Source/WebKit/ChangeLog (238851 => 238852)
--- tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 11:01:17 UTC (rev 238851)
+++ tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 16:01:58 UTC (rev 238852)
@@ -1,3 +1,30 @@
+2018-12-04 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Cherry-pick r238849. rdar://problem/46427844
+
+ Fix the watchOS build; stop unnecessarily linking CorePDF
+ https://bugs.webkit.org/show_bug.cgi?id=192356
+ <rdar://problem/46427844>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/WebKit.xcconfig:
+ * Platform/spi/ios/CorePDFSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-12-04 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the watchOS build; stop unnecessarily linking CorePDF
+ https://bugs.webkit.org/show_bug.cgi?id=192356
+ <rdar://problem/46427844>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/WebKit.xcconfig:
+ * Platform/spi/ios/CorePDFSPI.h:
+
2018-12-03 Alan Coon <alanc...@apple.com>
Cherry-pick r238817. rdar://problem/46377552
Modified: tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig (238851 => 238852)
--- tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 11:01:17 UTC (rev 238851)
+++ tags/Safari-607.1.16/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 16:01:58 UTC (rev 238852)
@@ -53,8 +53,9 @@
WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME));
WK_CARBON_LDFLAGS_macosx = -framework Carbon;
-WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_COCOA_TOUCH));
-WK_CORE_PDF_LDFLAGS_cocoatouch = -framework CorePDF;
+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_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 (238851 => 238852)
--- tags/Safari-607.1.16/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 11:01:17 UTC (rev 238851)
+++ tags/Safari-607.1.16/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 16:01:58 UTC (rev 238852)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
+
#import <CoreGraphics/CoreGraphics.h>
#import <UIKit/UIKit.h>
@@ -139,3 +141,5 @@
@end
#endif
+
+#endif // ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
