Attachment 360442 Details for Bug 193958 – ROLLOUT of r240630

[patch] ROLLOUT of r240630

bug-193958-20190128225552.patch (text/plain), 3.81 KB, created by WebKit Commit Bot on 2019-01-28 22:55:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-01-28 22:55:52 PST

Size: 3.81 KB

patch

obsolete

>Subversion Revision: 240644
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 0941bf0b871dcb142f4ffa721ce6a3cda7a69830..fb4784c9244b08c18e34e33f94574f51c988f1a6 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-28  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r240630.
>+        https://bugs.webkit.org/show_bug.cgi?id=193958
>+
>+        Broke Apple internal builds (Requested by rniwa on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Add back some includes that got removed at some point."
>+        https://bugs.webkit.org/show_bug.cgi?id=193942
>+        https://trac.webkit.org/changeset/240630
>+
> 2019-01-28  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide a way to edit page WebRTC settings on a remote target
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 878e3e2f35bf9333c87f0db7793434f59f102023..bcb3a2ca404a32334101cf25f8f47adb3af25a0d 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -477,10 +477,6 @@ static bool shouldAllowSettingAnyXHRHeaderFromFileURLs()
> 
> #endif
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/WKWebViewInternalAdditions.mm>
>-#endif
>-
> static bool shouldRequireUserGestureToLoadVideo()
> {
> #if PLATFORM(IOS_FAMILY)
>@@ -7046,10 +7042,6 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISe
> 
> #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 af16fc38be38409c13bdda2117f6e13d362c72a8..bec1522dfd026bbfb3f77e127b873c2ba0135c22 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>@@ -170,10 +170,6 @@ 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 58be76b7aa52e00ae33e1697a77b8529bb8a1533..9ce54b7ba548546a9084085c21c3ea67882726ab 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -137,10 +137,6 @@ 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 4a992bf234e410056b21a8a89bae858738b7da88..e05da73543b7ab115cdf5db8e4c0f4c0938bc65f 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -463,10 +463,6 @@ 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 193958: 360442