Changeset 229943 in webkit


Ignore:
Timestamp:
Mar 23, 2018, 10:56:49 PM (8 years ago)
Author:
timothy_horton@apple.com
Message:

Fix the build with no pasteboard
​https://bugs.webkit.org/show_bug.cgi?id=183973

Reviewed by Dan Bernstein.

  • .../Configurations/FeatureDefines.xcconfig:
  • WebView/WebView.mm:

(-[WebView _requestStartDataInteraction:globalPosition:]):
(-[WebView _getDataInteractionData]):
(-[WebView _dataOperationTextIndicator]):
(-[WebView _dragSourceAction]):
(-[WebView _draggedLinkTitle]):
(-[WebView _draggedLinkURL]):
(-[WebView _draggedElementBounds]):
(-[WebView _enteredDataInteraction:client:global:operation:]):
(-[WebView _updatedDataInteraction:client:global:operation:]):
(-[WebView _exitedDataInteraction:client:global:operation:]):
(-[WebView _performDataInteraction:client:global:operation:]):
(-[WebView _tryToPerformDataInteraction:client:global:operation:]):
(-[WebView _endedDataInteraction:global:]):
(-[WebView _dataInteractionCaretRect]):

  • WebView/WebViewPrivate.h:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r229912 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102018-03-23  Mark Lam  <mark.lam@apple.com>
    211

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117

  • trunk/Source/WebCore/ChangeLog

    r229939 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * platform/ios/PlatformPasteboardIOS.mm:
     10
    1112018-03-23  Wenson Hsieh  <wenson_hsieh@apple.com>
    212

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117

  • trunk/Source/WebCore/PAL/ChangeLog

    r229883 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102018-03-22  Tim Horton  <timothy_horton@apple.com>
    211

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117

  • trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

    r228825 r229943  
    4646#import <wtf/text/StringHash.h>
    4747
    48 #define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV)))
     48#define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV) || ENABLE(MINIMAL_SIMULATOR)))
    4949
    5050SOFT_LINK_FRAMEWORK(UIKit)

  • trunk/Source/WebKit/ChangeLog

    r229940 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102018-03-23  Megan Gardner  <megan_gardner@apple.com>
    211

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r229942 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * WebView/WebView.mm:
     10        (-[WebView _requestStartDataInteraction:globalPosition:]):
     11        (-[WebView _getDataInteractionData]):
     12        (-[WebView _dataOperationTextIndicator]):
     13        (-[WebView _dragSourceAction]):
     14        (-[WebView _draggedLinkTitle]):
     15        (-[WebView _draggedLinkURL]):
     16        (-[WebView _draggedElementBounds]):
     17        (-[WebView _enteredDataInteraction:client:global:operation:]):
     18        (-[WebView _updatedDataInteraction:client:global:operation:]):
     19        (-[WebView _exitedDataInteraction:client:global:operation:]):
     20        (-[WebView _performDataInteraction:client:global:operation:]):
     21        (-[WebView _tryToPerformDataInteraction:client:global:operation:]):
     22        (-[WebView _endedDataInteraction:global:]):
     23        (-[WebView _dataInteractionCaretRect]):
     24        * WebView/WebViewPrivate.h:
     25
    1262018-03-23  Tim Horton  <timothy_horton@apple.com>
    227

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r229926 r229943  
    18071807#endif
    18081808
    1809 #if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS)
     1809#if PLATFORM(IOS)
     1810
     1811#if ENABLE(DRAG_SUPPORT)
    18101812
    18111813- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
    … …  
    19391941}
    19401942
    1941 #endif // ENABLE(DRAG_SUPPORT) && PLATFORM(IOS)
     1943#else
     1944
     1945- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
     1946{
     1947    return NO;
     1948}
     1949
     1950- (WebUITextIndicatorData *)_getDataInteractionData
     1951{
     1952    return nil;
     1953}
     1954
     1955- (WebUITextIndicatorData *)_dataOperationTextIndicator
     1956{
     1957    return nil;
     1958}
     1959
     1960- (NSUInteger)_dragSourceAction
     1961{
     1962    return 0;
     1963}
     1964
     1965- (NSString *)_draggedLinkTitle
     1966{
     1967    return nil;
     1968}
     1969
     1970- (NSURL *)_draggedLinkURL
     1971{
     1972    return nil;
     1973}
     1974
     1975- (CGRect)_draggedElementBounds
     1976{
     1977    return CGRectNull;
     1978}
     1979
     1980- (uint64_t)_enteredDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
     1981{
     1982    return 0;
     1983}
     1984
     1985- (uint64_t)_updatedDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
     1986{
     1987    return 0;
     1988}
     1989
     1990- (void)_exitedDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
     1991{
     1992}
     1993
     1994- (void)_performDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
     1995{
     1996}
     1997
     1998- (BOOL)_tryToPerformDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
     1999{
     2000    return NO;
     2001}
     2002
     2003- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)globalPosition
     2004{
     2005}
     2006
     2007- (CGRect)_dataInteractionCaretRect
     2008{
     2009    return CGRectNull;
     2010}
     2011
     2012#endif
     2013#endif // PLATFORM(IOS)
    19422014
    19432015static NSMutableSet *knownPluginMIMETypes()

  • trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h

    r229448 r229943  
    484484- (void)_performDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
    485485- (BOOL)_tryToPerformDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
    486 - (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)clientPosition;
     486- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)globalPosition;
    487487
    488488@property (nonatomic, readonly, getter=_dataInteractionCaretRect) CGRect dataInteractionCaretRect;

  • trunk/Tools/ChangeLog

    r229937 r229943  
     12018-03-23  Tim Horton  <timothy_horton@apple.com>
     2
     3        Fix the build with no pasteboard
     4        https://bugs.webkit.org/show_bug.cgi?id=183973
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     9
    1102018-03-23  Youenn Fablet  <youenn@apple.com>
    211

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r229860 r229943  
    102102ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
    103103ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
    104 ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
    105104ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
    106105
    … …  
    115114ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
    116115ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
    117 ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
    118116ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
    119117
Note: See TracChangeset for help on using the changeset viewer.