[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

simon.fraser at apple.com simon.fraser at apple.com
Thu Feb 4 21:21:13 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 50d3321bc370ee7d047ea70eeb111ce9326cd9d2
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 05:45:39 2010 +0000

    2010-01-19  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Avoid calling NSEqualRects() on the garbage rect obtained
            by calling -frame on a null view.
    
            * platform/mac/WidgetMac.mm:
            (WebCore::Widget::setFrameRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53523 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0896f38..5a203ff 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-19  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Avoid calling NSEqualRects() on the garbage rect obtained
+        by calling -frame on a null view.
+
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::setFrameRect):
+
 2010-01-19  Maciej Stachowiak  <mjs at apple.com>
 
         Unreviewed build fix.
diff --git a/WebCore/platform/mac/WidgetMac.mm b/WebCore/platform/mac/WidgetMac.mm
index 158a672..3fd30aa 100644
--- a/WebCore/platform/mac/WidgetMac.mm
+++ b/WebCore/platform/mac/WidgetMac.mm
@@ -159,6 +159,9 @@ void Widget::setFrameRect(const IntRect& rect)
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     NSView *v = getOuterView();
+    if (!v)
+        return;
+
     NSRect f = rect;
     if (!NSEqualRects(f, [v frame])) {
         [v setFrame:f];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list