Full Screen mode does not preserve CALayer ordering after exiting.
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Apr 2012 21:29:05 +0000 (21:29 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Apr 2012 21:29:05 +0000 (21:29 +0000)
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:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@115368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebFullScreenController.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

index 646ff83..3a52868 100644 (file)
@@ -1,3 +1,16 @@
+2012-04-26  Jer Noble  <jer.noble@apple.com>
+
+        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  <jer.noble@apple.com>
 
         Placeholder view is immediately removed from hosting window upon entering full screen.
index f5f3e19..d4ec93e 100644 (file)
@@ -454,7 +454,7 @@ static IntRect screenRectOfContents(Element* element)
     [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];
 }
index 9a7f72d..bde23ce 100644 (file)
@@ -1,3 +1,16 @@
+2012-04-26  Jer Noble  <jer.noble@apple.com>
+
+        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  <jer.noble@apple.com>
 
         Placeholder view is immediately removed from hosting window upon entering full screen.
index a939abc..1c0a2a1 100644 (file)
@@ -451,7 +451,7 @@ static const NSTimeInterval DefaultWatchdogTimerInterval = 1;
     [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];
 }