Attachment 360466 Details for Bug 193942 – Patch

[patch] Patch

bug-193942-20190129093135.patch (text/plain), 3.73 KB, created by Timothy Hatcher on 2019-01-29 09:31:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-01-29 09:31:36 PST

Size: 3.73 KB

patch

obsolete

>Subversion Revision: 240257
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index fdfa234e85ee9a26a6dc87473d0e08359405ee36..133b196b39fbe0bcd4c1169ce57ad3c2995381f9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-28  Timothy Hatcher  <timothy@apple.com>
>+
>+        Add back some includes that got removed at some point.
>+        https://bugs.webkit.org/show_bug.cgi?id=193942
>+
>+        Reviewed by Tim Horton.
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
>+        * UIProcess/ios/PageClientImplIOS.h:
>+        * UIProcess/ios/PageClientImplIOS.mm:
>+
> 2019-01-22  Oriol Brufau  <obrufau@igalia.com>
> 
>         [css-logical] Implement flow-relative margin, padding and border shorthands
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 5f754aa55f86d401cd76bee65cd954ddd761f876..0137e6a2c6269d1bdd2a9fcd139862b68e059dce 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -477,6 +477,10 @@ - (BOOL)_isRetainingActiveFocusedState
> 
> #endif
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/WKWebViewInternalAdditions.mm>
>+#endif
>+
> static bool shouldRequireUserGestureToLoadVideo()
> {
> #if PLATFORM(IOS_FAMILY)
>@@ -7013,6 +7017,10 @@ - (void)_simulateTextEntered:(NSString *)text
> 
> #endif // PLATFORM(IOS_FAMILY)
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/WKWebViewAdditions.mm>
>+#endif
>+
> - (BOOL)_beginBackSwipeForTesting
> {
> #if PLATFORM(MAC)
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>index bec1522dfd026bbfb3f77e127b873c2ba0135c22..af16fc38be38409c13bdda2117f6e13d362c72a8 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>@@ -170,6 +170,10 @@ struct PrintInfo;
> @property (nonatomic, readonly, getter=_isRetainingActiveFocusedState) BOOL _retainingActiveFocusedState;
> #endif
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/WKWebViewInternalAdditions.h>
>+#endif
>+
> #if ENABLE(ACCESSIBILITY_EVENTS)
> - (void)_updateAccessibilityEventsEnabled;
> #endif
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>index 68e54dbf534a80ff693d897b71fadbf1315605d4..afc713b5702ec6dd5fdf348a71b172046509b610 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -137,6 +137,10 @@ private:
>         
>     void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) override;
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/PageClientImplIOSAdditions.h>
>+#endif
>+
>     void couldNotRestorePageState() override;
>     void restorePageState(Optional<WebCore::FloatPoint>, const WebCore::FloatPoint&, const WebCore::FloatBoxExtent&, double) override;
>     void restorePageCenterAndScale(Optional<WebCore::FloatPoint>, double) override;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>index 71ea6b8ffe7bbad929d680a4e853f01d0c8c3de1..61253d90f47a1139f3c1c278c7cd91232a28ca72 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -463,6 +463,10 @@ void PageClientImpl::didPerformDictionaryLookup(const DictionaryPopupInfo& dicti
> #endif // ENABLE(REVEAL)
> }
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/PageClientImplIOSAdditions.mm>
>+#endif
>+
> void PageClientImpl::setRemoteLayerTreeRootNode(RemoteLayerTreeNode* rootNode)
> {
>     [m_contentView _setAcceleratedCompositingRootView:rootNode ? rootNode->uiView() : nil];

Actions: View | Formatted Diff | Diff

Attachments on bug 193942: 360407 | 360466