REGRESSION (r169407): Calls to RenderStyle::getRoundedBorderFor() in computeRoundedRe...
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Sep 2014 02:24:18 +0000 (02:24 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Sep 2014 02:24:18 +0000 (02:24 +0000)
<http://webkit.org/b/136591>
<rdar://problem/18143731>

Reviewed by Simon Fraser.

In r169407, the RenderView* argument was removed from
RenderStyle::getRoundedBorderFor().  This argument was not
removed from these calls in computeRoundedRectForBoxShape(), but
because getRoundedBorderFor() always returned a reference, and
because the default for the next argument was true, there was no
actual change in behavior from this bug.

No new tests since there is no change in behavior.

* rendering/shapes/BoxShape.cpp:
(WebCore::computeRoundedRectForBoxShape): Remove RenderView*
arguments from calls to getRoundedBorderFor().

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/shapes/BoxShape.cpp

index 8bceb7defe806ba60a4c69880f7cefa30e65b6d5..955ec6d81b9d9548977cc71ea0ea6f6545caa8bf 100644 (file)
@@ -1,3 +1,24 @@
+2014-09-05  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r169407): Calls to RenderStyle::getRoundedBorderFor() in computeRoundedRectForBoxShape() still include RenderView pointer
+        <http://webkit.org/b/136591>
+        <rdar://problem/18143731>
+
+        Reviewed by Simon Fraser.
+
+        In r169407, the RenderView* argument was removed from
+        RenderStyle::getRoundedBorderFor().  This argument was not
+        removed from these calls in computeRoundedRectForBoxShape(), but
+        because getRoundedBorderFor() always returned a reference, and
+        because the default for the next argument was true, there was no
+        actual change in behavior from this bug.
+
+        No new tests since there is no change in behavior.
+
+        * rendering/shapes/BoxShape.cpp:
+        (WebCore::computeRoundedRectForBoxShape): Remove RenderView*
+        arguments from calls to getRoundedBorderFor().
+
 2014-09-05  Tim Horton  <timothy_horton@apple.com>
 
         [iOS] Work around bug 136593 by disabling the PDFDocumentImage live resize optimization there
index 389aac95115469b784d46efb54850f1b2e92641f..a759aeb06239e28e6ab4526fd51411d8fa82bdf7 100644 (file)
@@ -71,7 +71,7 @@ RoundedRect computeRoundedRectForBoxShape(CSSBoxType box, const RenderBox& rende
             return RoundedRect(renderer.marginBoxRect(), RoundedRect::Radii());
 
         LayoutRect marginBox = renderer.marginBoxRect();
-        RoundedRect::Radii radii = computeMarginBoxShapeRadii(style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view())).radii(), renderer);
+        RoundedRect::Radii radii = computeMarginBoxShapeRadii(style.getRoundedBorderFor(renderer.borderBoxRect()).radii(), renderer);
         radii.scale(calcBorderRadiiConstraintScaleFor(marginBox, radii));
         return RoundedRect(marginBox, radii);
     }
@@ -87,11 +87,11 @@ RoundedRect computeRoundedRectForBoxShape(CSSBoxType box, const RenderBox& rende
     case Stroke:
     case ViewBox:
     case BoxMissing:
-        return style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view()));
+        return style.getRoundedBorderFor(renderer.borderBoxRect());
     }
 
     ASSERT_NOT_REACHED();
-    return style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view()));
+    return style.getRoundedBorderFor(renderer.borderBoxRect());
 }
 
 LayoutRect BoxShape::shapeMarginLogicalBoundingBox() const