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

morrita at google.com morrita at google.com
Sun Feb 20 23:09:23 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 6d5597a465846cd663b2f9f5737560070bc59166
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 10:37:24 2011 +0000

    2011-01-18  MORITA Hajime  <morrita at google.com>
    
            Unreviewed crash fix on release builds.
    
            * rendering/RenderBoxModelObject.cpp:
            (WebCore::RenderBoxModelObject::paintFillLayerExtended):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index baf8ed7..5c0c78b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-18  MORITA Hajime  <morrita at google.com>
+
+        Unreviewed crash fix on release builds.
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+
 2011-01-18  Pavel Podivilov  <podivilov at chromium.org>
 
         Unreviewed, update localizedStrings.js.
diff --git a/Source/WebCore/rendering/RenderBoxModelObject.cpp b/Source/WebCore/rendering/RenderBoxModelObject.cpp
index 11771a7..f9849cf 100644
--- a/Source/WebCore/rendering/RenderBoxModelObject.cpp
+++ b/Source/WebCore/rendering/RenderBoxModelObject.cpp
@@ -548,7 +548,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
         context->save();
 
         RoundedIntRect border = style()->getRoundedBorderFor(borderRect);
-        border.excludeLogicalEdges(box->isHorizontal(), !includeLeftEdge, !includeRightEdge);
+        border.excludeLogicalEdges(box && box->isHorizontal(), !includeLeftEdge, !includeRightEdge);
         context->addRoundedRectClip(border);
         clippedToBorderRadius = true;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list