diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/mac')
3 files changed, 15 insertions, 15 deletions
diff --git a/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm b/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm index 33f3fe982..79053ed70 100644 --- a/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm +++ b/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm @@ -109,7 +109,7 @@ String CorrectionPanel::dismissInternal(ReasonForDismissingAlternativeText reaso void CorrectionPanel::recordAutocorrectionResponse(WKView* view, NSCorrectionResponse response, const String& replacedString, const String& replacementString) { - [[NSSpellChecker sharedSpellChecker] recordResponse:response toCorrection:replacementString forWord:replacedString language:nil inSpellDocumentWithTag:[view spellCheckerDocumentTag]]; + [[NSSpellChecker sharedSpellChecker] recordResponse:response toCorrection:replacementString forWord:replacedString language:nil inSpellDocumentWithTag:[view _wk_spellCheckerDocumentTag]]; } void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement, NSCorrectionIndicatorType correctionIndicatorType) @@ -118,7 +118,7 @@ void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, N return; NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker]; - NSInteger documentTag = [m_view.get() spellCheckerDocumentTag]; + NSInteger documentTag = [m_view.get() _wk_spellCheckerDocumentTag]; switch (correctionIndicatorType) { case NSCorrectionIndicatorTypeDefault: @@ -141,7 +141,7 @@ void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, N break; } - [m_view.get() handleAcceptedAlternativeText:acceptedReplacement]; + [m_view.get() _wk_handleAcceptedAlternativeText:acceptedReplacement]; m_view.clear(); if (acceptedReplacement) m_resultForDismissal.adoptNS([acceptedReplacement copy]); diff --git a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm index 238a67516..eb82134ef 100644 --- a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm +++ b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm @@ -242,7 +242,7 @@ static RetainPtr<CGImageRef> createImageWithCopiedData(CGImageRef sourceImage) // unnecessary in the full-screen animation case, and can cause bugs; see // https://bugs.webkit.org/show_bug.cgi?id=88940 and https://bugs.webkit.org/show_bug.cgi?id=88374 // We will resume the normal behavior in _startEnterFullScreenAnimationWithDuration: - [_webView _setSuppressVisibilityUpdates:YES]; + [_webView _wk_setSuppressVisibilityUpdates:YES]; // Swap the webView placeholder into place. if (!_webViewPlaceholder) { @@ -334,7 +334,7 @@ static RetainPtr<CGImageRef> createImageWithCopiedData(CGImageRef sourceImage) // See the related comment in enterFullScreen: // We will resume the normal behavior in _startExitFullScreenAnimationWithDuration: - [_webView _setSuppressVisibilityUpdates:YES]; + [_webView _wk_setSuppressVisibilityUpdates:YES]; [self _manager]->setAnimatingFullScreen(true); [self _manager]->willExitFullScreen(); @@ -581,7 +581,7 @@ static NSRect windowFrameFromApparentFrames(NSRect screenFrame, NSRect initialFr [_backgroundWindow.get() orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]]; - [_webView _setSuppressVisibilityUpdates:NO]; + [_webView _wk_setSuppressVisibilityUpdates:NO]; [[self window] setAutodisplay:YES]; [[self window] displayIfNeeded]; NSEnableScreenUpdates(); @@ -626,7 +626,7 @@ static NSRect windowFrameFromApparentFrames(NSRect screenFrame, NSRect initialFr finalBounds.origin = [[self window] convertScreenToBase:finalBounds.origin]; WKWindowSetClipRect([self window], finalBounds); - [_webView _setSuppressVisibilityUpdates:NO]; + [_webView _wk_setSuppressVisibilityUpdates:NO]; [[self window] setAutodisplay:YES]; [[self window] displayIfNeeded]; NSEnableScreenUpdates(); diff --git a/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm b/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm index b8427d56f..581a74d03 100644 --- a/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm +++ b/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm @@ -42,7 +42,7 @@ void WebFullScreenManagerProxy::invalidate() if (!m_webView) return; - [m_webView closeFullScreenWindowController]; + [m_webView _wk_closeFullScreenWindowController]; m_webView = 0; } @@ -50,43 +50,43 @@ void WebFullScreenManagerProxy::close() { if (!m_webView) return; - [[m_webView fullScreenWindowController] close]; + [[m_webView _wk_fullScreenWindowController] close]; } bool WebFullScreenManagerProxy::isFullScreen() { if (!m_webView) return false; - if (![m_webView hasFullScreenWindowController]) + if (![m_webView _wk_hasFullScreenWindowController]) return false; - return [[m_webView fullScreenWindowController] isFullScreen]; + return [[m_webView _wk_fullScreenWindowController] isFullScreen]; } void WebFullScreenManagerProxy::enterFullScreen() { if (!m_webView) return; - [[m_webView fullScreenWindowController] enterFullScreen:nil]; + [[m_webView _wk_fullScreenWindowController] enterFullScreen:nil]; } void WebFullScreenManagerProxy::exitFullScreen() { if (!m_webView) return; - [[m_webView fullScreenWindowController] exitFullScreen]; + [[m_webView _wk_fullScreenWindowController] exitFullScreen]; } void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) { if (m_webView) - [[m_webView fullScreenWindowController] beganEnterFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; + [[m_webView _wk_fullScreenWindowController] beganEnterFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; } void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) { if (m_webView) - [[m_webView fullScreenWindowController] beganExitFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; + [[m_webView _wk_fullScreenWindowController] beganExitFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; } } // namespace WebKit |