Attachment 370825 Details for Bug 198244 – WIP3

[patch] WIP3

gmail-scroll-inset-fix.patch (text/plain), 3.33 KB, created by Ryosuke Niwa on 2019-05-28 19:57:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2019-05-28 19:57:25 PDT

Size: 3.33 KB

patch

obsolete

>diff --git a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>index 12f351a2155..fb5b3ec4912 100644
>--- a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>@@ -31,6 +31,8 @@ WTF_EXTERN_C_END
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>+#define UIIMAGE_SYMBOLS_SPI_VERSION UIIMAGE_SYMBOLS_SPI_VERSION_DEPRECATED
>+
> #import <UIKit/NSParagraphStyle_Private.h>
> #import <UIKit/NSTextAttachment_Private.h>
> #import <UIKit/NSTextList.h>
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index fabe18a70ce..d63fa55597b 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -27,6 +27,8 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>+#define UIIMAGE_SYMBOLS_SPI_VERSION UIIMAGE_SYMBOLS_SPI_VERSION_DEPRECATED
>+
> #import <UIKit/UIAlertController_Private.h>
> #import <UIKit/UIApplication_Private.h>
> #import <UIKit/UIBarButtonItem_Private.h>
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index f6a7865db73..cf7a48be50f 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -1988,7 +1988,9 @@ - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTree
>     [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
>     [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
> #if ENABLE(ASYNC_SCROLLING)
>-    [_scrollView setScrollEnabled:_page->scrollingCoordinatorProxy()->hasScrollableMainFrame()];
>+    UIEdgeInsets insets = [[self scrollView] adjustedContentInset];
>+    bool hasContentInset = insets.left || insets.right || insets.top || insets.bottom;
>+    [_scrollView setScrollEnabled:_page->scrollingCoordinatorProxy()->hasScrollableMainFrame() || hasContentInset];
> #endif
>     if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom] && [_scrollView zoomScale] != layerTreeTransaction.pageScaleFactor()) {
>         LOG_WITH_STREAM(VisibleRects, stream << " updating scroll view with pageScaleFactor " << layerTreeTransaction.pageScaleFactor());
>diff --git a/Source/WebKit/UIProcess/WKImagePreviewViewController.mm b/Source/WebKit/UIProcess/WKImagePreviewViewController.mm
>index 79383d2a76b..08acff2aa57 100644
>--- a/Source/WebKit/UIProcess/WKImagePreviewViewController.mm
>+++ b/Source/WebKit/UIProcess/WKImagePreviewViewController.mm
>@@ -103,7 +103,9 @@ static CGSize _scaleSizeWithinSize(CGSize source, CGSize destination)
> }
> 
> #if HAVE(LINK_PREVIEW)
>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
> - (NSArray<UIPreviewAction *> *)previewActionItems
>+IGNORE_WARNINGS_END
> {
>     NSMutableArray<UIPreviewAction *> *previewActions = [NSMutableArray array];
>     for (_WKElementAction *imageAction in _imageActions.get()) {
>diff --git a/Tools/TestWebKitAPI/ios/UIKitSPI.h b/Tools/TestWebKitAPI/ios/UIKitSPI.h
>index 3fa668437d2..ed63468e41b 100644
>--- a/Tools/TestWebKitAPI/ios/UIKitSPI.h
>+++ b/Tools/TestWebKitAPI/ios/UIKitSPI.h
>@@ -29,6 +29,8 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>+#define UIIMAGE_SYMBOLS_SPI_VERSION UIIMAGE_SYMBOLS_SPI_VERSION_DEPRECATED
>+
> #import <UIKit/UIApplication_Private.h>
> #import <UIKit/UIBarButtonItemGroup_Private.h>
> #import <UIKit/UICalloutBar.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 198244: 370624 | 370625 | 370628 | 370629 | 370631 | 370632 | 370825 | 370826 | 371000 | 371024 | 371032