Title: [115368] trunk/Source
Revision
115368
Author
[email protected]
Date
2012-04-26 14:29:05 -0700 (Thu, 26 Apr 2012)

Log Message

Full Screen mode does not preserve CALayer ordering after exiting.
https://bugs.webkit.org/show_bug.cgi?id=83931

Reviewed by Eric Carlson.

Further corrections to r114567. When swapping view for otherView, give the correct
relative view to -[NSView addSubview:positioned:relativeTo:].

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 (115367 => 115368)


--- trunk/Source/WebKit/mac/ChangeLog	2012-04-26 21:27:42 UTC (rev 115367)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-04-26 21:29:05 UTC (rev 115368)
@@ -1,3 +1,16 @@
+2012-04-26  Jer Noble  <[email protected]>
+
+        Full Screen mode does not preserve CALayer ordering after exiting.
+        https://bugs.webkit.org/show_bug.cgi?id=83931
+
+        Reviewed by Eric Carlson.
+
+        Further corrections to r114567. When swapping view for otherView, give the correct
+        relative view to -[NSView addSubview:positioned:relativeTo:].
+
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullScreenController _swapView:with:]):
+
 2012-04-25  Jer Noble  <[email protected]>
 
         Placeholder view is immediately removed from hosting window upon entering full screen.

Modified: trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm (115367 => 115368)


--- trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-04-26 21:27:42 UTC (rev 115367)
+++ trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-04-26 21:29:05 UTC (rev 115368)
@@ -454,7 +454,7 @@
     [otherView setFrame:[view frame]];        
     [otherView setAutoresizingMask:[view autoresizingMask]];
     [otherView removeFromSuperview];
-    [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:otherView];
+    [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:view];
     [view removeFromSuperview];
     [CATransaction commit];
 }

Modified: trunk/Source/WebKit2/ChangeLog (115367 => 115368)


--- trunk/Source/WebKit2/ChangeLog	2012-04-26 21:27:42 UTC (rev 115367)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-26 21:29:05 UTC (rev 115368)
@@ -1,3 +1,16 @@
+2012-04-26  Jer Noble  <[email protected]>
+
+        Full Screen mode does not preserve CALayer ordering after exiting.
+        https://bugs.webkit.org/show_bug.cgi?id=83931
+
+        Reviewed by Eric Carlson.
+
+        Further corrections to r114567. When swapping view for otherView, give the correct
+        relative view to -[NSView addSubview:positioned:relativeTo:].
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController _swapView:with:]):
+
 2012-04-25  Jer Noble  <[email protected]>
 
         Placeholder view is immediately removed from hosting window upon entering full screen.

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (115367 => 115368)


--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-04-26 21:27:42 UTC (rev 115367)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-04-26 21:29:05 UTC (rev 115368)
@@ -451,7 +451,7 @@
     [otherView setFrame:[view frame]];        
     [otherView setAutoresizingMask:[view autoresizingMask]];
     [otherView removeFromSuperview];
-    [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:otherView];
+    [[view superview] addSubview:otherView positioned:NSWindowAbove relativeTo:view];
     [view removeFromSuperview];
     [CATransaction commit];
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to