Attachment 339435 Details for Bug 185251 – Fix OpenSource iOS build

[patch] Fix OpenSource iOS build

bug-185251-20180503120716.patch (text/plain), 5.10 KB, created by Wenson Hsieh on 2018-05-03 12:07:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-05-03 12:07:17 PDT

Size: 5.10 KB

patch

obsolete

>Subversion Revision: 231220
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 881b164c933eb2ad221e365a7e5aac9cf346a5f7..8bbe979f8fb9489380ee87baf3186557fcf14ea3 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-03  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Ads in NYTimes app are shifted downwards by the scroll view's top content inset
>+        https://bugs.webkit.org/show_bug.cgi?id=185251
>+        <rdar://problem/39062357>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a new DYLD_IOS_VERSION macro definition for previous or non-internal SDKs.
>+
>+        * wtf/spi/darwin/dyldSPI.h:
>+
> 2018-05-01  Robin Morisset  <rmorisset@apple.com>
> 
>         Correctly detect string overflow when using the 'Function' constructor
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5854d6db9669d574ed21d9d1612cd72dc51e2587..e1693692d9ba83be5a5c66733c108cd167fe580b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-05-03  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Ads in NYTimes app are shifted downwards by the scroll view's top content inset
>+        https://bugs.webkit.org/show_bug.cgi?id=185251
>+        <rdar://problem/39062357>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The NYTimes app embeds advertisements in each article's WKWebView by adding views in the WKScrollView's view
>+        hierarchy. These views are positioned using the bounding client rects of elements in the DOM (via Element
>+        ::getBoundingClientRect). Prior to r229641, WebKit would report bounding client rects inset by the content
>+        insets of WKScrollView, which means that if a top content inset X is specified on the scroll view, an element
>+        that is flush against the top of the viewport will have a bounding client rect top of -X (when it should really
>+        be 0).
>+
>+        To account for this, NYTimes adds the scroll view content insets back to the bounding client rect when
>+        determining the position of each advertisement which, after r229641, causes these views to be shifted downwards
>+        by an amount equal to the scroll view content inset top.
>+
>+        This new behavior does not affect Safari, since Safari uses SPI to explicitly set obscured insets. As such, we
>+        address this by gating the scroll view content inset fix with a linked-on-or-after check.
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _computedObscuredInset]):
>+        * UIProcess/Cocoa/VersionChecks.h:
>+
> 2018-05-01  Jer Noble  <jer.noble@apple.com>
> 
>         Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
>diff --git a/Source/WTF/wtf/spi/darwin/dyldSPI.h b/Source/WTF/wtf/spi/darwin/dyldSPI.h
>index 56efeffe0f1cacb0276fb1ec8f87e0935b3035e8..4506098a2bdcca257a0e171a068f1d80322b6b34 100644
>--- a/Source/WTF/wtf/spi/darwin/dyldSPI.h
>+++ b/Source/WTF/wtf/spi/darwin/dyldSPI.h
>@@ -37,6 +37,10 @@
> #define DYLD_IOS_VERSION_11_3 0x000B0300
> #endif
> 
>+#ifndef DYLD_IOS_VERSION_12_0
>+#define DYLD_IOS_VERSION_12_0 0x000C0000
>+#endif
>+
> #ifndef DYLD_MACOSX_VERSION_10_13
> #define DYLD_MACOSX_VERSION_10_13 0x000A0D00
> #endif
>@@ -52,6 +56,7 @@
> #define DYLD_IOS_VERSION_10_0 0x000A0000
> #define DYLD_IOS_VERSION_11_0 0x000B0000
> #define DYLD_IOS_VERSION_11_3 0x000B0300
>+#define DYLD_IOS_VERSION_12_0 0x000C0000
> 
> #define DYLD_MACOSX_VERSION_10_11 0x000A0B00
> #define DYLD_MACOSX_VERSION_10_12 0x000A0C00
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index b443524c2dc2b238a9c66f0dbc97ed99b9fed937..f44a41d8b6a2c6de0bdcd21586a8f5ceb411e7c7 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -1616,6 +1616,12 @@ - (UIRectEdge)_effectiveObscuredInsetEdgesAffectedBySafeArea
> 
> - (UIEdgeInsets)_computedObscuredInset
> {
>+    if (!linkedOnOrAfter(WebKit::SDKVersion::FirstWhereScrollViewContentInsetsAreNotObscuringInsets)) {
>+        // For binary compability with third party apps, treat scroll view content insets as obscuring insets when the app is compiled
>+        // against a WebKit version without the fix in r229641.
>+        return [self _computedContentInset];
>+    }
>+
>     if (_haveSetObscuredInsets)
>         return _obscuredInsets;
> 
>diff --git a/Source/WebKit/UIProcess/Cocoa/VersionChecks.h b/Source/WebKit/UIProcess/Cocoa/VersionChecks.h
>index efa415549a47487f2edcce1f3f1ff29ffbcddc82..f248c5fda4427566fbc7a589d43753813c094573 100644
>--- a/Source/WebKit/UIProcess/Cocoa/VersionChecks.h
>+++ b/Source/WebKit/UIProcess/Cocoa/VersionChecks.h
>@@ -38,6 +38,7 @@ enum class SDKVersion : uint32_t {
>     FirstWithExpiredOnlyReloadBehavior = DYLD_IOS_VERSION_11_0,
>     FirstThatDisallowsSettingAnyXHRHeaderFromFileURLs = DYLD_IOS_VERSION_11_3,
>     FirstThatDefaultsToPassiveTouchListenersOnDocument = DYLD_IOS_VERSION_11_3,
>+    FirstWhereScrollViewContentInsetsAreNotObscuringInsets = DYLD_IOS_VERSION_12_0
> #elif PLATFORM(MAC)
>     FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
>     FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185251: 339412 | 339435 | 339443