Title: [115324] trunk/Source
Revision
115324
Author
jer.no...@apple.com
Date
2012-04-26 09:52:13 -0700 (Thu, 26 Apr 2012)

Log Message

Placeholder view is immediately removed from hosting window upon entering full screen.
https://bugs.webkit.org/show_bug.cgi?id=84916

Reviewed by Darin Adler.

Correct a mistake added in r114567.  When swapping view for otherView, add otherView and
remove view (rather than adding otherView and removing otherView).

Source/WebKit/mac:

* WebView/WebFullScreenController.mm:
(-[WebFullScreenController _swapView:with:]):

Source/WebKit2:

* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController _swapView:with:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (115323 => 115324)


--- trunk/Source/WebKit/mac/ChangeLog	2012-04-26 16:44:46 UTC (rev 115323)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-04-26 16:52:13 UTC (rev 115324)
@@ -1,3 +1,16 @@
+2012-04-25  Jer Noble  <jer.no...@apple.com>
+
+        Placeholder view is immediately removed from hosting window upon entering full screen.
+        https://bugs.webkit.org/show_bug.cgi?id=84916
+
+        Reviewed by Darin Adler.
+
+        Correct a mistake added in r114567.  When swapping view for otherView, add otherView and 
+        remove view (rather than adding otherView and removing otherView).
+
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullScreenController _swapView:with:]):
+
 2012-04-25  Beth Dakin  <bda...@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=84913

Modified: trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm (115323 => 115324)


--- trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-04-26 16:44:46 UTC (rev 115323)
+++ trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-04-26 16:52:13 UTC (rev 115324)
@@ -455,7 +455,7 @@
     [otherView setAutoresizingMask:[view autoresizingMask]];
     [otherView removeFromSuperview];
     [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:otherView];
-    [otherView removeFromSuperview];
+    [view removeFromSuperview];
     [CATransaction commit];
 }
 

Modified: trunk/Source/WebKit2/ChangeLog (115323 => 115324)


--- trunk/Source/WebKit2/ChangeLog	2012-04-26 16:44:46 UTC (rev 115323)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-26 16:52:13 UTC (rev 115324)
@@ -1,3 +1,16 @@
+2012-04-25  Jer Noble  <jer.no...@apple.com>
+
+        Placeholder view is immediately removed from hosting window upon entering full screen.
+        https://bugs.webkit.org/show_bug.cgi?id=84916
+
+        Reviewed by Darin Adler.
+
+        Correct a mistake added in r114567.  When swapping view for otherView, add otherView and 
+        remove view (rather than adding otherView and removing otherView).
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController _swapView:with:]):
+
 2012-04-26  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Build and run TestWebKitAPI WebKit2 unit tests

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (115323 => 115324)


--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-04-26 16:44:46 UTC (rev 115323)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-04-26 16:52:13 UTC (rev 115324)
@@ -452,7 +452,7 @@
     [otherView setAutoresizingMask:[view autoresizingMask]];
     [otherView removeFromSuperview];
     [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:otherView];
-    [otherView removeFromSuperview];
+    [view removeFromSuperview];
     [CATransaction commit];
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to