Attachment 356475 Details for Bug 192356 – Patch

[patch] Patch

bug-192356-20181203235332.patch (text/plain), 2.24 KB, created by Tim Horton on 2018-12-03 23:53:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-12-03 23:53:32 PST

Size: 2.24 KB

patch

obsolete

>Subversion Revision: 238845
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b9c03493004af1babf4cbcb2d795ee6960021f97..d48715160158e625cfc4e122c58dfccc4fb81ea1 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-03  Tim Horton  <timothy_horton@apple.com>
>+
>+        Fix the watchOS build; stop unnecessarily linking CorePDF
>+        https://bugs.webkit.org/show_bug.cgi?id=192356
>+        <rdar://problem/46427844>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebKit.xcconfig:
>+        * Platform/spi/ios/CorePDFSPI.h:
>+
> 2018-12-03  Tim Horton  <timothy_horton@apple.com>
> 
>         Make it possible to disable animated keyboard scrolling behavior
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index 6bb8c4f9ab17966a93b593ec23023c89b1aa42d6..c7f1a6a7e6cbbbb07139642a0e496f947e07ef47 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -53,8 +53,9 @@ WK_ASSERTION_SERVICES_LDFLAGS_cocoatouch = -framework AssertionServices;
> 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;
>diff --git a/Source/WebKit/Platform/spi/ios/CorePDFSPI.h b/Source/WebKit/Platform/spi/ios/CorePDFSPI.h
>index 47e680fff037f343438dc125d9cb3d8377bd0fb1..465d663c554b8f7a653bb570c82868d3ae7aa931 100644
>--- a/Source/WebKit/Platform/spi/ios/CorePDFSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/CorePDFSPI.h
>@@ -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 @@ typedef enum {
> @end
> 
> #endif
>+
>+#endif // ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)

Actions: View | Formatted Diff | Diff

Attachments on bug 192356: 356475