Diff
Modified: trunk/Source/WebKit/ChangeLog (224929 => 224930)
--- trunk/Source/WebKit/ChangeLog 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/ChangeLog 2017-11-16 19:33:57 UTC (rev 224930)
@@ -1,3 +1,36 @@
+2017-11-16 Megan Gardner <[email protected]>
+
+ Remove allowBlockSelection as block selection is not supported anymore
+ https://bugs.webkit.org/show_bug.cgi?id=179738
+
+ Reviewed by Tim Horton.
+
+ Remove all instances of the alloweBlockSelection flag. Blocks selection is fully disabled
+ and thus this flag will do nothing. This was only added as a debug measure last year, and nothing
+ ever actually used it.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _allowsBlockSelection]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _allowsBlockSelection]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsBlockSelection:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::allowsBlockSelection): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+
2017-11-16 Brent Fulgham <[email protected]>
Whitelist additional IOKit properties based on customer feedback
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (224929 => 224930)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2017-11-16 19:33:57 UTC (rev 224930)
@@ -85,7 +85,6 @@
encoder << availableScreenSize;
encoder << textAutosizingWidth;
encoder << ignoresViewportScaleLimits;
- encoder << allowsBlockSelection;
#endif
#if PLATFORM(COCOA)
encoder << smartInsertDeleteEnabled;
@@ -228,8 +227,6 @@
return std::nullopt;
if (!decoder.decode(parameters.ignoresViewportScaleLimits))
return std::nullopt;
- if (!decoder.decode(parameters.allowsBlockSelection))
- return std::nullopt;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (224929 => 224930)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -137,7 +137,6 @@
WebCore::FloatSize availableScreenSize;
float textAutosizingWidth;
bool ignoresViewportScaleLimits;
- bool allowsBlockSelection;
#endif
#if PLATFORM(COCOA)
bool smartInsertDeleteEnabled;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-11-16 19:33:57 UTC (rev 224930)
@@ -1382,11 +1382,6 @@
return [_configuration selectionGranularity];
}
-- (BOOL)_allowsBlockSelection
-{
- return [_configuration _allowsBlockSelection];
-}
-
- (void)_setHasCustomContentView:(BOOL)pageHasCustomContentView loadedMIMEType:(const WTF::String&)mimeType
{
if (pageHasCustomContentView) {
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-11-16 19:33:57 UTC (rev 224930)
@@ -127,7 +127,6 @@
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
- BOOL _allowsBlockSelection;
_WKDragLiftDelay _dragLiftDelay;
#endif
@@ -218,7 +217,6 @@
#if PLATFORM(IOS)
_selectionGranularity = WKSelectionGranularityDynamic;
- _allowsBlockSelection = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDebugAllowBlockSelection"];
_dragLiftDelay = toDragLiftDelay([[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitDebugDragLiftDelay"]);
#endif
@@ -335,7 +333,6 @@
configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
configuration->_selectionGranularity = self->_selectionGranularity;
- configuration->_allowsBlockSelection = self->_allowsBlockSelection;
configuration->_ignoresViewportScaleLimits = self->_ignoresViewportScaleLimits;
configuration->_dragLiftDelay = self->_dragLiftDelay;
#endif
@@ -640,16 +637,6 @@
_allowsInlineMediaPlaybackAfterFullscreen = allows;
}
-- (BOOL)_allowsBlockSelection
-{
- return _allowsBlockSelection;
-}
-
-- (void)_setAllowsBlockSelection:(BOOL)allowsBlockSelection
-{
- _allowsBlockSelection = allowsBlockSelection;
-}
-
- (_WKDragLiftDelay)_dragLiftDelay
{
return _dragLiftDelay;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -71,7 +71,6 @@
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(10.0));
@property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(10.0));
-@property (nonatomic, setter=_setAllowsBlockSelection:) BOOL _allowsBlockSelection WK_API_AVAILABLE(ios(11.0));
@property (nonatomic, setter=_setDragLiftDelay:) _WKDragLiftDelay _dragLiftDelay WK_API_AVAILABLE(ios(11.0));
#else
@property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(10.12));
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -141,7 +141,6 @@
@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;
@property (nonatomic, readonly) WKSelectionGranularity _selectionGranularity;
-@property (nonatomic, readonly) BOOL _allowsBlockSelection;
@property (nonatomic, readonly) BOOL _allowsDoubleTapGestures;
@property (nonatomic, readonly) UIEdgeInsets _computedContentInset;
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -297,7 +297,6 @@
virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) = 0;
virtual void positionInformationDidChange(const InteractionInformationAtPosition&) = 0;
virtual void saveImageToLibrary(Ref<WebCore::SharedBuffer>&&) = 0;
- virtual bool allowsBlockSelection() = 0;
virtual void showPlaybackTargetPicker(bool hasVideo, const WebCore::IntRect& elementRect) = 0;
virtual void disableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID) = 0;
virtual double minimumZoomScale() const = 0;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-11-16 19:33:57 UTC (rev 224930)
@@ -5757,7 +5757,6 @@
parameters.textAutosizingWidth = textAutosizingWidth();
parameters.mimeTypesWithCustomContentProviders = m_pageClient.mimeTypesWithCustomContentProviders();
parameters.ignoresViewportScaleLimits = m_forceAlwaysUserScalable;
- parameters.allowsBlockSelection = m_pageClient.allowsBlockSelection();
#endif
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -131,7 +131,6 @@
bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) override;
void positionInformationDidChange(const InteractionInformationAtPosition&) override;
void saveImageToLibrary(Ref<WebCore::SharedBuffer>&&) override;
- bool allowsBlockSelection() override;
void showPlaybackTargetPicker(bool hasVideo, const WebCore::IntRect& elementRect) override;
bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) override;
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (224929 => 224930)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2017-11-16 19:33:57 UTC (rev 224930)
@@ -569,11 +569,6 @@
[m_contentView _stopAssistingNode];
}
-bool PageClientImpl::allowsBlockSelection()
-{
- return [m_webView _allowsBlockSelection];
-}
-
void PageClientImpl::showPlaybackTargetPicker(bool hasVideo, const IntRect& elementRect)
{
[m_contentView _showPlaybackTargetPicker:hasVideo fromRect:elementRect];
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (224929 => 224930)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-11-16 19:33:57 UTC (rev 224930)
@@ -351,7 +351,6 @@
, m_forceAlwaysUserScalable(parameters.ignoresViewportScaleLimits)
, m_screenSize(parameters.screenSize)
, m_availableScreenSize(parameters.availableScreenSize)
- , m_allowsBlockSelection(parameters.allowsBlockSelection)
#endif
, m_layerVolatilityTimer(*this, &WebPage::layerVolatilityTimerFired)
, m_activityState(parameters.activityState)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (224929 => 224930)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2017-11-16 19:19:39 UTC (rev 224929)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2017-11-16 19:33:57 UTC (rev 224930)
@@ -1526,7 +1526,6 @@
WebCore::FloatSize m_availableScreenSize;
RefPtr<WebCore::Range> m_currentBlockSelection;
WebCore::IntRect m_blockRectForTextSelection;
- bool m_allowsBlockSelection { false };
RefPtr<WebCore::Range> m_initialSelection;
WebCore::VisibleSelection m_storedSelectionForAccessibility { WebCore::VisibleSelection() };
