From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm') diff --git a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm index eb82134ef..238a67516 100644 --- a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm +++ b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm @@ -242,7 +242,7 @@ static RetainPtr 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 _wk_setSuppressVisibilityUpdates:YES]; + [_webView _setSuppressVisibilityUpdates:YES]; // Swap the webView placeholder into place. if (!_webViewPlaceholder) { @@ -334,7 +334,7 @@ static RetainPtr createImageWithCopiedData(CGImageRef sourceImage) // See the related comment in enterFullScreen: // We will resume the normal behavior in _startExitFullScreenAnimationWithDuration: - [_webView _wk_setSuppressVisibilityUpdates:YES]; + [_webView _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 _wk_setSuppressVisibilityUpdates:NO]; + [_webView _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 _wk_setSuppressVisibilityUpdates:NO]; + [_webView _setSuppressVisibilityUpdates:NO]; [[self window] setAutodisplay:YES]; [[self window] displayIfNeeded]; NSEnableScreenUpdates(); -- cgit v1.2.1