Title: [120277] trunk/Source/WebKit2
- Revision
- 120277
- Author
- [email protected]
- Date
- 2012-06-13 21:19:51 -0700 (Wed, 13 Jun 2012)
Log Message
Rename _swapView:with: to _replaceView:with:
https://bugs.webkit.org/show_bug.cgi?id=89037
Reviewed by Darin Adler.
_swapView:with: is a misnomer - after calling it, the first view is no longer
contained within the view hierarchy. "Replace" is a more accurate term.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
(-[WKFullScreenWindowController _replaceView:with:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (120276 => 120277)
--- trunk/Source/WebKit2/ChangeLog 2012-06-14 04:18:12 UTC (rev 120276)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-14 04:19:51 UTC (rev 120277)
@@ -1,3 +1,18 @@
+2012-06-13 Tim Horton <[email protected]>
+
+ Rename _swapView:with: to _replaceView:with:
+ https://bugs.webkit.org/show_bug.cgi?id=89037
+
+ Reviewed by Darin Adler.
+
+ _swapView:with: is a misnomer - after calling it, the first view is no longer
+ contained within the view hierarchy. "Replace" is a more accurate term.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+ (-[WKFullScreenWindowController _replaceView:with:]):
+
2012-06-13 Martin Robinson <[email protected]>
[GTK] Add an accelerated compositing implementation for WebKit2
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (120276 => 120277)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2012-06-14 04:18:12 UTC (rev 120276)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2012-06-14 04:19:51 UTC (rev 120277)
@@ -55,7 +55,7 @@
@interface WKFullScreenWindowController(Private)<NSAnimationDelegate>
- (void)_updateMenuAndDockForFullScreen;
-- (void)_swapView:(NSView*)view with:(NSView*)otherView;
+- (void)_replaceView:(NSView*)view with:(NSView*)otherView;
- (WebPageProxy*)_page;
- (WebFullScreenManagerProxy*)_manager;
- (void)_startEnterFullScreenAnimationWithDuration:(NSTimeInterval)duration;
@@ -245,7 +245,7 @@
[_webViewPlaceholder.get() setWantsLayer:YES];
}
[[_webViewPlaceholder.get() layer] setContents:(id)webViewContents.get()];
- [self _swapView:_webView with:_webViewPlaceholder.get()];
+ [self _replaceView:_webView with:_webViewPlaceholder.get()];
// Then insert the WebView into the full screen window
NSView* contentView = [[self window] contentView];
@@ -380,7 +380,7 @@
[[_webViewPlaceholder.get() window] setAutodisplay:NO];
NSResponder *firstResponder = [[self window] firstResponder];
- [self _swapView:_webViewPlaceholder.get() with:_webView];
+ [self _replaceView:_webViewPlaceholder.get() with:_webView];
[[_webView window] makeResponder:firstResponder firstResponderIfDescendantOfView:_webView];
NSRect windowBounds = [[self window] frame];
@@ -487,7 +487,7 @@
return webPage->fullScreenManager();
}
-- (void)_swapView:(NSView*)view with:(NSView*)otherView
+- (void)_replaceView:(NSView*)view with:(NSView*)otherView
{
[CATransaction begin];
[CATransaction setDisableActions:YES];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
