[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

simon.fraser at apple.com simon.fraser at apple.com
Sun Feb 20 23:04:21 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 57174879b913827110d8743e74216700bf033d2c
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 02:01:04 2011 +0000

    2011-01-16  Simon Fraser  <simon.fraser at apple.com>
    
            Keep Leopard build happy.
    
            * platform/mac/WidgetMac.mm:
            (WebCore::Widget::setBoundsSize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1a6c804..309f11d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-16  Simon Fraser  <simon.fraser at apple.com>
+
+        Keep Leopard build happy.
+
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::setBoundsSize):
+
 2011-01-16  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Source/WebCore/platform/mac/WidgetMac.mm b/Source/WebCore/platform/mac/WidgetMac.mm
index 0d12ebc..f3c951a 100644
--- a/Source/WebCore/platform/mac/WidgetMac.mm
+++ b/Source/WebCore/platform/mac/WidgetMac.mm
@@ -193,6 +193,8 @@ void Widget::setFrameRect(const IntRect& rect)
 
 void Widget::setBoundsSize(const IntSize& size)
 {
+    NSSize nsSize = size;
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     NSView *outerView = getOuterView();
     if (!outerView)
@@ -201,8 +203,6 @@ void Widget::setBoundsSize(const IntSize& size)
     // Take a reference to this Widget, because sending messages to outerView can invoke arbitrary
     // code, which can deref it.
     RefPtr<Widget> protectedThis(this);
-
-    NSSize nsSize = size;
     if (!NSEqualSizes(nsSize, [outerView bounds].size)) {
         [outerView setBoundsSize:nsSize];
         [outerView setNeedsDisplay:NO];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list