Title: [238849] trunk/Source/WebKit
- Revision
- 238849
- Author
- timothy_hor...@apple.com
- Date
- 2018-12-04 01:00:54 -0800 (Tue, 04 Dec 2018)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (238848 => 238849)
--- trunk/Source/WebKit/ChangeLog 2018-12-04 08:34:44 UTC (rev 238848)
+++ trunk/Source/WebKit/ChangeLog 2018-12-04 09:00:54 UTC (rev 238849)
@@ -1,3 +1,14 @@
+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 Tim Horton <timothy_hor...@apple.com>
Make it possible to disable animated keyboard scrolling behavior
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (238848 => 238849)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 08:34:44 UTC (rev 238848)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-12-04 09:00:54 UTC (rev 238849)
@@ -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: trunk/Source/WebKit/Platform/spi/ios/CorePDFSPI.h (238848 => 238849)
--- trunk/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 08:34:44 UTC (rev 238848)
+++ trunk/Source/WebKit/Platform/spi/ios/CorePDFSPI.h 2018-12-04 09:00:54 UTC (rev 238849)
@@ -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
