2008-07-31 John Sullivan <sullivan@apple.com>
authorsullivan@apple.com <sullivan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jul 2008 17:50:30 +0000 (17:50 +0000)
committersullivan@apple.com <sullivan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jul 2008 17:50:30 +0000 (17:50 +0000)
        Fixed <https://bugs.webkit.org/show_bug.cgi?id=5195>
        drawing with cacheDisplayInRect:toBitmapImageRep: doesn't trigger layout on Leopard

        Reviewed by Dan

        * WebView/WebHTMLView.mm:
        (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
        include Leopard in the #ifdef that forces a layout if needed

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

WebKit/mac/ChangeLog
WebKit/mac/WebView/WebHTMLView.mm

index 0e39d74..f09c2a9 100644 (file)
@@ -1,3 +1,14 @@
+2008-07-31  John Sullivan  <sullivan@apple.com>
+
+        Fixed <https://bugs.webkit.org/show_bug.cgi?id=5195>
+        drawing with cacheDisplayInRect:toBitmapImageRep: doesn't trigger layout on Leopard
+
+        Reviewed by Dan
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
+        include Leopard in the #ifdef that forces a layout if needed
+
 2008-07-30  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Adam and Hyatt
index 24f724f..d102126 100644 (file)
@@ -1219,8 +1219,9 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView
 {
-#ifdef BUILDING_ON_TIGER
-    // Because Tiger does not have viewWillDraw we need to do layout here.
+#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+    // Tiger needs this because AppKit in Tiger does not have viewWillDraw, so we need to do layout here.
+    // Leopard needs this as a workaround for rdar://5668489
     [self _web_layoutIfNeededRecursive];
 #endif