[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 13:39:06 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6466f132126b95bf0861d0228873db4686029ae6
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 15:37:27 2010 +0000

    Assertion fails in [WKView _updateWindowFrame] when closing a WebKit2 window
    https://bugs.webkit.org/show_bug.cgi?id=46264
    <rdar://problem/8463534>
    
    Reviewed by Adam Roben.
    
    * UIProcess/API/mac/WKView.mm:
    (-[WKView viewDidMoveToWindow]):
    Only update window visibility and frame when we're moving to a window.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 222f555..5030c30 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Assertion fails in [WKView _updateWindowFrame] when closing a WebKit2 window
+        https://bugs.webkit.org/show_bug.cgi?id=46264
+        <rdar://problem/8463534>
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView viewDidMoveToWindow]):
+        Only update window visibility and frame when we're moving to a window.
+
 2010-09-22  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 9482169..0375bc3 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -312,13 +312,13 @@ static bool isViewVisible(NSView *view)
     if ([self window]) {
         [self _updateActiveState];
         [self _updateVisibility];
+        [self _updateWindowVisibility];
+        [self _updateWindowFrame];
     } else {
         [self _updateVisibility];
         [self _updateActiveState];
     }
 
-    [self _updateWindowVisibility];
-    [self _updateWindowFrame];
 }
 
 - (void)_windowDidBecomeKey:(NSNotification *)notification

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list