<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163156] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163156">163156</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 21:41:46 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Make RoundedRect layout unit aware.
https://bugs.webkit.org/show_bug.cgi?id=127779
Reviewed by Simon Fraser.
In order to draw hairline borders, RoundedRect needs to be
LayoutUnit based.
No change in behavior.
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::fillRoundedRect):
* platform/graphics/GraphicsContext.h:
* platform/graphics/RoundedRect.cpp:
(WebCore::RoundedRect::Radii::scale):
(WebCore::RoundedRect::Radii::expand):
(WebCore::RoundedRect::inflateWithRadii):
(WebCore::RoundedRect::RoundedRect):
(WebCore::RoundedRect::intersectsQuad):
* platform/graphics/RoundedRect.h:
(WebCore::RoundedRect::Radii::Radii):
(WebCore::RoundedRect::Radii::setTopLeft):
(WebCore::RoundedRect::Radii::setTopRight):
(WebCore::RoundedRect::Radii::setBottomLeft):
(WebCore::RoundedRect::Radii::setBottomRight):
(WebCore::RoundedRect::Radii::topLeft):
(WebCore::RoundedRect::Radii::topRight):
(WebCore::RoundedRect::Radii::bottomLeft):
(WebCore::RoundedRect::Radii::bottomRight):
(WebCore::RoundedRect::Radii::expand):
(WebCore::RoundedRect::Radii::shrink):
(WebCore::RoundedRect::rect):
(WebCore::RoundedRect::setRect):
(WebCore::RoundedRect::move):
(WebCore::RoundedRect::inflate):
(WebCore::RoundedRect::expandRadii):
(WebCore::RoundedRect::shrinkRadii):
* platform/graphics/ShadowBlur.cpp:
(WebCore::ScratchBuffer::setCachedShadowValues):
(WebCore::ScratchBuffer::setCachedInsetShadowValues):
(WebCore::computeSliceSizesFromRadii):
(WebCore::ShadowBlur::templateSize):
(WebCore::ShadowBlur::drawRectShadow):
(WebCore::ShadowBlur::drawInsetShadow):
(WebCore::ShadowBlur::drawRectShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithTiling):
(WebCore::ShadowBlur::drawRectShadowWithTiling):
(WebCore::ShadowBlur::drawLayerPieces):
(WebCore::ShadowBlur::beginShadowLayer):
* platform/graphics/ShadowBlur.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::clipOut):
(WebCore::GraphicsContext::fillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::GraphicsContext::clipOut):
(WebCore::GraphicsContext::fillRoundedRect):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintOneBorderSide):
(WebCore::calculateSideRect):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::paintBorder):
(WebCore::RenderBoxModelObject::clipBorderSidePolygon):
(WebCore::calculateSideRectIncludingInner):
(WebCore::calculateAdjustedInnerBorder):
(WebCore::areaCastingShadowInHole):
(WebCore::RenderBoxModelObject::paintBoxShadow):
* rendering/RenderBoxModelObject.h:
* rendering/RenderThemeSafari.cpp:
(WebCore::RenderThemeSafari::paintMenuListButtonGradients):
(WebCore::RenderThemeSafari::paintSliderTrack):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsRoundedRectcpp">trunk/Source/WebCore/platform/graphics/RoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsRoundedRecth">trunk/Source/WebCore/platform/graphics/RoundedRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurh">trunk/Source/WebCore/platform/graphics/ShadowBlur.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2014-01-30 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Make RoundedRect layout unit aware.
+ https://bugs.webkit.org/show_bug.cgi?id=127779
+
+ Reviewed by Simon Fraser.
+
+ In order to draw hairline borders, RoundedRect needs to be
+ LayoutUnit based.
+
+ No change in behavior.
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::fillRoundedRect):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/RoundedRect.cpp:
+ (WebCore::RoundedRect::Radii::scale):
+ (WebCore::RoundedRect::Radii::expand):
+ (WebCore::RoundedRect::inflateWithRadii):
+ (WebCore::RoundedRect::RoundedRect):
+ (WebCore::RoundedRect::intersectsQuad):
+ * platform/graphics/RoundedRect.h:
+ (WebCore::RoundedRect::Radii::Radii):
+ (WebCore::RoundedRect::Radii::setTopLeft):
+ (WebCore::RoundedRect::Radii::setTopRight):
+ (WebCore::RoundedRect::Radii::setBottomLeft):
+ (WebCore::RoundedRect::Radii::setBottomRight):
+ (WebCore::RoundedRect::Radii::topLeft):
+ (WebCore::RoundedRect::Radii::topRight):
+ (WebCore::RoundedRect::Radii::bottomLeft):
+ (WebCore::RoundedRect::Radii::bottomRight):
+ (WebCore::RoundedRect::Radii::expand):
+ (WebCore::RoundedRect::Radii::shrink):
+ (WebCore::RoundedRect::rect):
+ (WebCore::RoundedRect::setRect):
+ (WebCore::RoundedRect::move):
+ (WebCore::RoundedRect::inflate):
+ (WebCore::RoundedRect::expandRadii):
+ (WebCore::RoundedRect::shrinkRadii):
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ScratchBuffer::setCachedShadowValues):
+ (WebCore::ScratchBuffer::setCachedInsetShadowValues):
+ (WebCore::computeSliceSizesFromRadii):
+ (WebCore::ShadowBlur::templateSize):
+ (WebCore::ShadowBlur::drawRectShadow):
+ (WebCore::ShadowBlur::drawInsetShadow):
+ (WebCore::ShadowBlur::drawRectShadowWithoutTiling):
+ (WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
+ (WebCore::ShadowBlur::drawInsetShadowWithTiling):
+ (WebCore::ShadowBlur::drawRectShadowWithTiling):
+ (WebCore::ShadowBlur::drawLayerPieces):
+ (WebCore::ShadowBlur::beginShadowLayer):
+ * platform/graphics/ShadowBlur.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::clipOut):
+ (WebCore::GraphicsContext::fillRoundedRect):
+ (WebCore::GraphicsContext::fillRectWithRoundedHole):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::clipOut):
+ (WebCore::GraphicsContext::fillRoundedRect):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintOneBorderSide):
+ (WebCore::calculateSideRect):
+ (WebCore::RenderBoxModelObject::paintBorderSides):
+ (WebCore::RenderBoxModelObject::paintBorder):
+ (WebCore::RenderBoxModelObject::clipBorderSidePolygon):
+ (WebCore::calculateSideRectIncludingInner):
+ (WebCore::calculateAdjustedInnerBorder):
+ (WebCore::areaCastingShadowInHole):
+ (WebCore::RenderBoxModelObject::paintBoxShadow):
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderThemeSafari::paintMenuListButtonGradients):
+ (WebCore::RenderThemeSafari::paintSliderTrack):
+
</ins><span class="cx"> 2014-01-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Add support for building against GTK+ 2
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -771,7 +771,6 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::fillRoundedRect(const RoundedRect& rect, const Color& color, ColorSpace colorSpace, BlendMode blendMode)
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> if (rect.isRounded()) {
</span><span class="cx"> setCompositeOperation(compositeOperation(), blendMode);
</span><span class="cx"> fillRoundedRect(rect.rect(), rect.radii().topLeft(), rect.radii().topRight(), rect.radii().bottomLeft(), rect.radii().bottomRight(), color, colorSpace);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -294,9 +294,9 @@
</span><span class="cx"> void fillRect(const FloatRect&, const Color&, ColorSpace);
</span><span class="cx"> void fillRect(const FloatRect&, Gradient&);
</span><span class="cx"> void fillRect(const FloatRect&, const Color&, ColorSpace, CompositeOperator, BlendMode = BlendModeNormal);
</span><del>- void fillRoundedRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color&, ColorSpace);
</del><ins>+ void fillRoundedRect(const FloatRect&, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight, const Color&, ColorSpace);
</ins><span class="cx"> void fillRoundedRect(const RoundedRect&, const Color&, ColorSpace, BlendMode = BlendModeNormal);
</span><del>- void fillRectWithRoundedHole(const IntRect&, const RoundedRect& roundedHoleRect, const Color&, ColorSpace);
</del><ins>+ void fillRectWithRoundedHole(const FloatRect&, const RoundedRect& roundedHoleRect, const Color&, ColorSpace);
</ins><span class="cx">
</span><span class="cx"> void clearRect(const FloatRect&);
</span><span class="cx">
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> // FIXME: Consider writing this in terms of a specialized RoundedRect that uses FloatRect and FloatSize radii.
</span><span class="cx"> void clipRoundedRect(const FloatRect&, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight);
</span><span class="cx">
</span><del>- void clipOut(const IntRect&);
</del><ins>+ void clipOut(const FloatRect&);
</ins><span class="cx"> void clipOutRoundedRect(const RoundedRect&);
</span><span class="cx"> void clipPath(const Path&, WindRule);
</span><span class="cx"> void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias = true);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RoundedRect.h"
</span><span class="cx">
</span><ins>+#include "LayoutRect.h"
+#include "LayoutUnit.h"
+
</ins><span class="cx"> #include <algorithm>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,42 +48,42 @@
</span><span class="cx"> // If either radius on a corner becomes zero, reset both radii on that corner.
</span><span class="cx"> m_topLeft.scale(factor);
</span><span class="cx"> if (!m_topLeft.width() || !m_topLeft.height())
</span><del>- m_topLeft = IntSize();
</del><ins>+ m_topLeft = LayoutSize();
</ins><span class="cx"> m_topRight.scale(factor);
</span><span class="cx"> if (!m_topRight.width() || !m_topRight.height())
</span><del>- m_topRight = IntSize();
</del><ins>+ m_topRight = LayoutSize();
</ins><span class="cx"> m_bottomLeft.scale(factor);
</span><span class="cx"> if (!m_bottomLeft.width() || !m_bottomLeft.height())
</span><del>- m_bottomLeft = IntSize();
</del><ins>+ m_bottomLeft = LayoutSize();
</ins><span class="cx"> m_bottomRight.scale(factor);
</span><span class="cx"> if (!m_bottomRight.width() || !m_bottomRight.height())
</span><del>- m_bottomRight = IntSize();
</del><ins>+ m_bottomRight = LayoutSize();
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RoundedRect::Radii::expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth)
</del><ins>+void RoundedRect::Radii::expand(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth)
</ins><span class="cx"> {
</span><span class="cx"> if (m_topLeft.width() > 0 && m_topLeft.height() > 0) {
</span><del>- m_topLeft.setWidth(std::max<int>(0, m_topLeft.width() + leftWidth));
- m_topLeft.setHeight(std::max<int>(0, m_topLeft.height() + topWidth));
</del><ins>+ m_topLeft.setWidth(std::max<LayoutUnit>(0, m_topLeft.width() + leftWidth));
+ m_topLeft.setHeight(std::max<LayoutUnit>(0, m_topLeft.height() + topWidth));
</ins><span class="cx"> }
</span><span class="cx"> if (m_topRight.width() > 0 && m_topRight.height() > 0) {
</span><del>- m_topRight.setWidth(std::max<int>(0, m_topRight.width() + rightWidth));
- m_topRight.setHeight(std::max<int>(0, m_topRight.height() + topWidth));
</del><ins>+ m_topRight.setWidth(std::max<LayoutUnit>(0, m_topRight.width() + rightWidth));
+ m_topRight.setHeight(std::max<LayoutUnit>(0, m_topRight.height() + topWidth));
</ins><span class="cx"> }
</span><span class="cx"> if (m_bottomLeft.width() > 0 && m_bottomLeft.height() > 0) {
</span><del>- m_bottomLeft.setWidth(std::max<int>(0, m_bottomLeft.width() + leftWidth));
- m_bottomLeft.setHeight(std::max<int>(0, m_bottomLeft.height() + bottomWidth));
</del><ins>+ m_bottomLeft.setWidth(std::max<LayoutUnit>(0, m_bottomLeft.width() + leftWidth));
+ m_bottomLeft.setHeight(std::max<LayoutUnit>(0, m_bottomLeft.height() + bottomWidth));
</ins><span class="cx"> }
</span><span class="cx"> if (m_bottomRight.width() > 0 && m_bottomRight.height() > 0) {
</span><del>- m_bottomRight.setWidth(std::max<int>(0, m_bottomRight.width() + rightWidth));
- m_bottomRight.setHeight(std::max<int>(0, m_bottomRight.height() + bottomWidth));
</del><ins>+ m_bottomRight.setWidth(std::max<LayoutUnit>(0, m_bottomRight.width() + rightWidth));
+ m_bottomRight.setHeight(std::max<LayoutUnit>(0, m_bottomRight.height() + bottomWidth));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RoundedRect::inflateWithRadii(int size)
</del><ins>+void RoundedRect::inflateWithRadii(const LayoutUnit& size)
</ins><span class="cx"> {
</span><del>- IntRect old = m_rect;
</del><ins>+ LayoutRect old = m_rect;
</ins><span class="cx">
</span><span class="cx"> m_rect.inflate(size);
</span><span class="cx"> // Considering the inflation factor of shorter size to scale the radii seems appropriate here
</span><span class="lines">@@ -131,18 +134,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RoundedRect::RoundedRect(int x, int y, int width, int height)
</del><ins>+RoundedRect::RoundedRect(const LayoutUnit& x, const LayoutUnit& y, const LayoutUnit& width, const LayoutUnit& height)
</ins><span class="cx"> : m_rect(x, y, width, height)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RoundedRect::RoundedRect(const IntRect& rect, const Radii& radii)
</del><ins>+RoundedRect::RoundedRect(const LayoutRect& rect, const Radii& radii)
</ins><span class="cx"> : m_rect(rect)
</span><span class="cx"> , m_radii(radii)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RoundedRect::RoundedRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
</del><ins>+RoundedRect::RoundedRect(const LayoutRect& rect, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
</ins><span class="cx"> : m_rect(rect)
</span><span class="cx"> , m_radii(topLeft, topRight, bottomLeft, bottomRight)
</span><span class="cx"> {
</span><span class="lines">@@ -186,7 +189,7 @@
</span><span class="cx"> if (!quad.intersectsRect(rect))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const IntSize& topLeft = m_radii.topLeft();
</del><ins>+ const LayoutSize& topLeft = m_radii.topLeft();
</ins><span class="cx"> if (!topLeft.isEmpty()) {
</span><span class="cx"> FloatRect rect(m_rect.x(), m_rect.y(), topLeft.width(), topLeft.height());
</span><span class="cx"> if (quad.intersectsRect(rect)) {
</span><span class="lines">@@ -197,7 +200,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const IntSize& topRight = m_radii.topRight();
</del><ins>+ const LayoutSize& topRight = m_radii.topRight();
</ins><span class="cx"> if (!topRight.isEmpty()) {
</span><span class="cx"> FloatRect rect(m_rect.maxX() - topRight.width(), m_rect.y(), topRight.width(), topRight.height());
</span><span class="cx"> if (quad.intersectsRect(rect)) {
</span><span class="lines">@@ -208,7 +211,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const IntSize& bottomLeft = m_radii.bottomLeft();
</del><ins>+ const LayoutSize& bottomLeft = m_radii.bottomLeft();
</ins><span class="cx"> if (!bottomLeft.isEmpty()) {
</span><span class="cx"> FloatRect rect(m_rect.x(), m_rect.maxY() - bottomLeft.height(), bottomLeft.width(), bottomLeft.height());
</span><span class="cx"> if (quad.intersectsRect(rect)) {
</span><span class="lines">@@ -219,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const IntSize& bottomRight = m_radii.bottomRight();
</del><ins>+ const LayoutSize& bottomRight = m_radii.bottomRight();
</ins><span class="cx"> if (!bottomRight.isEmpty()) {
</span><span class="cx"> FloatRect rect(m_rect.maxX() - bottomRight.width(), m_rect.maxY() - bottomRight.height(), bottomRight.width(), bottomRight.height());
</span><span class="cx"> if (quad.intersectsRect(rect)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.h (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -28,17 +28,19 @@
</span><span class="cx"> #define RoundedRect_h
</span><span class="cx">
</span><span class="cx"> #include "FloatQuad.h"
</span><del>-#include "IntRect.h"
</del><ins>+#include "LayoutRect.h"
+#include "LayoutSize.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class LayoutUnit;
</ins><span class="cx">
</span><span class="cx"> class RoundedRect {
</span><span class="cx"> public:
</span><span class="cx"> class Radii {
</span><span class="cx"> public:
</span><span class="cx"> Radii() {}
</span><del>- Radii(const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
</del><ins>+ Radii(const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
</ins><span class="cx"> : m_topLeft(topLeft)
</span><span class="cx"> , m_topRight(topRight)
</span><span class="cx"> , m_bottomLeft(bottomLeft)
</span><span class="lines">@@ -46,14 +48,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setTopLeft(const IntSize& size) { m_topLeft = size; }
- void setTopRight(const IntSize& size) { m_topRight = size; }
- void setBottomLeft(const IntSize& size) { m_bottomLeft = size; }
- void setBottomRight(const IntSize& size) { m_bottomRight = size; }
- const IntSize& topLeft() const { return m_topLeft; }
- const IntSize& topRight() const { return m_topRight; }
- const IntSize& bottomLeft() const { return m_bottomLeft; }
- const IntSize& bottomRight() const { return m_bottomRight; }
</del><ins>+ void setTopLeft(const LayoutSize& size) { m_topLeft = size; }
+ void setTopRight(const LayoutSize& size) { m_topRight = size; }
+ void setBottomLeft(const LayoutSize& size) { m_bottomLeft = size; }
+ void setBottomRight(const LayoutSize& size) { m_bottomRight = size; }
+ const LayoutSize& topLeft() const { return m_topLeft; }
+ const LayoutSize& topRight() const { return m_topRight; }
+ const LayoutSize& bottomLeft() const { return m_bottomLeft; }
+ const LayoutSize& bottomRight() const { return m_bottomRight; }
</ins><span class="cx">
</span><span class="cx"> bool isZero() const;
</span><span class="cx">
</span><span class="lines">@@ -61,35 +63,35 @@
</span><span class="cx"> void excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge);
</span><span class="cx">
</span><span class="cx"> void scale(float factor);
</span><del>- void expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth);
- void expand(int size) { expand(size, size, size, size); }
- void shrink(int topWidth, int bottomWidth, int leftWidth, int rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
- void shrink(int size) { shrink(size, size, size, size); }
</del><ins>+ void expand(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth);
+ void expand(const LayoutUnit& size) { expand(size, size, size, size); }
+ void shrink(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
+ void shrink(const LayoutUnit& size) { shrink(size, size, size, size); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- IntSize m_topLeft;
- IntSize m_topRight;
- IntSize m_bottomLeft;
- IntSize m_bottomRight;
</del><ins>+ LayoutSize m_topLeft;
+ LayoutSize m_topRight;
+ LayoutSize m_bottomLeft;
+ LayoutSize m_bottomRight;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- explicit RoundedRect(const IntRect&, const Radii& = Radii());
- RoundedRect(int x, int y, int width, int height);
- RoundedRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight);
</del><ins>+ explicit RoundedRect(const LayoutRect&, const Radii& = Radii());
+ RoundedRect(const LayoutUnit&, const LayoutUnit&, const LayoutUnit& width, const LayoutUnit& height);
+ RoundedRect(const LayoutRect&, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight);
</ins><span class="cx">
</span><del>- const IntRect& rect() const { return m_rect; }
</del><ins>+ const LayoutRect& rect() const { return m_rect; }
</ins><span class="cx"> const Radii& radii() const { return m_radii; }
</span><span class="cx"> bool isRounded() const { return !m_radii.isZero(); }
</span><span class="cx"> bool isEmpty() const { return m_rect.isEmpty(); }
</span><span class="cx">
</span><del>- void setRect(const IntRect& rect) { m_rect = rect; }
</del><ins>+ void setRect(const LayoutRect& rect) { m_rect = rect; }
</ins><span class="cx"> void setRadii(const Radii& radii) { m_radii = radii; }
</span><span class="cx">
</span><del>- void move(const IntSize& size) { m_rect.move(size); }
- void inflate(int size) { m_rect.inflate(size); }
- void inflateWithRadii(int size);
- void expandRadii(int size) { m_radii.expand(size); }
- void shrinkRadii(int size) { m_radii.shrink(size); }
</del><ins>+ void move(const LayoutSize& size) { m_rect.move(size); }
+ void inflate(const LayoutUnit& size) { m_rect.inflate(size); }
+ void inflateWithRadii(const LayoutUnit& size);
+ void expandRadii(const LayoutUnit& size) { m_radii.expand(size); }
+ void shrinkRadii(const LayoutUnit& size) { m_radii.shrink(size); }
</ins><span class="cx">
</span><span class="cx"> void includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
</span><span class="cx"> void excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge);
</span><span class="lines">@@ -102,7 +104,7 @@
</span><span class="cx"> bool intersectsQuad(const FloatQuad&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IntRect m_rect;
</del><ins>+ LayoutRect m_rect;
</ins><span class="cx"> Radii m_radii;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return m_imageBuffer.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool setCachedShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedRect::Radii& radii, const FloatSize& layerSize)
</del><ins>+ bool setCachedShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii, const FloatSize& layerSize)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastColorSpace == colorSpace && m_lastShadowRect == shadowRect && m_lastRadii == radii && m_lastLayerSize == layerSize)
</span><span class="cx"> return false;
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool setCachedInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedRect::Radii& radii)
</del><ins>+ bool setCachedInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii)
</ins><span class="cx"> {
</span><span class="cx"> if (m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastColorSpace == colorSpace && m_lastInsetBounds == bounds && shadowRect == m_lastShadowRect && radii == m_lastRadii)
</span><span class="cx"> return false;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect m_lastInsetBounds;
</span><span class="cx"> FloatRect m_lastShadowRect;
</span><del>- RoundedRect::Radii m_lastRadii;
</del><ins>+ FloatRoundedRect::Radii m_lastRadii;
</ins><span class="cx"> Color m_lastColor;
</span><span class="cx"> ColorSpace m_lastColorSpace;
</span><span class="cx"> FloatSize m_lastRadius;
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> graphicsContext->fillRect(FloatRect(m_layerOrigin, m_sourceRect.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const RoundedRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
</del><ins>+static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const FloatRoundedRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
</ins><span class="cx"> {
</span><span class="cx"> leftSlice = twiceRadius.width() + std::max(radii.topLeft().width(), radii.bottomLeft().width());
</span><span class="cx"> rightSlice = twiceRadius.width() + std::max(radii.topRight().width(), radii.bottomRight().width());
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> bottomSlice = twiceRadius.height() + std::max(radii.bottomLeft().height(), radii.bottomRight().height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedRect::Radii& radii) const
</del><ins>+IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const FloatRoundedRect::Radii& radii) const
</ins><span class="cx"> {
</span><span class="cx"> const int templateSideLength = 1;
</span><span class="cx">
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> templateSideLength + topSlice + bottomSlice);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii)
</del><ins>+void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const FloatRoundedRect::Radii& radii)
</ins><span class="cx"> {
</span><span class="cx"> IntRect layerRect = calculateLayerBoundingRect(graphicsContext, shadowedRect, graphicsContext->clipBounds());
</span><span class="cx"> if (layerRect.isEmpty())
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> drawRectShadowWithTiling(graphicsContext, shadowedRect, radii, templateSize, edgeSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii)
</del><ins>+void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const FloatRoundedRect::Radii& holeRadii)
</ins><span class="cx"> {
</span><span class="cx"> IntRect layerRect = calculateLayerBoundingRect(graphicsContext, rect, graphicsContext->clipBounds());
</span><span class="cx"> if (layerRect.isEmpty())
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> drawInsetShadowWithTiling(graphicsContext, rect, holeRect, holeRadii, templateSize, edgeSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntRect& layerRect)
</del><ins>+void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const FloatRoundedRect::Radii& radii, const IntRect& layerRect)
</ins><span class="cx"> {
</span><span class="cx"> m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</span><span class="cx"> if (!m_layerImage)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> ScratchBuffer::shared().scheduleScratchBufferPurge();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii, const IntRect& layerRect)
</del><ins>+void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const FloatRoundedRect::Radii& holeRadii, const IntRect& layerRect)
</ins><span class="cx"> {
</span><span class="cx"> m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</span><span class="cx"> if (!m_layerImage)
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> the shadow.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
</del><ins>+void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const FloatRoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
</ins><span class="cx"> {
</span><span class="cx"> m_layerImage = ScratchBuffer::shared().getScratchBuffer(templateSize);
</span><span class="cx"> if (!m_layerImage)
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx"> ScratchBuffer::shared().scheduleScratchBufferPurge();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
</del><ins>+void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const FloatRoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
</ins><span class="cx"> {
</span><span class="cx"> m_layerImage = ScratchBuffer::shared().getScratchBuffer(templateSize);
</span><span class="cx"> if (!m_layerImage)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> ScratchBuffer::shared().scheduleScratchBufferPurge();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const RoundedRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
</del><ins>+void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const FloatRoundedRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
</ins><span class="cx"> {
</span><span class="cx"> const IntSize twiceRadius = IntSize(bufferPadding.width() * 2, bufferPadding.height() * 2);
</span><span class="cx">
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx">
</span><span class="cx"> // We reset the scratch buffer values here, because the buffer will no longer contain
</span><span class="cx"> // data from any previous rectangle or inset shadows drawn via the tiling path.
</span><del>- ScratchBuffer::shared().setCachedShadowValues(FloatSize(), Color::black, ColorSpaceDeviceRGB, IntRect(), RoundedRect::Radii(), m_layerSize);
</del><ins>+ ScratchBuffer::shared().setCachedShadowValues(FloatSize(), Color::black, ColorSpaceDeviceRGB, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
</ins><span class="cx"> m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</span><span class="cx">
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.h (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "ColorSpace.h"
</span><span class="cx"> #include "FloatRect.h"
</span><del>-#include "RoundedRect.h"
</del><ins>+#include "FloatRoundedRect.h"
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> GraphicsContext* beginShadowLayer(GraphicsContext*, const FloatRect& layerArea);
</span><span class="cx"> void endShadowLayer(GraphicsContext*);
</span><span class="cx">
</span><del>- void drawRectShadow(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&);
- void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii);
</del><ins>+ void drawRectShadow(GraphicsContext*, const FloatRect&, const FloatRoundedRect::Radii&);
+ void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const FloatRoundedRect::Radii& holeRadii);
</ins><span class="cx">
</span><span class="cx"> void blurLayerImage(unsigned char*, const IntSize&, int stride);
</span><span class="cx">
</span><span class="lines">@@ -85,15 +85,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> IntRect calculateLayerBoundingRect(GraphicsContext*, const FloatRect& layerArea, const IntRect& clipRect);
</span><del>- IntSize templateSize(const IntSize& blurredEdgeSize, const RoundedRect::Radii&) const;
</del><ins>+ IntSize templateSize(const IntSize& blurredEdgeSize, const FloatRoundedRect::Radii&) const;
</ins><span class="cx">
</span><del>- void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntRect& layerRect);
- void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</del><ins>+ void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRoundedRect::Radii&, const IntRect& layerRect);
+ void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</ins><span class="cx">
</span><del>- void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntRect& layerRect);
- void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</del><ins>+ void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const FloatRoundedRect::Radii&, const IntRect& layerRect);
+ void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const FloatRoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</ins><span class="cx">
</span><del>- void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const RoundedRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
</del><ins>+ void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const FloatRoundedRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
</ins><span class="cx">
</span><span class="cx"> void blurShadowBuffer(const IntSize& templateSize);
</span><span class="cx"> void blurAndColorShadowBuffer(const IntSize& templateSize);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx"> m_data->scale(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::clipOut(const IntRect& r)
</del><ins>+void GraphicsContext::clipOut(const FloatRect& r)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1028,13 +1028,13 @@
</span><span class="cx"> cairo_set_fill_rule(cr, savedFillRule);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRoundedRect(const IntRect& r, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace)
</del><ins>+void GraphicsContext::fillRoundedRect(const FloatRect& r, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight, const Color& color, ColorSpace)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (hasShadow())
</span><del>- platformContext()->shadowBlur().drawRectShadow(this, r, RoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
</del><ins>+ platformContext()->shadowBlur().drawRectShadow(this, r, FloatRoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
</ins><span class="cx">
</span><span class="cx"> cairo_t* cr = platformContext()->cr();
</span><span class="cx"> cairo_save(cr);
</span><span class="lines">@@ -1046,7 +1046,7 @@
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace)
</del><ins>+void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled() || !color.isValid())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -846,7 +846,7 @@
</span><span class="cx"> setCGFillColor(context, oldFillColor, oldColorSpace);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRoundedRect(const FloatRect& rect, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight, const Color& color, ColorSpace colorSpace)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> CGContextSetShadowWithColor(platformContext(), CGSizeZero, 0, 0);
</span><span class="cx">
</span><span class="cx"> ShadowBlur contextShadow(m_state);
</span><del>- contextShadow.drawRectShadow(this, rect, RoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
</del><ins>+ contextShadow.drawRectShadow(this, rect, FloatRoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool equalWidths = (topLeft.width() == topRight.width() && topRight.width() == bottomLeft.width() && bottomLeft.width() == bottomRight.width());
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> setCGFillColor(context, oldFillColor, oldColorSpace);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx"> m_data->clip(rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::clipOut(const IntRect& rect)
</del><ins>+void GraphicsContext::clipOut(const FloatRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::clipOut(const IntRect& rect)
</del><ins>+void GraphicsContext::clipOut(const FloatRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> {
</span><span class="cx"> return IntPoint(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2);
</span><span class="cx"> }
</span><del>-void GraphicsContext::fillRoundedRect(const IntRect& fillRect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& c, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRoundedRect(const FloatRect& fillRect, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight, const Color& c, ColorSpace colorSpace)
</ins><span class="cx"> {
</span><span class="cx"> ScopeDCProvider dcProvider(m_data);
</span><span class="cx"> if (!m_data->m_dc)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -1650,7 +1650,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</span><del>- const IntRect& sideRect, BoxSide side, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge edges[], const Path* path,
</del><ins>+ const LayoutRect& sideRect, BoxSide side, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge edges[], const Path* path,
</ins><span class="cx"> BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
</span><span class="cx"> {
</span><span class="cx"> const BorderEdge& edgeToRender = edges[side];
</span><span class="lines">@@ -1696,9 +1696,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IntRect calculateSideRect(const RoundedRect& outerBorder, const BorderEdge edges[], int side)
</del><ins>+static LayoutRect calculateSideRect(const RoundedRect& outerBorder, const BorderEdge edges[], int side)
</ins><span class="cx"> {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> int width = edges[side].width;
</span><span class="cx">
</span><span class="cx"> if (side == BSTop)
</span><span class="lines">@@ -1729,7 +1729,7 @@
</span><span class="cx"> // only depends on sideRect when painting solid borders.
</span><span class="cx">
</span><span class="cx"> if (edges[BSTop].shouldRender() && includesEdge(edgeSet, BSTop)) {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> sideRect.setHeight(edges[BSTop].width + innerBorderAdjustment.y());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSTop].style) || borderWillArcInnerEdge(innerBorder.radii().topLeft(), innerBorder.radii().topRight()));
</span><span class="lines">@@ -1737,7 +1737,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSBottom].shouldRender() && includesEdge(edgeSet, BSBottom)) {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> sideRect.shiftYEdgeTo(sideRect.maxY() - edges[BSBottom].width - innerBorderAdjustment.y());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSBottom].style) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().bottomRight()));
</span><span class="lines">@@ -1745,7 +1745,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSLeft].shouldRender() && includesEdge(edgeSet, BSLeft)) {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> sideRect.setWidth(edges[BSLeft].width + innerBorderAdjustment.x());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSLeft].style) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().topLeft()));
</span><span class="lines">@@ -1753,7 +1753,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSRight].shouldRender() && includesEdge(edgeSet, BSRight)) {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> sideRect.shiftXEdgeTo(sideRect.maxX() - edges[BSRight].width - innerBorderAdjustment.x());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSRight].style) || borderWillArcInnerEdge(innerBorder.radii().bottomRight(), innerBorder.radii().topRight()));
</span><span class="lines">@@ -1878,8 +1878,8 @@
</span><span class="cx"> path.addRect(outerBorder.rect());
</span><span class="cx">
</span><span class="cx"> if (haveAllDoubleEdges) {
</span><del>- IntRect innerThirdRect = outerBorder.rect();
- IntRect outerThirdRect = outerBorder.rect();
</del><ins>+ LayoutRect innerThirdRect = outerBorder.rect();
+ LayoutRect outerThirdRect = outerBorder.rect();
</ins><span class="cx"> for (int side = BSTop; side <= BSLeft; ++side) {
</span><span class="cx"> int outerWidth;
</span><span class="cx"> int innerWidth;
</span><span class="lines">@@ -1933,7 +1933,7 @@
</span><span class="cx"> for (int i = BSTop; i <= BSLeft; ++i) {
</span><span class="cx"> const BorderEdge& currEdge = edges[i];
</span><span class="cx"> if (currEdge.shouldRender()) {
</span><del>- IntRect sideRect = calculateSideRect(outerBorder, edges, i);
</del><ins>+ LayoutRect sideRect = calculateSideRect(outerBorder, edges, i);
</ins><span class="cx"> path.addRect(sideRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2223,24 +2223,22 @@
</span><span class="cx"> FloatPoint firstQuad[4];
</span><span class="cx"> firstQuad[0] = quad[0];
</span><span class="cx"> firstQuad[1] = quad[1];
</span><del>- firstQuad[2] = side == BSTop || side == BSBottom ? FloatPoint(quad[3].x(), quad[2].y())
- : FloatPoint(quad[2].x(), quad[3].y());
</del><ins>+ firstQuad[2] = side == BSTop || side == BSBottom ? FloatPoint(quad[3].x(), quad[2].y()) : FloatPoint(quad[2].x(), quad[3].y());
</ins><span class="cx"> firstQuad[3] = quad[3];
</span><span class="cx"> graphicsContext->clipConvexPolygon(4, firstQuad, !firstEdgeMatches);
</span><span class="cx">
</span><span class="cx"> FloatPoint secondQuad[4];
</span><span class="cx"> secondQuad[0] = quad[0];
</span><del>- secondQuad[1] = side == BSTop || side == BSBottom ? FloatPoint(quad[0].x(), quad[1].y())
- : FloatPoint(quad[1].x(), quad[0].y());
</del><ins>+ secondQuad[1] = side == BSTop || side == BSBottom ? FloatPoint(quad[0].x(), quad[1].y()) : FloatPoint(quad[1].x(), quad[0].y());
</ins><span class="cx"> secondQuad[2] = quad[2];
</span><span class="cx"> secondQuad[3] = quad[3];
</span><span class="cx"> // Antialiasing affects the second side.
</span><span class="cx"> graphicsContext->clipConvexPolygon(4, secondQuad, !secondEdgeMatches);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IntRect calculateSideRectIncludingInner(const RoundedRect& outerBorder, const BorderEdge edges[], BoxSide side)
</del><ins>+static LayoutRect calculateSideRectIncludingInner(const RoundedRect& outerBorder, const BorderEdge edges[], BoxSide side)
</ins><span class="cx"> {
</span><del>- IntRect sideRect = outerBorder.rect();
</del><ins>+ LayoutRect sideRect = outerBorder.rect();
</ins><span class="cx"> int width;
</span><span class="cx">
</span><span class="cx"> switch (side) {
</span><span class="lines">@@ -2271,7 +2269,7 @@
</span><span class="cx"> // This function relies on the fact we only get radii not contained within each edge if one of the radii
</span><span class="cx"> // for an edge is zero, so we can shift the arc towards the zero radius corner.
</span><span class="cx"> RoundedRect::Radii newRadii = innerBorder.radii();
</span><del>- IntRect newRect = innerBorder.rect();
</del><ins>+ LayoutRect newRect = innerBorder.rect();
</ins><span class="cx">
</span><span class="cx"> float overshoot;
</span><span class="cx"> float maxRadii;
</span><span class="lines">@@ -2465,16 +2463,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline IntRect areaCastingShadowInHole(const IntRect& holeRect, int shadowExtent, int shadowSpread, const IntSize& shadowOffset)
</del><ins>+static inline LayoutRect areaCastingShadowInHole(const LayoutRect& holeRect, int shadowExtent, int shadowSpread, const IntSize& shadowOffset)
</ins><span class="cx"> {
</span><del>- IntRect bounds(holeRect);
</del><ins>+ LayoutRect bounds(holeRect);
</ins><span class="cx">
</span><span class="cx"> bounds.inflate(shadowExtent);
</span><span class="cx">
</span><span class="cx"> if (shadowSpread < 0)
</span><span class="cx"> bounds.inflate(-shadowSpread);
</span><span class="cx">
</span><del>- IntRect offsetBounds = bounds;
</del><ins>+ LayoutRect offsetBounds = bounds;
</ins><span class="cx"> offsetBounds.move(-shadowOffset);
</span><span class="cx"> return unionRect(bounds, offsetBounds);
</span><span class="cx"> }
</span><span class="lines">@@ -2556,7 +2554,7 @@
</span><span class="cx"> context->fillRoundedRect(fillRect, Color::black, s->colorSpace());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- IntRect rectToClipOut = border.rect();
</del><ins>+ LayoutRect rectToClipOut = border.rect();
</ins><span class="cx">
</span><span class="cx"> // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
</span><span class="cx"> // when painting the shadow. On the other hand, it introduces subpixel gaps along the
</span><span class="lines">@@ -2605,7 +2603,7 @@
</span><span class="cx">
</span><span class="cx"> Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255);
</span><span class="cx">
</span><del>- IntRect outerRect = areaCastingShadowInHole(border.rect(), shadowPaintingExtent, shadowSpread, shadowOffset);
</del><ins>+ LayoutRect outerRect = areaCastingShadowInHole(border.rect(), shadowPaintingExtent, shadowSpread, shadowOffset);
</ins><span class="cx"> RoundedRect roundedHole(holeRect, border.radii());
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -330,8 +330,8 @@
</span><span class="cx"> BoxSide, bool firstEdgeMatches, bool secondEdgeMatches);
</span><span class="cx"> void clipBorderSideForComplexInnerPath(GraphicsContext*, const RoundedRect&, const RoundedRect&, BoxSide, const class BorderEdge[]);
</span><span class="cx"> void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</span><del>- const IntRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const class BorderEdge[],
- const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
</del><ins>+ const LayoutRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const class BorderEdge[],
+ const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
</ins><span class="cx"> void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</span><span class="cx"> const class BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false);
</span><span class="cx"> void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (163155 => 163156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-01-31 05:37:15 UTC (rev 163155)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-01-31 05:41:46 UTC (rev 163156)
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGShadingRef> rightShading = adoptCF(CGShadingCreateAxial(cspace, CGPointMake(r.maxX(), r.y()), CGPointMake(r.maxX() - radius, r.y()), mainFunction.get(), false, false));
</span><span class="cx"> paintInfo.context->save();
</span><del>- CGContextClipToRect(context, bound.rect());
</del><ins>+ CGContextClipToRect(context, r);
</ins><span class="cx"> paintInfo.context->clipRoundedRect(bound);
</span><span class="cx"> CGContextDrawShading(context, mainShading.get());
</span><span class="cx"> paintInfo.context->restore();
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> paintInfo.context->save();
</span><del>- CGContextClipToRect(context, bound.rect());
</del><ins>+ CGContextClipToRect(context, r);
</ins><span class="cx"> paintInfo.context->clipRoundedRect(bound);
</span><span class="cx"> CGContextDrawShading(context, leftShading.get());
</span><span class="cx"> CGContextDrawShading(context, rightShading.get());
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</span><span class="cx">
</span><span class="cx"> paintInfo.context->save();
</span><del>- CGContextClipToRect(context, bounds.rect());
</del><ins>+ CGContextClipToRect(context, pixelSnappedIntRect(bounds.rect()));
</ins><span class="cx">
</span><span class="cx"> struct CGFunctionCallbacks mainCallbacks = { 0, TrackGradientInterpolate, NULL };
</span><span class="cx"> RetainPtr<CGFunctionRef> mainFunction = adoptCF(CGFunctionCreate(NULL, 1, NULL, 4, NULL, &mainCallbacks));
</span></span></pre>
</div>
</div>
</body>
</html>