<!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>[196439] trunk</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/196439">196439</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-02-11 14:15:45 -0800 (Thu, 11 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Make focusring painting subpixel aware.
https://bugs.webkit.org/show_bug.cgi?id=154111
Reviewed by David Hyatt.
Do not integral snap focusring rects while collecting them (use device pixel snapping instead
right before passing them to GraphicsContext::drawFocusRing).
Source/WebCore:
Unable to test.
* platform/graphics/GraphicsContext.h:
* platform/graphics/displaylists/DisplayListItems.h:
(WebCore::DisplayList::DrawFocusRingRects::create):
(WebCore::DisplayList::DrawFocusRingRects::rects):
(WebCore::DisplayList::DrawFocusRingRects::DrawFocusRingRects):
* platform/graphics/displaylists/DisplayListRecorder.cpp:
(WebCore::DisplayList::Recorder::drawFocusRing):
* platform/graphics/displaylists/DisplayListRecorder.h:
* platform/graphics/mac/GraphicsContextMac.mm:
(WebCore::GraphicsContext::drawFocusRing):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addFocusRingRectsForInlineChildren):
(WebCore::RenderBlock::addFocusRingRects):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::addFocusRingRectsForInlineChildren):
* rendering/RenderBlockFlow.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::addFocusRingRects):
* rendering/RenderBox.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::paintFocusRing):
(WebCore::RenderElement::issueRepaintForOutlineAuto):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::absoluteRects):
(WebCore::RenderInline::addFocusRingRects):
* rendering/RenderInline.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::addFocusRingRects):
* rendering/RenderListBox.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::addPDFURLRect):
(WebCore::RenderObject::absoluteFocusRingQuads):
* rendering/RenderObject.h:
(WebCore::RenderObject::addFocusRingRects):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::addFocusRingRects):
* rendering/RenderTextControl.h:
* rendering/svg/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::addFocusRingRects):
* rendering/svg/RenderSVGContainer.h:
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::addFocusRingRects):
* rendering/svg/RenderSVGImage.h:
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::addFocusRingRects):
* rendering/svg/RenderSVGShape.h:
LayoutTests:
* platform/mac/accessibility/image-link-expected.txt:
* platform/mac/accessibility/mac/aria-columnrowheaders-expected.txt: Copied from LayoutTests/platform/mac/accessibility/table-cells-expected.txt.
* platform/mac/accessibility/mac/document-links-expected.txt: Added.
* platform/mac/accessibility/table-attributes-expected.txt:
* platform/mac/accessibility/table-cells-expected.txt:
* platform/mac/accessibility/table-sections-expected.txt:
* platform/mac/accessibility/table-with-rules-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacariacolumnrowheadersexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacdocumentlinksexpectedtxt">trunk/LayoutTests/accessibility/mac/document-links-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityimagelinkexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/image-link-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytableattributesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablecellsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablesectionsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablewithrulesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemsh">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecorderh">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp">trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlineh">trunk/Source/WebCore/rendering/RenderInline.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainerh">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImagecpp">trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImageh">trunk/Source/WebCore/rendering/svg/RenderSVGImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapeh">trunk/Source/WebCore/rendering/svg/RenderSVGShape.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/ChangeLog 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-11 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Make focusring painting subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=154111
+
+ Reviewed by David Hyatt.
+
+ Do not integral snap focusring rects while collecting them (use device pixel snapping instead
+ right before passing them to GraphicsContext::drawFocusRing).
+
+ * platform/mac/accessibility/image-link-expected.txt:
+ * platform/mac/accessibility/mac/aria-columnrowheaders-expected.txt: Copied from LayoutTests/platform/mac/accessibility/table-cells-expected.txt.
+ * platform/mac/accessibility/mac/document-links-expected.txt: Added.
+ * platform/mac/accessibility/table-attributes-expected.txt:
+ * platform/mac/accessibility/table-cells-expected.txt:
+ * platform/mac/accessibility/table-sections-expected.txt:
+ * platform/mac/accessibility/table-with-rules-expected.txt:
+
</ins><span class="cx"> 2016-02-11 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> [INTL] Implement Intl.NumberFormat.prototype.resolvedOptions ()
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariacolumnrowheadersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {56, 18}
</del><ins>+AXSize: NSSize: {54, 18}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {29, 18}
</del><ins>+AXSize: NSSize: {28, 18}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {29, 18}
</del><ins>+AXSize: NSSize: {28, 18}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacdocumentlinksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/document-links-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/document-links-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/accessibility/mac/document-links-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXLink: 'link 4'>
</span><del>-AXSize: NSSize: {38, 18}
</del><ins>+AXSize: NSSize: {37, 18}
</ins><span class="cx"> AXTitle: link 4
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityimagelinkexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/image-link-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/image-link-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/platform/mac/accessibility/image-link-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXLink: 'Delicious cake'>
</span><del>-AXSize: NSSize: {280, 214}
</del><ins>+AXSize: NSSize: {280, 215}
</ins><span class="cx"> AXTitle: Delicious cake
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytableattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {144, 66}
</del><ins>+AXSize: NSSize: {145, 66}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {144, 66}
</del><ins>+AXSize: NSSize: {145, 66}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXRow>
</span><del>-AXSize: NSSize: {336, 30}
</del><ins>+AXSize: NSSize: {335, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> AXChildren: <array of size 2>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXRow>
</span><del>-AXSize: NSSize: {336, 36}
</del><ins>+AXSize: NSSize: {335, 36}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> AXChildren: <array of size 5>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXRow>
</span><del>-AXSize: NSSize: {336, 30}
</del><ins>+AXSize: NSSize: {335, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> AXChildren: <array of size 4>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXRow>
</span><del>-AXSize: NSSize: {336, 30}
</del><ins>+AXSize: NSSize: {335, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx"> AXChildren: <array of size 5>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXGroup>
</span><del>-AXSize: NSSize: {336, 66}
</del><ins>+AXSize: NSSize: {335, 66}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablecellsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {144, 66}
</del><ins>+AXSize: NSSize: {145, 66}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablesectionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXCell>
</span><del>-AXSize: NSSize: {29, 30}
</del><ins>+AXSize: NSSize: {28, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -860,7 +860,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXGroup>
</span><del>-AXSize: NSSize: {76, 30}
</del><ins>+AXSize: NSSize: {77, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -1732,7 +1732,7 @@
</span><span class="cx"> AXChildren: <array of size 3>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXGroup>
</span><del>-AXSize: NSSize: {76, 30}
</del><ins>+AXSize: NSSize: {77, 30}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablewithrulesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> AXChildren: <array of size 1>
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent: <AXGroup>
</span><del>-AXSize: NSSize: {29, 20}
</del><ins>+AXSize: NSSize: {30, 20}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/ChangeLog 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-02-11 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Make focusring painting subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=154111
+
+ Reviewed by David Hyatt.
+
+ Do not integral snap focusring rects while collecting them (use device pixel snapping instead
+ right before passing them to GraphicsContext::drawFocusRing).
+
+ Unable to test.
+
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/displaylists/DisplayListItems.h:
+ (WebCore::DisplayList::DrawFocusRingRects::create):
+ (WebCore::DisplayList::DrawFocusRingRects::rects):
+ (WebCore::DisplayList::DrawFocusRingRects::DrawFocusRingRects):
+ * platform/graphics/displaylists/DisplayListRecorder.cpp:
+ (WebCore::DisplayList::Recorder::drawFocusRing):
+ * platform/graphics/displaylists/DisplayListRecorder.h:
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::GraphicsContext::drawFocusRing):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addFocusRingRectsForInlineChildren):
+ (WebCore::RenderBlock::addFocusRingRects):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::addFocusRingRectsForInlineChildren):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::addFocusRingRects):
+ * rendering/RenderBox.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::paintFocusRing):
+ (WebCore::RenderElement::issueRepaintForOutlineAuto):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::absoluteRects):
+ (WebCore::RenderInline::addFocusRingRects):
+ * rendering/RenderInline.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::addFocusRingRects):
+ * rendering/RenderListBox.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::addPDFURLRect):
+ (WebCore::RenderObject::absoluteFocusRingQuads):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::addFocusRingRects):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::addFocusRingRects):
+ * rendering/RenderTextControl.h:
+ * rendering/svg/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::addFocusRingRects):
+ * rendering/svg/RenderSVGContainer.h:
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::addFocusRingRects):
+ * rendering/svg/RenderSVGImage.h:
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::addFocusRingRects):
+ * rendering/svg/RenderSVGShape.h:
+
</ins><span class="cx"> 2016-02-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Addressing post-review comments after r196393
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -436,10 +436,10 @@
</span><span class="cx"> bool mustUseShadowBlur() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void drawFocusRing(const Vector<IntRect>&, float width, float offset, const Color&);
</del><ins>+ void drawFocusRing(const Vector<FloatRect>&, float width, float offset, const Color&);
</ins><span class="cx"> void drawFocusRing(const Path&, float width, float offset, const Color&);
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void drawFocusRing(const Vector<IntRect>&, float width, float offset, double timeOffset, bool& needsRedraw);
</del><ins>+ void drawFocusRing(const Vector<FloatRect>&, float offset, double timeOffset, bool& needsRedraw);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setLineCap(LineCap);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, float width, float /* offset */, const Color& color)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, float width, float /* offset */, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -933,18 +933,18 @@
</span><span class="cx">
</span><span class="cx"> class DrawFocusRingRects : public DrawingItem {
</span><span class="cx"> public:
</span><del>- static Ref<DrawFocusRingRects> create(const Vector<IntRect>& rects, int width, int offset, const Color& color)
</del><ins>+ static Ref<DrawFocusRingRects> create(const Vector<FloatRect>& rects, int width, int offset, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new DrawFocusRingRects(rects, width, offset, color));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Vector<IntRect> rects() const { return m_rects; }
</del><ins>+ const Vector<FloatRect> rects() const { return m_rects; }
</ins><span class="cx"> int width() const { return m_width; }
</span><span class="cx"> int offset() const { return m_offset; }
</span><span class="cx"> Color color() const { return m_color; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DrawFocusRingRects(const Vector<IntRect>& rects, int width, int offset, const Color& color)
</del><ins>+ DrawFocusRingRects(const Vector<FloatRect>& rects, int width, int offset, const Color& color)
</ins><span class="cx"> : DrawingItem(ItemType::DrawFocusRingRects)
</span><span class="cx"> , m_rects(rects)
</span><span class="cx"> , m_width(width)
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Vector<IntRect> m_rects;
</del><ins>+ Vector<FloatRect> m_rects;
</ins><span class="cx"> int m_width;
</span><span class="cx"> int m_offset;
</span><span class="cx"> Color m_color;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> updateItemExtent(newItem);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Recorder::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, const Color& color)
</del><ins>+void Recorder::drawFocusRing(const Vector<FloatRect>& rects, int width, int offset, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> DrawingItem& newItem = downcast<DrawingItem>(appendItem(DrawFocusRingRects::create(rects, width, offset, color)));
</span><span class="cx"> updateItemExtent(newItem);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecorderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> void drawPath(const Path&);
</span><span class="cx">
</span><span class="cx"> void drawFocusRing(const Path&, int width, int offset, const Color&);
</span><del>- void drawFocusRing(const Vector<IntRect>&, int width, int offset, const Color&);
</del><ins>+ void drawFocusRing(const Vector<FloatRect>&, int width, int offset, const Color&);
</ins><span class="cx">
</span><span class="cx"> void save();
</span><span class="cx"> void restore();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, float, float offset, double timeOffset, bool& needsRedraw)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, float offset, double timeOffset, bool& needsRedraw)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, float, float offset, const Color&)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, float, float offset, const Color&)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (paintingDisabled())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This is nearly identical to the GraphicsContext::drawFocusRing function in GraphicsContextMac.mm.
</span><span class="cx"> // The code could move to GraphicsContextCG.cpp and be shared.
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, float width, float offset, const Color& color)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, float width, float offset, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -3427,12 +3427,12 @@
</span><span class="cx"> return caretRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::addFocusRingRectsForInlineChildren(Vector<IntRect>&, const LayoutPoint&, const RenderLayerModelObject*)
</del><ins>+void RenderBlock::addFocusRingRectsForInlineChildren(Vector<LayoutRect>&, const LayoutPoint&, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</del><ins>+void RenderBlock::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</ins><span class="cx"> {
</span><span class="cx"> // For blocks inside inlines, we include margins so that we run right up to the inline boxes
</span><span class="cx"> // above and below us (thus getting merged with them to form a single irregular shape).
</span><span class="lines">@@ -3447,9 +3447,9 @@
</span><span class="cx"> float bottomMargin = nextInlineHasLineBox ? collapsedMarginAfter() : LayoutUnit();
</span><span class="cx"> LayoutRect rect(additionalOffset.x(), additionalOffset.y() - topMargin, width(), height() + topMargin + bottomMargin);
</span><span class="cx"> if (!rect.isEmpty())
</span><del>- rects.append(snappedIntRect(rect));
</del><ins>+ rects.append(rect);
</ins><span class="cx"> } else if (width() && height())
</span><del>- rects.append(snappedIntRect(additionalOffset, size()));
</del><ins>+ rects.append(LayoutRect(additionalOffset, size()));
</ins><span class="cx">
</span><span class="cx"> if (!hasOverflowClip() && !hasControlClip()) {
</span><span class="cx"> if (childrenInline())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -380,8 +380,8 @@
</span><span class="cx"> void addOverflowFromPositionedObjects();
</span><span class="cx"> void addVisualOverflowFromTheme();
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
- virtual void addFocusRingRectsForInlineChildren(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer);
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
+ virtual void addFocusRingRectsForInlineChildren(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer);
</ins><span class="cx">
</span><span class="cx"> void computeRegionRangeForBoxChild(const RenderBox&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -3457,7 +3457,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void RenderBlockFlow::addFocusRingRectsForInlineChildren(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</del><ins>+void RenderBlockFlow::addFocusRingRectsForInlineChildren(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(childrenInline());
</span><span class="cx"> for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
</span><span class="lines">@@ -3465,7 +3465,7 @@
</span><span class="cx"> LayoutUnit bottom = std::min<LayoutUnit>(curr->lineBottom(), curr->top() + curr->height());
</span><span class="cx"> LayoutRect rect(additionalOffset.x() + curr->x(), additionalOffset.y() + top, curr->width(), bottom - top);
</span><span class="cx"> if (!rect.isEmpty())
</span><del>- rects.append(snappedIntRect(rect));
</del><ins>+ rects.append(rect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx">
</span><span class="cx"> Position positionForBox(InlineBox*, bool start = true) const;
</span><span class="cx"> virtual VisiblePosition positionForPointWithInlineChildren(const LayoutPoint& pointInLogicalContents, const RenderRegion*) override;
</span><del>- virtual void addFocusRingRectsForInlineChildren(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*) override;
</del><ins>+ virtual void addFocusRingRectsForInlineChildren(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME-BLOCKFLOW: These methods have implementations in
</span><span class="cx"> // RenderBlockLineLayout. They should be moved to the proper header once the
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -729,10 +729,10 @@
</span><span class="cx"> return LayoutRect(snapRectToDevicePixels(box, document().deviceScaleFactor()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</del><ins>+void RenderBox::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><span class="cx"> if (!size().isEmpty())
</span><del>- rects.append(snappedIntRect(additionalOffset, size()));
</del><ins>+ rects.append(LayoutRect(additionalOffset, size()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::reflectionOffset() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> // Bounds of the outline box in absolute coords. Respects transforms
</span><span class="cx"> virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const override final;
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual FloatRect repaintRectInLocalCoordinates() const override { return borderBoxRect(); }
</span><span class="cx"> virtual FloatRect objectBoundingBox() const override { return borderBoxRect(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -2085,15 +2085,19 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(style.outlineStyleIsAuto());
</span><span class="cx">
</span><del>- Vector<IntRect> focusRingRects;
</del><ins>+ Vector<LayoutRect> focusRingRects;
</ins><span class="cx"> addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</span><ins>+ Vector<FloatRect> pixelSnappedFocusRingRects;
+ float deviceScaleFactor = document().deviceScaleFactor();
+ for (const auto& rect : focusRingRects)
+ pixelSnappedFocusRingRects.append(snapRectToDevicePixels(rect, deviceScaleFactor));
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> bool needsRepaint;
</span><del>- paintInfo.context().drawFocusRing(focusRingRects, style.outlineWidth(), style.outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
</del><ins>+ paintInfo.context().drawFocusRing(pixelSnappedFocusRingRects, style.outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
</ins><span class="cx"> if (needsRepaint)
</span><span class="cx"> document().page()->focusController().setFocusedElementNeedsRepaint();
</span><span class="cx"> #else
</span><del>- paintInfo.context().drawFocusRing(focusRingRects, style.outlineWidth(), style.outlineOffset(), style.visitedDependentColor(CSSPropertyOutlineColor));
</del><ins>+ paintInfo.context().drawFocusRing(pixelSnappedFocusRingRects, style.outlineWidth(), style.outlineOffset(), style.visitedDependentColor(CSSPropertyOutlineColor));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2168,7 +2172,7 @@
</span><span class="cx"> void RenderElement::issueRepaintForOutlineAuto(float outlineSize)
</span><span class="cx"> {
</span><span class="cx"> LayoutRect repaintRect;
</span><del>- Vector<IntRect> focusRingRects;
</del><ins>+ Vector<LayoutRect> focusRingRects;
</ins><span class="cx"> addFocusRingRects(focusRingRects, LayoutPoint(), containerForRepaint());
</span><span class="cx"> for (auto rect : focusRingRects) {
</span><span class="cx"> rect.inflate(outlineSize);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -743,18 +743,18 @@
</span><span class="cx">
</span><span class="cx"> class AbsoluteRectsGeneratorContext {
</span><span class="cx"> public:
</span><del>- AbsoluteRectsGeneratorContext(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset)
</del><ins>+ AbsoluteRectsGeneratorContext(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
</ins><span class="cx"> : m_rects(rects)
</span><span class="cx"> , m_accumulatedOffset(accumulatedOffset) { }
</span><span class="cx">
</span><span class="cx"> void addRect(const FloatRect& rect)
</span><span class="cx"> {
</span><del>- IntRect intRect = enclosingIntRect(rect);
- intRect.move(m_accumulatedOffset.x(), m_accumulatedOffset.y());
- m_rects.append(intRect);
</del><ins>+ LayoutRect adjustedRect = LayoutRect(rect);
+ adjustedRect.moveBy(m_accumulatedOffset);
+ m_rects.append(adjustedRect);
</ins><span class="cx"> }
</span><span class="cx"> private:
</span><del>- Vector<IntRect>& m_rects;
</del><ins>+ Vector<LayoutRect>& m_rects;
</ins><span class="cx"> const LayoutPoint& m_accumulatedOffset;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -762,8 +762,11 @@
</span><span class="cx">
</span><span class="cx"> void RenderInline::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
</span><span class="cx"> {
</span><del>- AbsoluteRectsGeneratorContext context(rects, accumulatedOffset);
</del><ins>+ Vector<LayoutRect> lineboxRects;
+ AbsoluteRectsGeneratorContext context(lineboxRects, accumulatedOffset);
</ins><span class="cx"> generateLineBoxRects(context);
</span><ins>+ for (const auto& rect : lineboxRects)
+ rects.append(snappedIntRect(rect));
</ins><span class="cx">
</span><span class="cx"> if (RenderBoxModelObject* continuation = this->continuation()) {
</span><span class="cx"> if (is<RenderBox>(*continuation)) {
</span><span class="lines">@@ -1567,7 +1570,7 @@
</span><span class="cx"> repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</del><ins>+void RenderInline::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</ins><span class="cx"> {
</span><span class="cx"> AbsoluteRectsGeneratorContext context(rects, additionalOffset);
</span><span class="cx"> generateLineBoxRects(context);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const;
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</ins><span class="cx"> void paintOutline(PaintInfo&, const LayoutPoint&);
</span><span class="cx">
</span><span class="cx"> using RenderBoxModelObject::continuation;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</del><ins>+void RenderListBox::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</ins><span class="cx"> {
</span><span class="cx"> if (!selectElement().allowsNonContiguousSelection())
</span><span class="cx"> return RenderBlockFlow::addFocusRingRects(rects, additionalOffset, paintContainer);
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> HTMLElement* element = listItems[i];
</span><span class="cx"> if (is<HTMLOptionElement>(*element) && !element->isDisabledFormControl()) {
</span><span class="cx"> selectElement().setActiveSelectionEndIndex(i);
</span><del>- rects.append(snappedIntRect(itemBoundingBoxRect(additionalOffset, i)));
</del><ins>+ rects.append(itemBoundingBoxRect(additionalOffset, i));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canBeProgramaticallyScrolled() const override { return true; }
</span><span class="cx"> virtual void autoscroll(const IntPoint&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -720,9 +720,9 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::addPDFURLRect(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><del>- Vector<IntRect> focusRingRects;
</del><ins>+ Vector<LayoutRect> focusRingRects;
</ins><span class="cx"> addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</span><del>- IntRect urlRect = unionRect(focusRingRects);
</del><ins>+ LayoutRect urlRect = unionRect(focusRingRects);
</ins><span class="cx">
</span><span class="cx"> if (urlRect.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -798,18 +798,17 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
</span><span class="cx"> {
</span><del>- Vector<IntRect> rects;
</del><ins>+ Vector<LayoutRect> rects;
</ins><span class="cx"> // FIXME: addFocusRingRects() needs to be passed this transform-unaware
</span><span class="cx"> // localToAbsolute() offset here because RenderInline::addFocusRingRects()
</span><span class="cx"> // implicitly assumes that. This doesn't work correctly with transformed
</span><span class="cx"> // descendants.
</span><span class="cx"> FloatPoint absolutePoint = localToAbsolute();
</span><span class="cx"> addFocusRingRects(rects, flooredLayoutPoint(absolutePoint));
</span><del>- size_t count = rects.size();
- for (size_t i = 0; i < count; ++i) {
- IntRect rect = rects[i];
- rect.move(-absolutePoint.x(), -absolutePoint.y());
- quads.append(localToAbsoluteQuad(FloatQuad(rect)));
</del><ins>+ float deviceScaleFactor = document().deviceScaleFactor();
+ for (auto rect : rects) {
+ rect.moveBy(LayoutPoint(-absolutePoint));
+ quads.append(localToAbsoluteQuad(FloatQuad(snapRectToDevicePixels(rect, deviceScaleFactor))));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> bool shouldUseTransformFromContainer(const RenderObject* container) const;
</span><span class="cx"> void getTransformFromContainer(const RenderObject* container, const LayoutSize& offsetInContainer, TransformationMatrix&) const;
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& /* additionalOffset */, const RenderLayerModelObject* /* paintContainer */ = nullptr) { };
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& /* additionalOffset */, const RenderLayerModelObject* /* paintContainer */ = nullptr) { };
</ins><span class="cx">
</span><span class="cx"> LayoutRect absoluteOutlineBounds() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -231,10 +231,10 @@
</span><span class="cx"> setPreferredLogicalWidthsDirty(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTextControl::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</del><ins>+void RenderTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><span class="cx"> if (!size().isEmpty())
</span><del>- rects.append(snappedIntRect(additionalOffset, size()));
</del><ins>+ rects.append(LayoutRect(additionalOffset, size()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildren)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> virtual bool avoidsFloats() const override { return true; }
</span><span class="cx"> virtual bool canHaveGeneratedChildren() const override { return false; }
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canBeProgramaticallyScrolled() const override { return true; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -154,9 +154,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // addFocusRingRects is called from paintOutline and needs to be in the same coordinates as the paintOuline call
</span><del>-void RenderSVGContainer::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</del><ins>+void RenderSVGContainer::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><del>- IntRect paintRectInParent = enclosingIntRect(localToParentTransform().mapRect(repaintRectInLocalCoordinates()));
</del><ins>+ LayoutRect paintRectInParent = LayoutRect(localToParentTransform().mapRect(repaintRectInLocalCoordinates()));
</ins><span class="cx"> if (!paintRectInParent.isEmpty())
</span><span class="cx"> rects.append(paintRectInParent);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
</span><span class="cx"> virtual void removeChild(RenderObject&) override final;
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</ins><span class="cx">
</span><span class="cx"> virtual FloatRect objectBoundingBox() const override final { return m_objectBoundingBox; }
</span><span class="cx"> virtual FloatRect strokeBoundingBox() const override final { return m_strokeBoundingBox; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -222,10 +222,10 @@
</span><span class="cx"> repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGImage::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</del><ins>+void RenderSVGImage::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><span class="cx"> // this is called from paint() after the localTransform has already been applied
</span><del>- IntRect contentRect = enclosingIntRect(repaintRectInLocalCoordinates());
</del><ins>+ LayoutRect contentRect = LayoutRect(repaintRectInLocalCoordinates());
</ins><span class="cx"> if (!contentRect.isEmpty())
</span><span class="cx"> rects.append(contentRect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> virtual FloatRect repaintRectInLocalCoordinates() const override { return m_repaintBoundingBox; }
</span><span class="cx"> virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const override { return m_repaintBoundingBoxExcludingShadow; }
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</ins><span class="cx">
</span><span class="cx"> virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -326,9 +326,9 @@
</span><span class="cx">
</span><span class="cx"> // This method is called from inside paintOutline() since we call paintOutline()
</span><span class="cx"> // while transformed to our coord system, return local coords
</span><del>-void RenderSVGShape::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</del><ins>+void RenderSVGShape::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
</ins><span class="cx"> {
</span><del>- IntRect rect = enclosingIntRect(repaintRectInLocalCoordinates());
</del><ins>+ LayoutRect rect = LayoutRect(repaintRectInLocalCoordinates());
</ins><span class="cx"> if (!rect.isEmpty())
</span><span class="cx"> rects.append(rect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.h (196438 => 196439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2016-02-11 22:12:16 UTC (rev 196438)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2016-02-11 22:15:45 UTC (rev 196439)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void layout() override final;
</span><span class="cx"> virtual void paint(PaintInfo&, const LayoutPoint&) override final;
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</del><ins>+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</ins><span class="cx">
</span><span class="cx"> virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override final;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>