Changeset 239071 in webkit


Ignore:
Timestamp:
Dec 10, 2018 10:55:31 PM (5 years ago)
Author:
Chris Fleizach
Message:

[meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
​https://bugs.webkit.org/show_bug.cgi?id=192449

Reviewed by Darin Adler.

  • NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
  • NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
  • NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
  • NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
  • NetworkProcess/ios/NetworkProcessIOS.mm:
  • NetworkProcess/mac/NetworkProcessMac.mm:
  • NetworkProcess/mac/RemoteNetworkingContext.mm:
  • Platform/spi/ios/AccessibilitySupportSPI.h:
  • PlatformMac.cmake:
  • PluginProcess/PluginControllerProxy.cpp:
  • PluginProcess/PluginProcess.cpp:
  • PluginProcess/WebProcessConnection.cpp:
  • Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
  • Shared/API/c/cf/WKErrorCF.cpp:

(WKErrorCreateWithCFError):
(WKErrorCopyCFError):

  • Shared/API/c/cg/WKImageCG.cpp:

(WKImageCreateCGImage):
(WKImageCreateFromCGImage):

  • Shared/ChildProcess.cpp:
  • Shared/ContextMenuContextData.cpp:
  • Shared/EditorState.cpp:
  • Shared/Plugins/NPIdentifierData.cpp:
  • Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
  • Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
  • Shared/SessionState.cpp:
  • Shared/SessionTracker.cpp:
  • Shared/ShareableBitmap.cpp:
  • Shared/ShareableResource.cpp:
  • Shared/VisibleContentRectUpdateInfo.cpp:
  • Shared/WebBackForwardListItem.cpp:
  • Shared/WebContextMenuItemData.cpp:
  • Shared/WebCoreArgumentCoders.cpp:
  • Shared/WebHitTestResultData.cpp:
  • Shared/WebImage.cpp:
  • Shared/WebMediaSessionMetadata.cpp:
  • Shared/WebMemorySampler.cpp:
  • Shared/WebMouseEvent.cpp:
  • Shared/WebRenderObject.cpp:
  • Shared/WebSQLiteDatabaseTracker.cpp:
  • Shared/WebWheelEvent.cpp:
  • Shared/cf/ArgumentCodersCF.cpp:
  • Shared/ios/WebPlatformTouchPointIOS.cpp:
  • SourcesCocoa.txt:
  • UIProcess/API/APIContentRuleListStore.cpp:
  • UIProcess/API/APIHitTestResult.cpp:
  • UIProcess/API/APINavigation.cpp:
  • UIProcess/API/APIOpenPanelParameters.cpp:
  • UIProcess/API/APIPageConfiguration.cpp:
  • UIProcess/API/C/WKPage.cpp:

(WKPageLoadURLWithShouldOpenExternalURLsPolicy):
(WKPageLoadURLWithUserData):
(WKPageLoadURLRequestWithUserData):
(WKPageSetPaginationMode):
(WKPageGetPaginationMode):
(WKPageSetPageLoaderClient):
(WKPageSetPagePolicyClient):

  • UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
  • UIProcess/Cocoa/WebViewImpl.h:
  • UIProcess/Cocoa/WebViewImpl.mm:
  • UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
  • UIProcess/WebStorage/LocalStorageDatabase.cpp:
  • UIProcess/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
(-[WKContentView initWithFrame:processPool:configuration:webView:]):
(-[WKContentView dealloc]):
(-[WKContentView page]):
(-[WKContentView updateFixedClippingView:]):
(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInsets:unobscuredSafeAreaInsets:inputViewBounds:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
(-[WKContentView _updateForScreen:]):
(-[WKContentView _accessibilityRegisterUIProcessTokens]):
(-[WKContentView _createDrawingAreaProxy]):
(-[WKContentView _didCommitLayerTree:]):
(-[WKContentView _wk_pageCountForPrintFormatter:]):

  • UIProcess/ios/WKContentViewInteraction.mm:

(-[WKFocusedElementInfo initWithAssistedNodeInformation:isUserInitiated:userObject:]):
(hasAssistedNode):
(-[WKContentView setupInteraction]):
(-[WKContentView positionInformation]):
(-[WKContentView _webTouchEventsRecognized:]):
(inflateQuad):
(-[WKContentView _updateTapHighlight]):
(-[WKContentView _showTapHighlight]):
(-[WKContentView _requiresKeyboardWhenFirstResponder]):
(-[WKContentView _displayFormNodeInputView]):
(-[WKContentView inputView]):
(-[WKContentView _actionForLongPressFromPositionInformation:]):
(-[WKContentView currentPositionInformation]):
(-[WKContentView doAfterPositionInformationUpdate:forRequest:]):
(-[WKContentView _currentPositionInformationIsValidForRequest:]):
(-[WKContentView _hasValidOutstandingPositionInformationRequest:]):
(-[WKContentView _currentPositionInformationIsApproximatelyValidForRequest:]):
(-[WKContentView gestureRecognizerShouldBegin:]):
(-[WKContentView hasSelectablePositionAtPoint:]):
(-[WKContentView pointIsNearMarkedText:]):
(-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
(-[WKContentView webSelectionRectsForSelectionRects:]):
(-[WKContentView _twoFingerSingleTapGestureRecognized:]):
(-[WKContentView _stylusSingleTapRecognized:]):
(-[WKContentView _singleTapCommited:]):
(-[WKContentView _attemptClickAtLocation:]):
(-[WKContentView _positionInformationDidChange:]):
(-[WKContentView requiresAccessoryView]):
(-[WKContentView supportedPasteboardTypesForCurrentSelection]):
(-[WKContentView _lookupForWebView:]):
(-[WKContentView _shareForWebView:]):
(-[WKContentView textStylingAtPosition:inDirection:]):
(-[WKContentView canPerformActionForWebView:withSender:]):
(-[WKContentView selectForWebView:]):
(-[WKContentView _accessibilityRetrieveRectsEnclosingSelectionOffset:withGranularity:]):
(-[WKContentView _accessibilityRetrieveRectsAtSelectionOffset:withText:completionHandler:]):
(toGestureType):
(toUIWKGestureType):
(toSelectionTouch):
(toUIWKSelectionTouch):
(toGestureRecognizerState):
(toUIGestureRecognizerState):
(toUIWKSelectionFlags):
(toWKTextGranularity):
(toWKSelectionDirection):
(selectionChangedWithGesture):
(selectionChangedWithTouch):
(-[WKContentView changeSelectionWithGestureAt:withGesture:withState:withFlags:]):
(-[WKContentView autocorrectionData]):
(-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
(-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):
(-[WKContentView _updateAccessory]):
(-[WKContentView selectedTextRange]):
(-[WKContentView setMarkedText:selectedRange:]):
(coreWritingDirection):
(-[WKContentView closestPositionToPoint:]):
(-[WKContentView insertText:]):
(-[WKContentView textInputTraits]):
(-[WKContentView handleKeyWebEvent:]):
(-[WKContentView handleKeyWebEvent:withCompletionHandler:]):
(-[WKContentView isScrollableForKeyboardScrollViewAnimator:]):
(-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]):
(-[WKContentView assistedNodeInformation]):
(-[WKContentView assistedNodeSelectOptions]):
(isAssistableInputType):
(-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
(-[WKContentView _stopAssistingNode]):
(-[WKContentView updateCurrentAssistedNodeInformation:]):
(-[WKContentView presentViewControllerForCurrentAssistedNode]):
(-[WKContentView actionNameForFocusedFormControlView:]):
(-[WKContentView selectWordForReplacement]):
(-[WKContentView _updateChangedSelection:]):
(-[WKContentView _beginSuppressingSelectionAssistantForReason:]):
(-[WKContentView _stopSuppressingSelectionAssistantForReason:]):
(-[WKContentView _showPlaybackTargetPicker:fromRect:routeSharingPolicy:routingContextUID:]):
(-[WKContentView _showRunOpenPanel:resultListener:]):
(-[WKContentView _showShareSheet:completionHandler:]):
(-[WKContentView positionInformationForActionSheetAssistant:]):
(-[WKContentView updatePositionInformationForActionSheetAssistant:]):
(-[WKContentView _startDrag:item:]):
(-[WKContentView _didHandleAdditionalDragItemsRequest:]):
(-[WKContentView _didHandleStartDataInteractionRequest:]):
(dropOperationForWebCoreDragOperation):
(-[WKContentView dragDataForDropSession:dragDestinationAction:]):
(-[WKContentView _didConcludeEditDataInteraction:]):
(-[WKContentView _didPerformDragOperation:]):
(-[WKContentView _prepareToDragPromisedAttachment:]):
(-[WKContentView _itemsForBeginningOrAddingToSessionWithRegistrationList:stagedDragSource:]):
(-[WKContentView _autofillContext]):
(-[WKContentView _dragInteraction:itemsForAddingToSession:withTouchAtPoint:completion:]):
(-[WKContentView _dragInteraction:prepareForSession:completion:]):
(-[WKContentView dragInteraction:itemsForBeginningSession:]):
(-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
(-[WKContentView dragInteraction:session:didEndWithOperation:]):
(-[WKContentView dragInteraction:item:willAnimateCancelWithAnimator:]):
(-[WKContentView dropInteraction:performDrop:]):
(-[WKContentView dropInteraction:sessionDidEnd:]):
(-[WKContentView allowsLanguageSelectionMenuForListViewController:]):
(-[WKContentView shouldDisplayInputContextViewForListViewController:]):
(-[WKContentView numericInputModeForListViewController:]):
(-[WKContentView textContentTypeForListViewController:]):
(-[WKContentView allowsDictationInputForListViewController:]):
(-[WKContentView _simulateLongPressActionAtLocation:]):
(-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
(-[WKContentView _presentationRectsForPreviewItemController:]):

  • UIProcess/ios/fullscreen/WKFullScreenViewController.mm:

(WKFullScreenViewControllerPlaybackSessionModelClient::setInterface):
(WKFullScreenViewControllerVideoFullscreenModelClient::setInterface):
(WKFullScreenViewControllerVideoFullscreenModelClient::interface const):
(-[WKFullScreenViewController videoControlsManagerDidChange]):
(-[WKFullScreenViewController _manager]):
(-[WKFullScreenViewController _togglePiPAction:]):

  • UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

(-[WKFullscreenAnimationController configureInitialAndFinalStatesForTransition:]):
(-[WKFullScreenWindowController isFullScreen]):
(-[WKFullScreenWindowController enterFullScreen]):
(-[WKFullScreenWindowController beganEnterFullScreenWithInitialFrame:finalFrame:]):
(-[WKFullScreenWindowController exitFullScreen]):
(-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:finalFrame:]):
(-[WKFullScreenWindowController _completedExitFullScreen]):
(-[WKFullScreenWindowController webViewDidRemoveFromSuperviewWhileInFullscreen]):
(-[WKFullScreenWindowController _exitFullscreenImmediately]):
(-[WKFullScreenWindowController _manager]):

  • UIProcess/mac/WebPageProxyMac.mm:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/Cache/WebCacheStorageConnection.cpp:
  • WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:

(mediaTimeToCurrentTime):
(-[WKAnimationDelegate initWithLayerID:layerTreeHost:]):

  • WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:

(-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):

Location:
trunk/Source/WebKit
Files:
58 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r239068 r239071  
     12018-12-10  Chris Fleizach  <cfleizach@apple.com>
     2
     3        [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
     4        https://bugs.webkit.org/show_bug.cgi?id=192449
     5
     6        Reviewed by Darin Adler.
     7
     8        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
     9        * NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
     10        * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
     11        * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
     12        * NetworkProcess/ios/NetworkProcessIOS.mm:
     13        * NetworkProcess/mac/NetworkProcessMac.mm:
     14        * NetworkProcess/mac/RemoteNetworkingContext.mm:
     15        * Platform/spi/ios/AccessibilitySupportSPI.h:
     16        * PlatformMac.cmake:
     17        * PluginProcess/PluginControllerProxy.cpp:
     18        * PluginProcess/PluginProcess.cpp:
     19        * PluginProcess/WebProcessConnection.cpp:
     20        * Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
     21        * Shared/API/c/cf/WKErrorCF.cpp:
     22        (WKErrorCreateWithCFError):
     23        (WKErrorCopyCFError):
     24        * Shared/API/c/cg/WKImageCG.cpp:
     25        (WKImageCreateCGImage):
     26        (WKImageCreateFromCGImage):
     27        * Shared/ChildProcess.cpp:
     28        * Shared/ContextMenuContextData.cpp:
     29        * Shared/EditorState.cpp:
     30        * Shared/Plugins/NPIdentifierData.cpp:
     31        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
     32        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
     33        * Shared/SessionState.cpp:
     34        * Shared/SessionTracker.cpp:
     35        * Shared/ShareableBitmap.cpp:
     36        * Shared/ShareableResource.cpp:
     37        * Shared/VisibleContentRectUpdateInfo.cpp:
     38        * Shared/WebBackForwardListItem.cpp:
     39        * Shared/WebContextMenuItemData.cpp:
     40        * Shared/WebCoreArgumentCoders.cpp:
     41        * Shared/WebHitTestResultData.cpp:
     42        * Shared/WebImage.cpp:
     43        * Shared/WebMediaSessionMetadata.cpp:
     44        * Shared/WebMemorySampler.cpp:
     45        * Shared/WebMouseEvent.cpp:
     46        * Shared/WebRenderObject.cpp:
     47        * Shared/WebSQLiteDatabaseTracker.cpp:
     48        * Shared/WebWheelEvent.cpp:
     49        * Shared/cf/ArgumentCodersCF.cpp:
     50        * Shared/ios/WebPlatformTouchPointIOS.cpp:
     51        * SourcesCocoa.txt:
     52        * UIProcess/API/APIContentRuleListStore.cpp:
     53        * UIProcess/API/APIHitTestResult.cpp:
     54        * UIProcess/API/APINavigation.cpp:
     55        * UIProcess/API/APIOpenPanelParameters.cpp:
     56        * UIProcess/API/APIPageConfiguration.cpp:
     57        * UIProcess/API/C/WKPage.cpp:
     58        (WKPageLoadURLWithShouldOpenExternalURLsPolicy):
     59        (WKPageLoadURLWithUserData):
     60        (WKPageLoadURLRequestWithUserData):
     61        (WKPageSetPaginationMode):
     62        (WKPageGetPaginationMode):
     63        (WKPageSetPageLoaderClient):
     64        (WKPageSetPagePolicyClient):
     65        * UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
     66        * UIProcess/Cocoa/WebViewImpl.h:
     67        * UIProcess/Cocoa/WebViewImpl.mm:
     68        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
     69        * UIProcess/WebStorage/LocalStorageDatabase.cpp:
     70        * UIProcess/ios/WKContentView.mm:
     71        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
     72        (-[WKContentView initWithFrame:processPool:configuration:webView:]):
     73        (-[WKContentView dealloc]):
     74        (-[WKContentView page]):
     75        (-[WKContentView updateFixedClippingView:]):
     76        (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInsets:unobscuredSafeAreaInsets:inputViewBounds:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
     77        (-[WKContentView _updateForScreen:]):
     78        (-[WKContentView _accessibilityRegisterUIProcessTokens]):
     79        (-[WKContentView _createDrawingAreaProxy]):
     80        (-[WKContentView _didCommitLayerTree:]):
     81        (-[WKContentView _wk_pageCountForPrintFormatter:]):
     82        * UIProcess/ios/WKContentViewInteraction.mm:
     83        (-[WKFocusedElementInfo initWithAssistedNodeInformation:isUserInitiated:userObject:]):
     84        (hasAssistedNode):
     85        (-[WKContentView setupInteraction]):
     86        (-[WKContentView positionInformation]):
     87        (-[WKContentView _webTouchEventsRecognized:]):
     88        (inflateQuad):
     89        (-[WKContentView _updateTapHighlight]):
     90        (-[WKContentView _showTapHighlight]):
     91        (-[WKContentView _requiresKeyboardWhenFirstResponder]):
     92        (-[WKContentView _displayFormNodeInputView]):
     93        (-[WKContentView inputView]):
     94        (-[WKContentView _actionForLongPressFromPositionInformation:]):
     95        (-[WKContentView currentPositionInformation]):
     96        (-[WKContentView doAfterPositionInformationUpdate:forRequest:]):
     97        (-[WKContentView _currentPositionInformationIsValidForRequest:]):
     98        (-[WKContentView _hasValidOutstandingPositionInformationRequest:]):
     99        (-[WKContentView _currentPositionInformationIsApproximatelyValidForRequest:]):
     100        (-[WKContentView gestureRecognizerShouldBegin:]):
     101        (-[WKContentView hasSelectablePositionAtPoint:]):
     102        (-[WKContentView pointIsNearMarkedText:]):
     103        (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
     104        (-[WKContentView webSelectionRectsForSelectionRects:]):
     105        (-[WKContentView _twoFingerSingleTapGestureRecognized:]):
     106        (-[WKContentView _stylusSingleTapRecognized:]):
     107        (-[WKContentView _singleTapCommited:]):
     108        (-[WKContentView _attemptClickAtLocation:]):
     109        (-[WKContentView _positionInformationDidChange:]):
     110        (-[WKContentView requiresAccessoryView]):
     111        (-[WKContentView supportedPasteboardTypesForCurrentSelection]):
     112        (-[WKContentView _lookupForWebView:]):
     113        (-[WKContentView _shareForWebView:]):
     114        (-[WKContentView textStylingAtPosition:inDirection:]):
     115        (-[WKContentView canPerformActionForWebView:withSender:]):
     116        (-[WKContentView selectForWebView:]):
     117        (-[WKContentView _accessibilityRetrieveRectsEnclosingSelectionOffset:withGranularity:]):
     118        (-[WKContentView _accessibilityRetrieveRectsAtSelectionOffset:withText:completionHandler:]):
     119        (toGestureType):
     120        (toUIWKGestureType):
     121        (toSelectionTouch):
     122        (toUIWKSelectionTouch):
     123        (toGestureRecognizerState):
     124        (toUIGestureRecognizerState):
     125        (toUIWKSelectionFlags):
     126        (toWKTextGranularity):
     127        (toWKSelectionDirection):
     128        (selectionChangedWithGesture):
     129        (selectionChangedWithTouch):
     130        (-[WKContentView changeSelectionWithGestureAt:withGesture:withState:withFlags:]):
     131        (-[WKContentView autocorrectionData]):
     132        (-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
     133        (-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):
     134        (-[WKContentView _updateAccessory]):
     135        (-[WKContentView selectedTextRange]):
     136        (-[WKContentView setMarkedText:selectedRange:]):
     137        (coreWritingDirection):
     138        (-[WKContentView closestPositionToPoint:]):
     139        (-[WKContentView insertText:]):
     140        (-[WKContentView textInputTraits]):
     141        (-[WKContentView handleKeyWebEvent:]):
     142        (-[WKContentView handleKeyWebEvent:withCompletionHandler:]):
     143        (-[WKContentView isScrollableForKeyboardScrollViewAnimator:]):
     144        (-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]):
     145        (-[WKContentView assistedNodeInformation]):
     146        (-[WKContentView assistedNodeSelectOptions]):
     147        (isAssistableInputType):
     148        (-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
     149        (-[WKContentView _stopAssistingNode]):
     150        (-[WKContentView updateCurrentAssistedNodeInformation:]):
     151        (-[WKContentView presentViewControllerForCurrentAssistedNode]):
     152        (-[WKContentView actionNameForFocusedFormControlView:]):
     153        (-[WKContentView selectWordForReplacement]):
     154        (-[WKContentView _updateChangedSelection:]):
     155        (-[WKContentView _beginSuppressingSelectionAssistantForReason:]):
     156        (-[WKContentView _stopSuppressingSelectionAssistantForReason:]):
     157        (-[WKContentView _showPlaybackTargetPicker:fromRect:routeSharingPolicy:routingContextUID:]):
     158        (-[WKContentView _showRunOpenPanel:resultListener:]):
     159        (-[WKContentView _showShareSheet:completionHandler:]):
     160        (-[WKContentView positionInformationForActionSheetAssistant:]):
     161        (-[WKContentView updatePositionInformationForActionSheetAssistant:]):
     162        (-[WKContentView _startDrag:item:]):
     163        (-[WKContentView _didHandleAdditionalDragItemsRequest:]):
     164        (-[WKContentView _didHandleStartDataInteractionRequest:]):
     165        (dropOperationForWebCoreDragOperation):
     166        (-[WKContentView dragDataForDropSession:dragDestinationAction:]):
     167        (-[WKContentView _didConcludeEditDataInteraction:]):
     168        (-[WKContentView _didPerformDragOperation:]):
     169        (-[WKContentView _prepareToDragPromisedAttachment:]):
     170        (-[WKContentView _itemsForBeginningOrAddingToSessionWithRegistrationList:stagedDragSource:]):
     171        (-[WKContentView _autofillContext]):
     172        (-[WKContentView _dragInteraction:itemsForAddingToSession:withTouchAtPoint:completion:]):
     173        (-[WKContentView _dragInteraction:prepareForSession:completion:]):
     174        (-[WKContentView dragInteraction:itemsForBeginningSession:]):
     175        (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
     176        (-[WKContentView dragInteraction:session:didEndWithOperation:]):
     177        (-[WKContentView dragInteraction:item:willAnimateCancelWithAnimator:]):
     178        (-[WKContentView dropInteraction:performDrop:]):
     179        (-[WKContentView dropInteraction:sessionDidEnd:]):
     180        (-[WKContentView allowsLanguageSelectionMenuForListViewController:]):
     181        (-[WKContentView shouldDisplayInputContextViewForListViewController:]):
     182        (-[WKContentView numericInputModeForListViewController:]):
     183        (-[WKContentView textContentTypeForListViewController:]):
     184        (-[WKContentView allowsDictationInputForListViewController:]):
     185        (-[WKContentView _simulateLongPressActionAtLocation:]):
     186        (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
     187        (-[WKContentView _presentationRectsForPreviewItemController:]):
     188        * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
     189        (WKFullScreenViewControllerPlaybackSessionModelClient::setInterface):
     190        (WKFullScreenViewControllerVideoFullscreenModelClient::setInterface):
     191        (WKFullScreenViewControllerVideoFullscreenModelClient::interface const):
     192        (-[WKFullScreenViewController videoControlsManagerDidChange]):
     193        (-[WKFullScreenViewController _manager]):
     194        (-[WKFullScreenViewController _togglePiPAction:]):
     195        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
     196        (-[WKFullscreenAnimationController configureInitialAndFinalStatesForTransition:]):
     197        (-[WKFullScreenWindowController isFullScreen]):
     198        (-[WKFullScreenWindowController enterFullScreen]):
     199        (-[WKFullScreenWindowController beganEnterFullScreenWithInitialFrame:finalFrame:]):
     200        (-[WKFullScreenWindowController exitFullScreen]):
     201        (-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:finalFrame:]):
     202        (-[WKFullScreenWindowController _completedExitFullScreen]):
     203        (-[WKFullScreenWindowController webViewDidRemoveFromSuperviewWhileInFullscreen]):
     204        (-[WKFullScreenWindowController _exitFullscreenImmediately]):
     205        (-[WKFullScreenWindowController _manager]):
     206        * UIProcess/mac/WebPageProxyMac.mm:
     207        * WebKit.xcodeproj/project.pbxproj:
     208        * WebProcess/Cache/WebCacheStorageConnection.cpp:
     209        * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
     210        (mediaTimeToCurrentTime):
     211        (-[WKAnimationDelegate initWithLayerID:layerTreeHost:]):
     212        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
     213        (-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):
     214
    12152018-12-10  Don Olmstead  <don.olmstead@sony.com>
    2216

  • trunk/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm

    r239047 r239071  
    3232#import <wtf/ProcessPrivilege.h>
    3333
     34namespace WebKit {
    3435using namespace WebCore;
    35 
    36 namespace WebKit {
    3736
    3837void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)

  • trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp

    r239047 r239071  
    4242#include <WebCore/UniqueIDBDatabaseConnection.h>
    4343
     44namespace WebKit {
    4445using namespace WebCore;
    45 
    46 namespace WebKit {
    4746
    4847Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(NetworkConnectionToWebProcess& connection, uint64_t serverConnectionIdentifier, PAL::SessionID sessionID)

  • trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp

    r239047 r239071  
    5454#include <wtf/MainThread.h>
    5555
     56namespace WebKit {
    5657using namespace PAL;
    5758using namespace WebCore;
    58 
    59 namespace WebKit {
    6059
    6160#define SWSERVERCONNECTION_RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)

  • trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp

    r239047 r239071  
    3434#include <WebCore/ServiceWorkerContextData.h>
    3535
     36namespace WebKit {
    3637using namespace WebCore;
    37 
    38 namespace WebKit {
    3938
    4039WebSWServerToContextConnection::WebSWServerToContextConnection(const SecurityOriginData& securityOrigin, Ref<IPC::Connection>&& connection)

  • trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm

    r239047 r239071  
    4242#define ENABLE_MANUAL_NETWORK_SANDBOXING 0
    4343
     44namespace WebKit {
    4445using namespace WebCore;
    45 
    46 namespace WebKit {
    4746
    4847void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)

  • trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm

    r239056 r239071  
    4848#import <wtf/text/WTFString.h>
    4949
     50namespace WebKit {
    5051using namespace WebCore;
    51 
    52 namespace WebKit {
    5352
    5453void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)

  • trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm

    r239047 r239071  
    4040#import <wtf/MainThread.h>
    4141
     42namespace WebKit {
    4243using namespace WebCore;
    43 
    44 namespace WebKit {
    4544
    4645void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)

  • trunk/Source/WebKit/PluginProcess/PluginControllerProxy.cpp

    r239047 r239071  
    5252#endif
    5353
     54namespace WebKit {
    5455using namespace WebCore;
    55 
    56 namespace WebKit {
    5756
    5857PluginControllerProxy::PluginControllerProxy(WebProcessConnection* connection, const PluginCreationParameters& creationParameters)

  • trunk/Source/WebKit/PluginProcess/PluginProcess.cpp

    r239047 r239071  
    5050#endif
    5151
     52namespace WebKit {
     53
    5254using namespace WebCore;
    53 
    54 namespace WebKit {
    5555
    5656NO_RETURN static void callExit(IPC::Connection*)

  • trunk/Source/WebKit/PluginProcess/WebProcessConnection.cpp

    r239047 r239071  
    4545#endif
    4646
     47namespace WebKit {
    4748using namespace WebCore;
    48 
    49 namespace WebKit {
    5049
    5150static IPC::Connection* currentConnection;

  • trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb

    r239047 r239071  
    4141#include <WebCore/TextEncodingRegistry.h>
    4242
     43namespace WebKit {
    4344using namespace WebCore;
    44 
    45 namespace WebKit {
    4645
    4746WebPreferencesStore::ValueMap& WebPreferencesStore::defaults()

  • trunk/Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp

    r239047 r239071  
    3030#include "WKAPICast.h"
    3131
    32 using namespace WebCore;
    33 using namespace WebKit;
    34 
    3532WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError)
    3633{
    37     return toAPI(&API::Error::create(ResourceError(cfError)).leakRef());
     34    return WebKit::toAPI(&API::Error::create(WebCore::ResourceError(cfError)).leakRef());
    3835}
    3936
    4037CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error)
    4138{
    42     RetainPtr<CFErrorRef> cfError = toImpl(error)->platformError().cfError();
     39    WTF::RetainPtr<CFErrorRef> cfError = WebKit::toImpl(error)->platformError().cfError();
    4340    return cfError.leakRef();
    4441}
     42

  • trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp

    r239047 r239071  
    3333#include <WebCore/GraphicsContext.h>
    3434
    35 using namespace WebKit;
    36 using namespace WebCore;
    37 
    3835CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
    3936{
    40     WebImage* webImage = toImpl(imageRef);
     37    WebKit::WebImage* webImage = WebKit::toImpl(imageRef);
    4138    if (!webImage)
    4239        return nullptr;
    … …  
    5047        return nullptr;
    5148   
    52     IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
    53     auto webImage = WebImage::create(imageSize, toImageOptions(options));
     49    WebCore::IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
     50    auto webImage = WebKit::WebImage::create(imageSize, WebKit::toImageOptions(options));
    5451
    5552    auto graphicsContext = webImage->bitmap().createGraphicsContext();
    56     FloatRect rect(FloatPoint(0, 0), imageSize);
     53    WebCore::FloatRect rect(WebCore::FloatPoint(0, 0), imageSize);
    5754    graphicsContext->clearRect(rect);
    5855    graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
    5956    return toAPI(webImage.leakRef());
    6057}
     58

  • trunk/Source/WebKit/Shared/ChildProcess.cpp

    r239047 r239071  
    4040#endif
    4141
     42namespace WebKit {
    4243using namespace WebCore;
    43 
    44 namespace WebKit {
    4544
    4645ChildProcess::ChildProcess()

  • trunk/Source/WebKit/Shared/ContextMenuContextData.cpp

    r239047 r239071  
    3434#include <WebCore/GraphicsContext.h>
    3535
     36namespace WebKit {
    3637using namespace WebCore;
    37 
    38 namespace WebKit {
    3938
    4039ContextMenuContextData::ContextMenuContextData()

  • trunk/Source/WebKit/Shared/EditorState.cpp

    r239047 r239071  
    3030#include <wtf/text/TextStream.h>
    3131
     32namespace WebKit {
    3233using namespace WebCore;
    33 
    34 namespace WebKit {
    3534
    3635void EditorState::encode(IPC::Encoder& encoder) const

  • trunk/Source/WebKit/Shared/Plugins/NPIdentifierData.cpp

    r239047 r239071  
    3434#include <WebCore/IdentifierRep.h>
    3535
     36namespace WebKit {
    3637using namespace WebCore;
    37 
    38 namespace WebKit {
    3938
    4039NPIdentifierData::NPIdentifierData()

  • trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm

    r239047 r239071  
    7878#endif
    7979
     80namespace WebKit {
    8081using namespace WebCore;
    81 
    82 namespace WebKit {
    8382
    8483static CGColorRef cgColorFromColor(const Color& color)

  • trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp

    r239047 r239071  
    3939#include <wtf/text/TextStream.h>
    4040
     41#if ENABLE(ASYNC_SCROLLING)
     42
     43namespace IPC {
    4144using namespace WebCore;
    42 
    43 #if ENABLE(ASYNC_SCROLLING)
    44 
    45 namespace IPC {
    4645
    4746template<> struct ArgumentCoder<ScrollingStateNode> {

  • trunk/Source/WebKit/Shared/SessionState.cpp

    r239047 r239071  
    3030#include <WebCore/BackForwardItemIdentifier.h>
    3131
     32namespace WebKit {
    3233using namespace WebCore;
    33 
    34 namespace WebKit {
    3534
    3635bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy policy)

  • trunk/Source/WebKit/Shared/SessionTracker.cpp

    r239047 r239071  
    3232#include <wtf/RunLoop.h>
    3333
     34namespace WebKit {
    3435using namespace WebCore;
    35 
    36 namespace WebKit {
    3736
    3837static String& identifierBase()

  • trunk/Source/WebKit/Shared/ShareableBitmap.cpp

    r239047 r239071  
    3131#include <WebCore/GraphicsContext.h>
    3232
     33namespace WebKit {
    3334using namespace WebCore;
    34 
    35 namespace WebKit {
    36 
     35   
    3736ShareableBitmap::Handle::Handle()
    3837{

  • trunk/Source/WebKit/Shared/ShareableResource.cpp

    r239047 r239071  
    3232#include <WebCore/SharedBuffer.h>
    3333
     34namespace WebKit {
    3435using namespace WebCore;
    35 
    36 namespace WebKit {
    3736
    3837ShareableResource::Handle::Handle()

  • trunk/Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp

    r239047 r239071  
    3131#include <wtf/text/TextStream.h>
    3232
     33namespace WebKit {
    3334using namespace WebCore;
    34 
    35 namespace WebKit {
    3635
    3736void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const

  • trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp

    r239047 r239071  
    3333#include <wtf/URL.h>
    3434
     35namespace WebKit {
    3536using namespace WebCore;
    36 
    37 namespace WebKit {
    3837
    3938Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)

  • trunk/Source/WebKit/Shared/WebContextMenuItemData.cpp

    r239047 r239071  
    3535#include <WebCore/ContextMenu.h>
    3636
     37namespace WebKit {
    3738using namespace WebCore;
    38 
    39 namespace WebKit {
    4039
    4140WebContextMenuItemData::WebContextMenuItemData()

  • trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp

    r239047 r239071  
    113113#endif
    114114
     115namespace IPC {
    115116using namespace WebCore;
    116117using namespace WebKit;
    117 
    118 namespace IPC {
    119118
    120119static void encodeSharedBuffer(Encoder& encoder, const SharedBuffer* buffer)

  • trunk/Source/WebKit/Shared/WebHitTestResultData.cpp

    r239047 r239071  
    3232#include <wtf/text/WTFString.h>
    3333
     34namespace WebKit {
    3435using namespace WebCore;
    35 
    36 namespace WebKit {
    3736
    3837WebHitTestResultData::WebHitTestResultData()

  • trunk/Source/WebKit/Shared/WebImage.cpp

    r239047 r239071  
    2727#include "WebImage.h"
    2828
     29namespace WebKit {
    2930using namespace WebCore;
    30 
    31 namespace WebKit {
    3231
    3332RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)

  • trunk/Source/WebKit/Shared/WebMediaSessionMetadata.cpp

    r239047 r239071  
    2929#if ENABLE(MEDIA_SESSION)
    3030
     31namespace WebKit {
    3132using namespace WebCore;
    32 
    33 namespace WebKit {
    3433
    3534Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata)

  • trunk/Source/WebKit/Shared/WebMemorySampler.cpp

    r239047 r239071  
    3434#include <wtf/text/StringBuilder.h>
    3535
     36namespace WebKit {
    3637using namespace WebCore;
    37 
    38 namespace WebKit {
    3938
    4039static const char separator = '\t';

  • trunk/Source/WebKit/Shared/WebMouseEvent.cpp

    r239047 r239071  
    2929#include "WebCoreArgumentCoders.h"
    3030
     31namespace WebKit {
    3132using namespace WebCore;
    32 
    33 namespace WebKit {
    3433
    3534WebMouseEvent::WebMouseEvent()

  • trunk/Source/WebKit/Shared/WebRenderObject.cpp

    r239047 r239071  
    3838#include <WebCore/RenderWidget.h>
    3939
     40namespace WebKit {
    4041using namespace WebCore;
    41 
    42 namespace WebKit {
    4342
    4443RefPtr<WebRenderObject> WebRenderObject::create(WebPage* page)

  • trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp

    r239047 r239071  
    3434#include <wtf/MainThread.h>
    3535
     36namespace WebKit {
    3637using namespace WebCore;
    37 
    38 namespace WebKit {
    3938
    4039WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)

  • trunk/Source/WebKit/Shared/WebWheelEvent.cpp

    r239047 r239071  
    2929#include "WebCoreArgumentCoders.h"
    3030
     31namespace WebKit {   
    3132using namespace WebCore;
    32 
    33 namespace WebKit {   
    3433
    3534WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Modifiers modifiers, WallTime timestamp)

  • trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp

    r239047 r239071  
    6464#endif
    6565
     66namespace IPC {
    6667using namespace WebCore;
    67 
    68 namespace IPC {
    6968
    7069CFTypeRef tokenNullTypeRef()

  • trunk/Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp

    r239047 r239071  
    3131#include "WebCoreArgumentCoders.h"
    3232
     33namespace WebKit {
    3334using namespace WebCore;
    34 
    35 namespace WebKit {
    3635
    3736void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const

  • trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp

    r239047 r239071  
    4646#include <wtf/persistence/PersistentEncoder.h>
    4747
     48
     49namespace API {
    4850using namespace WebKit::NetworkCache;
    4951using namespace WebCore::FileSystem;
    5052
    51 namespace API {
    52    
    5353ContentRuleListStore& ContentRuleListStore::legacyDefaultStore()
    5454{

  • trunk/Source/WebKit/UIProcess/API/APIHitTestResult.cpp

    r239047 r239071  
    2121#include "APIHitTestResult.h"
    2222
     23namespace API {
    2324using namespace WebCore;
    24 
    25 namespace API {
    2625
    2726Ref<HitTestResult> HitTestResult::create(const WebKit::WebHitTestResultData& hitTestResultData)

  • trunk/Source/WebKit/UIProcess/API/APINavigation.cpp

    r239047 r239071  
    3131#include <wtf/DebugUtilities.h>
    3232
     33namespace API {
    3334using namespace WebCore;
    3435using namespace WebKit;
    35 
    36 namespace API {
    3736
    3837Navigation::Navigation(WebNavigationState& state)

  • trunk/Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp

    r239047 r239071  
    3232#include <wtf/Vector.h>
    3333
     34namespace API {
    3435using namespace WebCore;
    35 
    36 namespace API {
    3736
    3837Ref<OpenPanelParameters> OpenPanelParameters::create(const FileChooserSettings& settings)

  • trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp

    r239047 r239071  
    3939#endif
    4040
     41namespace API {
    4142using namespace WebCore;
    4243using namespace WebKit;
    43 
    44 namespace API {
    4544
    4645Ref<PageConfiguration> PageConfiguration::create()

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r238937 r239071  
    6161}
    6262
    63 using namespace WebCore;
    64 using namespace WebKit;
    65 
    6663WKTypeID WKContextGetTypeID()
    6764{
    … …  
    191188        }
    192189
    193         void didReceiveResponse(WebProcessPool& processPool, DownloadProxy& downloadProxy, const ResourceResponse& response) final
     190        void didReceiveResponse(WebProcessPool& processPool, DownloadProxy& downloadProxy, const WebCore::ResourceResponse& response) final
    194191        {
    195192            if (!m_client.didReceiveResponse)
    … …  
    233230        }
    234231
    235         void didFail(WebProcessPool& processPool, DownloadProxy& downloadProxy, const ResourceError& error) final
     232        void didFail(WebProcessPool& processPool, DownloadProxy& downloadProxy, const WebCore::ResourceError& error) final
    236233        {
    237234            if (!m_client.didFail)
    … …  
    257254        }
    258255
    259         void willSendRequest(WebProcessPool& processPool, DownloadProxy& downloadProxy, ResourceRequest&& request, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&& completionHandler) final
     256        void willSendRequest(WebProcessPool& processPool, DownloadProxy& downloadProxy, WebCore::ResourceRequest&& request, const WebCore::ResourceResponse&, CompletionHandler<void(WebCore::ResourceRequest&&)>&& completionHandler) final
    260257        {
    261258            if (m_client.didReceiveServerRedirect)
    … …  
    311308        return;
    312309
    313     toImpl(contextRef)->visitedLinkStore().addVisitedLinkHash(computeSharedStringHash(visitedURLString));
     310    toImpl(contextRef)->visitedLinkStore().addVisitedLinkHash(WebCore::computeSharedStringHash(visitedURLString));
    314311}
    315312

  • trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

    r239047 r239071  
    9898#endif
    9999
     100namespace API {
    100101using namespace WebCore;
    101102using namespace WebKit;
    102 
    103 namespace API {
     103   
    104104template<> struct ClientTraits<WKPageLoaderClientBase> {
    105105    typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3, WKPageLoaderClientV4, WKPageLoaderClientV5, WKPageLoaderClientV6> Versions;
    … …  
    131131    typedef std::tuple<WKPageFindMatchesClientV0> Versions;
    132132};
    133 
    134 }
     133   
     134} // namespace API
    135135
    136136WKTypeID WKPageGetTypeID()
    … …  
    161161void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef pageRef, WKURLRef URLRef, bool shouldOpenExternalURLs)
    162162{
    163     ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy = shouldOpenExternalURLs ? ShouldOpenExternalURLsPolicy::ShouldAllow : ShouldOpenExternalURLsPolicy::ShouldNotAllow;
     163    WebCore::ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy = shouldOpenExternalURLs ? WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow : WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow;
    164164    toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), shouldOpenExternalURLsPolicy);
    165165}
    … …  
    167167void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef)
    168168{
    169     toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
     169    toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
    170170}
    171171
    … …  
    179179{
    180180    auto resourceRequest = toImpl(urlRequestRef)->resourceRequest();
    181     toImpl(pageRef)->loadRequest(WTFMove(resourceRequest), ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
     181    toImpl(pageRef)->loadRequest(WTFMove(resourceRequest), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
    182182}
    183183
    … …  
    692692void WKPageSetPaginationMode(WKPageRef pageRef, WKPaginationMode paginationMode)
    693693{
    694     Pagination::Mode mode;
     694    WebCore::Pagination::Mode mode;
    695695    switch (paginationMode) {
    696696    case kWKPaginationModeUnpaginated:
    697         mode = Pagination::Unpaginated;
     697        mode = WebCore::Pagination::Unpaginated;
    698698        break;
    699699    case kWKPaginationModeLeftToRight:
    700         mode = Pagination::LeftToRightPaginated;
     700        mode = WebCore::Pagination::LeftToRightPaginated;
    701701        break;
    702702    case kWKPaginationModeRightToLeft:
    703         mode = Pagination::RightToLeftPaginated;
     703        mode = WebCore::Pagination::RightToLeftPaginated;
    704704        break;
    705705    case kWKPaginationModeTopToBottom:
    706         mode = Pagination::TopToBottomPaginated;
     706        mode = WebCore::Pagination::TopToBottomPaginated;
    707707        break;
    708708    case kWKPaginationModeBottomToTop:
    709         mode = Pagination::BottomToTopPaginated;
     709        mode = WebCore::Pagination::BottomToTopPaginated;
    710710        break;
    711711    default:
    … …  
    718718{
    719719    switch (toImpl(pageRef)->paginationMode()) {
    720     case Pagination::Unpaginated:
     720    case WebCore::Pagination::Unpaginated:
    721721        return kWKPaginationModeUnpaginated;
    722     case Pagination::LeftToRightPaginated:
     722    case WebCore::Pagination::LeftToRightPaginated:
    723723        return kWKPaginationModeLeftToRight;
    724     case Pagination::RightToLeftPaginated:
     724    case WebCore::Pagination::RightToLeftPaginated:
    725725        return kWKPaginationModeRightToLeft;
    726     case Pagination::TopToBottomPaginated:
     726    case WebCore::Pagination::TopToBottomPaginated:
    727727        return kWKPaginationModeTopToBottom;
    728     case Pagination::BottomToTopPaginated:
     728    case WebCore::Pagination::BottomToTopPaginated:
    729729        return kWKPaginationModeBottomToTop;
    730730    }
    … …  
    11081108        }
    11091109
    1110         void didFailProvisionalLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const ResourceError& error, API::Object* userData) override
     1110        void didFailProvisionalLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const WebCore::ResourceError& error, API::Object* userData) override
    11111111        {
    11121112            if (!m_client.didFailProvisionalLoadWithErrorForFrame)
    … …  
    11241124        }
    11251125
    1126         void didFailLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const ResourceError& error, API::Object* userData) override
     1126        void didFailLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const WebCore::ResourceError& error, API::Object* userData) override
    11271127        {
    11281128            if (!m_client.didFailLoadWithErrorForFrame)
    … …  
    12311231        }
    12321232
    1233         void decidePolicyForNewWindowAction(WebPageProxy& page, WebFrameProxy& frame, const NavigationActionData& navigationActionData, const ResourceRequest& resourceRequest, const String& frameName, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
     1233        void decidePolicyForNewWindowAction(WebPageProxy& page, WebFrameProxy& frame, const NavigationActionData& navigationActionData, const WebCore::ResourceRequest& resourceRequest, const String& frameName, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
    12341234        {
    12351235            if (!m_client.decidePolicyForNewWindowAction) {
    … …  
    12431243        }
    12441244
    1245         void decidePolicyForResponse(WebPageProxy& page, WebFrameProxy& frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, bool canShowMIMEType, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
     1245        void decidePolicyForResponse(WebPageProxy& page, WebFrameProxy& frame, const WebCore::ResourceResponse& resourceResponse, const WebCore::ResourceRequest& resourceRequest, bool canShowMIMEType, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
    12461246        {
    12471247            if (!m_client.decidePolicyForResponse_deprecatedForUseWithV0 && !m_client.decidePolicyForResponse) {
    … …  
    12591259        }
    12601260
    1261         void unableToImplementPolicy(WebPageProxy& page, WebFrameProxy& frame, const ResourceError& error, API::Object* userData) override
     1261        void unableToImplementPolicy(WebPageProxy& page, WebFrameProxy& frame, const WebCore::ResourceError& error, API::Object* userData) override
    12621262        {
    12631263            if (!m_client.unableToImplementPolicy)
    … …  
    12721272
    12731273namespace WebKit {
    1274 
     1274using namespace WebCore;
     1275   
    12751276class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
    12761277public:
    … …  
    27002701}
    27012702#endif
     2703

  • trunk/Source/WebKit/UIProcess/API/C/cg/WKIconDatabaseCG.cpp

    r239047 r239071  
    3232
    3333using namespace WebKit;
    34 using namespace WebCore;
    3534
    3635CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef, WKURLRef, WKSize)
    … …  
    4342    return nullptr;
    4443}
     44

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

    r239047 r239071  
    135135class PageClientImpl;
    136136class DrawingAreaProxy;
     137class SafeBrowsingWarning;
    137138class ViewGestureController;
    138139class ViewSnapshot;

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r239047 r239071  
    6262#import "WKPrintingView.h"
    6363#import "WKSafeBrowsingWarning.h"
     64#import "WKShareSheet.h"
    6465#import "WKTextInputWindowController.h"
    6566#import "WKViewLayoutStrategy.h"
     67#import "WKWebViewInternal.h"
    6668#import "WKWebViewPrivate.h"
    6769#import "WebBackForwardList.h"

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm

    r239047 r239071  
    3939#import <wtf/SoftLinking.h>
    4040
     41namespace WebKit {
    4142using namespace WebCore;
    42 
    43 namespace WebKit {
    4443
    4544static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)

  • trunk/Source/WebKit/UIProcess/WebStorage/LocalStorageDatabase.cpp

    r239047 r239071  
    3939#include <wtf/text/WTFString.h>
    4040
     41static const auto databaseUpdateInterval = 1_s;
     42
     43static const int maximumItemsToUpdate = 100;
     44
     45namespace WebKit {
    4146using namespace WebCore;
    42 
    43 static const auto databaseUpdateInterval = 1_s;
    44 
    45 static const int maximumItemsToUpdate = 100;
    46 
    47 namespace WebKit {
    4847
    4948Ref<LocalStorageDatabase> LocalStorageDatabase::create(Ref<WorkQueue>&& queue, Ref<LocalStorageDatabaseTracker>&& tracker, const SecurityOriginData& securityOrigin)

  • trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

    r239047 r239071  
    6363#import <wtf/text/TextStream.h>
    6464
     65
     66namespace WebKit {
    6567using namespace WebCore;
    6668using namespace WebKit;
    6769
    68 namespace WebKit {
    6970class HistoricalVelocityData {
    7071public:
    … …  
    172173
    173174@implementation WKContentView {
    174     std::unique_ptr<PageClientImpl> _pageClient;
     175    std::unique_ptr<WebKit::PageClientImpl> _pageClient;
    175176    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    176177    RetainPtr<WKBrowsingContextController> _browsingContextController;
    … …  
    182183    RetainPtr<WKInspectorHighlightView> _inspectorHighlightView;
    183184
    184     HistoricalVelocityData _historicalKinematicData;
     185    WebKit::HistoricalVelocityData _historicalKinematicData;
    185186
    186187    RetainPtr<NSUndoManager> _undoManager;
    … …  
    196197    _page = processPool.createWebPage(*_pageClient, WTFMove(configuration));
    197198    _page->initializeWebPage();
    198     _page->setIntrinsicDeviceScaleFactor(screenScaleFactor([UIScreen mainScreen]));
     199    _page->setIntrinsicDeviceScaleFactor(WebCore::screenScaleFactor([UIScreen mainScreen]));
    199200    _page->setUseFixedLayout(true);
    200201    _page->setDelegatesScrolling(true);
    … …  
    204205#endif
    205206
    206     WebProcessPool::statistics().wkViewCount++;
     207    WebKit::WebProcessPool::statistics().wkViewCount++;
    207208
    208209    _rootContentView = adoptNS([[UIView alloc] init]);
    … …  
    234235        return nil;
    235236
    236     InitializeWebKit2();
    237 
    238     _pageClient = std::make_unique<PageClientImpl>(self, webView);
     237    WebKit::InitializeWebKit2();
     238
     239    _pageClient = std::make_unique<WebKit::PageClientImpl>(self, webView);
    239240    _webView = webView;
    240241
    … …  
    250251    _page->close();
    251252
    252     WebProcessPool::statistics().wkViewCount--;
     253    WebKit::WebProcessPool::statistics().wkViewCount--;
    253254
    254255    [super dealloc];
    255256}
    256257
    257 - (WebPageProxy*)page
     258- (WebKit::WebPageProxy*)page
    258259{
    259260    return _page.get();
    … …  
    344345}
    345346
    346 - (void)updateFixedClippingView:(FloatRect)fixedPositionRectForUI
    347 {
    348     FloatRect clippingBounds = [self bounds];
     347- (void)updateFixedClippingView:(WebCore::FloatRect)fixedPositionRectForUI
     348{
     349    WebCore::FloatRect clippingBounds = [self bounds];
    349350    clippingBounds.unite(fixedPositionRectForUI);
    350351
    … …  
    387388
    388389    MonotonicTime timestamp = MonotonicTime::now();
    389     HistoricalVelocityData::VelocityData velocityData;
     390    WebKit::HistoricalVelocityData::VelocityData velocityData;
    390391    if (!isStableState)
    391392        velocityData = _historicalKinematicData.velocityForNewData(visibleContentRect.origin, zoomScale, timestamp);
    … …  
    393394        _historicalKinematicData.clear();
    394395
    395     RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
     396    WebKit::RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
    396397
    397398    CGRect unobscuredContentRectRespectingInputViewBounds = [self _computeUnobscuredContentRectRespectingInputViewBounds:unobscuredContentRect inputViewBounds:inputViewBounds];
    398     FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredContentRect, unobscuredContentRectRespectingInputViewBounds, _page->customFixedPositionRect(), zoomScale, FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled());
    399 
    400     VisibleContentRectUpdateInfo visibleContentRectUpdateInfo(
     399    WebCore::FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredContentRect, unobscuredContentRectRespectingInputViewBounds, _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled());
     400
     401    WebKit::VisibleContentRectUpdateInfo visibleContentRectUpdateInfo(
    401402        visibleContentRect,
    402403        unobscuredContentRect,
    … …  
    416417        velocityData.verticalVelocity,
    417418        velocityData.scaleChangeRate,
    418         downcast<RemoteLayerTreeDrawingAreaProxy>(*drawingArea).lastCommittedLayerTreeTransactionID());
     419        downcast<WebKit::RemoteLayerTreeDrawingAreaProxy>(*drawingArea).lastCommittedLayerTreeTransactionID());
    419420
    420421    LOG_WITH_STREAM(VisibleRects, stream << "-[WKContentView didUpdateVisibleRect]" << visibleContentRectUpdateInfo.dump());
    … …  
    425426    _sizeChangedSinceLastVisibleContentRectUpdate = NO;
    426427
    427     FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), zoomScale, FrameView::LayoutViewportConstraint::Unconstrained, scrollingCoordinator->visualViewportEnabled());
     428    WebCore::FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::Unconstrained, scrollingCoordinator->visualViewportEnabled());
    428429    scrollingCoordinator->viewportChangedViaDelegatedScrolling(scrollingCoordinator->rootScrollingNodeID(), fixedPositionRect, zoomScale);
    429430
    … …  
    477478{
    478479    ASSERT(screen);
    479     _page->setIntrinsicDeviceScaleFactor(screenScaleFactor(screen));
     480    _page->setIntrinsicDeviceScaleFactor(WebCore::screenScaleFactor(screen));
    480481    [self _accessibilityRegisterUIProcessTokens];
    481482}
    … …  
    498499{
    499500    auto uuid = [NSUUID UUID];
    500     NSData *remoteElementToken = newAccessibilityRemoteToken(uuid);
     501    NSData *remoteElementToken = WebKit::newAccessibilityRemoteToken(uuid);
    501502
    502503    // Store information about the WebProcess that can later be retrieved by the iOS Accessibility runtime.
    503     if (_page->process().state() == WebProcessProxy::State::Running) {
     504    if (_page->process().state() == WebKit::WebProcessProxy::State::Running) {
    504505        IPC::Connection* connection = _page->process().connection();
    505506        storeAccessibilityRemoteConnectionInformation(self, _page->process().processIdentifier(), connection->identifier().port, uuid);
    … …  
    517518#pragma mark PageClientImpl methods
    518519
    519 - (std::unique_ptr<DrawingAreaProxy>)_createDrawingAreaProxy
    520 {
    521     return std::make_unique<RemoteLayerTreeDrawingAreaProxy>(*_page);
     520- (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
     521{
     522    return std::make_unique<WebKit::RemoteLayerTreeDrawingAreaProxy>(*_page);
    522523}
    523524
    … …  
    555556    CGRect contentBounds = { scrollOrigin, contentsSize };
    556557
    557     LOG_WITH_STREAM(VisibleRects, stream << "-[WKContentView _didCommitLayerTree:] transactionID " <<  layerTreeTransaction.transactionID() << " contentBounds " << FloatRect(contentBounds));
     558    LOG_WITH_STREAM(VisibleRects, stream << "-[WKContentView _didCommitLayerTree:] transactionID " <<  layerTreeTransaction.transactionID() << " contentBounds " << WebCore::FloatRect(contentBounds));
    558559
    559560    BOOL boundsChanged = !CGRectEqualToRect([self bounds], contentBounds);
    … …  
    564565
    565566    if (_interactionViewsContainerView) {
    566         FloatPoint scaledOrigin = layerTreeTransaction.scrollOrigin();
     567        WebCore::FloatPoint scaledOrigin = layerTreeTransaction.scrollOrigin();
    567568        float scale = [[_webView scrollView] zoomScale];
    568569        scaledOrigin.scale(scale);
    … …  
    572573    if (boundsChanged) {
    573574        // FIXME: factor computeCustomFixedPositionRect() into something that gives us this rect.
    574         FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), [[_webView scrollView] zoomScale]);
     575        WebCore::FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), [[_webView scrollView] zoomScale]);
    575576        [self updateFixedClippingView:fixedPositionRect];
    576577
    … …  
    673674        return 0;
    674675
    675     PrintInfo printInfo;
     676    WebKit::PrintInfo printInfo;
    676677    printInfo.pageSetupScaleFactor = 1;
    677678    printInfo.snapshotFirstPage = printFormatter.snapshotFirstPage;
    … …  
    687688    _isPrintingToPDF = YES;
    688689    auto retainedSelf = retainPtr(self);
    689     return _page->computePagesForPrintingAndDrawToPDF(frameID, printInfo, [retainedSelf](const IPC::DataReference& pdfData, CallbackBase::Error error) {
     690    return _page->computePagesForPrintingAndDrawToPDF(frameID, printInfo, [retainedSelf](const IPC::DataReference& pdfData, WebKit::CallbackBase::Error error) {
    690691        retainedSelf->_isPrintingToPDF = NO;
    691         if (error != CallbackBase::Error::None)
     692        if (error != WebKit::CallbackBase::Error::None)
    692693            return;
    693694

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

    r239052 r239071  
    143143#endif
    144144
     145namespace WebKit {
    145146using namespace WebCore;
    146147using namespace WebKit;
    147 
    148 namespace WebKit {
    149148
    150149WKSelectionDrawingInfo::WKSelectionDrawingInfo()
    … …  
    283282
    284283@interface WKFocusedElementInfo : NSObject <_WKFocusedElementInfo>
    285 - (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated userObject:(NSObject <NSSecureCoding> *)userObject;
     284- (instancetype)initWithAssistedNodeInformation:(const WebKit::AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated userObject:(NSObject <NSSecureCoding> *)userObject;
    286285@end
    287286
    … …  
    443442}
    444443
    445 - (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated userObject:(NSObject <NSSecureCoding> *)userObject
     444- (instancetype)initWithAssistedNodeInformation:(const WebKit::AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated userObject:(NSObject <NSSecureCoding> *)userObject
    446445{
    447446    if (!(self = [super init]))
    … …  
    613612static inline bool hasAssistedNode(WebKit::AssistedNodeInformation assistedNodeInformation)
    614613{
    615     return (assistedNodeInformation.elementType != InputType::None);
     614    return (assistedNodeInformation.elementType != WebKit::InputType::None);
    616615}
    617616
    … …  
    730729    _actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
    731730    [_actionSheetAssistant setDelegate:self];
    732     _smartMagnificationController = std::make_unique<SmartMagnificationController>(self);
     731    _smartMagnificationController = std::make_unique<WebKit::SmartMagnificationController>(self);
    733732    _isExpectingFastSingleTapCommit = NO;
    734733    _potentialTapInProgress = NO;
    … …  
    978977}
    979978
    980 - (const InteractionInformationAtPosition&)positionInformation
     979- (const WebKit::InteractionInformationAtPosition&)positionInformation
    981980{
    982981    return _positionInformation;
    … …  
    11101109    _lastInteractionLocation = lastTouchEvent->locationInDocumentCoordinates;
    11111110    if (lastTouchEvent->type == UIWebTouchEventTouchBegin)
    1112         _layerTreeTransactionIdAtLastTouchStart = downcast<RemoteLayerTreeDrawingAreaProxy>(*_page->drawingArea()).lastCommittedLayerTreeTransactionID();
     1111        _layerTreeTransactionIdAtLastTouchStart = downcast<WebKit::RemoteLayerTreeDrawingAreaProxy>(*_page->drawingArea()).lastCommittedLayerTreeTransactionID();
    11131112
    11141113#if ENABLE(TOUCH_EVENTS)
    1115     NativeWebTouchEvent nativeWebTouchEvent(lastTouchEvent);
     1114    WebKit::NativeWebTouchEvent nativeWebTouchEvent(lastTouchEvent);
    11161115    nativeWebTouchEvent.setCanPreventNativeGestures(!_canSendTouchEventsAsynchronously || [gestureRecognizer isDefaultPrevented]);
    11171116
    … …  
    11461145}
    11471146
    1148 static FloatQuad inflateQuad(const FloatQuad& quad, float inflateSize)
     1147static WebCore::FloatQuad inflateQuad(const WebCore::FloatQuad& quad, float inflateSize)
    11491148{
    11501149    // We sort the output points like this (as expected by the highlight view):
    … …  
    11541153
    11551154    // 1) Sort the points horizontally.
    1156     FloatPoint points[4] = { quad.p1(), quad.p4(), quad.p2(), quad.p3() };
     1155    WebCore::FloatPoint points[4] = { quad.p1(), quad.p4(), quad.p2(), quad.p3() };
    11571156    if (points[0].x() > points[1].x())
    11581157        std::swap(points[0], points[1]);
    … …  
    11801179    points[3].move(inflateSize, inflateSize);
    11811180
    1182     return FloatQuad(points[1], points[0], points[2], points[3]);
     1181    return WebCore::FloatQuad(points[1], points[0], points[2], points[3]);
    11831182}
    11841183
    … …  
    12171216    RetainPtr<NSMutableArray> rects = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
    12181217    for (size_t i = 0; i < quadCount; ++i) {
    1219         const FloatQuad& quad = highlightedQuads[i];
     1218        const WebCore::FloatQuad& quad = highlightedQuads[i];
    12201219        if (quad.isRectilinear()) {
    1221             FloatRect boundingBox = quad.boundingBox();
     1220            WebCore::FloatRect boundingBox = quad.boundingBox();
    12221221            boundingBox.scale(selfScale);
    12231222            boundingBox.inflate(minimumTapHighlightRadius);
    … …  
    12361235        RetainPtr<NSMutableArray> quads = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
    12371236        for (size_t i = 0; i < quadCount; ++i) {
    1238             FloatQuad quad = highlightedQuads[i];
     1237            WebCore::FloatQuad quad = highlightedQuads[i];
    12391238            quad.scale(selfScale);
    1240             FloatQuad extendedQuad = inflateQuad(quad, minimumTapHighlightRadius);
     1239            WebCore::FloatQuad extendedQuad = inflateQuad(quad, minimumTapHighlightRadius);
    12411240            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p1()]];
    12421241            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p2()]];
    … …  
    12571256- (void)_showTapHighlight
    12581257{
    1259     auto shouldPaintTapHighlight = [&](const FloatRect& rect) {
     1258    auto shouldPaintTapHighlight = [&](const WebCore::FloatRect& rect) {
    12601259        static const float highlightPaintThreshold = 0.3; // 30%
    12611260        float highlightArea = 0;
    … …  
    13611360    // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
    13621361    switch (_assistedNodeInformation.elementType) {
    1363     case InputType::None:
     1362    case WebKit::InputType::None:
    13641363        return NO;
    1365     case InputType::Select:
     1364    case WebKit::InputType::Select:
    13661365#if ENABLE(INPUT_TYPE_COLOR)
    1367     case InputType::Color:
    1368 #endif
    1369     case InputType::Date:
    1370     case InputType::Month:
    1371     case InputType::DateTimeLocal:
    1372     case InputType::Time:
     1366    case WebKit::InputType::Color:
     1367#endif
     1368    case WebKit::InputType::Date:
     1369    case WebKit::InputType::Month:
     1370    case WebKit::InputType::DateTimeLocal:
     1371    case WebKit::InputType::Time:
    13731372        return !currentUserInterfaceIdiomIsPad();
    1374     case InputType::Drawing:
     1373    case WebKit::InputType::Drawing:
    13751374        return YES;
    13761375    default:
    … …  
    13871386- (void)_displayFormNodeInputView
    13881387{
    1389     if (!_suppressSelectionAssistantReasons.contains(FocusedElementIsTransparent)) {
     1388    if (!_suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTransparent)) {
    13901389        // In case user scaling is force enabled, do not use that scaling when zooming in with an input field.
    13911390        // Zooming above the page's default scale factor should only happen when the user performs it.
    13921391        [self _zoomToFocusRect:_assistedNodeInformation.elementRect
    1393             selectionRect:_didAccessoryTabInitiateFocus ? IntRect() : _assistedNodeInformation.selectionRect
     1392            selectionRect:_didAccessoryTabInitiateFocus ? WebCore::IntRect() : _assistedNodeInformation.selectionRect
    13941393            insideFixed:_assistedNodeInformation.insideFixedPosition
    13951394            fontSize:_assistedNodeInformation.nodeFontSize
    … …  
    13971396            maximumScale:_assistedNodeInformation.maximumScaleFactorIgnoringAlwaysScalable
    13981397            allowScaling:_assistedNodeInformation.allowsUserScalingIgnoringAlwaysScalable && !currentUserInterfaceIdiomIsPad()
    1399             forceScroll:(_assistedNodeInformation.inputMode == InputMode::None) ? !currentUserInterfaceIdiomIsPad() : [self requiresAccessoryView]];
     1398            forceScroll:(_assistedNodeInformation.inputMode == WebCore::InputMode::None) ? !currentUserInterfaceIdiomIsPad() : [self requiresAccessoryView]];
    14001399    }
    14011400
    … …  
    14101409        return nil;
    14111410
    1412     if (_assistedNodeInformation.inputMode == InputMode::None)
     1411    if (_assistedNodeInformation.inputMode == WebCore::InputMode::None)
    14131412        return [[UIView new] autorelease];
    14141413
    14151414    if (!_inputPeripheral) {
    14161415        switch (_assistedNodeInformation.elementType) {
    1417         case InputType::Select:
     1416        case WebKit::InputType::Select:
    14181417            _inputPeripheral = adoptNS([[WKFormSelectControl alloc] initWithView:self]);
    14191418            break;
    14201419#if ENABLE(INPUT_TYPE_COLOR)
    1421         case InputType::Color:
     1420        case WebKit::InputType::Color:
    14221421            _inputPeripheral = adoptNS([[WKFormColorControl alloc] initWithView:self]);
    14231422            break;
    14241423#endif
    1425         case InputType::Drawing:
     1424        case WebKit::InputType::Drawing:
    14261425#if HAVE(PENCILKIT)
    14271426            _inputPeripheral = adoptNS([[WKInkPickerControl alloc] initWithDrawingView:_page->editableImageController().editableImage(_assistedNodeInformation.embeddedViewID)->drawingView.get()]);
    … …  
    15611560}
    15621561
    1563 - (SEL)_actionForLongPressFromPositionInformation:(const InteractionInformationAtPosition&)positionInformation
     1562- (SEL)_actionForLongPressFromPositionInformation:(const WebKit::InteractionInformationAtPosition&)positionInformation
    15641563{
    15651564    if (!_webView.configuration._longPressActionsEnabled)
    … …  
    15741573    if (positionInformation.isLink) {
    15751574#if ENABLE(DATA_DETECTION)
    1576         if (DataDetection::canBePresentedByDataDetectors(positionInformation.url))
     1575        if (WebCore::DataDetection::canBePresentedByDataDetectors(positionInformation.url))
    15771576            return @selector(_showDataDetectorsSheet);
    15781577#endif
    … …  
    15901589}
    15911590
    1592 - (InteractionInformationAtPosition)currentPositionInformation
     1591- (WebKit::InteractionInformationAtPosition)currentPositionInformation
    15931592{
    15941593    return _positionInformation;
    15951594}
    15961595
    1597 - (void)doAfterPositionInformationUpdate:(void (^)(InteractionInformationAtPosition))action forRequest:(InteractionInformationRequest)request
     1596- (void)doAfterPositionInformationUpdate:(void (^)(WebKit::InteractionInformationAtPosition))action forRequest:(WebKit::InteractionInformationRequest)request
    15981597{
    15991598    if ([self _currentPositionInformationIsValidForRequest:request]) {
    … …  
    16401639}
    16411640
    1642 - (BOOL)_currentPositionInformationIsValidForRequest:(const InteractionInformationRequest&)request
     1641- (BOOL)_currentPositionInformationIsValidForRequest:(const WebKit::InteractionInformationRequest&)request
    16431642{
    16441643    return _hasValidPositionInformation && _positionInformation.request.isValidForRequest(request);
    16451644}
    16461645
    1647 - (BOOL)_hasValidOutstandingPositionInformationRequest:(const InteractionInformationRequest&)request
     1646- (BOOL)_hasValidOutstandingPositionInformationRequest:(const WebKit::InteractionInformationRequest&)request
    16481647{
    16491648    return _outstandingPositionInformationRequest && _outstandingPositionInformationRequest->isValidForRequest(request);
    16501649}
    16511650
    1652 - (BOOL)_currentPositionInformationIsApproximatelyValidForRequest:(const InteractionInformationRequest&)request
     1651- (BOOL)_currentPositionInformationIsApproximatelyValidForRequest:(const WebKit::InteractionInformationRequest&)request
    16531652{
    16541653    return _hasValidPositionInformation && _positionInformation.request.isApproximatelyValidForRequest(request);
    … …  
    17161715            // Request information about the position with sync message.
    17171716            // If the assisted node is the same, prevent the gesture.
    1718             if (![self ensurePositionInformationIsUpToDate:InteractionInformationRequest(roundedIntPoint(point))])
     1717            if (![self ensurePositionInformationIsUpToDate:WebKit::InteractionInformationRequest(WebCore::roundedIntPoint(point))])
    17191718                return NO;
    17201719            if (_positionInformation.nodeAtPositionIsAssistedNode)
    … …  
    17351734        // Send an async message to find out.
    17361735        _hasValidPositionInformation = NO;
    1737         InteractionInformationRequest request(roundedIntPoint(point));
     1736        WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    17381737
    17391738        // If 3D Touch is enabled, asynchronously collect snapshots in the hopes that
    … …  
    17541753        // to gestureRecognizerShouldBegin.
    17551754        // Force a sync call if not ready yet.
    1756         InteractionInformationRequest request(roundedIntPoint(point));
     1755        WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    17571756        if (![self ensurePositionInformationIsUpToDate:request])
    17581757            return NO;
    … …  
    18111810        return NO;
    18121811
    1813     InteractionInformationRequest request(roundedIntPoint(point));
     1812    WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    18141813    if (![self ensurePositionInformationIsUpToDate:request])
    18151814        return NO;
    … …  
    18341833        return NO;
    18351834
    1836     InteractionInformationRequest request(roundedIntPoint(point));
     1835    WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    18371836    if (![self ensurePositionInformationIsUpToDate:request])
    18381837        return NO;
    … …  
    18481847        return NO;
    18491848
    1850     InteractionInformationRequest request(roundedIntPoint(point));
     1849    WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    18511850    if (![self ensurePositionInformationIsUpToDate:request])
    18521851        return NO;
    … …  
    18921891        WebSelectionRect *webRect = [WebSelectionRect selectionRect];
    18931892        webRect.rect = coreRect.rect();
    1894         webRect.writingDirection = coreRect.direction() == TextDirection::LTR ? WKWritingDirectionLeftToRight : WKWritingDirectionRightToLeft;
     1893        webRect.writingDirection = coreRect.direction() == WebCore::TextDirection::LTR ? WKWritingDirectionLeftToRight : WKWritingDirectionRightToLeft;
    18951894        webRect.isLineBreak = coreRect.isLineBreak();
    18961895        webRect.isFirstOnLine = coreRect.isFirstOnLine();
    … …  
    19491948    _isTapHighlightIDValid = YES;
    19501949    _isExpectingFastSingleTapCommit = YES;
    1951     _page->handleTwoFingerTapAtPoint(roundedIntPoint(gestureRecognizer.centroid), ++_latestTapID);
     1950    _page->handleTwoFingerTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.centroid), ++_latestTapID);
    19521951}
    19531952
    … …  
    19581957
    19591958    ASSERT(gestureRecognizer == _stylusSingleTapGestureRecognizer);
    1960     _page->handleStylusSingleTapAtPoint(roundedIntPoint(gestureRecognizer.location), ++_latestTapID);
     1959    _page->handleStylusSingleTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.location), ++_latestTapID);
    19611960}
    19621961
    … …  
    20502049    if (![self isFirstResponder]) {
    20512050        if (!_inputViewUpdateDeferrer)
    2052             _inputViewUpdateDeferrer = std::make_unique<InputViewUpdateDeferrer>();
     2051            _inputViewUpdateDeferrer = std::make_unique<WebKit::InputViewUpdateDeferrer>();
    20532052        [self becomeFirstResponder];
    20542053    }
    … …  
    21092108    if (![self isFirstResponder]) {
    21102109        if (!_inputViewUpdateDeferrer)
    2111             _inputViewUpdateDeferrer = std::make_unique<InputViewUpdateDeferrer>();
     2110            _inputViewUpdateDeferrer = std::make_unique<WebKit::InputViewUpdateDeferrer>();
    21122111        [self becomeFirstResponder];
    21132112    }
    … …  
    21332132}
    21342133
    2135 - (void)_positionInformationDidChange:(const InteractionInformationAtPosition&)info
     2134- (void)_positionInformationDidChange:(const WebKit::InteractionInformationAtPosition&)info
    21362135{
    21372136    _outstandingPositionInformationRequest = std::nullopt;
    21382137
    2139     InteractionInformationAtPosition newInfo = info;
     2138    WebKit::InteractionInformationAtPosition newInfo = info;
    21402139    newInfo.mergeCompatibleOptionalInformation(_positionInformation);
    21412140
    … …  
    21862185        return YES;
    21872186
    2188     if (_assistedNodeInformation.inputMode == InputMode::None)
     2187    if (_assistedNodeInformation.inputMode == WebCore::InputMode::None)
    21892188        return NO;
    21902189
    21912190    switch (_assistedNodeInformation.elementType) {
    2192     case InputType::None:
     2191    case WebKit::InputType::None:
    21932192        return NO;
    2194     case InputType::Text:
    2195     case InputType::Password:
    2196     case InputType::Search:
    2197     case InputType::Email:
    2198     case InputType::URL:
    2199     case InputType::Phone:
    2200     case InputType::Number:
    2201     case InputType::NumberPad:
    2202     case InputType::ContentEditable:
    2203     case InputType::TextArea:
    2204     case InputType::Select:
    2205     case InputType::Date:
    2206     case InputType::DateTime:
    2207     case InputType::DateTimeLocal:
    2208     case InputType::Month:
    2209     case InputType::Week:
    2210     case InputType::Time:
     2193    case WebKit::InputType::Text:
     2194    case WebKit::InputType::Password:
     2195    case WebKit::InputType::Search:
     2196    case WebKit::InputType::Email:
     2197    case WebKit::InputType::URL:
     2198    case WebKit::InputType::Phone:
     2199    case WebKit::InputType::Number:
     2200    case WebKit::InputType::NumberPad:
     2201    case WebKit::InputType::ContentEditable:
     2202    case WebKit::InputType::TextArea:
     2203    case WebKit::InputType::Select:
     2204    case WebKit::InputType::Date:
     2205    case WebKit::InputType::DateTime:
     2206    case WebKit::InputType::DateTimeLocal:
     2207    case WebKit::InputType::Month:
     2208    case WebKit:: InputType::Week:
     2209    case WebKit::InputType::Time:
    22112210#if ENABLE(INPUT_TYPE_COLOR)
    2212     case InputType::Color:
     2211    case WebKit::InputType::Color:
    22132212#endif
    22142213        return !currentUserInterfaceIdiomIsPad();
    2215     case InputType::Drawing:
     2214    case WebKit::InputType::Drawing:
    22162215        return YES;
    22172216    }
    … …  
    22582257
    22592258        richTypes = [[NSMutableArray alloc] init];
    2260         [richTypes addObject:WebArchivePboardType];
     2259        [richTypes addObject:WebCore::WebArchivePboardType];
    22612260        [richTypes addObjectsFromArray:UIPasteboardTypeListImage];
    22622261        [richTypes addObjectsFromArray:plainTextTypes];
    … …  
    22802279{
    22812280    RetainPtr<WKContentView> view = self;
    2282     _page->getSelectionContext([view](const String& selectedText, const String& textBefore, const String& textAfter, CallbackBase::Error error) {
    2283         if (error != CallbackBase::Error::None)
     2281    _page->getSelectionContext([view](const String& selectedText, const String& textBefore, const String& textAfter, WebKit::CallbackBase::Error error) {
     2282        if (error != WebKit::CallbackBase::Error::None)
    22842283            return;
    22852284        if (!selectedText)
    … …  
    23052304{
    23062305    RetainPtr<WKContentView> view = self;
    2307     _page->getSelectionOrContentsAsString([view](const String& string, CallbackBase::Error error) {
    2308         if (error != CallbackBase::Error::None)
     2306    _page->getSelectionOrContentsAsString([view](const String& string, WebKit::CallbackBase::Error error) {
     2307        if (error != WebKit::CallbackBase::Error::None)
    23092308            return;
    23102309        if (!string)
    … …  
    24662465    auto typingAttributes = _page->editorState().postLayoutData().typingAttributes;
    24672466    CTFontSymbolicTraits symbolicTraits = 0;
    2468     if (typingAttributes & AttributeBold)
     2467    if (typingAttributes & WebKit::AttributeBold)
    24692468        symbolicTraits |= kCTFontBoldTrait;
    2470     if (typingAttributes & AttributeItalics)
     2469    if (typingAttributes & WebKit::AttributeItalics)
    24712470        symbolicTraits |= kCTFontTraitItalic;
    24722471
    … …  
    24822481        [result setObject:(id)font.get() forKey:NSFontAttributeName];
    24832482   
    2484     if (typingAttributes & AttributeUnderline)
     2483    if (typingAttributes & WebKit::AttributeUnderline)
    24852484        [result setObject:[NSNumber numberWithInt:NSUnderlineStyleSingle] forKey:NSUnderlineStyleAttributeName];
    24862485
    … …  
    25752574            return NO;
    25762575
    2577         NSArray *allCustomPasteboardData = [pasteboard dataForPasteboardType:@(PasteboardCustomData::cocoaType()) inItemSet:indices];
     2576        NSArray *allCustomPasteboardData = [pasteboard dataForPasteboardType:@(WebCore::PasteboardCustomData::cocoaType()) inItemSet:indices];
    25782577        for (NSData *data in allCustomPasteboardData) {
    2579             auto buffer = SharedBuffer::create(data);
    2580             if (PasteboardCustomData::fromSharedBuffer(buffer.get()).origin == focusedDocumentOrigin)
     2578            auto buffer = WebCore::SharedBuffer::create(data);
     2579            if (WebCore::PasteboardCustomData::fromSharedBuffer(buffer.get()).origin == focusedDocumentOrigin)
    25812580                return YES;
    25822581        }
    … …  
    27142713    [_textSelectionAssistant selectWord];
    27152714    // We cannot use selectWord command, because we want to be able to select the word even when it is the last in the paragraph.
    2716     _page->extendSelection(WordGranularity);
     2715    _page->extendSelection(WebCore::WordGranularity);
    27172716}
    27182717
    … …  
    27942793{
    27952794    RetainPtr<WKContentView> view = self;
    2796     _page->requestRectsForGranularityWithSelectionOffset(toWKTextGranularity(granularity), offset , [view, offset, granularity](const Vector<WebCore::SelectionRect>& selectionRects, CallbackBase::Error error) {
     2795    _page->requestRectsForGranularityWithSelectionOffset(toWKTextGranularity(granularity), offset , [view, offset, granularity](const Vector<WebCore::SelectionRect>& selectionRects, WebKit::CallbackBase::Error error) {
    27972796        if (error != WebKit::CallbackBase::Error::None)
    27982797            return;
    … …  
    28072806}
    28082807
    2809 - (void)_accessibilityRetrieveRectsAtSelectionOffset:(NSInteger)offset withText:(NSString *)text completionHandler:(void (^)(const Vector<SelectionRect>& rects))completionHandler
     2808- (void)_accessibilityRetrieveRectsAtSelectionOffset:(NSInteger)offset withText:(NSString *)text completionHandler:(void (^)(const Vector<WebCore::SelectionRect>& rects))completionHandler
    28102809{
    28112810    RetainPtr<WKContentView> view = self;
    2812     _page->requestRectsAtSelectionOffsetWithText(offset, text, [view, offset, capturedCompletionHandler = makeBlockPtr(completionHandler)](const Vector<SelectionRect>& selectionRects, CallbackBase::Error error) {
     2811    _page->requestRectsAtSelectionOffsetWithText(offset, text, [view, offset, capturedCompletionHandler = makeBlockPtr(completionHandler)](const Vector<WebCore::SelectionRect>& selectionRects, WebKit::CallbackBase::Error error) {
    28132812        if (capturedCompletionHandler)
    28142813            capturedCompletionHandler(selectionRects);
    … …  
    28332832// UIWKInteractionViewProtocol
    28342833
    2835 static inline GestureType toGestureType(UIWKGestureType gestureType)
     2834static inline WebKit::GestureType toGestureType(UIWKGestureType gestureType)
    28362835{
    28372836    switch (gestureType) {
    28382837    case UIWKGestureLoupe:
    2839         return GestureType::Loupe;
     2838        return WebKit::GestureType::Loupe;
    28402839    case UIWKGestureOneFingerTap:
    2841         return GestureType::OneFingerTap;
     2840        return WebKit::GestureType::OneFingerTap;
    28422841    case UIWKGestureTapAndAHalf:
    2843         return GestureType::TapAndAHalf;
     2842        return WebKit::GestureType::TapAndAHalf;
    28442843    case UIWKGestureDoubleTap:
    2845         return GestureType::DoubleTap;
     2844        return WebKit::GestureType::DoubleTap;
    28462845    case UIWKGestureTapAndHalf:
    2847         return GestureType::TapAndHalf;
     2846        return WebKit::GestureType::TapAndHalf;
    28482847    case UIWKGestureDoubleTapInUneditable:
    2849         return GestureType::DoubleTapInUneditable;
     2848        return WebKit::GestureType::DoubleTapInUneditable;
    28502849    case UIWKGestureOneFingerTapInUneditable:
    2851         return GestureType::OneFingerTapInUneditable;
     2850        return WebKit::GestureType::OneFingerTapInUneditable;
    28522851    case UIWKGestureOneFingerTapSelectsAll:
    2853         return GestureType::OneFingerTapSelectsAll;
     2852        return WebKit::GestureType::OneFingerTapSelectsAll;
    28542853    case UIWKGestureOneFingerDoubleTap:
    2855         return GestureType::OneFingerDoubleTap;
     2854        return WebKit::GestureType::OneFingerDoubleTap;
    28562855    case UIWKGestureOneFingerTripleTap:
    2857         return GestureType::OneFingerTripleTap;
     2856        return WebKit::GestureType::OneFingerTripleTap;
    28582857    case UIWKGestureTwoFingerSingleTap:
    2859         return GestureType::TwoFingerSingleTap;
     2858        return WebKit::GestureType::TwoFingerSingleTap;
    28602859    case UIWKGestureTwoFingerRangedSelectGesture:
    2861         return GestureType::TwoFingerRangedSelectGesture;
     2860        return WebKit::GestureType::TwoFingerRangedSelectGesture;
    28622861    case UIWKGestureTapOnLinkWithGesture:
    2863         return GestureType::TapOnLinkWithGesture;
     2862        return WebKit::GestureType::TapOnLinkWithGesture;
    28642863    case UIWKGestureMakeWebSelection:
    2865         return GestureType::MakeWebSelection;
     2864        return WebKit::GestureType::MakeWebSelection;
    28662865    case UIWKGesturePhraseBoundary:
    2867         return GestureType::PhraseBoundary;
     2866        return WebKit::GestureType::PhraseBoundary;
    28682867    }
    28692868    ASSERT_NOT_REACHED();
    2870     return GestureType::Loupe;
    2871 }
    2872 
    2873 static inline UIWKGestureType toUIWKGestureType(GestureType gestureType)
     2869    return WebKit::GestureType::Loupe;
     2870}
     2871
     2872static inline UIWKGestureType toUIWKGestureType(WebKit::GestureType gestureType)
    28742873{
    28752874    switch (gestureType) {
    2876     case GestureType::Loupe:
     2875    case WebKit::GestureType::Loupe:
    28772876        return UIWKGestureLoupe;
    2878     case GestureType::OneFingerTap:
     2877    case WebKit::GestureType::OneFingerTap:
    28792878        return UIWKGestureOneFingerTap;
    2880     case GestureType::TapAndAHalf:
     2879    case WebKit::GestureType::TapAndAHalf:
    28812880        return UIWKGestureTapAndAHalf;
    2882     case GestureType::DoubleTap:
     2881    case WebKit::GestureType::DoubleTap:
    28832882        return UIWKGestureDoubleTap;
    2884     case GestureType::TapAndHalf:
     2883    case WebKit::GestureType::TapAndHalf:
    28852884        return UIWKGestureTapAndHalf;
    2886     case GestureType::DoubleTapInUneditable:
     2885    case WebKit::GestureType::DoubleTapInUneditable:
    28872886        return UIWKGestureDoubleTapInUneditable;
    2888     case GestureType::OneFingerTapInUneditable:
     2887    case WebKit::GestureType::OneFingerTapInUneditable:
    28892888        return UIWKGestureOneFingerTapInUneditable;
    2890     case GestureType::OneFingerTapSelectsAll:
     2889    case WebKit::GestureType::OneFingerTapSelectsAll:
    28912890        return UIWKGestureOneFingerTapSelectsAll;
    2892     case GestureType::OneFingerDoubleTap:
     2891    case WebKit::GestureType::OneFingerDoubleTap:
    28932892        return UIWKGestureOneFingerDoubleTap;
    2894     case GestureType::OneFingerTripleTap:
     2893    case WebKit::GestureType::OneFingerTripleTap:
    28952894        return UIWKGestureOneFingerTripleTap;
    2896     case GestureType::TwoFingerSingleTap:
     2895    case WebKit::GestureType::TwoFingerSingleTap:
    28972896        return UIWKGestureTwoFingerSingleTap;
    2898     case GestureType::TwoFingerRangedSelectGesture:
     2897    case WebKit::GestureType::TwoFingerRangedSelectGesture:
    28992898        return UIWKGestureTwoFingerRangedSelectGesture;
    2900     case GestureType::TapOnLinkWithGesture:
     2899    case WebKit::GestureType::TapOnLinkWithGesture:
    29012900        return UIWKGestureTapOnLinkWithGesture;
    2902     case GestureType::MakeWebSelection:
     2901    case WebKit::GestureType::MakeWebSelection:
    29032902        return UIWKGestureMakeWebSelection;
    2904     case GestureType::PhraseBoundary:
     2903    case WebKit::GestureType::PhraseBoundary:
    29052904        return UIWKGesturePhraseBoundary;
    29062905    }
    29072906}
    29082907
    2909 static inline SelectionTouch toSelectionTouch(UIWKSelectionTouch touch)
     2908static inline WebKit::SelectionTouch toSelectionTouch(UIWKSelectionTouch touch)
    29102909{
    29112910    switch (touch) {
    29122911    case UIWKSelectionTouchStarted:
    2913         return SelectionTouch::Started;
     2912        return WebKit::SelectionTouch::Started;
    29142913    case UIWKSelectionTouchMoved:
    2915         return SelectionTouch::Moved;
     2914        return WebKit::SelectionTouch::Moved;
    29162915    case UIWKSelectionTouchEnded:
    2917         return SelectionTouch::Ended;
     2916        return WebKit::SelectionTouch::Ended;
    29182917    case UIWKSelectionTouchEndedMovingForward:
    2919         return SelectionTouch::EndedMovingForward;
     2918        return WebKit::SelectionTouch::EndedMovingForward;
    29202919    case UIWKSelectionTouchEndedMovingBackward:
    2921         return SelectionTouch::EndedMovingBackward;
     2920        return WebKit::SelectionTouch::EndedMovingBackward;
    29222921    case UIWKSelectionTouchEndedNotMoving:
    2923         return SelectionTouch::EndedNotMoving;
     2922        return WebKit::SelectionTouch::EndedNotMoving;
    29242923    }
    29252924    ASSERT_NOT_REACHED();
    2926     return SelectionTouch::Ended;
    2927 }
    2928 
    2929 static inline UIWKSelectionTouch toUIWKSelectionTouch(SelectionTouch touch)
     2925    return WebKit::SelectionTouch::Ended;
     2926}
     2927
     2928static inline UIWKSelectionTouch toUIWKSelectionTouch(WebKit::SelectionTouch touch)
    29302929{
    29312930    switch (touch) {
    2932     case SelectionTouch::Started:
     2931    case WebKit::SelectionTouch::Started:
    29332932        return UIWKSelectionTouchStarted;
    2934     case SelectionTouch::Moved:
     2933    case WebKit::SelectionTouch::Moved:
    29352934        return UIWKSelectionTouchMoved;
    2936     case SelectionTouch::Ended:
     2935    case WebKit::SelectionTouch::Ended:
    29372936        return UIWKSelectionTouchEnded;
    2938     case SelectionTouch::EndedMovingForward:
     2937    case WebKit::SelectionTouch::EndedMovingForward:
    29392938        return UIWKSelectionTouchEndedMovingForward;
    2940     case SelectionTouch::EndedMovingBackward:
     2939    case WebKit::SelectionTouch::EndedMovingBackward:
    29412940        return UIWKSelectionTouchEndedMovingBackward;
    2942     case SelectionTouch::EndedNotMoving:
     2941    case WebKit::SelectionTouch::EndedNotMoving:
    29432942        return UIWKSelectionTouchEndedNotMoving;
    29442943    }
    29452944}
    29462945
    2947 static inline GestureRecognizerState toGestureRecognizerState(UIGestureRecognizerState state)
     2946static inline WebKit::GestureRecognizerState toGestureRecognizerState(UIGestureRecognizerState state)
    29482947{
    29492948    switch (state) {
    29502949    case UIGestureRecognizerStatePossible:
    2951         return GestureRecognizerState::Possible;
     2950        return WebKit::GestureRecognizerState::Possible;
    29522951    case UIGestureRecognizerStateBegan:
    2953         return GestureRecognizerState::Began;
     2952        return WebKit::GestureRecognizerState::Began;
    29542953    case UIGestureRecognizerStateChanged:
    2955         return GestureRecognizerState::Changed;
     2954        return WebKit::GestureRecognizerState::Changed;
    29562955    case UIGestureRecognizerStateCancelled:
    2957         return GestureRecognizerState::Cancelled;
     2956        return WebKit::GestureRecognizerState::Cancelled;
    29582957    case UIGestureRecognizerStateEnded:
    2959         return GestureRecognizerState::Ended;
     2958        return WebKit::GestureRecognizerState::Ended;
    29602959    case UIGestureRecognizerStateFailed:
    2961         return GestureRecognizerState::Failed;
    2962     }
    2963 }
    2964 
    2965 static inline UIGestureRecognizerState toUIGestureRecognizerState(GestureRecognizerState state)
     2960        return WebKit::GestureRecognizerState::Failed;
     2961    }
     2962}
     2963
     2964static inline UIGestureRecognizerState toUIGestureRecognizerState(WebKit::GestureRecognizerState state)
    29662965{
    29672966    switch (state) {
    2968     case GestureRecognizerState::Possible:
     2967    case WebKit::GestureRecognizerState::Possible:
    29692968        return UIGestureRecognizerStatePossible;
    2970     case GestureRecognizerState::Began:
     2969    case WebKit::GestureRecognizerState::Began:
    29712970        return UIGestureRecognizerStateBegan;
    2972     case GestureRecognizerState::Changed:
     2971    case WebKit::GestureRecognizerState::Changed:
    29732972        return UIGestureRecognizerStateChanged;
    2974     case GestureRecognizerState::Cancelled:
     2973    case WebKit::GestureRecognizerState::Cancelled:
    29752974        return UIGestureRecognizerStateCancelled;
    2976     case GestureRecognizerState::Ended:
     2975    case WebKit::GestureRecognizerState::Ended:
    29772976        return UIGestureRecognizerStateEnded;
    2978     case GestureRecognizerState::Failed:
     2977    case WebKit::GestureRecognizerState::Failed:
    29792978        return UIGestureRecognizerStateFailed;
    29802979    }
    29812980}
    29822981
    2983 static inline UIWKSelectionFlags toUIWKSelectionFlags(SelectionFlags flags)
     2982static inline UIWKSelectionFlags toUIWKSelectionFlags(WebKit::SelectionFlags flags)
    29842983{
    29852984    NSInteger uiFlags = UIWKNone;
    2986     if (flags & WordIsNearTap)
     2985    if (flags & WebKit::WordIsNearTap)
    29872986        uiFlags |= UIWKWordIsNearTap;
    2988     if (flags & PhraseBoundaryChanged)
     2987    if (flags & WebKit::PhraseBoundaryChanged)
    29892988        uiFlags |= UIWKPhraseBoundaryChanged;
    29902989
    … …  
    29962995    switch (granularity) {
    29972996    case UITextGranularityCharacter:
    2998         return CharacterGranularity;
     2997        return WebCore::CharacterGranularity;
    29992998    case UITextGranularityWord:
    3000         return WordGranularity;
     2999        return WebCore::WordGranularity;
    30013000    case UITextGranularitySentence:
    3002         return SentenceGranularity;
     3001        return WebCore::SentenceGranularity;
    30033002    case UITextGranularityParagraph:
    3004         return ParagraphGranularity;
     3003        return WebCore::ParagraphGranularity;
    30053004    case UITextGranularityLine:
    3006         return LineGranularity;
     3005        return WebCore::LineGranularity;
    30073006    case UITextGranularityDocument:
    3008         return DocumentGranularity;
     3007        return WebCore::DocumentGranularity;
    30093008    }
    30103009}
    … …  
    30153014    case UITextLayoutDirectionDown:
    30163015    case UITextLayoutDirectionRight:
    3017         return DirectionRight;
     3016        return WebCore::DirectionRight;
    30183017    case UITextLayoutDirectionUp:
    30193018    case UITextLayoutDirectionLeft:
    3020         return DirectionLeft;
     3019        return WebCore::DirectionLeft;
    30213020    default:
    30223021        // UITextDirection is not an enum, but we only want to accept values from UITextLayoutDirection.
    30233022        ASSERT_NOT_REACHED();
    3024         return DirectionRight;
     3023        return WebCore::DirectionRight;
    30253024    }
    30263025}
    … …  
    30323031        return;
    30333032    }
    3034     [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithGestureAt:(CGPoint)point withGesture:toUIWKGestureType((GestureType)gestureType) withState:toUIGestureRecognizerState(static_cast<GestureRecognizerState>(gestureState)) withFlags:(toUIWKSelectionFlags((SelectionFlags)flags))];
     3033    [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithGestureAt:(CGPoint)point withGesture:toUIWKGestureType((WebKit::GestureType)gestureType) withState:toUIGestureRecognizerState(static_cast<WebKit::GestureRecognizerState>(gestureState)) withFlags:(toUIWKSelectionFlags((WebKit::SelectionFlags)flags))];
    30353034}
    30363035
    … …  
    30413040        return;
    30423041    }
    3043     [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:toUIWKSelectionTouch((SelectionTouch)touch) withFlags:static_cast<UIWKSelectionFlags>(flags)];
     3042    [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:toUIWKSelectionTouch((WebKit::SelectionTouch)touch) withFlags:static_cast<UIWKSelectionFlags>(flags)];
    30443043}
    30453044
    … …  
    30573056{
    30583057    _usingGestureForSelection = YES;
    3059     _page->selectWithGesture(WebCore::IntPoint(point), CharacterGranularity, static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(state)), [self _isInteractingWithAssistedNode], [self, state, flags](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t innerFlags, WebKit::CallbackBase::Error error) {
     3058    _page->selectWithGesture(WebCore::IntPoint(point), WebCore::CharacterGranularity, static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(state)), [self _isInteractingWithAssistedNode], [self, state, flags](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t innerFlags, WebKit::CallbackBase::Error error) {
    30603059        selectionChangedWithGesture(self, point, gestureType, gestureState, flags | innerFlags, error);
    30613060        if (state == UIGestureRecognizerStateEnded || state == UIGestureRecognizerStateCancelled)
    … …  
    30963095}
    30973096
    3098 - (const WKAutoCorrectionData&)autocorrectionData
     3097- (const WebKit::WKAutoCorrectionData&)autocorrectionData
    30993098{
    31003099    return _autocorrectionData;
    … …  
    31113110    RetainPtr<WKContentView> view = self;
    31123111    _autocorrectionData.autocorrectionHandler = [completionHandler copy];
    3113     _page->requestAutocorrectionData(input, [view](const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits, WebKit::CallbackBase::Error) {
     3112    _page->requestAutocorrectionData(input, [view](const Vector<WebCore::FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits, WebKit::CallbackBase::Error) {
    31143113        CGRect firstRect = CGRectZero;
    31153114        CGRect lastRect = CGRectZero;
    … …  
    33513350    RetainPtr<WKContentView> view = self;
    33523351    _page->setInitialFocus(selectingForward, false, WebKit::WebKeyboardEvent(), [view, completionHandlerCopy](WebKit::CallbackBase::Error) {
    3353         BOOL didBecomeFirstResponder = view->_assistedNodeInformation.elementType != InputType::None && [view becomeFirstResponder];
     3352        BOOL didBecomeFirstResponder = view->_assistedNodeInformation.elementType != WebKit::InputType::None && [view becomeFirstResponder];
    33543353        completionHandlerCopy(didBecomeFirstResponder);
    33553354        Block_release(completionHandlerCopy);
    … …  
    34023401    else {
    34033402        switch (_assistedNodeInformation.elementType) {
    3404         case InputType::Date:
    3405         case InputType::Month:
    3406         case InputType::DateTimeLocal:
    3407         case InputType::Time:
     3403        case WebKit::InputType::Date:
     3404        case WebKit::InputType::Month:
     3405        case WebKit::InputType::DateTimeLocal:
     3406        case WebKit::InputType::Time:
    34083407            [_formAccessoryView setClearVisible:YES];
    34093408            break;
    … …  
    34713470   
    34723471    auto& postLayoutEditorStateData = _page->editorState().postLayoutData();
    3473     FloatRect startRect = postLayoutEditorStateData.caretRectAtStart;
    3474     FloatRect endRect = postLayoutEditorStateData.caretRectAtEnd;
     3472    WebCore::FloatRect startRect = postLayoutEditorStateData.caretRectAtStart;
     3473    WebCore::FloatRect endRect = postLayoutEditorStateData.caretRectAtEnd;
    34753474    double inverseScale = [self inverseScale];
    34763475    // We want to keep the original caret width, while the height scales with
    … …  
    35513550{
    35523551    _markedText = markedText;
    3553     _page->setCompositionAsync(markedText, Vector<WebCore::CompositionUnderline>(), selectedRange, EditingRange());
     3552    _page->setCompositionAsync(markedText, Vector<WebCore::CompositionUnderline>(), selectedRange, WebKit::EditingRange());
    35543553}
    35553554
    … …  
    36153614}
    36163615
    3617 static WritingDirection coreWritingDirection(NSWritingDirection direction)
     3616static WebKit::WritingDirection coreWritingDirection(NSWritingDirection direction)
    36183617{
    36193618    switch (direction) {
    36203619    case NSWritingDirectionNatural:
    3621         return WritingDirection::Natural;
     3620        return WebCore::WritingDirection::Natural;
    36223621    case NSWritingDirectionLeftToRight:
    3623         return WritingDirection::LeftToRight;
     3622        return WebCore::WritingDirection::LeftToRight;
    36243623    case NSWritingDirectionRightToLeft:
    3625         return WritingDirection::RightToLeft;
     3624        return WebCore::WritingDirection::RightToLeft;
    36263625    default:
    36273626        ASSERT_NOT_REACHED();
    3628         return WritingDirection::Natural;
     3627        return WebCore::WritingDirection::Natural;
    36293628    }
    36303629}
    … …  
    36483647{
    36493648#if PLATFORM(IOSMAC)
    3650     InteractionInformationRequest request(roundedIntPoint(point));
     3649    WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
    36513650    [self requestAsynchronousPositionInformationUpdate:request];
    36523651    if ([self _currentPositionInformationIsApproximatelyValidForRequest:request] && _positionInformation.isSelectable)
    … …  
    36743673- (void)insertText:(NSString *)aStringValue
    36753674{
    3676     _page->insertTextAsync(aStringValue, EditingRange());
     3675    _page->insertTextAsync(aStringValue, WebKit::EditingRange());
    36773676}
    36783677
    … …  
    37943793        _traits = adoptNS([[UITextInputTraits alloc] init]);
    37953794
    3796     [_traits setSecureTextEntry:_assistedNodeInformation.elementType == InputType::Password || [_formInputSession forceSecureTextEntry]];
    3797     [_traits setShortcutConversionType:_assistedNodeInformation.elementType == InputType::Password ? UITextShortcutConversionTypeNo : UITextShortcutConversionTypeDefault];
     3795    [_traits setSecureTextEntry:_assistedNodeInformation.elementType == WebKit::InputType::Password || [_formInputSession forceSecureTextEntry]];
     3796    [_traits setShortcutConversionType:_assistedNodeInformation.elementType == WebKit::InputType::Password ? UITextShortcutConversionTypeNo : UITextShortcutConversionTypeDefault];
    37983797
    37993798    if (!_assistedNodeInformation.formAction.isEmpty())
    3800         [_traits setReturnKeyType:(_assistedNodeInformation.elementType == InputType::Search) ? UIReturnKeySearch : UIReturnKeyGo];
    3801 
    3802     if (_assistedNodeInformation.elementType == InputType::Password || _assistedNodeInformation.elementType == InputType::Email || _assistedNodeInformation.elementType == InputType::URL || _assistedNodeInformation.formAction.contains("login")) {
     3799        [_traits setReturnKeyType:(_assistedNodeInformation.elementType == WebKit::InputType::Search) ? UIReturnKeySearch : UIReturnKeyGo];
     3800
     3801    if (_assistedNodeInformation.elementType == WebKit::InputType::Password || _assistedNodeInformation.elementType == WebKit::InputType::Email || _assistedNodeInformation.elementType == WebKit::InputType::URL || _assistedNodeInformation.formAction.contains("login")) {
    38033802        [_traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
    38043803        [_traits setAutocorrectionType:UITextAutocorrectionTypeNo];
    … …  
    38093808
    38103809    switch (_assistedNodeInformation.inputMode) {
    3811     case InputMode::Unspecified:
     3810    case WebCore::InputMode::Unspecified:
    38123811        switch (_assistedNodeInformation.elementType) {
    3813         case InputType::Phone:
     3812        case WebKit::InputType::Phone:
    38143813            [_traits setKeyboardType:UIKeyboardTypePhonePad];
    38153814            break;
    3816         case InputType::URL:
     3815        case WebKit::InputType::URL:
    38173816            [_traits setKeyboardType:UIKeyboardTypeURL];
    38183817            break;
    3819         case InputType::Email:
     3818        case WebKit::InputType::Email:
    38203819            [_traits setKeyboardType:UIKeyboardTypeEmailAddress];
    38213820            break;
    3822         case InputType::Number:
     3821        case WebKit::InputType::Number:
    38233822            [_traits setKeyboardType:UIKeyboardTypeNumbersAndPunctuation];
    38243823            break;
    3825         case InputType::NumberPad:
     3824        case WebKit::InputType::NumberPad:
    38263825            [_traits setKeyboardType:UIKeyboardTypeNumberPad];
    38273826            break;
    3828         case InputType::None:
    3829         case InputType::ContentEditable:
    3830         case InputType::Text:
    3831         case InputType::Password:
    3832         case InputType::TextArea:
    3833         case InputType::Search:
    3834         case InputType::Date:
    3835         case InputType::DateTime:
    3836         case InputType::DateTimeLocal:
    3837         case InputType::Month:
    3838         case InputType::Week:
    3839         case InputType::Time:
    3840         case InputType::Select:
    3841         case InputType::Drawing:
     3827        case WebKit::InputType::None:
     3828        case WebKit::InputType::ContentEditable:
     3829        case WebKit::InputType::Text:
     3830        case WebKit::InputType::Password:
     3831        case WebKit::InputType::TextArea:
     3832        case WebKit::InputType::Search:
     3833        case WebKit::InputType::Date:
     3834        case WebKit::InputType::DateTime:
     3835        case WebKit::InputType::DateTimeLocal:
     3836        case WebKit::InputType::Month:
     3837        case WebKit::InputType::Week:
     3838        case WebKit::InputType::Time:
     3839        case WebKit::InputType::Select:
     3840        case WebKit::InputType::Drawing:
    38423841#if ENABLE(INPUT_TYPE_COLOR)
    3843         case InputType::Color:
     3842        case WebKit::InputType::Color:
    38443843#endif
    38453844            [_traits setKeyboardType:UIKeyboardTypeDefault];
    38463845        }
    38473846        break;
    3848     case InputMode::None:
     3847    case WebCore::InputMode::None:
    38493848        break;
    3850     case InputMode::Text:
     3849    case WebCore::InputMode::Text:
    38513850        [_traits setKeyboardType:UIKeyboardTypeDefault];
    38523851        break;
    3853     case InputMode::Telephone:
     3852    case WebCore::InputMode::Telephone:
    38543853        [_traits setKeyboardType:UIKeyboardTypePhonePad];
    38553854        break;
    3856     case InputMode::Url:
     3855    case WebCore::InputMode::Url:
    38573856        [_traits setKeyboardType:UIKeyboardTypeURL];
    38583857        break;
    3859     case InputMode::Email:
     3858    case WebCore::InputMode::Email:
    38603859        [_traits setKeyboardType:UIKeyboardTypeEmailAddress];
    38613860        break;
    3862     case InputMode::Numeric:
     3861    case WebCore::InputMode::Numeric:
    38633862        [_traits setKeyboardType:UIKeyboardTypeNumbersAndPunctuation];
    38643863        break;
    3865     case InputMode::Decimal:
     3864    case WebCore::InputMode::Decimal:
    38663865        [_traits setKeyboardType:UIKeyboardTypeDecimalPad];
    38673866        break;
    3868     case InputMode::Search:
     3867    case WebCore::InputMode::Search:
    38693868        [_traits setKeyboardType:UIKeyboardTypeWebSearch];
    38703869        break;
    … …  
    39603959- (void)handleKeyWebEvent:(::WebEvent *)theEvent
    39613960{
    3962     _page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
     3961    _page->handleKeyboardEvent(WebKit::NativeWebKeyboardEvent(theEvent));
    39633962}
    39643963
    … …  
    39663965{
    39673966    _keyWebEventHandler = makeBlockPtr(completionHandler);
    3968     _page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
     3967    _page->handleKeyboardEvent(WebKit::NativeWebKeyboardEvent(theEvent));
    39693968}
    39703969
    … …  
    40704069        return NO;
    40714070
    4072     if (_assistedNodeInformation.elementType == InputType::Select)
     4071    if (_assistedNodeInformation.elementType == WebKit::InputType::Select)
    40734072        return NO;
    40744073
    … …  
    40764075}
    40774076
    4078 - (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(ScrollingIncrement)increment
     4077- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment
    40794078{
    40804079    switch (increment) {
    4081     case ScrollingIncrement::Document:
     4080    case WebKit::ScrollingIncrement::Document:
    40824081        return [self convertRect:self.bounds toView:_webView].size.height;
    4083     case ScrollingIncrement::Page:
     4082    case WebKit::ScrollingIncrement::Page:
    40844083        return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height)) toView:_webView].height;
    4085     case ScrollingIncrement::Line:
     4084    case WebKit::ScrollingIncrement::Line:
    40864085        return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pixelsPerLineStep()) toView:_webView].height;
    40874086    }
    … …  
    43394338}
    43404339
    4341 - (const AssistedNodeInformation&)assistedNodeInformation
     4340- (const WebKit::AssistedNodeInformation&)assistedNodeInformation
    43424341{
    43434342    return _assistedNodeInformation;
    43444343}
    43454344
    4346 - (Vector<OptionItem>&)assistedNodeSelectOptions
     4345- (Vector<WebKit::OptionItem>&)assistedNodeSelectOptions
    43474346{
    43484347    return _assistedNodeInformation.selectOptions;
    … …  
    43554354}
    43564355
    4357 static bool isAssistableInputType(InputType type)
     4356static bool isAssistableInputType(WebKit::InputType type)
    43584357{
    43594358    switch (type) {
    4360     case InputType::ContentEditable:
    4361     case InputType::Text:
    4362     case InputType::Password:
    4363     case InputType::TextArea:
    4364     case InputType::Search:
    4365     case InputType::Email:
    4366     case InputType::URL:
    4367     case InputType::Phone:
    4368     case InputType::Number:
    4369     case InputType::NumberPad:
    4370     case InputType::Date:
    4371     case InputType::DateTime:
    4372     case InputType::DateTimeLocal:
    4373     case InputType::Month:
    4374     case InputType::Week:
    4375     case InputType::Time:
    4376     case InputType::Select:
    4377     case InputType::Drawing:
     4359    case WebKit::InputType::ContentEditable:
     4360    case WebKit::InputType::Text:
     4361    case WebKit::InputType::Password:
     4362    case WebKit::InputType::TextArea:
     4363    case WebKit::InputType::Search:
     4364    case WebKit::InputType::Email:
     4365    case WebKit::InputType::URL:
     4366    case WebKit::InputType::Phone:
     4367    case WebKit::InputType::Number:
     4368    case WebKit::InputType::NumberPad:
     4369    case WebKit::InputType::Date:
     4370    case WebKit::InputType::DateTime:
     4371    case WebKit::InputType::DateTimeLocal:
     4372    case WebKit::InputType::Month:
     4373    case WebKit::InputType::Week:
     4374    case WebKit::InputType::Time:
     4375    case WebKit::InputType::Select:
     4376    case WebKit::InputType::Drawing:
    43784377#if ENABLE(INPUT_TYPE_COLOR)
    4379     case InputType::Color:
     4378    case WebKit::InputType::Color:
    43804379#endif
    43814380        return true;
    43824381
    4383     case InputType::None:
     4382    case WebKit::InputType::None:
    43844383        return false;
    43854384    }
    … …  
    43894388}
    43904389
    4391 - (void)_startAssistingNode:(const AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode changingActivityState:(BOOL)changingActivityState userObject:(NSObject <NSSecureCoding> *)userObject
     4390- (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode changingActivityState:(BOOL)changingActivityState userObject:(NSObject <NSSecureCoding> *)userObject
    43924391{
    43934392    SetForScope<BOOL> isChangingFocusForScope { _isChangingFocus, hasAssistedNode(_assistedNodeInformation) };
    … …  
    44114410
    44124411    if (information.elementIsTransparent)
    4413         [self _beginSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
     4412        [self _beginSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent];
    44144413    else
    4415         [self _stopSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
     4414        [self _stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent];
    44164415
    44174416    switch (startInputSessionPolicy) {
    … …  
    44894488   
    44904489    switch (information.elementType) {
    4491     case InputType::Select:
    4492     case InputType::DateTimeLocal:
    4493     case InputType::Time:
    4494     case InputType::Month:
    4495     case InputType::Date:
     4490    case WebKit::InputType::Select:
     4491    case WebKit::InputType::DateTimeLocal:
     4492    case WebKit::InputType::Time:
     4493    case WebKit::InputType::Month:
     4494    case WebKit::InputType::Date:
    44964495#if ENABLE(INPUT_TYPE_COLOR)
    4497     case InputType::Color:
     4496    case WebKit::InputType::Color:
    44984497#endif
    44994498        break;
    … …  
    45374536    BOOL editableChanged = [self setIsEditable:NO];
    45384537
    4539     _assistedNodeInformation.elementType = InputType::None;
     4538    _assistedNodeInformation.elementType = WebKit::InputType::None;
    45404539    _inputPeripheral = nil;
    45414540    _focusRequiresStrongPasswordAssistance = NO;
    … …  
    45584557    [_webView didEndFormControlInteraction];
    45594558
    4560     [self _stopSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
     4559    [self _stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent];
    45614560}
    45624561
    … …  
    45834582    auto identifierBeforeUpdate = _assistedNodeInformation.assistedNodeIdentifier;
    45844583    _page->requestAssistedNodeInformation([callback = WTFMove(callback), identifierBeforeUpdate, weakSelf] (auto& info, auto error) {
    4585         if (!weakSelf || error != CallbackBase::Error::None || info.assistedNodeIdentifier != identifierBeforeUpdate) {
     4584        if (!weakSelf || error != WebKit::CallbackBase::Error::None || info.assistedNodeIdentifier != identifierBeforeUpdate) {
    45864585            // If the assisted node may have changed in the meantime, don't overwrite assisted node information.
    45874586            callback(false);
    … …  
    46424641
    46434642    switch (_assistedNodeInformation.elementType) {
    4644     case InputType::Select:
     4643    case WebKit::InputType::Select:
    46454644        _presentedFullScreenInputViewController = adoptNS([[WKSelectMenuListViewController alloc] initWithDelegate:self]);
    46464645        break;
    4647     case InputType::Time:
     4646    case WebKit::InputType::Time:
    46484647        // Time inputs are special, in that the only UI affordances for dismissal are push buttons rather than status bar chevrons.
    46494648        // As such, modal presentation and dismissal is preferred even if a navigation stack exists.
    … …  
    46514650        _presentedFullScreenInputViewController = adoptNS([[WKTimePickerViewController alloc] initWithDelegate:self]);
    46524651        break;
    4653     case InputType::Date:
     4652    case WebKit::InputType::Date:
    46544653        _presentedFullScreenInputViewController = adoptNS([[WKDatePickerViewController alloc] initWithDelegate:self]);
    46554654        break;
    4656     case InputType::None:
     4655    case WebKit::InputType::None:
    46574656        break;
    46584657    default:
    … …  
    47734772
    47744773    switch (_assistedNodeInformation.elementType) {
    4775     case InputType::Select:
    4776     case InputType::Time:
    4777     case InputType::Date:
     4774    case WebKit::InputType::Select:
     4775    case WebKit::InputType::Time:
     4776    case WebKit::InputType::Date:
    47784777#if ENABLE(INPUT_TYPE_COLOR)
    4779     case InputType::Color:
     4778    case WebKit::InputType::Color:
    47804779#endif
    47814780        return nil;
    4782     case InputType::Search:
     4781    case WebKit::InputType::Search:
    47834782        return WebCore::formControlSearchButtonTitle();
    47844783    default:
    … …  
    48984897- (void)selectWordForReplacement
    48994898{
    4900     _page->extendSelection(WordGranularity);
     4899    _page->extendSelection(WebCore::WordGranularity);
    49014900}
    49024901
    … …  
    49154914    if (hasAssistedNode(_assistedNodeInformation)) {
    49164915        if (postLayoutData.elementIsTransparent)
    4917             [self _beginSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
     4916            [self _beginSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent];
    49184917        else
    4919             [self _stopSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
    4920     }
    4921 
    4922     WKSelectionDrawingInfo selectionDrawingInfo(_page->editorState());
     4918            [self _stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent];
     4919    }
     4920
     4921    WebKit::WKSelectionDrawingInfo selectionDrawingInfo(_page->editorState());
    49234922    if (force || selectionDrawingInfo != _lastSelectionDrawingInfo) {
    49244923        LOG_WITH_STREAM(Selection, stream << "_updateChangedSelection " << selectionDrawingInfo);
    … …  
    49574956}
    49584957
    4959 - (void)_beginSuppressingSelectionAssistantForReason:(SuppressSelectionAssistantReason)reason
     4958- (void)_beginSuppressingSelectionAssistantForReason:(WebKit::SuppressSelectionAssistantReason)reason
    49604959{
    49614960    bool wasSuppressingSelectionAssistant = !!_suppressSelectionAssistantReasons;
    … …  
    49664965}
    49674966
    4968 - (void)_stopSuppressingSelectionAssistantForReason:(SuppressSelectionAssistantReason)reason
     4967- (void)_stopSuppressingSelectionAssistantForReason:(WebKit::SuppressSelectionAssistantReason)reason
    49694968{
    49704969    bool wasSuppressingSelectionAssistant = !!_suppressSelectionAssistantReasons;
    … …  
    50315030}
    50325031
    5033 - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)routeSharingPolicy routingContextUID:(NSString *)routingContextUID
     5032- (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)routeSharingPolicy routingContextUID:(NSString *)routingContextUID
    50345033{
    50355034#if ENABLE(AIRPLAY_PICKER)
    … …  
    50465045}
    50475046
    5048 - (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebOpenPanelResultListenerProxy*)listener
     5047- (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener
    50495048{
    50505049    ASSERT(!_fileUploadPanel);
    … …  
    50725071}
    50735072
    5074 - (void)_showShareSheet:(const ShareDataWithParsedURL&)data completionHandler:(CompletionHandler<void(bool)>&&)completionHandler
     5073- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)data completionHandler:(CompletionHandler<void(bool)>&&)completionHandler
    50755074{
    50765075#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    … …  
    51515150- (std::optional<WebKit::InteractionInformationAtPosition>)positionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant
    51525151{
    5153     InteractionInformationRequest request(_positionInformation.request.point);
     5152    WebKit::InteractionInformationRequest request(_positionInformation.request.point);
    51545153    request.includeSnapshot = true;
    51555154    request.includeLinkIndicator = assistant.needsLinkIndicator;
    … …  
    51635162{
    51645163    _hasValidPositionInformation = NO;
    5165     InteractionInformationRequest request(_positionInformation.request.point);
     5164    WebKit::InteractionInformationRequest request(_positionInformation.request.point);
    51665165    request.includeSnapshot = true;
    51675166    request.includeLinkIndicator = assistant.needsLinkIndicator;
    … …  
    53255324}
    53265325
    5327 - (void)_startDrag:(RetainPtr<CGImageRef>)image item:(const DragItem&)item
    5328 {
    5329     ASSERT(item.sourceAction != DragSourceActionNone);
     5326- (void)_startDrag:(RetainPtr<CGImageRef>)image item:(const WebCore::DragItem&)item
     5327{
     5328    ASSERT(item.sourceAction != WebCore::DragSourceActionNone);
    53305329
    53315330    if (item.promisedAttachmentInfo)
    … …  
    53535352
    53545353    RELEASE_LOG(DragAndDrop, "Drag session: %p adding %tu items", _dragDropInteractionState.dragSession(), dragItemsToAdd.count);
    5355     _dragDropInteractionState.clearStagedDragSource(dragItemsToAdd.count ? DragDropInteractionState::DidBecomeActive::Yes : DragDropInteractionState::DidBecomeActive::No);
     5354    _dragDropInteractionState.clearStagedDragSource(dragItemsToAdd.count ? WebKit::DragDropInteractionState::DidBecomeActive::Yes : WebKit::DragDropInteractionState::DidBecomeActive::No);
    53565355
    53575356    completion(dragItemsToAdd);
    … …  
    53715370
    53725371    if (!_dragDropInteractionState.dragSession().items.count) {
    5373         auto positionForDragEnd = roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd());
     5372        auto positionForDragEnd = WebCore::roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd());
    53745373        [self cleanUpDragSourceSessionState];
    53755374        if (started) {
    53765375            // A client of the Objective C SPI or UIKit might have prevented the drag from beginning entirely in the UI process, in which case
    53775376            // we need to balance the `dragstart` event with a `dragend`.
    5378             _page->dragEnded(positionForDragEnd, positionForDragEnd, DragOperationNone);
     5377            _page->dragEnded(positionForDragEnd, positionForDragEnd, WebCore::DragOperationNone);
    53795378        }
    53805379    }
    … …  
    53945393}
    53955394
    5396 static UIDropOperation dropOperationForWebCoreDragOperation(DragOperation operation)
    5397 {
    5398     if (operation & DragOperationMove)
     5395static UIDropOperation dropOperationForWebCoreDragOperation(WebCore::DragOperation operation)
     5396{
     5397    if (operation & WebCore::DragOperationMove)
    53995398        return UIDropOperationMove;
    54005399
    5401     if (operation & DragOperationCopy)
     5400    if (operation & WebCore::DragOperationCopy)
    54025401        return UIDropOperationCopy;
    54035402
    … …  
    54055404}
    54065405
    5407 - (DragData)dragDataForDropSession:(id <UIDropSession>)session dragDestinationAction:(WKDragDestinationAction)dragDestinationAction
     5406- (WebCore::DragData)dragDataForDropSession:(id <UIDropSession>)session dragDestinationAction:(WKDragDestinationAction)dragDestinationAction
    54085407{
    54095408    CGPoint global;
    … …  
    54115410    [self computeClientAndGlobalPointsForDropSession:session outClientPoint:&client outGlobalPoint:&global];
    54125411
    5413     DragOperation dragOperationMask = static_cast<DragOperation>(session.allowsMoveOperation ? DragOperationEvery : (DragOperationEvery & ~DragOperationMove));
    5414     return { session, roundedIntPoint(client), roundedIntPoint(global), dragOperationMask, DragApplicationNone, static_cast<DragDestinationAction>(dragDestinationAction) };
     5412    WebCore::DragOperation dragOperationMask = static_cast<WebCore::DragOperation>(session.allowsMoveOperation ? WebCore::DragOperationEvery : (WebCore::DragOperationEvery & ~WebCore::DragOperationMove));
     5413    return { session, WebCore::roundedIntPoint(client), WebCore::roundedIntPoint(global), dragOperationMask, WebCore::DragApplicationNone, static_cast<WebCore::DragDestinationAction>(dragDestinationAction) };
    54155414}
    54165415
    … …  
    54555454}
    54565455
    5457 - (void)_didConcludeEditDataInteraction:(std::optional<TextIndicatorData>)data
     5456- (void)_didConcludeEditDataInteraction:(std::optional<WebCore::TextIndicatorData>)data
    54585457{
    54595458    if (!data)
    … …  
    54825481        [visibleContentViewSnapshot removeFromSuperview];
    54835482        [UIView animateWithDuration:0.25 animations:^() {
    5484             [protectedSelf _stopSuppressingSelectionAssistantForReason:DropAnimationIsRunning];
     5483            [protectedSelf _stopSuppressingSelectionAssistantForReason:WebKit::DropAnimationIsRunning];
    54855484            [unselectedContentSnapshot setAlpha:0];
    54865485        } completion:^(BOOL completed) {
    … …  
    54995498
    55005499    if (!_isAnimatingConcludeEditDrag)
    5501         [self _stopSuppressingSelectionAssistantForReason:DropAnimationIsRunning];
     5500        [self _stopSuppressingSelectionAssistantForReason:WebKit::DropAnimationIsRunning];
    55025501
    55035502    CGPoint global;
    … …  
    55055504    [self computeClientAndGlobalPointsForDropSession:dropSession outClientPoint:&client outGlobalPoint:&global];
    55065505    [self cleanUpDragSourceSessionState];
    5507     _page->dragEnded(roundedIntPoint(client), roundedIntPoint(global), _page->currentDragOperation());
     5506    _page->dragEnded(WebCore::roundedIntPoint(client), WebCore::roundedIntPoint(global), _page->currentDragOperation());
    55085507}
    55095508
    … …  
    55305529}
    55315530
    5532 - (void)_prepareToDragPromisedAttachment:(const PromisedAttachmentInfo&)info
     5531- (void)_prepareToDragPromisedAttachment:(const WebCore::PromisedAttachmentInfo&)info
    55335532{
    55345533    auto session = retainPtr(_dragDropInteractionState.dragSession());
    … …  
    55685567        }
    55695568
    5570         NSString *temporaryBlobDirectory = FileSystem::createTemporaryDirectory(@"blobs");
     5569        NSString *temporaryBlobDirectory = WebCore::FileSystem::createTemporaryDirectory(@"blobs");
    55715570        NSURL *destinationURL = [NSURL fileURLWithPath:[temporaryBlobDirectory stringByAppendingPathComponent:[NSUUID UUID].UUIDString] isDirectory:NO];
    55725571
    … …  
    56245623}
    56255624
    5626 - (NSArray<UIDragItem *> *)_itemsForBeginningOrAddingToSessionWithRegistrationList:(WebItemProviderRegistrationInfoList *)registrationList stagedDragSource:(const DragSourceState&)stagedDragSource
     5625- (NSArray<UIDragItem *> *)_itemsForBeginningOrAddingToSessionWithRegistrationList:(WebItemProviderRegistrationInfoList *)registrationList stagedDragSource:(const WebKit::DragSourceState&)stagedDragSource
    56275626{
    56285627    NSItemProvider *defaultItemProvider = registrationList.itemProvider;
    … …  
    56575656- (NSDictionary *)_autofillContext
    56585657{
    5659     BOOL provideStrongPasswordAssistance = _focusRequiresStrongPasswordAssistance && _assistedNodeInformation.elementType == InputType::Password;
     5658    BOOL provideStrongPasswordAssistance = _focusRequiresStrongPasswordAssistance && _assistedNodeInformation.elementType == WebKit::InputType::Password;
    56605659    if (!hasAssistedNode(_assistedNodeInformation) || (!_assistedNodeInformation.acceptsAutofilledLoginCredentials && !provideStrongPasswordAssistance))
    56615660        return nil;
    … …  
    57025701
    57035702    _dragDropInteractionState.dragSessionWillRequestAdditionalItem(completion);
    5704     _page->requestAdditionalItemsForDragSession(roundedIntPoint(point), roundedIntPoint(point));
     5703    _page->requestAdditionalItemsForDragSession(WebCore::roundedIntPoint(point), WebCore::roundedIntPoint(point));
    57055704}
    57065705
    … …  
    57215720    _dragDropInteractionState.prepareForDragSession(session, completion);
    57225721
    5723     auto dragOrigin = roundedIntPoint([session locationInView:self]);
    5724     _page->requestStartDataInteraction(dragOrigin, roundedIntPoint([self convertPoint:dragOrigin toView:self.window]));
     5722    auto dragOrigin = WebCore::roundedIntPoint([session locationInView:self]);
     5723    _page->requestStartDataInteraction(dragOrigin, WebCore::roundedIntPoint([self convertPoint:dragOrigin toView:self.window]));
    57255724
    57265725    RELEASE_LOG(DragAndDrop, "Drag session requested: %p at origin: {%d, %d}", session, dragOrigin.x(), dragOrigin.y());
    … …  
    57485747
    57495748    RELEASE_LOG(DragAndDrop, "Drag session: %p starting with %tu items", session, [dragItems count]);
    5750     _dragDropInteractionState.clearStagedDragSource([dragItems count] ? DragDropInteractionState::DidBecomeActive::Yes : DragDropInteractionState::DidBecomeActive::No);
     5749    _dragDropInteractionState.clearStagedDragSource([dragItems count] ? WebKit::DragDropInteractionState::DidBecomeActive::Yes : WebKit::DragDropInteractionState::DidBecomeActive::No);
    57515750
    57525751    return dragItems;
    … …  
    57665765- (void)dragInteraction:(UIDragInteraction *)interaction willAnimateLiftWithAnimator:(id <UIDragAnimating>)animator session:(id <UIDragSession>)session
    57675766{
    5768     if (!_shouldRestoreCalloutBarAfterDrop && _dragDropInteractionState.anyActiveDragSourceIs(DragSourceActionSelection)) {
     5767    if (!_shouldRestoreCalloutBarAfterDrop && _dragDropInteractionState.anyActiveDragSourceIs(WebCore::DragSourceActionSelection)) {
    57695768        // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of hiding interaction assistant controls.
    57705769        [_textSelectionAssistant willStartScrollingOverflow];
    … …  
    57725771    }
    57735772
    5774     auto positionForDragEnd = roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd());
     5773    auto positionForDragEnd = WebCore::roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd());
    57755774    RetainPtr<WKContentView> protectedSelf(self);
    57765775    [animator addCompletion:[session, positionForDragEnd, protectedSelf, page = _page] (UIViewAnimatingPosition finalPosition) {
    … …  
    57825781            // The lift was canceled, so -dropInteraction:sessionDidEnd: will never be invoked. This is the last chance to clean up.
    57835782            [protectedSelf cleanUpDragSourceSessionState];
    5784             page->dragEnded(positionForDragEnd, positionForDragEnd, DragOperationNone);
     5783            page->dragEnded(positionForDragEnd, positionForDragEnd, WebCore::DragOperationNone);
    57855784        }
    57865785    }];
    … …  
    58135812
    58145813    [self cleanUpDragSourceSessionState];
    5815     _page->dragEnded(roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd()), roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd()), operation);
     5814    _page->dragEnded(WebCore::roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd()), WebCore::roundedIntPoint(_dragDropInteractionState.adjustedPositionForDragEnd()), operation);
    58165815}
    58175816
    … …  
    58385837        page->dragCancelled();
    58395838        if (auto completion = protectedSelf->_dragDropInteractionState.takeDragCancelSetDownBlock()) {
    5840             page->callAfterNextPresentationUpdate([completion] (CallbackBase::Error) {
     5839            page->callAfterNextPresentationUpdate([completion] (WebKit::CallbackBase::Error) {
    58415840                completion();
    58425841            });
    … …  
    59495948        capturedDragData.setFileNames(filenames);
    59505949
    5951         SandboxExtension::Handle sandboxExtensionHandle;
    5952         SandboxExtension::HandleArray sandboxExtensionForUpload;
     5950        WebKit::SandboxExtension::Handle sandboxExtensionHandle;
     5951        WebKit::SandboxExtension::HandleArray sandboxExtensionForUpload;
    59535952        retainedSelf->_page->createSandboxExtensionsIfNeeded(filenames, sandboxExtensionHandle, sandboxExtensionForUpload);
    59545953        retainedSelf->_page->performDragOperation(capturedDragData, "data interaction pasteboard", WTFMove(sandboxExtensionHandle), WTFMove(sandboxExtensionForUpload));
    59555954
    59565955        retainedSelf->_visibleContentViewSnapshot = [retainedSelf snapshotViewAfterScreenUpdates:NO];
    5957         [retainedSelf _beginSuppressingSelectionAssistantForReason:DropAnimationIsRunning];
     5956        [retainedSelf _beginSuppressingSelectionAssistantForReason:WebKit::DropAnimationIsRunning];
    59585957        [UIView performWithoutAnimation:[retainedSelf] {
    59595958            [retainedSelf->_visibleContentViewSnapshot setFrame:[retainedSelf bounds]];
    … …  
    59955994    [self computeClientAndGlobalPointsForDropSession:session outClientPoint:&client outGlobalPoint:&global];
    59965995    [self cleanUpDragSourceSessionState];
    5997     _page->dragEnded(roundedIntPoint(client), roundedIntPoint(global), DragOperationNone);
     5996    _page->dragEnded(WebCore::roundedIntPoint(client), WebCore::roundedIntPoint(global), WebCore::DragOperationNone);
    59985997}
    59995998
    … …  
    60606059{
    60616060    switch (_assistedNodeInformation.elementType) {
    6062     case InputType::ContentEditable:
    6063     case InputType::Text:
    6064     case InputType::TextArea:
    6065     case InputType::Search:
    6066     case InputType::Email:
    6067     case InputType::URL:
     6061    case WebKit::InputType::ContentEditable:
     6062    case WebKit::InputType::Text:
     6063    case WebKit::InputType::TextArea:
     6064    case WebKit::InputType::Search:
     6065    case WebKit::InputType::Email:
     6066    case WebKit::InputType::URL:
    60686067        return YES;
    60696068    default:
    … …  
    61036102{
    61046103    switch (_assistedNodeInformation.elementType) {
    6105     case InputType::ContentEditable:
    6106     case InputType::Text:
    6107     case InputType::Password:
    6108     case InputType::TextArea:
    6109     case InputType::Search:
    6110     case InputType::Email:
    6111     case InputType::URL:
    6112     case InputType::Phone:
     6104    case WebKit::InputType::ContentEditable:
     6105    case WebKit::InputType::Text:
     6106    case WebKit::InputType::Password:
     6107    case WebKit::InputType::TextArea:
     6108    case WebKit::InputType::Search:
     6109    case WebKit::InputType::Email:
     6110    case WebKit::InputType::URL:
     6111    case WebKit::InputType::Phone:
    61136112        return YES;
    61146113    default:
    … …  
    61226121{
    61236122    switch (_assistedNodeInformation.elementType) {
    6124     case InputType::Phone:
     6123    case WebKit::InputType::Phone:
    61256124        return WKNumberPadInputModeTelephone;
    6126     case InputType::Number:
     6125    case WebKit::InputType::Number:
    61276126        return WKNumberPadInputModeNumbersAndSymbols;
    6128     case InputType::NumberPad:
     6127    case WebKit::InputType::NumberPad:
    61296128        return WKNumberPadInputModeNumbersOnly;
    61306129    default:
    … …  
    61366135{
    61376136    switch (_assistedNodeInformation.elementType) {
    6138     case InputType::Password:
     6137    case WebKit::InputType::Password:
    61396138        return UITextContentTypePassword;
    6140     case InputType::URL:
     6139    case WebKit::InputType::URL:
    61416140        return UITextContentTypeURL;
    6142     case InputType::Email:
     6141    case WebKit::InputType::Email:
    61436142        return UITextContentTypeEmailAddress;
    6144     case InputType::Phone:
     6143    case WebKit::InputType::Phone:
    61456144        return UITextContentTypeTelephoneNumber;
    61466145    default:
    … …  
    61696168- (BOOL)allowsDictationInputForListViewController:(PUICQuickboardViewController *)controller
    61706169{
    6171     return _assistedNodeInformation.elementType != InputType::Password;
     6170    return _assistedNodeInformation.elementType != WebKit::InputType::Password;
    61726171}
    61736172
    … …  
    62316230{
    62326231    RetainPtr<WKContentView> protectedSelf = self;
    6233     [self doAfterPositionInformationUpdate:[protectedSelf] (InteractionInformationAtPosition) {
     6232    [self doAfterPositionInformationUpdate:[protectedSelf] (WebKit::InteractionInformationAtPosition) {
    62346233        if (SEL action = [protectedSelf _actionForLongPress])
    62356234            [protectedSelf performSelector:action];
    6236     } forRequest:InteractionInformationRequest(roundedIntPoint(location))];
     6235    } forRequest:WebKit::InteractionInformationRequest(WebCore::roundedIntPoint(location))];
    62376236}
    62386237
    … …  
    63286327        return NO;
    63296328
    6330     InteractionInformationRequest request(roundedIntPoint(position));
     6329    WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(position));
    63316330    request.includeSnapshot = true;
    63326331    request.includeLinkIndicator = true;
    … …  
    63486347            return YES;
    63496348#if ENABLE(DATA_DETECTION)
    6350         if (DataDetection::canBePresentedByDataDetectors(linkURL))
     6349        if (WebCore::DataDetection::canBePresentedByDataDetectors(linkURL))
    63516350            return YES;
    63526351#endif
    … …  
    66196618
    66206619    if (_positionInformation.linkIndicator.contentImage) {
    6621         FloatPoint origin = _positionInformation.linkIndicator.textBoundingRectInRootViewCoordinates.location();
    6622         for (FloatRect& rect : _positionInformation.linkIndicator.textRectsInBoundingRectCoordinates) {
     6620        WebCore::FloatPoint origin = _positionInformation.linkIndicator.textBoundingRectInRootViewCoordinates.location();
     6621        for (WebCore::FloatRect& rect : _positionInformation.linkIndicator.textRectsInBoundingRectCoordinates) {
    66236622            CGRect cgRect = rect;
    66246623            cgRect.origin.x += origin.x();

  • trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm

    r239047 r239071  
    4141#import <wtf/RetainPtr.h>
    4242
    43 using namespace WebCore;
    44 using namespace WebKit;
    45 
    4643static const NSTimeInterval showHideAnimationDuration = 0.1;
    4744static const NSTimeInterval pipHideAnimationDuration = 0.2;
    … …  
    5754@end
    5855
    59 class WKFullScreenViewControllerPlaybackSessionModelClient : PlaybackSessionModelClient {
     56class WKFullScreenViewControllerPlaybackSessionModelClient : WebCore::PlaybackSessionModelClient {
    6057public:
    6158    void setParent(WKFullScreenViewController *parent) { m_parent = parent; }
    … …  
    7572    }
    7673
    77     void setInterface(PlaybackSessionInterfaceAVKit* interface)
     74    void setInterface(WebCore::PlaybackSessionInterfaceAVKit* interface)
    7875    {
    7976        if (m_interface == interface)
    … …  
    8986private:
    9087    WKFullScreenViewController *m_parent { nullptr };
    91     RefPtr<PlaybackSessionInterfaceAVKit> m_interface;
     88    RefPtr<WebCore::PlaybackSessionInterfaceAVKit> m_interface;
    9289};
    9390
    94 class WKFullScreenViewControllerVideoFullscreenModelClient : VideoFullscreenModelClient {
     91class WKFullScreenViewControllerVideoFullscreenModelClient : WebCore::VideoFullscreenModelClient {
    9592public:
    9693    void setParent(WKFullScreenViewController *parent) { m_parent = parent; }
    9794
    98     void setInterface(VideoFullscreenInterfaceAVKit* interface)
     95    void setInterface(WebCore::VideoFullscreenInterfaceAVKit* interface)
    9996    {
    10097        if (m_interface == interface)
    … …  
    108105    }
    109106
    110     VideoFullscreenInterfaceAVKit* interface() const { return m_interface.get(); }
     107    WebCore::VideoFullscreenInterfaceAVKit* interface() const { return m_interface.get(); }
    111108
    112109    void willEnterPictureInPicture() final
    … …  
    127124private:
    128125    WKFullScreenViewController *m_parent { nullptr };
    129     RefPtr<VideoFullscreenInterfaceAVKit> m_interface;
     126    RefPtr<WebCore::VideoFullscreenInterfaceAVKit> m_interface;
    130127};
    131128
    … …  
    153150@interface WKFullScreenViewController () <UIGestureRecognizerDelegate, UIToolbarDelegate>
    154151@property (weak, nonatomic) WKWebView *_webView; // Cannot be retained, see <rdar://problem/14884666>.
    155 @property (readonly, nonatomic) WebFullScreenManagerProxy* _manager;
     152@property (readonly, nonatomic) WebKit::WebFullScreenManagerProxy* _manager;
    156153@property (readonly, nonatomic) WebCore::FloatBoxExtent _effectiveFullscreenInsets;
    157154@end
    … …  
    261258- (void)videoControlsManagerDidChange
    262259{
    263     WebPageProxy* page = [self._webView _page];
     260    WebKit::WebPageProxy* page = [self._webView _page];
    264261    auto* videoFullscreenManager = page ? page->videoFullscreenManager() : nullptr;
    265262    auto* videoFullscreenInterface = videoFullscreenManager ? videoFullscreenManager->controlsManagerInterface() : nullptr;
    … …  
    269266    _videoFullscreenClient.setInterface(videoFullscreenInterface);
    270267
    271     PlaybackSessionModel* playbackSessionModel = playbackSessionInterface ? playbackSessionInterface->playbackSessionModel() : nullptr;
     268    WebCore::PlaybackSessionModel* playbackSessionModel = playbackSessionInterface ? playbackSessionInterface->playbackSessionModel() : nullptr;
    272269    self.playing = playbackSessionModel ? playbackSessionModel->isPlaying() : NO;
    273270    [_pipButton setHidden:!playbackSessionModel];
    … …  
    482479
    483480@dynamic _manager;
    484 - (WebFullScreenManagerProxy*)_manager
     481- (WebKit::WebFullScreenManagerProxy*)_manager
    485482{
    486483    if (auto* page = [self._webView _page])
    … …  
    508505- (void)_togglePiPAction:(id)sender
    509506{
    510     WebPageProxy* page = [self._webView _page];
     507    WebKit::WebPageProxy* page = [self._webView _page];
    511508    if (!page)
    512509        return;
    513510
    514     PlaybackSessionManagerProxy* playbackSessionManager = page->playbackSessionManager();
     511    WebKit::PlaybackSessionManagerProxy* playbackSessionManager = page->playbackSessionManager();
    515512    if (!playbackSessionManager)
    516513        return;
    … …  
    520517        return;
    521518
    522     PlaybackSessionModel* playbackSessionModel = playbackSessionInterface->playbackSessionModel();
     519    WebCore::PlaybackSessionModel* playbackSessionModel = playbackSessionInterface->playbackSessionModel();
    523520    if (!playbackSessionModel)
    524521        return;

  • trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

    r239047 r239071  
    5454#import <wtf/spi/cocoa/SecuritySPI.h>
    5555
    56 using namespace WebKit;
    57 using namespace WebCore;
    5856
    5957#if !HAVE(URL_FORMATTING)
    … …  
    6260
    6361namespace WebKit {
     62using namespace WebKit;
     63using namespace WebCore;
    6464
    6565static CGSize sizeExpandedToSize(CGSize initial, CGSize other)
    … …  
    213213    _animatingView = _animatingIn ? toView : fromView;
    214214
    215     CGRect boundsRect = largestRectWithAspectRatioInsideRect(FloatRect(inlineFrame).size().aspectRatio(), fullscreenFrame);
     215    CGRect boundsRect = WebCore::largestRectWithAspectRatioInsideRect(WebCore::FloatRect(inlineFrame).size().aspectRatio(), fullscreenFrame);
    216216    boundsRect.origin = CGPointZero;
    217217
    … …  
    221221    _finalMaskViewCenter = CGPointMake(CGRectGetMidX([_animatingView bounds]), CGRectGetMidY([_animatingView bounds]));
    222222
    223     FloatRect scaleRect = smallestRectWithAspectRatioAroundRect(FloatRect(fullscreenFrame).size().aspectRatio(), inlineFrame);
     223    WebCore::FloatRect scaleRect = WebCore::smallestRectWithAspectRatioAroundRect(WebCore::FloatRect(fullscreenFrame).size().aspectRatio(), inlineFrame);
    224224    CGAffineTransform scaleTransform = CGAffineTransformMakeScale(scaleRect.width() / fullscreenFrame.size.width, scaleRect.height() / fullscreenFrame.size.height);
    225225    CGAffineTransform translateTransform = CGAffineTransformMakeTranslation(CGRectGetMidX(inlineFrame) - CGRectGetMidX(fullscreenFrame), CGRectGetMidY(inlineFrame) - CGRectGetMidY(fullscreenFrame));
    … …  
    426426    RetainPtr<WKFullScreenPlaceholderView> _webViewPlaceholder;
    427427
    428     FullScreenState _fullScreenState;
    429     WKWebViewState _viewState;
     428    WebKit::FullScreenState _fullScreenState;
     429    WebKit::WKWebViewState _viewState;
    430430
    431431    RetainPtr<UIWindow> _window;
    … …  
    475475- (BOOL)isFullScreen
    476476{
    477     return _fullScreenState == WaitingToEnterFullScreen
    478         || _fullScreenState == EnteringFullScreen
    479         || _fullScreenState == InFullScreen;
     477    return _fullScreenState == WebKit::WaitingToEnterFullScreen
     478        || _fullScreenState == WebKit::EnteringFullScreen
     479        || _fullScreenState == WebKit::InFullScreen;
    480480}
    481481
    … …  
    501501    [self _invalidateEVOrganizationName];
    502502
    503     _fullScreenState = WaitingToEnterFullScreen;
     503    _fullScreenState = WebKit::WaitingToEnterFullScreen;
    504504
    505505    _window = adoptNS([[UIWindow alloc] init]);
    … …  
    564564       
    565565        [[_webViewPlaceholder layer] setContents:(id)[snapshotImage CGImage]];
    566         replaceViewWithView(webView.get(), _webViewPlaceholder.get());
    567 
    568         WKWebViewState().applyTo(webView.get());
     566        WebKit::replaceViewWithView(webView.get(), _webViewPlaceholder.get());
     567
     568        WebKit::WKWebViewState().applyTo(webView.get());
    569569       
    570570        [webView setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
    … …  
    578578            manager->setAnimatingFullScreen(true);
    579579
    580         ViewportArguments arguments { ViewportArguments::CSSDeviceAdaptation };
     580        WebCore::ViewportArguments arguments { WebCore::ViewportArguments::CSSDeviceAdaptation };
    581581        arguments.zoom = 1;
    582582        arguments.minZoom = 1;
    … …  
    585585        page->setOverrideViewportArguments(arguments);
    586586
    587         _repaintCallback = VoidCallback::create([protectedSelf = retainPtr(self), self](WebKit::CallbackBase::Error) {
     587        _repaintCallback = WebKit::VoidCallback::create([protectedSelf = retainPtr(self), self](WebKit::CallbackBase::Error) {
    588588            _repaintCallback = nullptr;
    589589            if (auto* manager = [protectedSelf _manager]) {
    … …  
    603603- (void)beganEnterFullScreenWithInitialFrame:(CGRect)initialFrame finalFrame:(CGRect)finalFrame
    604604{
    605     if (_fullScreenState != WaitingToEnterFullScreen)
    606         return;
    607     _fullScreenState = EnteringFullScreen;
     605    if (_fullScreenState != WebKit::WaitingToEnterFullScreen)
     606        return;
     607    _fullScreenState = WebKit::EnteringFullScreen;
    608608
    609609    _initialFrame = initialFrame;
    610610    _finalFrame = finalFrame;
    611611   
    612     _initialFrame.size = sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
    613     _finalFrame.size = sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
    614     _initialFrame = safeInlineRect(_initialFrame, [_rootViewController view].frame.size);
     612    _initialFrame.size = WebKit::sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
     613    _finalFrame.size = WebKit::sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
     614    _initialFrame = WebKit::safeInlineRect(_initialFrame, [_rootViewController view].frame.size);
    615615
    616616    [CATransaction begin];
    … …  
    628628
    629629    [_rootViewController presentViewController:_fullscreenViewController.get() animated:YES completion:^{
    630         _fullScreenState = InFullScreen;
     630        _fullScreenState = WebKit::InFullScreen;
    631631
    632632        auto* page = [self._webView _page];
    … …  
    660660    if (!self.isFullScreen)
    661661        return;
    662     _fullScreenState = WaitingToExitFullScreen;
     662    _fullScreenState = WebKit::WaitingToExitFullScreen;
    663663
    664664    if (auto* manager = self._manager) {
    … …  
    674674- (void)beganExitFullScreenWithInitialFrame:(CGRect)initialFrame finalFrame:(CGRect)finalFrame
    675675{
    676     if (_fullScreenState != WaitingToExitFullScreen)
    677         return;
    678     _fullScreenState = ExitingFullScreen;
     676    if (_fullScreenState != WebKit::WaitingToExitFullScreen)
     677        return;
     678    _fullScreenState = WebKit::ExitingFullScreen;
    679679
    680680    _initialFrame = initialFrame;
    681681    _finalFrame = finalFrame;
    682682   
    683     _initialFrame.size = sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
    684     _finalFrame.size = sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
    685     _finalFrame = safeInlineRect(_finalFrame, [_rootViewController view].frame.size);
     683    _initialFrame.size = WebKit::sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
     684    _finalFrame.size = WebKit::sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
     685    _finalFrame = WebKit::safeInlineRect(_finalFrame, [_rootViewController view].frame.size);
    686686
    687687    if (auto* page = [self._webView _page])
    … …  
    701701- (void)_completedExitFullScreen
    702702{
    703     if (_fullScreenState != ExitingFullScreen)
    704         return;
    705     _fullScreenState = NotInFullScreen;
     703    if (_fullScreenState != WebKit::ExitingFullScreen)
     704        return;
     705    _fullScreenState = WebKit::NotInFullScreen;
    706706
    707707    [CATransaction begin];
    … …  
    738738    }
    739739
    740     _repaintCallback = VoidCallback::create([protectedSelf = retainPtr(self), self](WebKit::CallbackBase::Error) {
     740    _repaintCallback = WebKit::VoidCallback::create([protectedSelf = retainPtr(self), self](WebKit::CallbackBase::Error) {
    741741        _repaintCallback = nullptr;
    742742        _webViewPlaceholder.get().parent = nil;
    … …  
    764764- (void)webViewDidRemoveFromSuperviewWhileInFullscreen
    765765{
    766     if (_fullScreenState == InFullScreen && self._webView.window != _window.get())
     766    if (_fullScreenState == WebKit::InFullScreen && self._webView.window != _window.get())
    767767        [self _exitFullscreenImmediately];
    768768}
    … …  
    856856        manager->requestExitFullScreen();
    857857    [self exitFullScreen];
    858     _fullScreenState = ExitingFullScreen;
     858    _fullScreenState = WebKit::ExitingFullScreen;
    859859    [self _completedExitFullScreen];
    860860    RetainPtr<WKWebView> webView = self._webView;
    861861    _webViewPlaceholder.get().parent = nil;
    862     replaceViewWithView(_webViewPlaceholder.get(), webView.get());
     862    WebKit::replaceViewWithView(_webViewPlaceholder.get(), webView.get());
    863863    if (auto* page = [webView _page])
    864864        page->setSuppressVisibilityUpdates(false);
    … …  
    962962}
    963963
    964 - (WebFullScreenManagerProxy*)_manager
     964- (WebKit::WebFullScreenManagerProxy*)_manager
    965965{
    966966    if (auto* page = [self._webView _page])
    … …  
    10501050@end
    10511051
     1052
    10521053#endif // PLATFORM(IOS_FAMILY) && ENABLE(FULLSCREEN_API)

  • trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm

    r239047 r239071  
    6868#define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(m_process->checkURLReceivedFromWebProcess(url), m_process->connection())
    6969
    70 using namespace WebCore;
    71 
    7270@interface NSApplication ()
    7371- (BOOL)isSpeaking;
    … …  
    108106
    109107namespace WebKit {
    110 
     108using namespace WebCore;
     109   
    111110static inline bool expectsLegacyImplicitRubberBandControl()
    112111{

  • trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp

    r239047 r239071  
    3636#include <wtf/MainThread.h>
    3737
     38namespace WebKit {
    3839using namespace WebCore::DOMCacheEngine;
    39 using namespace WebKit::CacheStorage;
    40 
    41 namespace WebKit {
     40using namespace CacheStorage;
    4241
    4342WebCacheStorageConnection::WebCacheStorageConnection(WebCacheStorageProvider& provider, PAL::SessionID sessionID)

  • trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm

    r239047 r239071  
    4141#import <wtf/text/TextStream.h>
    4242
    43 using namespace WTF;
    44 using namespace WebCore;
    45 
    4643static MonotonicTime mediaTimeToCurrentTime(CFTimeInterval t)
    4744{
    48     return MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
     45    return WTF::MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
    4946}
    5047
    … …  
    5653@implementation WKAnimationDelegate
    5754
    58 - (instancetype)initWithLayerID:(GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
     55- (instancetype)initWithLayerID:(WebCore::GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
    5956{
    6057    if ((self = [super init])) {
    … …  
    9996
    10097namespace WebKit {
     98using namespace WebCore;
    10199
    102100void PlatformCAAnimationRemote::KeyframeValue::encode(IPC::Encoder& encoder) const

  • trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm

    r239047 r239071  
    4949#import <wtf/ObjCRuntimeExtras.h>
    5050
    51 using namespace WebCore;
    52 using namespace WebKit;
    5351
    5452@implementation WKAccessibilityWebPageObject
    … …  
    219217    // Some plugins may be able to figure out the scroll position and inset on their own.
    220218    bool applyContentOffset = true;
    221     if (auto pluginView = WebPage::pluginViewForFrame(m_page->mainFrame()))
     219    if (auto pluginView = WebKit::WebPage::pluginViewForFrame(m_page->mainFrame()))
    222220        applyContentOffset = !pluginView->plugin()->pluginHandlesContentOffsetForAccessibilityHitTest();
    223221
Note: See TracChangeset for help on using the changeset viewer.