<!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>[165599] 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/165599">165599</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 20:44:03 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass const RenderStyle& to box decoration functions.
https://bugs.webkit.org/show_bug.cgi?id=130201
Reviewed by Andreas Goran Kling.
No change in functionality.
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::paintBoxShadow):
(WebCore::InlineFlowBox::paintBoxDecorations):
(WebCore::InlineFlowBox::paintMask):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintBoxDecorations):
(WebCore::RenderBox::paintMaskImages):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintNinePieceImage):
(WebCore::RenderBoxModelObject::paintOneBorderSide):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::paintTranslucentBorderSides):
(WebCore::RenderBoxModelObject::paintBorder):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
(WebCore::RenderBoxModelObject::getBorderEdgeInfo):
(WebCore::RenderBoxModelObject::borderObscuresBackgroundEdge):
(WebCore::RenderBoxModelObject::borderObscuresBackground):
(WebCore::RenderBoxModelObject::paintBoxShadow):
* rendering/RenderBoxModelObject.h:
* rendering/RenderFieldset.cpp:
(WebCore::RenderFieldset::paintBoxDecorations):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::paintBoxDecorations):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paintBoxDecorations):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.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="#trunkSourceWebCorerenderingRenderFieldsetcpp">trunk/Source/WebCore/rendering/RenderFieldset.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-03-13 Zalan Bujtas <zalan@apple.com>
+
+ Pass const RenderStyle& to box decoration functions.
+ https://bugs.webkit.org/show_bug.cgi?id=130201
+
+ Reviewed by Andreas Goran Kling.
+
+ No change in functionality.
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::paintBoxShadow):
+ (WebCore::InlineFlowBox::paintBoxDecorations):
+ (WebCore::InlineFlowBox::paintMask):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintBoxDecorations):
+ (WebCore::RenderBox::paintMaskImages):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintNinePieceImage):
+ (WebCore::RenderBoxModelObject::paintOneBorderSide):
+ (WebCore::RenderBoxModelObject::paintBorderSides):
+ (WebCore::RenderBoxModelObject::paintTranslucentBorderSides):
+ (WebCore::RenderBoxModelObject::paintBorder):
+ (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
+ (WebCore::RenderBoxModelObject::getBorderEdgeInfo):
+ (WebCore::RenderBoxModelObject::borderObscuresBackgroundEdge):
+ (WebCore::RenderBoxModelObject::borderObscuresBackground):
+ (WebCore::RenderBoxModelObject::paintBoxShadow):
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderFieldset.cpp:
+ (WebCore::RenderFieldset::paintBoxDecorations):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::paintBoxDecorations):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::paintBoxDecorations):
+
</ins><span class="cx"> 2014-03-13 Jinwoo Jeong <jw00.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Refactor Vibration algorithm to use only one timer.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -1239,11 +1239,11 @@
</span><span class="cx"> void InlineFlowBox::paintBoxShadow(const PaintInfo& info, const RenderStyle& style, ShadowStyle shadowStyle, const LayoutRect& paintRect)
</span><span class="cx"> {
</span><span class="cx"> if ((!prevLineBox() && !nextLineBox()) || !parent())
</span><del>- renderer().paintBoxShadow(info, paintRect, &style, shadowStyle);
</del><ins>+ renderer().paintBoxShadow(info, paintRect, style, shadowStyle);
</ins><span class="cx"> else {
</span><span class="cx"> // FIXME: We can do better here in the multi-line case. We want to push a clip so that the shadow doesn't
</span><span class="cx"> // protrude incorrectly at the edges, and we want to possibly include shadows cast from the previous/following lines
</span><del>- renderer().paintBoxShadow(info, paintRect, &style, shadowStyle, includeLogicalLeftEdge(), includeLogicalRightEdge());
</del><ins>+ renderer().paintBoxShadow(info, paintRect, style, shadowStyle, includeLogicalLeftEdge(), includeLogicalRightEdge());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1340,7 +1340,7 @@
</span><span class="cx"> // The simple case is where we either have no border image or we are the only box for this object. In those
</span><span class="cx"> // cases only a single call to draw is required.
</span><span class="cx"> if (!hasBorderImage || (!prevLineBox() && !nextLineBox()))
</span><del>- renderer().paintBorder(paintInfo, paintRect, &lineStyle, BackgroundBleedNone, includeLogicalLeftEdge(), includeLogicalRightEdge());
</del><ins>+ renderer().paintBorder(paintInfo, paintRect, lineStyle, BackgroundBleedNone, includeLogicalLeftEdge(), includeLogicalRightEdge());
</ins><span class="cx"> else {
</span><span class="cx"> // We have a border image that spans multiple lines.
</span><span class="cx"> // We need to adjust tx and ty by the width of all previous lines.
</span><span class="lines">@@ -1364,7 +1364,7 @@
</span><span class="cx"> LayoutRect clipRect = clipRectForNinePieceImageStrip(this, borderImage, paintRect);
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><span class="cx"> context->clip(clipRect);
</span><del>- renderer().paintBorder(paintInfo, LayoutRect(stripX, stripY, stripWidth, stripHeight), &lineStyle);
</del><ins>+ renderer().paintBorder(paintInfo, LayoutRect(stripX, stripY, stripWidth, stripHeight), lineStyle);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1416,7 +1416,7 @@
</span><span class="cx"> // The simple case is where we are the only box for this object. In those
</span><span class="cx"> // cases only a single call to draw is required.
</span><span class="cx"> if (!prevLineBox() && !nextLineBox()) {
</span><del>- renderer().paintNinePieceImage(paintInfo.context, LayoutRect(adjustedPaintOffset, frameRect.size()), &renderer().style(), maskNinePieceImage, compositeOp);
</del><ins>+ renderer().paintNinePieceImage(paintInfo.context, LayoutRect(adjustedPaintOffset, frameRect.size()), renderer().style(), maskNinePieceImage, compositeOp);
</ins><span class="cx"> } else {
</span><span class="cx"> // We have a mask image that spans multiple lines.
</span><span class="cx"> // We need to adjust _tx and _ty by the width of all previous lines.
</span><span class="lines">@@ -1434,7 +1434,7 @@
</span><span class="cx"> LayoutRect clipRect = clipRectForNinePieceImageStrip(this, maskNinePieceImage, paintRect);
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> paintInfo.context->clip(clipRect);
</span><del>- renderer().paintNinePieceImage(paintInfo.context, LayoutRect(stripX, stripY, stripWidth, stripHeight), &renderer().style(), maskNinePieceImage, compositeOp);
</del><ins>+ renderer().paintNinePieceImage(paintInfo.context, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer().style(), maskNinePieceImage, compositeOp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (pushTransparencyLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -1205,7 +1205,7 @@
</span><span class="cx"> // FIXME: Should eventually give the theme control over whether the box shadow should paint, since controls could have
</span><span class="cx"> // custom shadows of their own.
</span><span class="cx"> if (!boxShadowShouldBeAppliedToBackground(bleedAvoidance))
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Normal);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Normal);
</ins><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context, false);
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedUseTransparencyLayer) {
</span><span class="lines">@@ -1224,18 +1224,18 @@
</span><span class="cx"> bool themePainted = style().hasAppearance() && !theme().paint(this, paintInfo, snappedPaintRect);
</span><span class="cx"> if (!themePainted) {
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedBackgroundOverBorder)
</span><del>- paintBorder(paintInfo, paintRect, &style(), bleedAvoidance);
</del><ins>+ paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
</ins><span class="cx">
</span><span class="cx"> paintBackground(paintInfo, paintRect, bleedAvoidance);
</span><span class="cx">
</span><span class="cx"> if (style().hasAppearance())
</span><span class="cx"> theme().paintDecorations(this, paintInfo, snappedPaintRect);
</span><span class="cx"> }
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Inset);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Inset);
</ins><span class="cx">
</span><span class="cx"> // The theme will tell us whether or not we should also paint the CSS border.
</span><span class="cx"> if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style().hasAppearance() || (!themePainted && theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style().hasBorder())
</span><del>- paintBorder(paintInfo, paintRect, &style(), bleedAvoidance);
</del><ins>+ paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
</ins><span class="cx">
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)
</span><span class="cx"> paintInfo.context->endTransparencyLayer();
</span><span class="lines">@@ -1450,7 +1450,7 @@
</span><span class="cx">
</span><span class="cx"> if (allMaskImagesLoaded) {
</span><span class="cx"> paintFillLayers(paintInfo, Color(), style().maskLayers(), paintRect, BackgroundBleedNone, compositeOp);
</span><del>- paintNinePieceImage(paintInfo.context, paintRect, &style(), style().maskBoxImage(), compositeOp);
</del><ins>+ paintNinePieceImage(paintInfo.context, paintRect, style(), style().maskBoxImage(), compositeOp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (pushTransparencyLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx"> return valueForLength(borderSlice, boxExtent, renderView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBoxModelObject::paintNinePieceImage(GraphicsContext* graphicsContext, const LayoutRect& rect, const RenderStyle* style,
</del><ins>+bool RenderBoxModelObject::paintNinePieceImage(GraphicsContext* graphicsContext, const LayoutRect& rect, const RenderStyle& style,
</ins><span class="cx"> const NinePieceImage& ninePieceImage, CompositeOperator op)
</span><span class="cx"> {
</span><span class="cx"> StyleImage* styleImage = ninePieceImage.image();
</span><span class="lines">@@ -1242,19 +1242,19 @@
</span><span class="cx"> if (!styleImage->isLoaded())
</span><span class="cx"> return true; // Never paint a nine-piece image incrementally, but don't paint the fallback borders either.
</span><span class="cx">
</span><del>- if (!styleImage->canRender(this, style->effectiveZoom()))
</del><ins>+ if (!styleImage->canRender(this, style.effectiveZoom()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: border-image is broken with full page zooming when tiling has to happen, since the tiling function
</span><span class="cx"> // doesn't have any understanding of the zoom that is in effect on the tile.
</span><span class="cx"> LayoutRect rectWithOutsets = rect;
</span><del>- rectWithOutsets.expand(style->imageOutsets(ninePieceImage));
</del><ins>+ rectWithOutsets.expand(style.imageOutsets(ninePieceImage));
</ins><span class="cx"> IntRect borderImageRect = pixelSnappedIntRect(rectWithOutsets);
</span><span class="cx">
</span><span class="cx"> IntSize imageSize = calculateImageIntrinsicDimensions(styleImage, borderImageRect.size(), DoNotScaleByEffectiveZoom);
</span><span class="cx">
</span><span class="cx"> // If both values are ‘auto’ then the intrinsic width and/or height of the image should be used, if any.
</span><del>- styleImage->setContainerSizeForRenderer(this, imageSize, style->effectiveZoom());
</del><ins>+ styleImage->setContainerSizeForRenderer(this, imageSize, style.effectiveZoom());
</ins><span class="cx">
</span><span class="cx"> int imageWidth = imageSize.width();
</span><span class="cx"> int imageHeight = imageSize.height();
</span><span class="lines">@@ -1269,10 +1269,10 @@
</span><span class="cx"> ENinePieceImageRule hRule = ninePieceImage.horizontalRule();
</span><span class="cx"> ENinePieceImageRule vRule = ninePieceImage.verticalRule();
</span><span class="cx">
</span><del>- int topWidth = computeBorderImageSide(ninePieceImage.borderSlices().top(), style->borderTopWidth(), topSlice, borderImageRect.height(), renderView);
- int rightWidth = computeBorderImageSide(ninePieceImage.borderSlices().right(), style->borderRightWidth(), rightSlice, borderImageRect.width(), renderView);
- int bottomWidth = computeBorderImageSide(ninePieceImage.borderSlices().bottom(), style->borderBottomWidth(), bottomSlice, borderImageRect.height(), renderView);
- int leftWidth = computeBorderImageSide(ninePieceImage.borderSlices().left(), style->borderLeftWidth(), leftSlice, borderImageRect.width(), renderView);
</del><ins>+ int topWidth = computeBorderImageSide(ninePieceImage.borderSlices().top(), style.borderTopWidth(), topSlice, borderImageRect.height(), renderView);
+ int rightWidth = computeBorderImageSide(ninePieceImage.borderSlices().right(), style.borderRightWidth(), rightSlice, borderImageRect.width(), renderView);
+ int bottomWidth = computeBorderImageSide(ninePieceImage.borderSlices().bottom(), style.borderBottomWidth(), bottomSlice, borderImageRect.height(), renderView);
+ int leftWidth = computeBorderImageSide(ninePieceImage.borderSlices().left(), style.borderLeftWidth(), leftSlice, borderImageRect.width(), renderView);
</ins><span class="cx">
</span><span class="cx"> // Reduce the widths if they're too large.
</span><span class="cx"> // The spec says: Given Lwidth as the width of the border image area, Lheight as its height, and Wside as the border image width
</span><span class="lines">@@ -1296,7 +1296,7 @@
</span><span class="cx"> && (imageHeight - topSlice - bottomSlice) > 0 && (borderImageRect.height() - topWidth - bottomWidth) > 0;
</span><span class="cx">
</span><span class="cx"> RefPtr<Image> image = styleImage->image(this, imageSize);
</span><del>- ColorSpace colorSpace = style->colorSpace();
</del><ins>+ ColorSpace colorSpace = style.colorSpace();
</ins><span class="cx">
</span><span class="cx"> float destinationWidth = borderImageRect.width() - leftWidth - rightWidth;
</span><span class="cx"> float destinationHeight = borderImageRect.height() - topWidth - bottomWidth;
</span><span class="lines">@@ -1659,7 +1659,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</del><ins>+void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle& style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</ins><span class="cx"> const LayoutRect& sideRect, BoxSide side, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge edges[], const Path* path,
</span><span class="cx"> BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
</span><span class="cx"> {
</span><span class="lines">@@ -1723,7 +1723,7 @@
</span><span class="cx"> return sideRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</del><ins>+void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle& style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</ins><span class="cx"> const IntPoint& innerBorderAdjustment, const BorderEdge edges[], BorderEdgeFlags edgeSet, BackgroundBleedAvoidance bleedAvoidance,
</span><span class="cx"> bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
</span><span class="cx"> {
</span><span class="lines">@@ -1771,7 +1771,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</del><ins>+void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle& style, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</ins><span class="cx"> const BorderEdge edges[], BorderEdgeFlags edgesToDraw, BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias)
</span><span class="cx"> {
</span><span class="cx"> // willBeOverdrawn assumes that we draw in order: top, bottom, left, right.
</span><span class="lines">@@ -1814,12 +1814,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::paintBorder(const PaintInfo& info, const LayoutRect& rect, const RenderStyle* style,
</del><ins>+void RenderBoxModelObject::paintBorder(const PaintInfo& info, const LayoutRect& rect, const RenderStyle& style,
</ins><span class="cx"> BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
</span><span class="cx"> {
</span><span class="cx"> GraphicsContext* graphicsContext = info.context;
</span><span class="cx"> // border-image is not affected by border-radius.
</span><del>- if (paintNinePieceImage(graphicsContext, rect, style, style->borderImage()))
</del><ins>+ if (paintNinePieceImage(graphicsContext, rect, style, style.borderImage()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (graphicsContext->paintingDisabled())
</span><span class="lines">@@ -1827,8 +1827,8 @@
</span><span class="cx">
</span><span class="cx"> BorderEdge edges[4];
</span><span class="cx"> getBorderEdgeInfo(edges, style, includeLogicalLeftEdge, includeLogicalRightEdge);
</span><del>- RoundedRect outerBorder = style->getRoundedBorderFor(rect, &view(), includeLogicalLeftEdge, includeLogicalRightEdge);
- RoundedRect innerBorder = style->getRoundedInnerBorderFor(borderInnerRectAdjustedForBleedAvoidance(*graphicsContext, rect, bleedAvoidance), includeLogicalLeftEdge, includeLogicalRightEdge);
</del><ins>+ RoundedRect outerBorder = style.getRoundedBorderFor(rect, &view(), includeLogicalLeftEdge, includeLogicalRightEdge);
+ RoundedRect innerBorder = style.getRoundedInnerBorderFor(borderInnerRectAdjustedForBleedAvoidance(*graphicsContext, rect, bleedAvoidance), includeLogicalLeftEdge, includeLogicalRightEdge);
</ins><span class="cx">
</span><span class="cx"> bool haveAlphaColor = false;
</span><span class="cx"> bool haveAllSolidEdges = true;
</span><span class="lines">@@ -1935,7 +1935,7 @@
</span><span class="cx"> path.addRect(snappedInnerBorder.rect());
</span><span class="cx">
</span><span class="cx"> graphicsContext->setFillRule(RULE_EVENODD);
</span><del>- graphicsContext->setFillColor(edges[firstVisibleEdge].color, style->colorSpace());
</del><ins>+ graphicsContext->setFillColor(edges[firstVisibleEdge].color, style.colorSpace());
</ins><span class="cx"> graphicsContext->fillPath(path);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1952,7 +1952,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> graphicsContext->setFillRule(RULE_NONZERO);
</span><del>- graphicsContext->setFillColor(edges[firstVisibleEdge].color, style->colorSpace());
</del><ins>+ graphicsContext->setFillColor(edges[firstVisibleEdge].color, style.colorSpace());
</ins><span class="cx"> graphicsContext->fillPath(path);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1972,7 +1972,7 @@
</span><span class="cx">
</span><span class="cx"> // If only one edge visible antialiasing doesn't create seams
</span><span class="cx"> bool antialias = shouldAntialiasLines(graphicsContext) || numEdgesVisible == 1;
</span><del>- RoundedRect unadjustedInnerBorder = (bleedAvoidance == BackgroundBleedBackgroundOverBorder) ? style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge) : innerBorder;
</del><ins>+ RoundedRect unadjustedInnerBorder = (bleedAvoidance == BackgroundBleedBackgroundOverBorder) ? style.getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge) : innerBorder;
</ins><span class="cx"> IntPoint innerBorderAdjustment(innerBorder.rect().x() - unadjustedInnerBorder.rect().x(), innerBorder.rect().y() - unadjustedInnerBorder.rect().y());
</span><span class="cx"> if (haveAlphaColor)
</span><span class="cx"> paintTranslucentBorderSides(graphicsContext, style, outerBorder, unadjustedInnerBorder, innerBorderAdjustment, edges, edgesToDraw, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias);
</span><span class="lines">@@ -1981,8 +1981,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::drawBoxSideFromPath(GraphicsContext* graphicsContext, const LayoutRect& borderRect, const Path& borderPath, const BorderEdge edges[],
</span><del>- float thickness, float drawThickness, BoxSide side, const RenderStyle* style,
- Color color, EBorderStyle borderStyle, BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
</del><ins>+ float thickness, float drawThickness, BoxSide side, const RenderStyle& style, Color color, EBorderStyle borderStyle, BackgroundBleedAvoidance bleedAvoidance,
+ bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
</ins><span class="cx"> {
</span><span class="cx"> if (thickness <= 0)
</span><span class="cx"> return;
</span><span class="lines">@@ -1996,7 +1996,7 @@
</span><span class="cx"> return;
</span><span class="cx"> case DOTTED:
</span><span class="cx"> case DASHED: {
</span><del>- graphicsContext->setStrokeColor(color, style->colorSpace());
</del><ins>+ graphicsContext->setStrokeColor(color, style.colorSpace());
</ins><span class="cx">
</span><span class="cx"> // The stroke is doubled here because the provided path is the
</span><span class="cx"> // outside edge of the border so half the stroke is clipped off.
</span><span class="lines">@@ -2056,7 +2056,7 @@
</span><span class="cx"> // Draw inner border line
</span><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*graphicsContext);
</span><del>- RoundedRect innerClip = style->getRoundedInnerBorderFor(borderRect,
</del><ins>+ RoundedRect innerClip = style.getRoundedInnerBorderFor(borderRect,
</ins><span class="cx"> innerBorderTopWidth, innerBorderBottomWidth, innerBorderLeftWidth, innerBorderRightWidth,
</span><span class="cx"> includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx">
</span><span class="lines">@@ -2076,7 +2076,7 @@
</span><span class="cx"> ++outerBorderRightWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RoundedRect outerClip = style->getRoundedInnerBorderFor(outerRect,
</del><ins>+ RoundedRect outerClip = style.getRoundedInnerBorderFor(outerRect,
</ins><span class="cx"> outerBorderTopWidth, outerBorderBottomWidth, outerBorderLeftWidth, outerBorderRightWidth,
</span><span class="cx"> includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx"> graphicsContext->clipOutRoundedRect(FloatRoundedRect(outerClip));
</span><span class="lines">@@ -2107,7 +2107,7 @@
</span><span class="cx"> LayoutUnit leftWidth = edges[BSLeft].widthForPainting() / 2;
</span><span class="cx"> LayoutUnit rightWidth = edges[BSRight].widthForPainting() / 2;
</span><span class="cx">
</span><del>- RoundedRect clipRect = style->getRoundedInnerBorderFor(borderRect,
</del><ins>+ RoundedRect clipRect = style.getRoundedInnerBorderFor(borderRect,
</ins><span class="cx"> topWidth, bottomWidth, leftWidth, rightWidth,
</span><span class="cx"> includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx">
</span><span class="lines">@@ -2128,7 +2128,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> graphicsContext->setStrokeStyle(NoStroke);
</span><del>- graphicsContext->setFillColor(color, style->colorSpace());
</del><ins>+ graphicsContext->setFillColor(color, style.colorSpace());
</ins><span class="cx"> graphicsContext->drawRect(pixelSnappedForPainting(borderRect, document().deviceScaleFactor()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2363,36 +2363,36 @@
</span><span class="cx"> graphicsContext->clipOutRoundedRect(FloatRoundedRect(calculateAdjustedInnerBorder(innerBorder, side)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::getBorderEdgeInfo(BorderEdge edges[], const RenderStyle* style, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
</del><ins>+void RenderBoxModelObject::getBorderEdgeInfo(BorderEdge edges[], const RenderStyle& style, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
</ins><span class="cx"> {
</span><del>- bool horizontal = style->isHorizontalWritingMode();
</del><ins>+ bool horizontal = style.isHorizontalWritingMode();
</ins><span class="cx"> float deviceScaleFactor = document().deviceScaleFactor();
</span><span class="cx">
</span><del>- edges[BSTop] = BorderEdge(style->borderTopWidth(),
- style->visitedDependentColor(CSSPropertyBorderTopColor),
- style->borderTopStyle(),
- style->borderTopIsTransparent(),
</del><ins>+ edges[BSTop] = BorderEdge(style.borderTopWidth(),
+ style.visitedDependentColor(CSSPropertyBorderTopColor),
+ style.borderTopStyle(),
+ style.borderTopIsTransparent(),
</ins><span class="cx"> horizontal || includeLogicalLeftEdge,
</span><span class="cx"> deviceScaleFactor);
</span><span class="cx">
</span><del>- edges[BSRight] = BorderEdge(style->borderRightWidth(),
- style->visitedDependentColor(CSSPropertyBorderRightColor),
- style->borderRightStyle(),
- style->borderRightIsTransparent(),
</del><ins>+ edges[BSRight] = BorderEdge(style.borderRightWidth(),
+ style.visitedDependentColor(CSSPropertyBorderRightColor),
+ style.borderRightStyle(),
+ style.borderRightIsTransparent(),
</ins><span class="cx"> !horizontal || includeLogicalRightEdge,
</span><span class="cx"> deviceScaleFactor);
</span><span class="cx">
</span><del>- edges[BSBottom] = BorderEdge(style->borderBottomWidth(),
- style->visitedDependentColor(CSSPropertyBorderBottomColor),
- style->borderBottomStyle(),
- style->borderBottomIsTransparent(),
</del><ins>+ edges[BSBottom] = BorderEdge(style.borderBottomWidth(),
+ style.visitedDependentColor(CSSPropertyBorderBottomColor),
+ style.borderBottomStyle(),
+ style.borderBottomIsTransparent(),
</ins><span class="cx"> horizontal || includeLogicalRightEdge,
</span><span class="cx"> deviceScaleFactor);
</span><span class="cx">
</span><del>- edges[BSLeft] = BorderEdge(style->borderLeftWidth(),
- style->visitedDependentColor(CSSPropertyBorderLeftColor),
- style->borderLeftStyle(),
- style->borderLeftIsTransparent(),
</del><ins>+ edges[BSLeft] = BorderEdge(style.borderLeftWidth(),
+ style.visitedDependentColor(CSSPropertyBorderLeftColor),
+ style.borderLeftStyle(),
+ style.borderLeftIsTransparent(),
</ins><span class="cx"> !horizontal || includeLogicalLeftEdge,
</span><span class="cx"> deviceScaleFactor);
</span><span class="cx"> }
</span><span class="lines">@@ -2400,7 +2400,7 @@
</span><span class="cx"> bool RenderBoxModelObject::borderObscuresBackgroundEdge(const FloatSize& contextScale) const
</span><span class="cx"> {
</span><span class="cx"> BorderEdge edges[4];
</span><del>- getBorderEdgeInfo(edges, &style());
</del><ins>+ getBorderEdgeInfo(edges, style());
</ins><span class="cx">
</span><span class="cx"> for (int i = BSTop; i <= BSLeft; ++i) {
</span><span class="cx"> const BorderEdge& currEdge = edges[i];
</span><span class="lines">@@ -2423,7 +2423,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> BorderEdge edges[4];
</span><del>- getBorderEdgeInfo(edges, &style());
</del><ins>+ getBorderEdgeInfo(edges, style());
</ins><span class="cx">
</span><span class="cx"> for (int i = BSTop; i <= BSLeft; ++i) {
</span><span class="cx"> const BorderEdge& currEdge = edges[i];
</span><span class="lines">@@ -2495,22 +2495,22 @@
</span><span class="cx"> return unionRect(bounds, offsetBounds);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::paintBoxShadow(const PaintInfo& info, const LayoutRect& paintRect, const RenderStyle* s, ShadowStyle shadowStyle, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
</del><ins>+void RenderBoxModelObject::paintBoxShadow(const PaintInfo& info, const LayoutRect& paintRect, const RenderStyle& style, ShadowStyle shadowStyle, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Deal with border-image. Would be great to use border-image as a mask.
</span><span class="cx"> GraphicsContext* context = info.context;
</span><del>- if (context->paintingDisabled() || !s->boxShadow())
</del><ins>+ if (context->paintingDisabled() || !style.boxShadow())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RoundedRect border = (shadowStyle == Inset)
</span><del>- ? s->getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
- : s->getRoundedBorderFor(paintRect, &view(), includeLogicalLeftEdge, includeLogicalRightEdge);
</del><ins>+ ? style.getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
+ : style.getRoundedBorderFor(paintRect, &view(), includeLogicalLeftEdge, includeLogicalRightEdge);
</ins><span class="cx">
</span><del>- bool hasBorderRadius = s->hasBorderRadius();
- bool isHorizontal = s->isHorizontalWritingMode();
</del><ins>+ bool hasBorderRadius = style.hasBorderRadius();
+ bool isHorizontal = style.isHorizontalWritingMode();
</ins><span class="cx">
</span><del>- bool hasOpaqueBackground = s->visitedDependentColor(CSSPropertyBackgroundColor).isValid() && s->visitedDependentColor(CSSPropertyBackgroundColor).alpha() == 255;
- for (const ShadowData* shadow = s->boxShadow(); shadow; shadow = shadow->next()) {
</del><ins>+ bool hasOpaqueBackground = style.visitedDependentColor(CSSPropertyBackgroundColor).isValid() && style.visitedDependentColor(CSSPropertyBackgroundColor).alpha() == 255;
+ for (const ShadowData* shadow = style.boxShadow(); shadow; shadow = shadow->next()) {
</ins><span class="cx"> if (shadow->style() != shadowStyle)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -2544,9 +2544,9 @@
</span><span class="cx"> fillRect.move(extraOffset);
</span><span class="cx">
</span><span class="cx"> if (shadow->isWebkitBoxShadow())
</span><del>- context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
</del><ins>+ context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</ins><span class="cx"> else
</span><del>- context->setShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
</del><ins>+ context->setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</ins><span class="cx">
</span><span class="cx"> if (hasBorderRadius) {
</span><span class="cx"> RoundedRect rectToClipOut = border;
</span><span class="lines">@@ -2564,12 +2564,12 @@
</span><span class="cx"> RoundedRect influenceRect(shadowRect, border.radii());
</span><span class="cx"> influenceRect.expandRadii(2 * shadowPaintingExtent + shadowSpread);
</span><span class="cx"> if (allCornersClippedOut(influenceRect, info.rect))
</span><del>- context->fillRect(fillRect.rect(), Color::black, s->colorSpace());
</del><ins>+ context->fillRect(fillRect.rect(), Color::black, style.colorSpace());
</ins><span class="cx"> else {
</span><span class="cx"> fillRect.expandRadii(shadowSpread);
</span><span class="cx"> if (!fillRect.isRenderable())
</span><span class="cx"> fillRect.adjustRadii();
</span><del>- context->fillRoundedRect(FloatRoundedRect(fillRect), Color::black, s->colorSpace());
</del><ins>+ context->fillRoundedRect(FloatRoundedRect(fillRect), Color::black, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> LayoutRect rectToClipOut = border.rect();
</span><span class="lines">@@ -2588,7 +2588,7 @@
</span><span class="cx">
</span><span class="cx"> if (!rectToClipOut.isEmpty())
</span><span class="cx"> context->clipOut(rectToClipOut);
</span><del>- context->fillRect(fillRect.rect(), Color::black, s->colorSpace());
</del><ins>+ context->fillRect(fillRect.rect(), Color::black, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Inset shadow.
</span><span class="lines">@@ -2597,9 +2597,9 @@
</span><span class="cx">
</span><span class="cx"> if (holeRect.isEmpty()) {
</span><span class="cx"> if (hasBorderRadius)
</span><del>- context->fillRoundedRect(FloatRoundedRect(border), shadowColor, s->colorSpace());
</del><ins>+ context->fillRoundedRect(FloatRoundedRect(border), shadowColor, style.colorSpace());
</ins><span class="cx"> else
</span><del>- context->fillRect(border.rect(), shadowColor, s->colorSpace());
</del><ins>+ context->fillRect(border.rect(), shadowColor, style.colorSpace());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2638,11 +2638,11 @@
</span><span class="cx"> shadowOffset -= extraOffset;
</span><span class="cx">
</span><span class="cx"> if (shadow->isWebkitBoxShadow())
</span><del>- context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
</del><ins>+ context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</ins><span class="cx"> else
</span><del>- context->setShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
</del><ins>+ context->setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</ins><span class="cx">
</span><del>- context->fillRectWithRoundedHole(outerRect, FloatRoundedRect(roundedHole), fillColor, s->colorSpace());
</del><ins>+ context->fillRectWithRoundedHole(outerRect, FloatRoundedRect(roundedHole), fillColor, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -165,9 +165,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void childBecameNonInline(RenderObject* /*child*/) { }
</span><span class="cx">
</span><del>- void paintBorder(const PaintInfo&, const LayoutRect&, const RenderStyle*, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
- bool paintNinePieceImage(GraphicsContext*, const LayoutRect&, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
- void paintBoxShadow(const PaintInfo&, const LayoutRect&, const RenderStyle*, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
</del><ins>+ void paintBorder(const PaintInfo&, const LayoutRect&, const RenderStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
+ bool paintNinePieceImage(GraphicsContext*, const LayoutRect&, const RenderStyle&, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
+ void paintBoxShadow(const PaintInfo&, const LayoutRect&, const RenderStyle&, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
</ins><span class="cx"> void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const LayoutSize& = LayoutSize(), CompositeOperator = CompositeSourceOver, RenderElement* backgroundObject = 0);
</span><span class="cx">
</span><span class="cx"> virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox* = 0) const;
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
</span><span class="cx">
</span><span class="cx"> void calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderElement* = 0) const;
</span><del>- void getBorderEdgeInfo(class BorderEdge[], const RenderStyle*, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
</del><ins>+ void getBorderEdgeInfo(class BorderEdge[], const RenderStyle&, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
</ins><span class="cx"> bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;
</span><span class="cx"> bool borderObscuresBackground() const;
</span><span class="cx"> RoundedRect backgroundRoundedRectAdjustedForBleedAvoidance(const GraphicsContext&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox*, const LayoutSize&, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</span><span class="lines">@@ -330,17 +330,17 @@
</span><span class="cx"> void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</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><del>- void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</del><ins>+ void paintOneBorderSide(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</ins><span class="cx"> const LayoutRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const class BorderEdge[],
</span><span class="cx"> const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
</span><del>- void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</del><ins>+ void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</ins><span class="cx"> const class BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false);
</span><del>- void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</del><ins>+ void paintBorderSides(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</ins><span class="cx"> const IntPoint& innerBorderAdjustment, const class BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance,
</span><span class="cx"> bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = 0);
</span><span class="cx"> void drawBoxSideFromPath(GraphicsContext*, const LayoutRect&, const Path&, const class BorderEdge[],
</span><del>- float thickness, float drawThickness, BoxSide, const RenderStyle*,
- Color, EBorderStyle, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
</del><ins>+ float thickness, float drawThickness, BoxSide, const RenderStyle&,
+ Color, EBorderStyle, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
</ins><span class="cx"> void paintMaskForTextFillBox(ImageBuffer*, const IntRect&, InlineFlowBox*, const LayoutRect&, RenderNamedFlowFragment*);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFieldsetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFieldset.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFieldset.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderFieldset.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -160,9 +160,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!boxShadowShouldBeAppliedToBackground(determineBackgroundBleedAvoidance(paintInfo.context)))
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Normal);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Normal);
</ins><span class="cx"> paintFillLayers(paintInfo, style().visitedDependentColor(CSSPropertyBackgroundColor), style().backgroundLayers(), paintRect);
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Inset);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Inset);
</ins><span class="cx">
</span><span class="cx"> if (!style().hasBorder())
</span><span class="cx"> return;
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> graphicsContext->clipOut(pixelSnappedIntRect(clipLeft, paintRect.y() + legend->y(), clipWidth, legend->height()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- paintBorder(paintInfo, paintRect, &style());
</del><ins>+ paintBorder(paintInfo, paintRect, style());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFieldset::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -734,12 +734,12 @@
</span><span class="cx">
</span><span class="cx"> BackgroundBleedAvoidance bleedAvoidance = determineBackgroundBleedAvoidance(paintInfo.context);
</span><span class="cx"> if (!boxShadowShouldBeAppliedToBackground(bleedAvoidance))
</span><del>- paintBoxShadow(paintInfo, rect, &style(), Normal);
</del><ins>+ paintBoxShadow(paintInfo, rect, style(), Normal);
</ins><span class="cx"> paintBackground(paintInfo, rect, bleedAvoidance);
</span><del>- paintBoxShadow(paintInfo, rect, &style(), Inset);
</del><ins>+ paintBoxShadow(paintInfo, rect, style(), Inset);
</ins><span class="cx">
</span><span class="cx"> if (style().hasBorder() && !collapseBorders())
</span><del>- paintBorder(paintInfo, rect, &style());
</del><ins>+ paintBorder(paintInfo, rect, style());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (165598 => 165599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2014-03-14 02:49:57 UTC (rev 165598)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2014-03-14 03:44:03 UTC (rev 165599)
</span><span class="lines">@@ -1319,17 +1319,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutRect paintRect = LayoutRect(paintOffset, pixelSnappedSize());
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Normal);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Normal);
</ins><span class="cx">
</span><span class="cx"> // Paint our cell background.
</span><span class="cx"> paintBackgroundsBehindCell(paintInfo, paintOffset, this);
</span><span class="cx">
</span><del>- paintBoxShadow(paintInfo, paintRect, &style(), Inset);
</del><ins>+ paintBoxShadow(paintInfo, paintRect, style(), Inset);
</ins><span class="cx">
</span><span class="cx"> if (!style().hasBorder() || tableElt->collapseBorders())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- paintBorder(paintInfo, paintRect, &style());
</del><ins>+ paintBorder(paintInfo, paintRect, style());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTableCell::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span></span></pre>
</div>
</div>
</body>
</html>