Changeset 164621 in webkit


Ignore:
Timestamp:
Feb 24, 2014, 6:40:28 PM (11 years ago)
Author:
Simon Fraser
Message:

Remove WKInteractionView, move code into WKContentView
​https://bugs.webkit.org/show_bug.cgi?id=129275

Reviewed by Benjamin Poulain.

WKInteractionView as an interim solution as WebKit2 on iOS was being
brought up, and should be removed.

Move its code into a category on WKContentView, mostly unchanged. The
WKContentView (WKInteraction) categroy now implements the various protocols
that WKInteractionView implemented.

WKContentView is not an API class, so no longer has WK_API_CLASS, and can
have implementation-related data members. WKContentViewInternal.h is removed.

WKContentView now exposes a WebPageProxy* rather than a WKPageRef.

Other changes: WKActionSheetAssistant no longer stores a WebPageProxy,
getting it from the WKContentView instead.

WKAutoCorrectionData and InteractionInformationAtPosition are stored via unique_ptr
to reduce class size, and avoid having to expose their details in the header.

  • Configurations/WebKit2.xcconfig:
  • UIProcess/API/Cocoa/WKWebViewInternal.h:
  • UIProcess/API/ios/WKViewIOS.mm:

(-[WKView setAllowsBackForwardNavigationGestures:]):
(-[WKView pageRef]):
(-[WKView _pageExtendedBackgroundColor]):
(-[WKView _setBackgroundExtendsBeyondPage:]):
(-[WKView _backgroundExtendsBeyondPage]):

  • UIProcess/ios/PageClientImplIOS.mm:
  • UIProcess/ios/WKActionSheet.h:
  • UIProcess/ios/WKActionSheet.mm:

(-[WKActionSheet initWithView:]):
(+[WKElementAction customElementActionWithTitle:actionHandler:]):
(copyElement):
(saveImage):
(+[WKElementAction standardElementActionWithType:customTitle:]):
(-[WKElementAction runActionWithElementInfo:view:]):

  • UIProcess/ios/WKActionSheetAssistant.h:
  • UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant initWithView:]):
(-[WKActionSheetAssistant dealloc]):
(-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]):
(-[WKActionSheetAssistant presentationRectInHostViewForSheet]):
(-[WKActionSheetAssistant actionSheet:clickedButtonAtIndex:]):
(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
(-[WKActionSheetAssistant showImageSheet]):
(-[WKActionSheetAssistant showLinkSheet]):
(-[WKActionSheetAssistant showDataDetectorsSheet]):
(-[WKActionSheetAssistant cleanupSheet]):

  • UIProcess/ios/WKContentView.h:
  • UIProcess/ios/WKContentView.mm:

(-[WKContentView initWithFrame:context:WebKit::configuration:WebKit::]):
(-[WKContentView dealloc]):
(-[WKContentView page]):
(-[WKContentView isAssistingNode]):
(-[WKContentView didFinishScrolling]):
(-[WKContentView willStartZoomOrScroll]):
(-[WKContentView willStartUserTriggeredScroll]):
(-[WKContentView willStartUserTriggeredZoom]):
(-[WKContentView didZoomToScale:]):
(-[WKContentView _didCommitLoadForMainFrame]):
(-[WKContentView _didCommitLayerTree:WebKit::]):

  • UIProcess/ios/WKContentViewInteraction.h: Renamed from Source/WebKit2/UIProcess/ios/WKInteractionView.h.
  • UIProcess/ios/WKContentViewInteraction.mm: Renamed from Source/WebKit2/UIProcess/ios/WKInteractionView.mm.

(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView positionInformation]):
(-[WKContentView setInputDelegate:]):
(-[WKContentView inputDelegate]):
(-[WKContentView isEditable]):
(-[WKContentView canBecomeFirstResponder]):
(-[WKContentView resignFirstResponder]):
(-[WKContentView _webTouchEventsRecognized:]):
(inflateQuad):
(-[WKContentView _webTouchEvent:WebKit::preventsNativeGestures:]):
(-[WKContentView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
(-[WKContentView _cancelLongPressGestureRecognizer]):
(-[WKContentView _didScroll]):
(-[WKContentView _requiresKeyboardResetOnReload]):
(-[WKContentView gestureRecognizer:canPreventGestureRecognizer:]):
(-[WKContentView gestureRecognizer:canBePreventedByGestureRecognizer:]):
(isSamePair):
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView _showImageSheet]):
(-[WKContentView _showLinkSheet]):
(-[WKContentView _showDataDetectorsSheet]):
(-[WKContentView _actionForLongPress]):
(-[WKContentView ensurePositionInformationIsUpToDate:]):
(-[WKContentView _updatePositionInformation]):
(-[WKContentView gestureRecognizerShouldBegin:]):
(-[WKContentView _cancelInteraction]):
(-[WKContentView hasSelectablePositionAtPoint:]):
(-[WKContentView pointIsInAssistedNode:]):
(-[WKContentView webSelectionRects]):
(-[WKContentView _highlightLongPressRecognized:]):
(-[WKContentView _longPressRecognized:]):
(-[WKContentView _singleTapRecognized:]):
(-[WKContentView _doubleTapRecognized:]):
(-[WKContentView _twoFingerDoubleTapRecognized:]):
(-[WKContentView _twoFingerPanRecognized:]):
(-[WKContentView _attemptClickAtLocation:]):
(-[WKContentView useSelectionAssistantWithMode:]):
(-[WKContentView clearSelection]):
(-[WKContentView _positionInformationDidChange:]):
(-[WKContentView _willStartScrollingOrZooming]):
(-[WKContentView _willStartUserTriggeredScrollingOrZooming]):
(-[WKContentView _didEndScrollingOrZooming]):
(-[WKContentView inputAccessoryView]):
(-[WKContentView supportedPasteboardTypesForCurrentSelection]):
(-[WKContentView _addShortcut:]):
(-[WKContentView _promptForReplace:]):
(-[WKContentView replace:]):
(-[WKContentView canPerformAction:withSender:]):
(-[WKContentView _resetShowingTextStyle:]):
(-[WKContentView _performAction:]):
(-[WKContentView copy:]):
(-[WKContentView cut:]):
(-[WKContentView paste:]):
(-[WKContentView select:]):
(-[WKContentView selectAll:]):
(-[WKContentView toggleBoldface:]):
(-[WKContentView toggleItalics:]):
(-[WKContentView toggleUnderline:]):
(-[WKContentView _showTextStyleOptions:]):
(-[WKContentView _showDictionary:]):
(-[WKContentView _define:]):
(toWKGestureType):
(toUIWKGestureType):
(toWKSelectionTouch):
(toUIWKSelectionTouch):
(toWKGestureRecognizerState):
(toUIGestureRecognizerState):
(toUIWKSelectionFlags):
(toWKHandlePosition):
(selectionChangedWithGesture):
(selectionChangedWithTouch):
(-[WKContentView _didUpdateBlockSelectionWithTouch:WebKit::withFlags:WebKit::growThreshold:shrinkThreshold:]):
(-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
(-[WKContentView changeSelectionWithTouchAt:withSelectionTouch:baseIsStart:]):
(-[WKContentView changeSelectionWithTouchesFrom:to:withGesture:withState:]):
(-[WKContentView changeBlockSelectionWithTouchAt:withSelectionTouch:forHandle:]):
(-[WKContentView autocorrectionData]):
(-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
(-[WKContentView textFirstRect]):
(-[WKContentView textLastRect]):
(-[WKContentView applyAutocorrection:toString:withCompletionHandler:]):
(-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
(-[WKContentView accessoryDone]):
(-[WKContentView accessoryTab:]):
(-[WKContentView accessoryAutoFill]):
(-[WKContentView accessoryClear]):
(-[WKContentView _updateAccessory]):
(-[WKContentView textInRange:]):
(-[WKContentView replaceRange:withText:]):
(-[WKContentView selectedTextRange]):
(-[WKContentView caretRectForPosition:]):
(-[WKContentView selectionRectsForRange:]):
(-[WKContentView setSelectedTextRange:]):
(-[WKContentView hasMarkedText]):
(-[WKContentView markedText]):
(-[WKContentView markedTextRange]):
(-[WKContentView markedTextStyle]):
(-[WKContentView setMarkedTextStyle:]):
(-[WKContentView setMarkedText:selectedRange:]):
(-[WKContentView unmarkText]):
(-[WKContentView beginningOfDocument]):
(-[WKContentView endOfDocument]):
(-[WKContentView textRangeFromPosition:toPosition:]):
(-[WKContentView positionFromPosition:offset:]):
(-[WKContentView positionFromPosition:inDirection:offset:]):
(-[WKContentView comparePosition:toPosition:]):
(-[WKContentView offsetFromPosition:toPosition:]):
(-[WKContentView tokenizer]):
(-[WKContentView positionWithinRange:farthestInDirection:]):
(-[WKContentView characterRangeByExtendingPosition:inDirection:]):
(-[WKContentView baseWritingDirectionForPosition:inDirection:]):
(-[WKContentView setBaseWritingDirection:forRange:]):
(-[WKContentView firstRectForRange:]):
(-[WKContentView closestPositionToPoint:]):
(-[WKContentView closestPositionToPoint:withinRange:]):
(-[WKContentView characterRangeAtPoint:]):
(-[WKContentView deleteBackward]):
(-[WKContentView insertText:]):
(-[WKContentView hasText]):
(-[WKContentView textInputTraits]):
(-[WKContentView interactionAssistant]):
(-[WKContentView webSelectionAssistant]):
(-[WKContentView selectionRange]):
(-[WKContentView rectForNSRange:]):
(-[WKContentView _markedTextNSRange]):
(-[WKContentView selectedDOMRange]):
(-[WKContentView setSelectedDOMRange:affinityDownstream:]):
(-[WKContentView replaceRangeWithTextWithoutClosingTyping:replacementText:]):
(-[WKContentView rectContainingCaretSelection]):
(-[WKContentView requiresKeyEvents]):
(-[WKContentView handleKeyWebEvent:]):
(-[WKContentView _interpretKeyEvent:isCharEvent:]):
(-[WKContentView setBottomBufferHeight:]):
(-[WKContentView automaticallySelectedOverlay]):
(-[WKContentView selectionGranularity]):
(-[WKContentView insertDictationResult:withCorrectionIdentifier:]):
(-[WKContentView metadataDictionariesForDictationResults]):
(-[WKContentView previousUnperturbedDictationResultBoundaryFromPosition:]):
(-[WKContentView nextUnperturbedDictationResultBoundaryFromPosition:]):
(-[WKContentView moveBackward:]):
(-[WKContentView moveForward:]):
(-[WKContentView characterBeforeCaretSelection]):
(-[WKContentView wordContainingCaretSelection]):
(-[WKContentView wordRangeContainingCaretSelection]):
(-[WKContentView setMarkedText:]):
(-[WKContentView hasContent]):
(-[WKContentView selectAll]):
(-[WKContentView textColorForCaretSelection]):
(-[WKContentView fontForCaretSelection]):
(-[WKContentView hasSelection]):
(-[WKContentView isPosition:atBoundary:inDirection:]):
(-[WKContentView positionFromPosition:toBoundary:inDirection:]):
(-[WKContentView isPosition:withinTextUnit:inDirection:]):
(-[WKContentView rangeEnclosingPosition:withGranularity:inDirection:]):
(-[WKContentView takeTraitsFrom:]):
(-[WKContentView _startAssistingKeyboard]):
(-[WKContentView _stopAssistingKeyboard]):
(-[WKContentView _startAssistingNode]):
(-[WKContentView _stopAssistingNode]):
(-[WKContentView _selectionChanged]):
(-[WKContentView shouldIgnoreWebTouch]):
(-[WKContentView isAnyTouchOverActiveArea:]):
(-[WKTextRange _isCaret]):
(-[WKTextRange _isRanged]):
(+[WKTextRange textRangeWithState:isRange:isEditable:startRect:endRect:selectionRects:selectedTextLength:]):
(-[WKTextRange dealloc]):
(-[WKTextRange description]):
(-[WKTextRange start]):
(-[WKTextRange end]):
(-[WKTextRange isEmpty]):
(-[WKTextRange isEqual:]):
(+[WKTextPosition textPositionWithRect:]):
(-[WKTextPosition isEqual:]):
(-[WKTextPosition description]):
(-[WKTextSelectionRect initWithWebRect:]):
(-[WKTextSelectionRect dealloc]):
(+[WKTextSelectionRect textSelectionRectsWithWebRects:]):
(-[WKTextSelectionRect rect]):
(-[WKTextSelectionRect writingDirection]):
(-[WKTextSelectionRect range]):
(-[WKTextSelectionRect containsStart]):
(-[WKTextSelectionRect containsEnd]):
(-[WKTextSelectionRect isVertical]):
(+[WKAutocorrectionRects autocorrectionRectsWithRects:lastRect:]):
(+[WKAutocorrectionContext autocorrectionContextWithData:markedText:selectedText:afterText:selectedRangeInMarkedText:]):
(-[WKAutocorrectionContext dealloc]):

  • UIProcess/ios/WKContentViewInternal.h: Removed.
  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
1 deleted
13 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164619 r164621  
     12014-02-24  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove WKInteractionView, move code into WKContentView
     4        https://bugs.webkit.org/show_bug.cgi?id=129275
     5
     6        Reviewed by Benjamin Poulain.
     7       
     8        WKInteractionView as an interim solution as WebKit2 on iOS was being
     9        brought up, and should be removed.
     10       
     11        Move its code into a category on WKContentView, mostly unchanged. The
     12        WKContentView (WKInteraction) categroy now implements the various protocols
     13        that WKInteractionView implemented.
     14       
     15        WKContentView is not an API class, so no longer has WK_API_CLASS, and can
     16        have implementation-related data members. WKContentViewInternal.h is removed.
     17       
     18        WKContentView now exposes a WebPageProxy* rather than a WKPageRef.
     19       
     20        Other changes: WKActionSheetAssistant no longer stores a WebPageProxy,
     21        getting it from the WKContentView instead.
     22       
     23        WKAutoCorrectionData and InteractionInformationAtPosition are stored via unique_ptr
     24        to reduce class size, and avoid having to expose their details in the header.
     25
     26        * Configurations/WebKit2.xcconfig:
     27        * UIProcess/API/Cocoa/WKWebViewInternal.h:
     28        * UIProcess/API/ios/WKViewIOS.mm:
     29        (-[WKView setAllowsBackForwardNavigationGestures:]):
     30        (-[WKView pageRef]):
     31        (-[WKView _pageExtendedBackgroundColor]):
     32        (-[WKView _setBackgroundExtendsBeyondPage:]):
     33        (-[WKView _backgroundExtendsBeyondPage]):
     34        * UIProcess/ios/PageClientImplIOS.mm:
     35        * UIProcess/ios/WKActionSheet.h:
     36        * UIProcess/ios/WKActionSheet.mm:
     37        (-[WKActionSheet initWithView:]):
     38        (+[WKElementAction customElementActionWithTitle:actionHandler:]):
     39        (copyElement):
     40        (saveImage):
     41        (+[WKElementAction standardElementActionWithType:customTitle:]):
     42        (-[WKElementAction runActionWithElementInfo:view:]):
     43        * UIProcess/ios/WKActionSheetAssistant.h:
     44        * UIProcess/ios/WKActionSheetAssistant.mm:
     45        (-[WKActionSheetAssistant initWithView:]):
     46        (-[WKActionSheetAssistant dealloc]):
     47        (-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]):
     48        (-[WKActionSheetAssistant presentationRectInHostViewForSheet]):
     49        (-[WKActionSheetAssistant actionSheet:clickedButtonAtIndex:]):
     50        (-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
     51        (-[WKActionSheetAssistant showImageSheet]):
     52        (-[WKActionSheetAssistant showLinkSheet]):
     53        (-[WKActionSheetAssistant showDataDetectorsSheet]):
     54        (-[WKActionSheetAssistant cleanupSheet]):
     55        * UIProcess/ios/WKContentView.h:
     56        * UIProcess/ios/WKContentView.mm:
     57        (-[WKContentView initWithFrame:context:WebKit::configuration:WebKit::]):
     58        (-[WKContentView dealloc]):
     59        (-[WKContentView page]):
     60        (-[WKContentView isAssistingNode]):
     61        (-[WKContentView didFinishScrolling]):
     62        (-[WKContentView willStartZoomOrScroll]):
     63        (-[WKContentView willStartUserTriggeredScroll]):
     64        (-[WKContentView willStartUserTriggeredZoom]):
     65        (-[WKContentView didZoomToScale:]):
     66        (-[WKContentView _didCommitLoadForMainFrame]):
     67        (-[WKContentView _didCommitLayerTree:WebKit::]):
     68        * UIProcess/ios/WKContentViewInteraction.h: Renamed from Source/WebKit2/UIProcess/ios/WKInteractionView.h.
     69        * UIProcess/ios/WKContentViewInteraction.mm: Renamed from Source/WebKit2/UIProcess/ios/WKInteractionView.mm.
     70        (-[WKContentView setupInteraction]):
     71        (-[WKContentView cleanupInteraction]):
     72        (-[WKContentView positionInformation]):
     73        (-[WKContentView setInputDelegate:]):
     74        (-[WKContentView inputDelegate]):
     75        (-[WKContentView isEditable]):
     76        (-[WKContentView canBecomeFirstResponder]):
     77        (-[WKContentView resignFirstResponder]):
     78        (-[WKContentView _webTouchEventsRecognized:]):
     79        (inflateQuad):
     80        (-[WKContentView _webTouchEvent:WebKit::preventsNativeGestures:]):
     81        (-[WKContentView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
     82        (-[WKContentView _cancelLongPressGestureRecognizer]):
     83        (-[WKContentView _didScroll]):
     84        (-[WKContentView _requiresKeyboardResetOnReload]):
     85        (-[WKContentView gestureRecognizer:canPreventGestureRecognizer:]):
     86        (-[WKContentView gestureRecognizer:canBePreventedByGestureRecognizer:]):
     87        (isSamePair):
     88        (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
     89        (-[WKContentView _showImageSheet]):
     90        (-[WKContentView _showLinkSheet]):
     91        (-[WKContentView _showDataDetectorsSheet]):
     92        (-[WKContentView _actionForLongPress]):
     93        (-[WKContentView ensurePositionInformationIsUpToDate:]):
     94        (-[WKContentView _updatePositionInformation]):
     95        (-[WKContentView gestureRecognizerShouldBegin:]):
     96        (-[WKContentView _cancelInteraction]):
     97        (-[WKContentView hasSelectablePositionAtPoint:]):
     98        (-[WKContentView pointIsInAssistedNode:]):
     99        (-[WKContentView webSelectionRects]):
     100        (-[WKContentView _highlightLongPressRecognized:]):
     101        (-[WKContentView _longPressRecognized:]):
     102        (-[WKContentView _singleTapRecognized:]):
     103        (-[WKContentView _doubleTapRecognized:]):
     104        (-[WKContentView _twoFingerDoubleTapRecognized:]):
     105        (-[WKContentView _twoFingerPanRecognized:]):
     106        (-[WKContentView _attemptClickAtLocation:]):
     107        (-[WKContentView useSelectionAssistantWithMode:]):
     108        (-[WKContentView clearSelection]):
     109        (-[WKContentView _positionInformationDidChange:]):
     110        (-[WKContentView _willStartScrollingOrZooming]):
     111        (-[WKContentView _willStartUserTriggeredScrollingOrZooming]):
     112        (-[WKContentView _didEndScrollingOrZooming]):
     113        (-[WKContentView inputAccessoryView]):
     114        (-[WKContentView supportedPasteboardTypesForCurrentSelection]):
     115        (-[WKContentView _addShortcut:]):
     116        (-[WKContentView _promptForReplace:]):
     117        (-[WKContentView replace:]):
     118        (-[WKContentView canPerformAction:withSender:]):
     119        (-[WKContentView _resetShowingTextStyle:]):
     120        (-[WKContentView _performAction:]):
     121        (-[WKContentView copy:]):
     122        (-[WKContentView cut:]):
     123        (-[WKContentView paste:]):
     124        (-[WKContentView select:]):
     125        (-[WKContentView selectAll:]):
     126        (-[WKContentView toggleBoldface:]):
     127        (-[WKContentView toggleItalics:]):
     128        (-[WKContentView toggleUnderline:]):
     129        (-[WKContentView _showTextStyleOptions:]):
     130        (-[WKContentView _showDictionary:]):
     131        (-[WKContentView _define:]):
     132        (toWKGestureType):
     133        (toUIWKGestureType):
     134        (toWKSelectionTouch):
     135        (toUIWKSelectionTouch):
     136        (toWKGestureRecognizerState):
     137        (toUIGestureRecognizerState):
     138        (toUIWKSelectionFlags):
     139        (toWKHandlePosition):
     140        (selectionChangedWithGesture):
     141        (selectionChangedWithTouch):
     142        (-[WKContentView _didUpdateBlockSelectionWithTouch:WebKit::withFlags:WebKit::growThreshold:shrinkThreshold:]):
     143        (-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
     144        (-[WKContentView changeSelectionWithTouchAt:withSelectionTouch:baseIsStart:]):
     145        (-[WKContentView changeSelectionWithTouchesFrom:to:withGesture:withState:]):
     146        (-[WKContentView changeBlockSelectionWithTouchAt:withSelectionTouch:forHandle:]):
     147        (-[WKContentView autocorrectionData]):
     148        (-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
     149        (-[WKContentView textFirstRect]):
     150        (-[WKContentView textLastRect]):
     151        (-[WKContentView applyAutocorrection:toString:withCompletionHandler:]):
     152        (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
     153        (-[WKContentView accessoryDone]):
     154        (-[WKContentView accessoryTab:]):
     155        (-[WKContentView accessoryAutoFill]):
     156        (-[WKContentView accessoryClear]):
     157        (-[WKContentView _updateAccessory]):
     158        (-[WKContentView textInRange:]):
     159        (-[WKContentView replaceRange:withText:]):
     160        (-[WKContentView selectedTextRange]):
     161        (-[WKContentView caretRectForPosition:]):
     162        (-[WKContentView selectionRectsForRange:]):
     163        (-[WKContentView setSelectedTextRange:]):
     164        (-[WKContentView hasMarkedText]):
     165        (-[WKContentView markedText]):
     166        (-[WKContentView markedTextRange]):
     167        (-[WKContentView markedTextStyle]):
     168        (-[WKContentView setMarkedTextStyle:]):
     169        (-[WKContentView setMarkedText:selectedRange:]):
     170        (-[WKContentView unmarkText]):
     171        (-[WKContentView beginningOfDocument]):
     172        (-[WKContentView endOfDocument]):
     173        (-[WKContentView textRangeFromPosition:toPosition:]):
     174        (-[WKContentView positionFromPosition:offset:]):
     175        (-[WKContentView positionFromPosition:inDirection:offset:]):
     176        (-[WKContentView comparePosition:toPosition:]):
     177        (-[WKContentView offsetFromPosition:toPosition:]):
     178        (-[WKContentView tokenizer]):
     179        (-[WKContentView positionWithinRange:farthestInDirection:]):
     180        (-[WKContentView characterRangeByExtendingPosition:inDirection:]):
     181        (-[WKContentView baseWritingDirectionForPosition:inDirection:]):
     182        (-[WKContentView setBaseWritingDirection:forRange:]):
     183        (-[WKContentView firstRectForRange:]):
     184        (-[WKContentView closestPositionToPoint:]):
     185        (-[WKContentView closestPositionToPoint:withinRange:]):
     186        (-[WKContentView characterRangeAtPoint:]):
     187        (-[WKContentView deleteBackward]):
     188        (-[WKContentView insertText:]):
     189        (-[WKContentView hasText]):
     190        (-[WKContentView textInputTraits]):
     191        (-[WKContentView interactionAssistant]):
     192        (-[WKContentView webSelectionAssistant]):
     193        (-[WKContentView selectionRange]):
     194        (-[WKContentView rectForNSRange:]):
     195        (-[WKContentView _markedTextNSRange]):
     196        (-[WKContentView selectedDOMRange]):
     197        (-[WKContentView setSelectedDOMRange:affinityDownstream:]):
     198        (-[WKContentView replaceRangeWithTextWithoutClosingTyping:replacementText:]):
     199        (-[WKContentView rectContainingCaretSelection]):
     200        (-[WKContentView requiresKeyEvents]):
     201        (-[WKContentView handleKeyWebEvent:]):
     202        (-[WKContentView _interpretKeyEvent:isCharEvent:]):
     203        (-[WKContentView setBottomBufferHeight:]):
     204        (-[WKContentView automaticallySelectedOverlay]):
     205        (-[WKContentView selectionGranularity]):
     206        (-[WKContentView insertDictationResult:withCorrectionIdentifier:]):
     207        (-[WKContentView metadataDictionariesForDictationResults]):
     208        (-[WKContentView previousUnperturbedDictationResultBoundaryFromPosition:]):
     209        (-[WKContentView nextUnperturbedDictationResultBoundaryFromPosition:]):
     210        (-[WKContentView moveBackward:]):
     211        (-[WKContentView moveForward:]):
     212        (-[WKContentView characterBeforeCaretSelection]):
     213        (-[WKContentView wordContainingCaretSelection]):
     214        (-[WKContentView wordRangeContainingCaretSelection]):
     215        (-[WKContentView setMarkedText:]):
     216        (-[WKContentView hasContent]):
     217        (-[WKContentView selectAll]):
     218        (-[WKContentView textColorForCaretSelection]):
     219        (-[WKContentView fontForCaretSelection]):
     220        (-[WKContentView hasSelection]):
     221        (-[WKContentView isPosition:atBoundary:inDirection:]):
     222        (-[WKContentView positionFromPosition:toBoundary:inDirection:]):
     223        (-[WKContentView isPosition:withinTextUnit:inDirection:]):
     224        (-[WKContentView rangeEnclosingPosition:withGranularity:inDirection:]):
     225        (-[WKContentView takeTraitsFrom:]):
     226        (-[WKContentView _startAssistingKeyboard]):
     227        (-[WKContentView _stopAssistingKeyboard]):
     228        (-[WKContentView _startAssistingNode]):
     229        (-[WKContentView _stopAssistingNode]):
     230        (-[WKContentView _selectionChanged]):
     231        (-[WKContentView shouldIgnoreWebTouch]):
     232        (-[WKContentView isAnyTouchOverActiveArea:]):
     233        (-[WKTextRange _isCaret]):
     234        (-[WKTextRange _isRanged]):
     235        (+[WKTextRange textRangeWithState:isRange:isEditable:startRect:endRect:selectionRects:selectedTextLength:]):
     236        (-[WKTextRange dealloc]):
     237        (-[WKTextRange description]):
     238        (-[WKTextRange start]):
     239        (-[WKTextRange end]):
     240        (-[WKTextRange isEmpty]):
     241        (-[WKTextRange isEqual:]):
     242        (+[WKTextPosition textPositionWithRect:]):
     243        (-[WKTextPosition isEqual:]):
     244        (-[WKTextPosition description]):
     245        (-[WKTextSelectionRect initWithWebRect:]):
     246        (-[WKTextSelectionRect dealloc]):
     247        (+[WKTextSelectionRect textSelectionRectsWithWebRects:]):
     248        (-[WKTextSelectionRect rect]):
     249        (-[WKTextSelectionRect writingDirection]):
     250        (-[WKTextSelectionRect range]):
     251        (-[WKTextSelectionRect containsStart]):
     252        (-[WKTextSelectionRect containsEnd]):
     253        (-[WKTextSelectionRect isVertical]):
     254        (+[WKAutocorrectionRects autocorrectionRectsWithRects:lastRect:]):
     255        (+[WKAutocorrectionContext autocorrectionContextWithData:markedText:selectedText:afterText:selectedRangeInMarkedText:]):
     256        (-[WKAutocorrectionContext dealloc]):
     257        * UIProcess/ios/WKContentViewInternal.h: Removed.
     258        * WebKit2.xcodeproj/project.pbxproj:
     259
    12602014-02-24  Anders Carlsson  <andersca@apple.com>
    2261

  • trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

    r164576 r164621  
    4646EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WKThumbnailView.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
    4747EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    48 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm WKContentView.mm WKScrollView.mm WKGeolocationProviderIOSObjCSecurityOrigin.mm WKInteractionView.mm WebIOSEventFactory.mm WKActionSheet.mm WKActionSheetAssistant.mm;
     48EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm WKContentView.mm WKContentViewInteraction.mm WKScrollView.mm WKGeolocationProviderIOSObjCSecurityOrigin.mm WebIOSEventFactory.mm WKActionSheet.mm WKActionSheetAssistant.mm;
    4949
    5050INSTALLHDRS_SCRIPT_PHASE = YES;

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r164603 r164621  
    140140
    141141    _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:context configuration:std::move(webPageConfiguration)]);
    142     _page = _contentView->_page;
     142    _page = [_contentView page];
    143143    [_contentView setDelegate:self];
    144144    [_contentView layer].anchorPoint = CGPointZero;

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

    r163564 r164621  
    3131
    3232#if PLATFORM(IOS)
    33 #import "WKContentViewInternal.h"
     33#import "WKContentView.h"
    3434#import <UIKit/UIScrollView_Private.h>
    3535#endif

  • trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

    r164522 r164621  
    130130    _allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
    131131   
    132     WebPageProxy *webPageProxy = toImpl([_contentView _pageRef]);
     132    WebPageProxy *webPageProxy = [_contentView page];
    133133   
    134134    if (allowsBackForwardNavigationGestures) {
    … …  
    308308- (WKPageRef)pageRef
    309309{
    310     return [_contentView _pageRef];
     310    return toAPI([_contentView page]);
    311311}
    312312
    … …  
    367367- (UIColor *)_pageExtendedBackgroundColor
    368368{
    369     WebPageProxy* webPageProxy = toImpl([_contentView _pageRef]);
    370     WebCore::Color color = webPageProxy->pageExtendedBackgroundColor();
     369    WebCore::Color color = [_contentView page]->pageExtendedBackgroundColor();
    371370    if (!color.isValid())
    372371        return nil;
    … …  
    377376- (void)_setBackgroundExtendsBeyondPage:(BOOL)backgroundExtends
    378377{
    379     WebPageProxy* webPageProxy = toImpl([_contentView _pageRef]);
    380     webPageProxy->setBackgroundExtendsBeyondPage(backgroundExtends);
     378    [_contentView page]->setBackgroundExtendsBeyondPage(backgroundExtends);
    381379}
    382380
    383381- (BOOL)_backgroundExtendsBeyondPage
    384382{
    385     WebPageProxy* webPageProxy = toImpl([_contentView _pageRef]);
    386     return webPageProxy->backgroundExtendsBeyondPage();
     383    return [_contentView page]->backgroundExtendsBeyondPage();
    387384}
    388385

  • trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

    r164599 r164621  
    2929#import "NativeWebKeyboardEvent.h"
    3030#import "InteractionInformationAtPosition.h"
    31 #import "WKContentViewInternal.h"
     31#import "WKContentView.h"
     32#import "WKContentViewInteraction.h"
    3233#import "WebContextMenuProxy.h"
    3334#import "WebEditCommandProxy.h"

  • trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.h

    r164599 r164621  
    2929
    3030@protocol WKActionSheetDelegate;
    31 @class WKInteractionView;
     31@class WKContentView;
    3232
    3333@interface WKActionSheet : UIActionSheet
    … …  
    3535@property (nonatomic, assign) id <WKActionSheetDelegate> sheetDelegate;
    3636@property (nonatomic) UIPopoverArrowDirection arrowDirections;
    37 - (id)initWithView:(WKInteractionView *)view;
     37- (id)initWithView:(WKContentView *)view;
    3838- (void)doneWithSheet;
    3939- (BOOL)presentSheet;
    … …  
    6262
    6363typedef void (^WKElementActionHandler)(WKElementActionInfo *);
    64 typedef void (^WKElementActionHandlerInternal)(WKInteractionView *, WKElementActionInfo *);
     64typedef void (^WKElementActionHandlerInternal)(WKContentView *, WKElementActionInfo *);
    6565
    6666typedef enum {
    … …  
    7979+ (WKElementAction *)standardElementActionWithType:(WKElementActionType)type;
    8080+ (WKElementAction *)standardElementActionWithType:(WKElementActionType)type customTitle:(NSString *)title;
    81 - (void)runActionWithElementInfo:(WKElementActionInfo *)info view:(WKInteractionView *)view;
     81- (void)runActionWithElementInfo:(WKElementActionInfo *)info view:(WKContentView *)view;
    8282
    8383@end

  • trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm

    r164599 r164621  
    2828
    2929#import "WKGestureTypes.h"
    30 #import "WKInteractionView.h"
     30#import "WKContentViewInteraction.h"
    3131#import <SafariServices/SSReadingList.h>
    3232#import <UIKit/UIActionSheet_Private.h>
    … …  
    4141SOFT_LINK_CLASS(SafariServices, SSReadingList);
    4242
     43using namespace WebKit;
     44
    4345@interface WKElementAction(Private)
    44 - (void)_runActionWithElement:(NSURL *)targetURL documentView:(WKInteractionView *)view interactionLocation:(CGPoint)interactionLocation;
     46- (void)_runActionWithElement:(NSURL *)targetURL documentView:(WKContentView *)view interactionLocation:(CGPoint)interactionLocation;
    4547@end
    4648
    … …  
    4850    id<WKActionSheetDelegate> _sheetDelegate;
    4951    id<UIActionSheetDelegate> _delegateWhileRotating;
    50     WKInteractionView *_view;
     52    WKContentView *_view;
    5153    UIPopoverArrowDirection _arrowDirections;
    5254    BOOL _isRotating;
    5355}
    5456
    55 - (id)initWithView:(WKInteractionView *)view
     57- (id)initWithView:(WKContentView *)view
    5658{
    5759    self = [super init];
    … …  
    227229{
    228230    return [[[self alloc] initWithTitle:title
    229                           actionHandler:^(WKInteractionView *view, WKElementActionInfo *actionInfo) { handler(actionInfo); }
     231                          actionHandler:^(WKContentView *view, WKElementActionInfo *actionInfo) { handler(actionInfo); }
    230232                                   type:WKElementActionTypeCustom] autorelease];
    231233}
    232234
    233 static void copyElement(WKInteractionView *view)
     235static void copyElement(WKContentView *view)
    234236{
    235237    [view _performAction:WebKit::WKSheetActionCopy];
    236238}
    237239
    238 static void saveImage(WKInteractionView *view)
     240static void saveImage(WKContentView *view)
    239241{
    240242    [view _performAction:WebKit::WKSheetActionSaveImage];
    … …  
    256258    case WKElementActionTypeCopy:
    257259        title = WEB_UI_STRING_KEY("Copy", "Copy ActionSheet Link", "Title for Copy Link or Image action button");
    258         handler = ^(WKInteractionView *view, WKElementActionInfo *actionInfo) {
     260        handler = ^(WKContentView *view, WKElementActionInfo *actionInfo) {
    259261            copyElement(view);
    260262        };
    … …  
    262264    case WKElementActionTypeOpen:
    263265        title = WEB_UI_STRING_KEY("Open", "Open ActionSheet Link", "Title for Open Link action button");
    264         handler = ^(WKInteractionView *view, WKElementActionInfo *actionInfo) {
     266        handler = ^(WKContentView *view, WKElementActionInfo *actionInfo) {
    265267            [view _attemptClickAtLocation:actionInfo.interactionLocation];
    266268        };
    … …  
    268270    case WKElementActionTypeSaveImage:
    269271        title = WEB_UI_STRING_KEY("Save Image", "Save Image", "Title for Save Image action button");
    270         handler = ^(WKInteractionView *view, WKElementActionInfo *actionInfo) {
     272        handler = ^(WKContentView *view, WKElementActionInfo *actionInfo) {
    271273            saveImage(view);
    272274        };
    … …  
    274276    case WKElementActionTypeAddToReadingList:
    275277        title = WEB_UI_STRING("Add to Reading List", "Title for Add to Reading List action button");
    276         handler = ^(WKInteractionView *view, WKElementActionInfo *actionInfo) {
     278        handler = ^(WKContentView *view, WKElementActionInfo *actionInfo) {
    277279            addToReadingList(actionInfo.url, actionInfo.title);
    278280        };
    … …  
    290292}
    291293
    292 - (void)runActionWithElementInfo:(WKElementActionInfo *)info view:(WKInteractionView *)view
     294- (void)runActionWithElementInfo:(WKElementActionInfo *)info view:(WKContentView *)view
    293295{
    294296    _actionHandler(view, info);

  • trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h

    r164599 r164621  
    3232
    3333@protocol WKActionSheetDelegate;
    34 @class WKInteractionView;
     34@class WKContentView;
    3535
    3636namespace WebKit {
    … …  
    4040@interface WKActionSheetAssistant : NSObject <WKActionSheetDelegate>
    4141
    42 - (id)initWithView:(WKInteractionView *)view;
    43 - (void)setPage:(PassRefPtr<WebKit::WebPageProxy>)page;
     42- (id)initWithView:(WKContentView *)view;
    4443- (void)showLinkSheet;
    4544- (void)showImageSheet;

  • trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm

    r164599 r164621  
    2828
    2929#import "WKActionSheet.h"
    30 #import "WKInteractionView.h"
     30#import "WKContentViewInteraction.h"
    3131#import "WebPageProxy.h"
    3232#import <TCC/TCC.h>
    … …  
    5353
    5454@interface WKElementAction(Private)
    55 - (void)_runActionWithElement:(NSURL *)targetURL documentView:(WKInteractionView *)view interactionLocation:(CGPoint)interactionLocation;
     55- (void)_runActionWithElement:(NSURL *)targetURL documentView:(WKContentView *)view interactionLocation:(CGPoint)interactionLocation;
    5656@end
    5757
    5858@implementation WKActionSheetAssistant {
    5959    RetainPtr<WKActionSheet> _interactionSheet;
    60     RefPtr<WebKit::WebPageProxy> _page;
    6160    RetainPtr<NSArray> _elementActions;
    62     WKInteractionView *_view;
    63 }
    64 
    65 - (id)initWithView:(WKInteractionView *)view
     61    WKContentView *_view;
     62}
     63
     64- (id)initWithView:(WKContentView *)view
    6665{
    6766    _view = view;
    … …  
    7271{
    7372    [self cleanupSheet];
    74     _page = nullptr;
    7573    [super dealloc];
    76 }
    77 
    78 - (void)setPage:(PassRefPtr<WebKit::WebPageProxy>)page
    79 {
    80     _page = page;
    8174}
    8275
    … …  
    221214
    222215    [_interactionSheet setCancelButtonIndex:[_interactionSheet addButtonWithTitle:WEB_UI_STRING_KEY("Cancel", "Cancel button label in button bar", "Title for Cancel button label in button bar")]];
    223     _page->startInteractionWithElementAtPosition(_view.positionInformation.point);
     216    _view.page->startInteractionWithElementAtPosition(_view.positionInformation.point);
    224217}
    225218
    … …  
    327320- (void)cleanupSheet
    328321{
    329     _page->stopInteraction();
     322    _view.page->stopInteraction();
    330323
    331324    [_interactionSheet doneWithSheet];

  • trunk/Source/WebKit2/UIProcess/ios/WKContentView.h

    r164599 r164621  
    3232
    3333@class WKContentView;
    34 @class WKWebViewConfiguration;
    3534
    3635namespace WebKit {
     36class DrawingAreaProxy;
     37class GeolocationPermissionRequestProxy;
    3738class RemoteLayerTreeTransaction;
    3839class WebContext;
     40class WebFrameProxy;
     41class WebPageProxy;
     42class WebSecurityOrigin;
    3943struct WebPageConfiguration;
    4044}
    … …  
    4852@end
    4953
    50 WK_API_CLASS
    51 @interface WKContentView : UIView
     54@interface WKContentView : UIView {
     55@package
     56    RefPtr<WebKit::WebPageProxy> _page;
     57}
    5258
    5359@property (nonatomic, readonly) WKBrowsingContextController *browsingContextController;
    54 
    5560@property (nonatomic, assign) id <WKContentViewDelegate> delegate;
    5661
    57 @property (nonatomic, readonly) WKPageRef _pageRef;
     62@property (nonatomic, readonly) WebKit::WebPageProxy* page;
    5863@property (nonatomic, readonly) BOOL isAssistingNode;
    5964
    … …  
    7075- (void)willStartUserTriggeredZoom;
    7176
     77- (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy;
     78- (void)_processDidExit;
     79- (void)_didRelaunchProcess;
     80- (void)_setAcceleratedCompositingRootLayer:(CALayer *)rootLayer;
     81
     82- (void)_didCommitLoadForMainFrame;
     83- (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction;
     84
     85- (void)_decidePolicyForGeolocationRequestFromOrigin:(WebKit::WebSecurityOrigin&)origin frame:(WebKit::WebFrameProxy&)frame request:(WebKit::GeolocationPermissionRequestProxy&)permissionRequest;
     86
     87- (RetainPtr<CGImageRef>)_takeViewSnapshot;
     88
    7289@end

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

    r164603 r164621  
    2525
    2626#import "config.h"
    27 #import "WKContentViewInternal.h"
    28 
    29 #import "InteractionInformationAtPosition.h"
     27#import "WKContentViewInteraction.h"
     28
    3029#import "PageClientImplIOS.h"
    3130#import "RemoteLayerTreeDrawingAreaProxy.h"
    … …  
    3534#import "WKBrowsingContextGroupPrivate.h"
    3635#import "WKGeolocationProviderIOS.h"
    37 #import "WKInteractionView.h"
    3836#import "WKPreferencesInternal.h"
    3937#import "WKProcessGroupPrivate.h"
    … …  
    4543#import "WebSystemInterface.h"
    4644#import <UIKit/UIWindow_Private.h>
    47 #import <WebCore/ViewportArguments.h>
    4845#import <wtf/RetainPtr.h>
    49 
    50 #if USE(IOSURFACE)
    51 #import <IOSurface/IOSurface.h>
    52 #endif
    5346
    5447#if __has_include(<QuartzCore/QuartzCorePrivate.h>)
    … …  
    6861
    6962    RetainPtr<UIView> _rootContentView;
    70     RetainPtr<WKInteractionView> _interactionView;
    7163}
    7264
    … …  
    9486    [self addSubview:_rootContentView.get()];
    9587
    96     _interactionView = adoptNS([[WKInteractionView alloc] init]);
    97     [_interactionView setPage:_page];
    98     [self addSubview:_interactionView.get()];
     88    [self setupInteraction];
     89    [self setUserInteractionEnabled:YES];
    9990
    10091    self.layer.hitTestsAsOpaque = YES;
    … …  
    10596- (void)dealloc
    10697{
     98    [self cleanupInteraction];
     99
    107100    _page->close();
    108101
    … …  
    110103
    111104    [super dealloc];
     105}
     106
     107- (WebPageProxy*)page
     108{
     109    return _page.get();
    112110}
    113111
    … …  
    146144- (BOOL)isAssistingNode
    147145{
    148     return [_interactionView isEditable];
     146    return [self isEditable];
    149147}
    150148
    … …  
    192190{
    193191    [self _updateFixedPositionRect];
    194     [_interactionView _didEndScrollingOrZooming];
     192    [self _didEndScrollingOrZooming];
    195193}
    196194
    197195- (void)willStartZoomOrScroll
    198196{
    199     [_interactionView _willStartScrollingOrZooming];
     197    [self _willStartScrollingOrZooming];
    200198}
    201199
    202200- (void)willStartUserTriggeredScroll
    203201{
    204     [_interactionView _willStartUserTriggeredScrollingOrZooming];
     202    [self _willStartUserTriggeredScrollingOrZooming];
    205203}
    206204
    207205- (void)willStartUserTriggeredZoom
    208206{
    209     [_interactionView _willStartUserTriggeredScrollingOrZooming];
     207    [self _willStartUserTriggeredScrollingOrZooming];
    210208    _page->willStartUserTriggeredZooming();
    211209}
    … …  
    214212{
    215213    _page->didFinishZooming(scale);
    216     [_interactionView _didEndScrollingOrZooming];
     214    [self _didEndScrollingOrZooming];
    217215}
    218216
    … …  
    254252    if ([_delegate respondsToSelector:@selector(contentViewDidCommitLoadForMainFrame:)])
    255253        [_delegate contentViewDidCommitLoadForMainFrame:self];
    256     [_interactionView _stopAssistingNode];
     254
     255    [self _stopAssistingNode];
    257256}
    258257
    … …  
    262261
    263262    [self setBounds:{CGPointZero, contentsSize}];
    264     [_interactionView setFrame:CGRectMake(0, 0, contentsSize.width, contentsSize.height)];
    265263    [_rootContentView setFrame:CGRectMake(0, 0, contentsSize.width, contentsSize.height)];
    266264
    … …  
    269267}
    270268
    271 - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsNativeGesture
    272 {
    273     [_interactionView _webTouchEvent:touchEvent preventsNativeGestures:preventsNativeGesture];
    274 }
    275 
    276 - (void)_didGetTapHighlightForRequest:(uint64_t)requestID color:(const Color&)color quads:(const Vector<FloatQuad>&)highlightedQuads topLeftRadius:(const IntSize&)topLeftRadius topRightRadius:(const IntSize&)topRightRadius bottomLeftRadius:(const IntSize&)bottomLeftRadius bottomRightRadius:(const IntSize&)bottomRightRadius
    277 {
    278     [_interactionView _didGetTapHighlightForRequest:requestID color:color quads:highlightedQuads topLeftRadius:topLeftRadius topRightRadius:topRightRadius bottomLeftRadius:bottomLeftRadius bottomRightRadius:bottomRightRadius];
    279 }
    280 
    281269- (void)_setAcceleratedCompositingRootLayer:(CALayer *)rootLayer
    282270{
    283271    [[_rootContentView layer] setSublayers:@[rootLayer]];
    284 }
    285 
    286 // FIXME: change the name. Leave it for now to make it easier to refer to the UIKit implementation.
    287 - (void)_startAssistingNode
    288 {
    289     [_interactionView _startAssistingNode];
    290 }
    291 
    292 - (void)_stopAssistingNode
    293 {
    294     [_interactionView _stopAssistingNode];
    295 }
    296 
    297 - (void)_selectionChanged
    298 {
    299     [_interactionView _selectionChanged];
    300 }
    301 
    302 - (void)_didUpdateBlockSelectionWithTouch:(WKSelectionTouch)touch withFlags:(WKSelectionFlags)flags growThreshold:(CGFloat)growThreshold shrinkThreshold:(CGFloat)shrinkThreshold
    303 {
    304     [_interactionView _didUpdateBlockSelectionWithTouch:touch withFlags:flags growThreshold:growThreshold shrinkThreshold:shrinkThreshold];
    305 }
    306 
    307 - (BOOL)_interpretKeyEvent:(WebIOSEvent *)theEvent isCharEvent:(BOOL)isCharEvent
    308 {
    309     return [_interactionView _interpretKeyEvent:theEvent isCharEvent:isCharEvent];
    310 }
    311 
    312 - (void)_positionInformationDidChange:(const InteractionInformationAtPosition&)info
    313 {
    314     [_interactionView _positionInformationDidChange:info];
    315272}
    316273

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

    r164620 r164621  
    2424 */
    2525
     26#import "WKContentView.h"
     27
     28#import "InteractionInformationAtPosition.h"
    2629#import "WKGestureTypes.h"
    27 #import <UIKit/UIWebFormAccessory.h>
    2830#import <UIKit/UITextInput_Private.h>
    2931#import <UIKit/UIView.h>
     32#import <UIKit/UIWebFormAccessory.h>
    3033#import <UIKit/UIWebTouchEventsGestureRecognizer.h>
    3134#import <UIKit/UIWKSelectionAssistant.h>
    3235#import <UIKit/UIWKTextInteractionAssistant.h>
    3336#import <wtf/Forward.h>
     37#import <wtf/text/WTFString.h>
    3438#import <wtf/Vector.h>
    35 
    36 @class UIWebScrollView;
    3739
    3840namespace WebCore {
    … …  
    4850}
    4951
     52@class _UIWebHighlightLongPressGestureRecognizer;
     53@class _UIHighlightView;
    5054@class WebIOSEvent;
     55@class WKActionSheetAssistant;
    5156
    52 @interface WKInteractionView : UIView<UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol>
     57typedef void (^UIWKAutocorrectionCompletionHandler)(UIWKAutocorrectionRects *rectsForInput);
     58typedef void (^UIWKAutocorrectionContextHandler)(UIWKAutocorrectionContext *autocorrectionContext);
     59
     60namespace WebKit {
     61struct WKAutoCorrectionData {
     62    String fontName;
     63    CGFloat fontSize;
     64    uint64_t fontTraits;
     65    CGRect textFirstRect;
     66    CGRect textLastRect;
     67    UIWKAutocorrectionCompletionHandler autocorrectionHandler;
     68    UIWKAutocorrectionContextHandler autocorrectionContextHandler;
     69};
     70}
     71
     72@interface WKContentView () {
     73    RetainPtr<UIWebTouchEventsGestureRecognizer> _touchEventGestureRecognizer;
     74    BOOL _canSendTouchEventsAsynchronously;
     75    unsigned _nativeWebTouchEventUniqueIdBeingSentSynchronously;
     76
     77    RetainPtr<UITapGestureRecognizer> _singleTapGestureRecognizer;
     78    RetainPtr<_UIWebHighlightLongPressGestureRecognizer> _highlightLongPressGestureRecognizer;
     79    RetainPtr<UILongPressGestureRecognizer> _longPressGestureRecognizer;
     80    RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizer;
     81    RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
     82    RetainPtr<UIPanGestureRecognizer> _twoFingerPanGestureRecognizer;
     83
     84    RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
     85    RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
     86
     87    UITextInputTraits *_traits;
     88    BOOL _isEditable;
     89    UIWebFormAccessory *_accessory;
     90    id <UITextInputDelegate> _inputDelegate;
     91    BOOL _showingTextStyleOptions;
     92
     93    RetainPtr<_UIHighlightView> _highlightView;
     94    uint64_t _latestTapHighlightID;
     95    BOOL _isTapHighlightIDValid;
     96    WebKit::WKAutoCorrectionData _autocorrectionData;
     97    RetainPtr<NSString> _markedText;
     98    WebKit::InteractionInformationAtPosition _positionInformation;
     99    BOOL _hasValidPositionInformation;
     100    RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
     101}
     102
     103@end
     104
     105@interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol>
    53106
    54107@property (nonatomic, readonly) BOOL isEditable;
    55108
    56 - (void)setScrollView:(UIWebScrollView *)scrollView;
    57 - (void)setPage:(PassRefPtr<WebKit::WebPageProxy>)page;
     109- (void)setupInteraction;
     110- (void)cleanupInteraction;
    58111
    59112- (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsDefault;
    … …  
    72125- (void)_didEndScrollingOrZooming;
    73126- (void)_didUpdateBlockSelectionWithTouch:(WebKit::WKSelectionTouch)touch withFlags:(WebKit::WKSelectionFlags)flags growThreshold:(CGFloat)growThreshold shrinkThreshold:(CGFloat)shrinkThreshold;
    74 @property (readonly, nonatomic) WebKit::InteractionInformationAtPosition positionInformation;
     127
     128@property (readonly, nonatomic) const WebKit::InteractionInformationAtPosition& positionInformation;
     129@property (readonly, nonatomic) const WebKit::WKAutoCorrectionData& autocorrectionData;
     130
    75131@end

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

    r164620 r164621  
    11/*
    2  * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2525
    2626#import "config.h"
    27 #import "WKInteractionView.h"
    28 
    29 #import "InteractionInformationAtPosition.h"
     27#import "WKContentViewInteraction.h"
     28
    3029#import "NativeWebKeyboardEvent.h"
    3130#import "NativeWebTouchEvent.h"
    32 #import "WKActionSheetAssistant.h"
    33 #import "WKBase.h"
    34 #import "WKGestureTypes.h"
    3531#import "WebEvent.h"
    3632#import "WebIOSEventFactory.h"
    3733#import "WebPageMessages.h"
    3834#import "WebProcessProxy.h"
     35#import "WKActionSheetAssistant.h"
    3936#import <DataDetectorsUI/DDDetectionController.h>
     37#import <UIKit/_UIHighlightView.h>
     38#import <UIKit/_UIWebHighlightLongPressGestureRecognizer.h>
    4039#import <UIKit/UIFont_Private.h>
    4140#import <UIKit/UIGestureRecognizer_Private.h>
    … …  
    4443#import <UIKit/UITapGestureRecognizer_Private.h>
    4544#import <UIKit/UITextInteractionAssistant_Private.h>
    46 #import <UIKit/UIWebDocumentView.h>
    47 #import <UIKit/UIWebScrollView.h>
    48 #import <UIKit/_UIHighlightView.h>
    49 #import <UIKit/_UIWebHighlightLongPressGestureRecognizer.h>
     45#import <UIKit/UIWebDocumentView.h> // FIXME: should not include this header.
    5046#import <WebCore/Color.h>
    5147#import <WebCore/FloatQuad.h>
    … …  
    5349#import <WebCore/SoftLinking.h>
    5450#import <WebCore/WebEvent.h>
    55 #import <WebKit/WebSelectionRect.h>
     51#import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
    5652#import <wtf/RetainPtr.h>
    57 #import <wtf/text/WTFString.h>
    5853
    5954SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectorsUI)
    … …  
    130125@end
    131126
    132 typedef void (^UIWKAutocorrectionCompletionHandler)(UIWKAutocorrectionRects *rectsForInput);
    133 typedef void (^UIWKAutocorrectionContextHandler)(UIWKAutocorrectionContext *autocorrectionContext);
    134 
    135 struct WKAutoCorrectionData{
    136     String fontName;
    137     CGFloat fontSize;
    138     uint64_t fontTraits;
    139     CGRect textFirstRect;
    140     CGRect textLastRect;
    141     UIWKAutocorrectionCompletionHandler autocorrectionHandler;
    142     UIWKAutocorrectionContextHandler autocorrectionContextHandler;
    143 };
    144 
    145 @interface WKInteractionView (Private)
    146 @property (readonly, nonatomic) WKAutoCorrectionData *autocorrectionData;
     127@interface WKContentView () {
     128
     129}
     130
    147131@end
    148132
    149 @implementation WKInteractionView {
    150     RetainPtr<UIWebTouchEventsGestureRecognizer> _touchEventGestureRecognizer;
    151     BOOL _canSendTouchEventsAsynchronously;
    152     unsigned _nativeWebTouchEventUniqueIdBeingSentSynchronously;
    153 
    154     RetainPtr<UITapGestureRecognizer> _singleTapGestureRecognizer;
    155     RetainPtr<_UIWebHighlightLongPressGestureRecognizer> _highlightLongPressGestureRecognizer;
    156     RetainPtr<UILongPressGestureRecognizer> _longPressGestureRecognizer;
    157     RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizer;
    158     RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
    159     RetainPtr<UIPanGestureRecognizer> _twoFingerPanGestureRecognizer;
    160 
    161     RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
    162     RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
    163 
    164     UITextInputTraits *_traits;
    165     BOOL _isEditable;
    166     UIWebFormAccessory *_accessory;
    167     id <UITextInputDelegate> _inputDelegate;
    168     BOOL _showingTextStyleOptions;
    169 
    170     __weak UIWebScrollView *_scrollView;
    171     RefPtr<WebPageProxy> _page;
    172 
    173     RetainPtr<_UIHighlightView> _highlightView;
    174     uint64_t _latestTapHighlightID;
    175     BOOL _isTapHighlightIDValid;
    176     WKAutoCorrectionData _autocorrectionData;
    177     RetainPtr<NSString> _markedText;
    178     InteractionInformationAtPosition _positionInformation;
    179     BOOL _hasValidPositionInformation;
    180     RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
    181 }
    182 
    183 @synthesize inputDelegate = _inputDelegate;
    184 
    185 - (id)initWithFrame:(CGRect)frame
    186 {
    187     self = [super initWithFrame:frame];
    188     if (self) {
    189         _touchEventGestureRecognizer = adoptNS([[UIWebTouchEventsGestureRecognizer alloc] initWithTarget:self action:@selector(_webTouchEventsRecognized:) touchDelegate:self]);
    190         [_touchEventGestureRecognizer setDelegate:self];
    191         [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
    192 
    193         _singleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_singleTapRecognized:)]);
    194         [_singleTapGestureRecognizer setDelegate:self];
    195         [self addGestureRecognizer:_singleTapGestureRecognizer.get()];
    196 
    197         _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
    198         [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
    199         [_doubleTapGestureRecognizer setDelegate:self];
    200         [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
    201         [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
    202 
    203         _highlightLongPressGestureRecognizer = adoptNS([[_UIWebHighlightLongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_highlightLongPressRecognized:)]);
    204         [_highlightLongPressGestureRecognizer setDelay:highlightDelay];
    205         [_highlightLongPressGestureRecognizer setDelegate:self];
    206         [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
    207 
    208         _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
    209         [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
    210         [_longPressGestureRecognizer setDelegate:self];
    211         [self addGestureRecognizer:_longPressGestureRecognizer.get()];
    212 
    213         _twoFingerPanGestureRecognizer = adoptNS([[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerPanRecognized:)]);
    214         [_twoFingerPanGestureRecognizer setMinimumNumberOfTouches:2];
    215         [_twoFingerPanGestureRecognizer setMaximumNumberOfTouches:2];
    216         [_twoFingerPanGestureRecognizer setDelegate:self];
    217         [self addGestureRecognizer:_twoFingerPanGestureRecognizer.get()];
    218 
    219         [self setUserInteractionEnabled:YES];
    220         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
    221         _showingTextStyleOptions = NO;
    222     }
     133@implementation WKContentView (WKInteraction)
     134
     135- (void)setupInteraction
     136{
     137    _touchEventGestureRecognizer = adoptNS([[UIWebTouchEventsGestureRecognizer alloc] initWithTarget:self action:@selector(_webTouchEventsRecognized:) touchDelegate:self]);
     138    [_touchEventGestureRecognizer setDelegate:self];
     139    [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
     140
     141    _singleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_singleTapRecognized:)]);
     142    [_singleTapGestureRecognizer setDelegate:self];
     143    [self addGestureRecognizer:_singleTapGestureRecognizer.get()];
     144
     145    _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
     146    [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
     147    [_doubleTapGestureRecognizer setDelegate:self];
     148    [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
     149    [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
     150
     151    _highlightLongPressGestureRecognizer = adoptNS([[_UIWebHighlightLongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_highlightLongPressRecognized:)]);
     152    [_highlightLongPressGestureRecognizer setDelay:highlightDelay];
     153    [_highlightLongPressGestureRecognizer setDelegate:self];
     154    [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
     155
     156    _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
     157    [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
     158    [_longPressGestureRecognizer setDelegate:self];
     159    [self addGestureRecognizer:_longPressGestureRecognizer.get()];
     160
     161    _twoFingerPanGestureRecognizer = adoptNS([[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerPanRecognized:)]);
     162    [_twoFingerPanGestureRecognizer setMinimumNumberOfTouches:2];
     163    [_twoFingerPanGestureRecognizer setMaximumNumberOfTouches:2];
     164    [_twoFingerPanGestureRecognizer setDelegate:self];
     165    [self addGestureRecognizer:_twoFingerPanGestureRecognizer.get()];
     166
     167    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
     168    _showingTextStyleOptions = NO;
    223169
    224170    // FIXME: This should be called when we get notified that loading has completed.
    225171    [self useSelectionAssistantWithMode:UIWebSelectionModeWeb];
    226 
     172   
    227173    _actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
    228     return self;
    229 }
    230 
    231 - (void)dealloc
     174}
     175
     176- (void)cleanupInteraction
    232177{
    233178    _webSelectionAssistant = nil;
    … …  
    242187
    243188    [_accessory release];
    244     [super dealloc];
    245 }
    246 
    247 - (void)setScrollView:(UIWebScrollView *)scrollView
    248 {
    249     _scrollView = scrollView;
    250 }
    251 
    252 - (void)setPage:(PassRefPtr<WebKit::WebPageProxy>)page
    253 {
    254     _page = page;
    255     [_actionSheetAssistant setPage:_page];
     189}
     190
     191- (const InteractionInformationAtPosition&)positionInformation
     192{
     193    return _positionInformation;
     194}
     195
     196- (void)setInputDelegate:(id <UITextInputDelegate>)inputDelegate
     197{
     198    _inputDelegate = inputDelegate;
     199}
     200
     201- (id <UITextInputDelegate>)inputDelegate
     202{
     203    return _inputDelegate;
    256204}
    257205
    … …  
    11261074}
    11271075
    1128 static void selectionChangedWithGesture(bool error, WKInteractionView *view, const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags)
     1076static void selectionChangedWithGesture(bool error, WKContentView *view, const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags)
    11291077{
    11301078    if (error) {
    … …  
    11381086}
    11391087
    1140 static void selectionChangedWithTouch(bool error, WKInteractionView *view, const WebCore::IntPoint& point, uint32_t touch)
     1088static void selectionChangedWithTouch(bool error, WKContentView *view, const WebCore::IntPoint& point, uint32_t touch)
    11411089{
    11421090    if (error) {
    … …  
    11811129}
    11821130
    1183 - (WKAutoCorrectionData *)autocorrectionData
    1184 {
    1185     return &_autocorrectionData;
     1131- (const WKAutoCorrectionData&)autocorrectionData
     1132{
     1133    return _autocorrectionData;
    11861134}
    11871135
    … …  
    11931141        return;
    11941142    }
     1143
    11951144    _autocorrectionData.autocorrectionHandler = [completionHandler copy];
    11961145    _page->requestAutocorrectionData(input, AutocorrectionDataCallback::create([self, completionHandler](bool, const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits) {
    … …  
    12011150            lastRect = rects[rects.size() - 1];
    12021151        }
    1203 
    1204         WKAutoCorrectionData *autocorrectionData = self.autocorrectionData;
    1205         autocorrectionData->fontName = fontName;
    1206         autocorrectionData->fontSize = fontSize;
    1207         autocorrectionData->fontTraits = traits;
    1208         autocorrectionData->textFirstRect = firstRect;
    1209         autocorrectionData->textLastRect = lastRect;
    1210 
    1211         autocorrectionData->autocorrectionHandler(rects.size() ? [WKAutocorrectionRects autocorrectionRectsWithRects:firstRect lastRect:lastRect] : nil);
    1212         [autocorrectionData->autocorrectionHandler release];
    1213         autocorrectionData->autocorrectionHandler = nil;
     1152       
     1153        _autocorrectionData.fontName = fontName;
     1154        _autocorrectionData.fontSize = fontSize;
     1155        _autocorrectionData.fontTraits = traits;
     1156        _autocorrectionData.textFirstRect = firstRect;
     1157        _autocorrectionData.textLastRect = lastRect;
     1158
     1159        _autocorrectionData.autocorrectionHandler(rects.size() ? [WKAutocorrectionRects autocorrectionRectsWithRects:firstRect lastRect:lastRect] : nil);
     1160        [_autocorrectionData.autocorrectionHandler release];
     1161        _autocorrectionData.autocorrectionHandler = nil;
    12141162    }));
    12151163}
    … …  
    12301178    _autocorrectionData.autocorrectionHandler = [completionHandler copy];
    12311179    _page->applyAutocorrection(correction, input, StringCallback::create([self](bool /*error*/, StringImpl* string) {
    1232         WKAutoCorrectionData *autocorrectionData = self.autocorrectionData;
    1233 
    1234         autocorrectionData->autocorrectionHandler(string ? [WKAutocorrectionRects autocorrectionRectsWithRects:autocorrectionData->textFirstRect lastRect:autocorrectionData->textLastRect] : nil);
    1235         [autocorrectionData->autocorrectionHandler release];
    1236         autocorrectionData->autocorrectionHandler = nil;
     1180        _autocorrectionData.autocorrectionHandler(string ? [WKAutocorrectionRects autocorrectionRectsWithRects:_autocorrectionData.textFirstRect lastRect:_autocorrectionData.textLastRect] : nil);
     1181        [_autocorrectionData.autocorrectionHandler release];
     1182        _autocorrectionData.autocorrectionHandler = nil;
    12371183    }));
    12381184}
    … …  
    12551201        _autocorrectionData.autocorrectionContextHandler = [completionHandler copy];
    12561202        _page->requestAutocorrectionContext(AutocorrectionContextCallback::create([self, completionHandler](bool /*error*/, const String& beforeText, const String& markedText, const String& selectedText, const String& afterText, uint64_t location, uint64_t length) {
    1257             WKAutoCorrectionData *autocorrectionData = self.autocorrectionData;
    1258             autocorrectionData->autocorrectionContextHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
     1203            _autocorrectionData.autocorrectionContextHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
    12591204        }));
    12601205    }

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r164603 r164621  
    7373                0FCB4E4C18BBE044000FCFC9 /* WKContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3C18BBE044000FCFC9 /* WKContentView.h */; };
    7474                0FCB4E4D18BBE044000FCFC9 /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */; };
    75                 0FCB4E4E18BBE044000FCFC9 /* WKContentViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3E18BBE044000FCFC9 /* WKContentViewInternal.h */; };
    7675                0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h */; };
    7776                0FCB4E5018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm */; };
    7877                0FCB4E5118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */; };
    79                 0FCB4E5218BBE044000FCFC9 /* WKInteractionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E4218BBE044000FCFC9 /* WKInteractionView.h */; };
    80                 0FCB4E5318BBE044000FCFC9 /* WKInteractionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4318BBE044000FCFC9 /* WKInteractionView.mm */; };
    8178                0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */; };
    8279                0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */; };
    … …  
    8986                0FCB4E6818BBE3D9000FCFC9 /* WKTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5E18BBE3D9000FCFC9 /* WKTextInputWindowController.h */; };
    9087                0FCB4E6918BBE3D9000FCFC9 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */; };
     88                0FCB4E6C18BBF26A000FCFC9 /* WKContentViewInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */; };
     89                0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
    9190                0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
    9291                0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
    … …  
    17371736                0FCB4E3C18BBE044000FCFC9 /* WKContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentView.h; path = ios/WKContentView.h; sourceTree = "<group>"; };
    17381737                0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentView.mm; path = ios/WKContentView.mm; sourceTree = "<group>"; };
    1739                 0FCB4E3E18BBE044000FCFC9 /* WKContentViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInternal.h; path = ios/WKContentViewInternal.h; sourceTree = "<group>"; };
    17401738                0FCB4E3F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGeolocationProviderIOS.h; path = ios/WKGeolocationProviderIOS.h; sourceTree = "<group>"; };
    17411739                0FCB4E4018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOS.mm; path = ios/WKGeolocationProviderIOS.mm; sourceTree = "<group>"; };
    17421740                0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOSObjCSecurityOrigin.mm; path = ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm; sourceTree = "<group>"; };
    1743                 0FCB4E4218BBE044000FCFC9 /* WKInteractionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInteractionView.h; path = ios/WKInteractionView.h; sourceTree = "<group>"; };
    1744                 0FCB4E4318BBE044000FCFC9 /* WKInteractionView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInteractionView.mm; path = ios/WKInteractionView.mm; sourceTree = "<group>"; };
    17451741                0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKScrollView.h; path = ios/WKScrollView.h; sourceTree = "<group>"; };
    17461742                0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollView.mm; path = ios/WKScrollView.mm; sourceTree = "<group>"; };
    … …  
    17531749                0FCB4E5E18BBE3D9000FCFC9 /* WKTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTextInputWindowController.h; sourceTree = "<group>"; };
    17541750                0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKTextInputWindowController.mm; sourceTree = "<group>"; };
     1751                0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInteraction.h; path = ios/WKContentViewInteraction.h; sourceTree = "<group>"; };
     1752                0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentViewInteraction.mm; path = ios/WKContentViewInteraction.mm; sourceTree = "<group>"; };
    17551753                0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    17561754                0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDrawingAreaProxyMessages.h; sourceTree = "<group>"; };
    … …  
    42624260                                0FCB4E3C18BBE044000FCFC9 /* WKContentView.h */,
    42634261                                0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */,
    4264                                 0FCB4E3E18BBE044000FCFC9 /* WKContentViewInternal.h */,
     4262                                0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */,
     4263                                0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */,
    42654264                                0FCB4E3F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h */,
    42664265                                0FCB4E4018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm */,
    42674266                                0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */,
    4268                                 0FCB4E4218BBE044000FCFC9 /* WKInteractionView.h */,
    4269                                 0FCB4E4318BBE044000FCFC9 /* WKInteractionView.mm */,
    42704267                                0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */,
    42714268                                0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */,
    … …  
    64396436                                1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */,
    64406437                                2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */,
    6441                                 0FCB4E5218BBE044000FCFC9 /* WKInteractionView.h in Headers */,
    64426438                                1A2328FF162C866A00D82F7A /* MessageEncoder.h in Headers */,
    64436439                                1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */,
    … …  
    67856781                                BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
    67866782                                51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
    6787                                 0FCB4E4E18BBE044000FCFC9 /* WKContentViewInternal.h in Headers */,
    67886783                                BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
    67896784                                BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
    … …  
    68116806                                BC204EF011C83EC8008F3375 /* WKBundleAPICast.h in Headers */,
    68126807                                935EEB9F127761AC003322B8 /* WKBundleBackForwardList.h in Headers */,
     6808                                0FCB4E6C18BBF26A000FCFC9 /* WKContentViewInteraction.h in Headers */,
    68136809                                517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */,
    68146810                                935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */,
    … …  
    82668262                                0F594792187B3B3A00437857 /* RemoteScrollingCoordinator.mm in Sources */,
    82678263                                BC4075FB124FF0270068F20A /* WKError.cpp in Sources */,
    8268                                 0FCB4E5318BBE044000FCFC9 /* WKInteractionView.mm in Sources */,
    82698264                                BCFD548B132D82680055D816 /* WKErrorCF.cpp in Sources */,
    82708265                                BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */,
    … …  
    83418336                                BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
    83428337                                C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
     8338                                0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */,
    83438339                                C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
    83448340                                373CEAD5185417AE008C363D /* WKNSData.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.