<!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>[173049] 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/173049">173049</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-27 22:27:41 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Cleanup snapSizeToPixel/snapSizeToDevicePixel.
https://bugs.webkit.org/show_bug.cgi?id=136264
Reviewed by Simon Fraser.
1. Align snapSizeToPixel()/snapSizeToDevicePixel() function names with the rest of snapping
functions. ->snappedIntSize()/snapSizeToDevicePixel().
2. Operate on LayoutSize/LayoutPoint instead of LayoutUnit/LayoutUnit to reflect functionality.
Covered by existing tests.
Source/WebCore:
* platform/LayoutUnit.h:
(WebCore::snapSizeToPixel): Deleted.
(WebCore::snapSizeToDevicePixel): Deleted.
* platform/graphics/LayoutPoint.h:
(WebCore::snappedIntSize):
(WebCore::snapSizeToDevicePixel):
(WebCore::pixelSnappedIntSize): Deleted.
* platform/graphics/LayoutRect.h:
(WebCore::LayoutRect::pixelSnappedSize):
(WebCore::LayoutRect::pixelSnappedWidth):
(WebCore::LayoutRect::pixelSnappedHeight):
(WebCore::pixelSnappedIntRect):
(WebCore::pixelSnappedIntRectFromEdges):
(WebCore::pixelSnappedForPainting):
(WebCore::directionalPixelSnappedForPainting):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::pixelSnappedClientWidth):
(WebCore::RenderBox::pixelSnappedClientHeight):
(WebCore::RenderBox::pixelSnappedOffsetWidth):
(WebCore::RenderBox::pixelSnappedOffsetHeight):
(WebCore::RenderBox::scrollWidth):
(WebCore::RenderBox::scrollHeight):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::pixelSnappedOffsetWidth):
(WebCore::RenderBoxModelObject::pixelSnappedOffsetHeight):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateLayerPosition):
(WebCore::RenderLayer::scrollWidth):
(WebCore::RenderLayer::scrollHeight):
* rendering/RenderTreeAsText.cpp:
(WebCore::writeLayers):
Tools:
* TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
(TestWebKitAPI::TEST): Deleted.
LayoutTests:
* cssom/subpixel-offsetleft-top-width-height-values-expected.txt:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscssomsubpixeloffsetlefttopwidthheightvaluesexpectedtxt">trunk/LayoutTests/cssom/subpixel-offsetleft-top-width-height-values-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointh">trunk/Source/WebCore/platform/graphics/LayoutPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/LayoutTests/ChangeLog 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Cleanup snapSizeToPixel/snapSizeToDevicePixel.
+ https://bugs.webkit.org/show_bug.cgi?id=136264
+
+ Reviewed by Simon Fraser.
+
+ 1. Align snapSizeToPixel()/snapSizeToDevicePixel() function names with the rest of snapping
+ functions. ->snappedIntSize()/snapSizeToDevicePixel().
+ 2. Operate on LayoutSize/LayoutPoint instead of LayoutUnit/LayoutUnit to reflect functionality.
+
+ Covered by existing tests.
+
+ * cssom/subpixel-offsetleft-top-width-height-values-expected.txt:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt:
+
</ins><span class="cx"> 2014-08-27 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Scrollbar corner can be drawn outside containing frame
</span></span></pre></div>
<a id="trunkLayoutTestscssomsubpixeloffsetlefttopwidthheightvaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/cssom/subpixel-offsetleft-top-width-height-values-expected.txt (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/cssom/subpixel-offsetleft-top-width-height-values-expected.txt 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/LayoutTests/cssom/subpixel-offsetleft-top-width-height-values-expected.txt 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -2,54 +2,54 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:0.00
</span><span class="cx"> offsetTop:0.00 offsetLeft:0.00 offsetWidth:0.00 offsetHeight:0.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:0.00
</span><del>-offsetTop:0.00 offsetLeft:0.00 offsetWidth:1.00 offsetHeight:1.00
-clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</del><ins>+offsetTop:0.00 offsetLeft:0.00 offsetWidth:0.00 offsetHeight:0.00
+clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:0.00
</ins><span class="cx"> offsetTop:1.00 offsetLeft:1.00 offsetWidth:0.00 offsetHeight:0.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:0.00
</span><span class="cx"> offsetTop:1.00 offsetLeft:2.00 offsetWidth:0.00 offsetHeight:0.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:0.00
</span><del>-offsetTop:1.00 offsetLeft:3.00 offsetWidth:0.00 offsetHeight:1.00
-clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:1.00
-offsetTop:1.00 offsetLeft:4.00 offsetWidth:0.00 offsetHeight:1.00
-clientTop:0.00 clientLeft:0.00 clientWidth:0.00 clientHeight:1.00
</del><ins>+offsetTop:1.00 offsetLeft:3.00 offsetWidth:1.00 offsetHeight:1.00
+clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
+offsetTop:1.00 offsetLeft:4.00 offsetWidth:1.00 offsetHeight:1.00
+clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</ins><span class="cx"> offsetTop:1.00 offsetLeft:5.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><span class="cx"> offsetTop:2.00 offsetLeft:6.00 offsetWidth:1.00 offsetHeight:1.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:0.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</ins><span class="cx"> offsetTop:2.00 offsetLeft:8.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><span class="cx"> offsetTop:2.00 offsetLeft:10.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><span class="cx"> offsetTop:2.00 offsetLeft:12.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><del>-offsetTop:2.00 offsetLeft:14.00 offsetWidth:2.00 offsetHeight:2.00
-clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</del><ins>+offsetTop:2.00 offsetLeft:14.00 offsetWidth:1.00 offsetHeight:1.00
+clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</ins><span class="cx"> offsetTop:3.00 offsetLeft:17.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><span class="cx"> offsetTop:3.00 offsetLeft:20.00 offsetWidth:1.00 offsetHeight:1.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:1.00
</span><del>-offsetTop:3.00 offsetLeft:23.00 offsetWidth:1.00 offsetHeight:2.00
-clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:2.00
-offsetTop:3.00 offsetLeft:26.00 offsetWidth:1.00 offsetHeight:2.00
-clientTop:0.00 clientLeft:0.00 clientWidth:1.00 clientHeight:2.00
</del><ins>+offsetTop:3.00 offsetLeft:23.00 offsetWidth:2.00 offsetHeight:2.00
+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
+offsetTop:3.00 offsetLeft:26.00 offsetWidth:2.00 offsetHeight:2.00
+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</ins><span class="cx"> offsetTop:3.00 offsetLeft:29.00 offsetWidth:2.00 offsetHeight:2.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</span><span class="cx"> offsetTop:4.00 offsetLeft:32.00 offsetWidth:2.00 offsetHeight:2.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:1.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</ins><span class="cx"> offsetTop:4.00 offsetLeft:36.00 offsetWidth:2.00 offsetHeight:2.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</span><span class="cx"> offsetTop:2.00 offsetLeft:0.00 offsetWidth:2.00 offsetHeight:2.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</span><del>-offsetTop:2.00 offsetLeft:2.00 offsetWidth:3.00 offsetHeight:3.00
-clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</del><ins>+offsetTop:2.00 offsetLeft:2.00 offsetWidth:2.00 offsetHeight:2.00
+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</ins><span class="cx"> offsetTop:3.00 offsetLeft:5.00 offsetWidth:2.00 offsetHeight:2.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
</span><del>-offsetTop:3.00 offsetLeft:7.00 offsetWidth:3.00 offsetHeight:3.00
</del><ins>+offsetTop:3.00 offsetLeft:7.00 offsetWidth:2.00 offsetHeight:2.00
+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
+offsetTop:4.00 offsetLeft:10.00 offsetWidth:3.00 offsetHeight:3.00
+clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
+offsetTop:4.00 offsetLeft:13.00 offsetWidth:3.00 offsetHeight:3.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</span><del>-offsetTop:4.00 offsetLeft:10.00 offsetWidth:2.00 offsetHeight:2.00
-clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:2.00
-offsetTop:4.00 offsetLeft:13.00 offsetWidth:2.00 offsetHeight:3.00
-clientTop:0.00 clientLeft:0.00 clientWidth:2.00 clientHeight:3.00
</del><span class="cx"> offsetTop:4.00 offsetLeft:16.00 offsetWidth:3.00 offsetHeight:3.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</span><span class="cx"> offsetTop:5.00 offsetLeft:19.00 offsetWidth:3.00 offsetHeight:3.00
</span><span class="lines">@@ -60,16 +60,16 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</span><span class="cx"> offsetTop:6.00 offsetLeft:30.00 offsetWidth:3.00 offsetHeight:3.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</span><del>-offsetTop:6.00 offsetLeft:34.00 offsetWidth:4.00 offsetHeight:4.00
-clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</del><ins>+offsetTop:6.00 offsetLeft:34.00 offsetWidth:3.00 offsetHeight:3.00
+clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</ins><span class="cx"> offsetTop:7.00 offsetLeft:39.00 offsetWidth:3.00 offsetHeight:3.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
</span><del>-offsetTop:7.00 offsetLeft:43.00 offsetWidth:4.00 offsetHeight:4.00
</del><ins>+offsetTop:7.00 offsetLeft:43.00 offsetWidth:3.00 offsetHeight:3.00
+clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
+offsetTop:8.00 offsetLeft:48.00 offsetWidth:4.00 offsetHeight:4.00
+clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
+offsetTop:8.00 offsetLeft:53.00 offsetWidth:4.00 offsetHeight:4.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><del>-offsetTop:8.00 offsetLeft:48.00 offsetWidth:3.00 offsetHeight:3.00
-clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:3.00
-offsetTop:8.00 offsetLeft:53.00 offsetWidth:3.00 offsetHeight:4.00
-clientTop:0.00 clientLeft:0.00 clientWidth:3.00 clientHeight:4.00
</del><span class="cx"> offsetTop:8.00 offsetLeft:58.00 offsetWidth:4.00 offsetHeight:4.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><span class="cx"> offsetTop:9.00 offsetLeft:63.00 offsetWidth:4.00 offsetHeight:4.00
</span><span class="lines">@@ -82,41 +82,41 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><span class="cx"> offsetTop:9.00 offsetLeft:5.00 offsetWidth:4.00 offsetHeight:4.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><del>-offsetTop:9.00 offsetLeft:9.00 offsetWidth:5.00 offsetHeight:5.00
</del><ins>+offsetTop:9.00 offsetLeft:9.00 offsetWidth:4.00 offsetHeight:4.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><span class="cx"> offsetTop:10.00 offsetLeft:14.00 offsetWidth:4.00 offsetHeight:4.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</span><span class="cx"> offsetTop:10.00 offsetLeft:18.00 offsetWidth:5.00 offsetHeight:5.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:4.00
</ins><span class="cx"> offsetTop:11.00 offsetLeft:23.00 offsetWidth:5.00 offsetHeight:5.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><del>-offsetTop:12.00 offsetLeft:28.00 offsetWidth:5.00 offsetHeight:4.00
-clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:4.00
</del><ins>+offsetTop:12.00 offsetLeft:28.00 offsetWidth:5.00 offsetHeight:5.00
+clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</ins><span class="cx"> offsetTop:12.00 offsetLeft:34.00 offsetWidth:5.00 offsetHeight:5.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:4.00 clientHeight:5.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</ins><span class="cx"> offsetTop:13.00 offsetLeft:39.00 offsetWidth:5.00 offsetHeight:5.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><del>-offsetTop:13.00 offsetLeft:45.00 offsetWidth:5.00 offsetHeight:6.00
</del><ins>+offsetTop:13.00 offsetLeft:45.00 offsetWidth:5.00 offsetHeight:5.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><span class="cx"> offsetTop:14.00 offsetLeft:51.00 offsetWidth:5.00 offsetHeight:5.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><span class="cx"> offsetTop:15.00 offsetLeft:57.00 offsetWidth:5.00 offsetHeight:5.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><del>-offsetTop:15.00 offsetLeft:63.00 offsetWidth:6.00 offsetHeight:6.00
</del><ins>+offsetTop:15.00 offsetLeft:63.00 offsetWidth:5.00 offsetHeight:5.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><span class="cx"> offsetTop:16.00 offsetLeft:70.00 offsetWidth:5.00 offsetHeight:5.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</span><span class="cx"> offsetTop:16.00 offsetLeft:76.00 offsetWidth:6.00 offsetHeight:6.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:5.00
</ins><span class="cx"> offsetTop:17.00 offsetLeft:83.00 offsetWidth:6.00 offsetHeight:6.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><del>-offsetTop:18.00 offsetLeft:90.00 offsetWidth:6.00 offsetHeight:5.00
-clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:5.00
</del><ins>+offsetTop:18.00 offsetLeft:90.00 offsetWidth:6.00 offsetHeight:6.00
+clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</ins><span class="cx"> offsetTop:18.00 offsetLeft:98.00 offsetWidth:6.00 offsetHeight:6.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:5.00 clientHeight:6.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</ins><span class="cx"> offsetTop:19.00 offsetLeft:105.00 offsetWidth:6.00 offsetHeight:6.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><del>-offsetTop:19.00 offsetLeft:113.00 offsetWidth:6.00 offsetHeight:7.00
</del><ins>+offsetTop:19.00 offsetLeft:113.00 offsetWidth:6.00 offsetHeight:6.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><span class="cx"> offsetTop:18.00 offsetLeft:2.00 offsetWidth:6.00 offsetHeight:6.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><span class="lines">@@ -124,18 +124,18 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><span class="cx"> offsetTop:20.00 offsetLeft:14.00 offsetWidth:6.00 offsetHeight:6.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><del>-offsetTop:20.00 offsetLeft:20.00 offsetWidth:6.00 offsetHeight:6.00
</del><ins>+offsetTop:20.00 offsetLeft:20.00 offsetWidth:7.00 offsetHeight:7.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</span><span class="cx"> offsetTop:21.00 offsetLeft:27.00 offsetWidth:7.00 offsetHeight:7.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</ins><span class="cx"> offsetTop:22.00 offsetLeft:34.00 offsetWidth:7.00 offsetHeight:7.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><span class="cx"> offsetTop:23.00 offsetLeft:41.00 offsetWidth:7.00 offsetHeight:7.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><del>-offsetTop:24.00 offsetLeft:48.00 offsetWidth:6.00 offsetHeight:7.00
-clientTop:0.00 clientLeft:0.00 clientWidth:6.00 clientHeight:6.00
</del><ins>+offsetTop:24.00 offsetLeft:48.00 offsetWidth:7.00 offsetHeight:7.00
+clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</ins><span class="cx"> offsetTop:24.00 offsetLeft:56.00 offsetWidth:7.00 offsetHeight:7.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:6.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</ins><span class="cx"> offsetTop:25.00 offsetLeft:64.00 offsetWidth:7.00 offsetHeight:7.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><span class="cx"> offsetTop:26.00 offsetLeft:72.00 offsetWidth:7.00 offsetHeight:7.00
</span><span class="lines">@@ -144,30 +144,30 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><span class="cx"> offsetTop:28.00 offsetLeft:88.00 offsetWidth:7.00 offsetHeight:7.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><del>-offsetTop:28.00 offsetLeft:96.00 offsetWidth:7.00 offsetHeight:7.00
</del><ins>+offsetTop:28.00 offsetLeft:96.00 offsetWidth:8.00 offsetHeight:8.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</span><span class="cx"> offsetTop:29.00 offsetLeft:105.00 offsetWidth:8.00 offsetHeight:8.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</ins><span class="cx"> offsetTop:30.00 offsetLeft:114.00 offsetWidth:8.00 offsetHeight:8.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><span class="cx"> offsetTop:31.00 offsetLeft:123.00 offsetWidth:8.00 offsetHeight:8.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><del>-offsetTop:32.00 offsetLeft:132.00 offsetWidth:7.00 offsetHeight:8.00
-clientTop:0.00 clientLeft:0.00 clientWidth:7.00 clientHeight:7.00
</del><ins>+offsetTop:32.00 offsetLeft:132.00 offsetWidth:8.00 offsetHeight:8.00
+clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</ins><span class="cx"> offsetTop:32.00 offsetLeft:142.00 offsetWidth:8.00 offsetHeight:8.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:7.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</ins><span class="cx"> offsetTop:33.00 offsetLeft:152.00 offsetWidth:8.00 offsetHeight:8.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><span class="cx"> offsetTop:32.00 offsetLeft:2.00 offsetWidth:8.00 offsetHeight:8.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><del>-offsetTop:33.00 offsetLeft:11.00 offsetWidth:8.00 offsetHeight:9.00
</del><ins>+offsetTop:33.00 offsetLeft:11.00 offsetWidth:8.00 offsetHeight:8.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><del>-offsetTop:34.00 offsetLeft:19.00 offsetWidth:8.00 offsetHeight:9.00
</del><ins>+offsetTop:34.00 offsetLeft:19.00 offsetWidth:8.00 offsetHeight:8.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</span><span class="cx"> offsetTop:35.00 offsetLeft:27.00 offsetWidth:9.00 offsetHeight:9.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:8.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</ins><span class="cx"> offsetTop:36.00 offsetLeft:36.00 offsetWidth:9.00 offsetHeight:9.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:8.00 clientHeight:8.00
</ins><span class="cx"> offsetTop:37.00 offsetLeft:45.00 offsetWidth:9.00 offsetHeight:9.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</span><span class="cx"> offsetTop:38.00 offsetLeft:54.00 offsetWidth:9.00 offsetHeight:9.00
</span><span class="lines">@@ -180,14 +180,14 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</span><span class="cx"> offsetTop:42.00 offsetLeft:92.00 offsetWidth:9.00 offsetHeight:9.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</span><del>-offsetTop:43.00 offsetLeft:103.00 offsetWidth:9.00 offsetHeight:10.00
</del><ins>+offsetTop:43.00 offsetLeft:103.00 offsetWidth:9.00 offsetHeight:9.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</span><del>-offsetTop:44.00 offsetLeft:113.00 offsetWidth:9.00 offsetHeight:10.00
</del><ins>+offsetTop:44.00 offsetLeft:113.00 offsetWidth:9.00 offsetHeight:9.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</span><span class="cx"> offsetTop:45.00 offsetLeft:123.00 offsetWidth:10.00 offsetHeight:10.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:9.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</ins><span class="cx"> offsetTop:46.00 offsetLeft:134.00 offsetWidth:10.00 offsetHeight:10.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:9.00 clientHeight:9.00
</ins><span class="cx"> offsetTop:47.00 offsetLeft:145.00 offsetWidth:10.00 offsetHeight:10.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><span class="cx"> offsetTop:48.00 offsetLeft:156.00 offsetWidth:10.00 offsetHeight:10.00
</span><span class="lines">@@ -198,122 +198,122 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><span class="cx"> offsetTop:51.00 offsetLeft:191.00 offsetWidth:10.00 offsetHeight:10.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><del>-offsetTop:50.00 offsetLeft:4.00 offsetWidth:10.00 offsetHeight:11.00
</del><ins>+offsetTop:50.00 offsetLeft:4.00 offsetWidth:10.00 offsetHeight:10.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><del>-offsetTop:51.00 offsetLeft:14.00 offsetWidth:10.00 offsetHeight:11.00
</del><ins>+offsetTop:51.00 offsetLeft:14.00 offsetWidth:10.00 offsetHeight:10.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><del>-offsetTop:52.00 offsetLeft:24.00 offsetWidth:11.00 offsetHeight:10.00
</del><ins>+offsetTop:52.00 offsetLeft:24.00 offsetWidth:11.00 offsetHeight:11.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><del>-offsetTop:54.00 offsetLeft:34.00 offsetWidth:10.00 offsetHeight:10.00
</del><ins>+offsetTop:54.00 offsetLeft:34.00 offsetWidth:11.00 offsetHeight:11.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</span><span class="cx"> offsetTop:55.00 offsetLeft:45.00 offsetWidth:11.00 offsetHeight:11.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:10.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</ins><span class="cx"> offsetTop:56.00 offsetLeft:56.00 offsetWidth:11.00 offsetHeight:11.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><span class="cx"> offsetTop:57.00 offsetLeft:67.00 offsetWidth:11.00 offsetHeight:11.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><span class="cx"> offsetTop:58.00 offsetLeft:78.00 offsetWidth:11.00 offsetHeight:11.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:10.00 clientHeight:10.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</ins><span class="cx"> offsetTop:60.00 offsetLeft:90.00 offsetWidth:11.00 offsetHeight:11.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><span class="cx"> offsetTop:61.00 offsetLeft:102.00 offsetWidth:11.00 offsetHeight:11.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><del>-offsetTop:62.00 offsetLeft:114.00 offsetWidth:11.00 offsetHeight:12.00
</del><ins>+offsetTop:62.00 offsetLeft:114.00 offsetWidth:11.00 offsetHeight:11.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><del>-offsetTop:63.00 offsetLeft:126.00 offsetWidth:11.00 offsetHeight:12.00
</del><ins>+offsetTop:63.00 offsetLeft:126.00 offsetWidth:11.00 offsetHeight:11.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><del>-offsetTop:64.00 offsetLeft:138.00 offsetWidth:12.00 offsetHeight:11.00
</del><ins>+offsetTop:64.00 offsetLeft:138.00 offsetWidth:12.00 offsetHeight:12.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><del>-offsetTop:66.00 offsetLeft:150.00 offsetWidth:11.00 offsetHeight:11.00
</del><ins>+offsetTop:66.00 offsetLeft:150.00 offsetWidth:12.00 offsetHeight:12.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</span><span class="cx"> offsetTop:67.00 offsetLeft:163.00 offsetWidth:12.00 offsetHeight:12.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:11.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</ins><span class="cx"> offsetTop:68.00 offsetLeft:176.00 offsetWidth:12.00 offsetHeight:12.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><span class="cx"> offsetTop:69.00 offsetLeft:189.00 offsetWidth:12.00 offsetHeight:12.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><span class="cx"> offsetTop:70.00 offsetLeft:202.00 offsetWidth:12.00 offsetHeight:12.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:11.00 clientHeight:11.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</ins><span class="cx"> offsetTop:72.00 offsetLeft:216.00 offsetWidth:12.00 offsetHeight:12.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><span class="cx"> offsetTop:73.00 offsetLeft:230.00 offsetWidth:12.00 offsetHeight:12.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><del>-offsetTop:72.00 offsetLeft:5.00 offsetWidth:12.00 offsetHeight:13.00
</del><ins>+offsetTop:72.00 offsetLeft:5.00 offsetWidth:12.00 offsetHeight:12.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><del>-offsetTop:73.00 offsetLeft:17.00 offsetWidth:13.00 offsetHeight:12.00
</del><ins>+offsetTop:73.00 offsetLeft:17.00 offsetWidth:12.00 offsetHeight:12.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><span class="cx"> offsetTop:75.00 offsetLeft:29.00 offsetWidth:13.00 offsetHeight:13.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:12.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</ins><span class="cx"> offsetTop:76.00 offsetLeft:42.00 offsetWidth:13.00 offsetHeight:13.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:13.00
-offsetTop:78.00 offsetLeft:54.00 offsetWidth:12.00 offsetHeight:13.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</span><ins>+offsetTop:78.00 offsetLeft:54.00 offsetWidth:13.00 offsetHeight:13.00
+clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</ins><span class="cx"> offsetTop:79.00 offsetLeft:67.00 offsetWidth:13.00 offsetHeight:13.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><span class="cx"> offsetTop:80.00 offsetLeft:80.00 offsetWidth:13.00 offsetHeight:13.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:12.00 clientHeight:12.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</ins><span class="cx"> offsetTop:82.00 offsetLeft:94.00 offsetWidth:13.00 offsetHeight:13.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><del>-offsetTop:83.00 offsetLeft:107.00 offsetWidth:14.00 offsetHeight:14.00
</del><ins>+offsetTop:83.00 offsetLeft:107.00 offsetWidth:13.00 offsetHeight:13.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><span class="cx"> offsetTop:85.00 offsetLeft:121.00 offsetWidth:13.00 offsetHeight:13.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><del>-offsetTop:86.00 offsetLeft:135.00 offsetWidth:13.00 offsetHeight:14.00
</del><ins>+offsetTop:86.00 offsetLeft:135.00 offsetWidth:13.00 offsetHeight:13.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><del>-offsetTop:87.00 offsetLeft:149.00 offsetWidth:14.00 offsetHeight:13.00
</del><ins>+offsetTop:87.00 offsetLeft:149.00 offsetWidth:13.00 offsetHeight:13.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><span class="cx"> offsetTop:89.00 offsetLeft:163.00 offsetWidth:14.00 offsetHeight:14.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:13.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</ins><span class="cx"> offsetTop:90.00 offsetLeft:178.00 offsetWidth:14.00 offsetHeight:14.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:14.00
-offsetTop:92.00 offsetLeft:192.00 offsetWidth:13.00 offsetHeight:14.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</span><ins>+offsetTop:92.00 offsetLeft:192.00 offsetWidth:14.00 offsetHeight:14.00
+clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</ins><span class="cx"> offsetTop:93.00 offsetLeft:207.00 offsetWidth:14.00 offsetHeight:14.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><span class="cx"> offsetTop:94.00 offsetLeft:222.00 offsetWidth:14.00 offsetHeight:14.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:13.00 clientHeight:13.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</ins><span class="cx"> offsetTop:96.00 offsetLeft:238.00 offsetWidth:14.00 offsetHeight:14.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><del>-offsetTop:97.00 offsetLeft:253.00 offsetWidth:15.00 offsetHeight:15.00
</del><ins>+offsetTop:97.00 offsetLeft:253.00 offsetWidth:14.00 offsetHeight:14.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><span class="cx"> offsetTop:99.00 offsetLeft:269.00 offsetWidth:14.00 offsetHeight:14.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><del>-offsetTop:98.00 offsetLeft:6.00 offsetWidth:14.00 offsetHeight:15.00
</del><ins>+offsetTop:98.00 offsetLeft:6.00 offsetWidth:14.00 offsetHeight:14.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><del>-offsetTop:100.00 offsetLeft:20.00 offsetWidth:14.00 offsetHeight:14.00
</del><ins>+offsetTop:100.00 offsetLeft:20.00 offsetWidth:15.00 offsetHeight:15.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</span><span class="cx"> offsetTop:101.00 offsetLeft:35.00 offsetWidth:15.00 offsetHeight:15.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:15.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</ins><span class="cx"> offsetTop:103.00 offsetLeft:49.00 offsetWidth:15.00 offsetHeight:15.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:14.00
-offsetTop:104.00 offsetLeft:64.00 offsetWidth:15.00 offsetHeight:14.00
-clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:14.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
+offsetTop:104.00 offsetLeft:64.00 offsetWidth:15.00 offsetHeight:15.00
+clientTop:0.00 clientLeft:0.00 clientWidth:14.00 clientHeight:14.00
</ins><span class="cx"> offsetTop:106.00 offsetLeft:79.00 offsetWidth:15.00 offsetHeight:15.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><span class="cx"> offsetTop:108.00 offsetLeft:94.00 offsetWidth:15.00 offsetHeight:15.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:14.00
-offsetTop:109.00 offsetLeft:109.00 offsetWidth:16.00 offsetHeight:16.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><ins>+offsetTop:109.00 offsetLeft:109.00 offsetWidth:15.00 offsetHeight:15.00
+clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</ins><span class="cx"> offsetTop:111.00 offsetLeft:125.00 offsetWidth:15.00 offsetHeight:15.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><span class="cx"> offsetTop:112.00 offsetLeft:140.00 offsetWidth:15.00 offsetHeight:15.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><del>-offsetTop:114.00 offsetLeft:156.00 offsetWidth:15.00 offsetHeight:16.00
</del><ins>+offsetTop:114.00 offsetLeft:156.00 offsetWidth:15.00 offsetHeight:15.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><del>-offsetTop:116.00 offsetLeft:172.00 offsetWidth:15.00 offsetHeight:15.00
</del><ins>+offsetTop:116.00 offsetLeft:172.00 offsetWidth:16.00 offsetHeight:16.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</span><span class="cx"> offsetTop:117.00 offsetLeft:189.00 offsetWidth:16.00 offsetHeight:16.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:16.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</ins><span class="cx"> offsetTop:119.00 offsetLeft:205.00 offsetWidth:16.00 offsetHeight:16.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:15.00
-offsetTop:120.00 offsetLeft:222.00 offsetWidth:16.00 offsetHeight:15.00
-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:15.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
+offsetTop:120.00 offsetLeft:222.00 offsetWidth:16.00 offsetHeight:16.00
+clientTop:0.00 clientLeft:0.00 clientWidth:15.00 clientHeight:15.00
</ins><span class="cx"> offsetTop:122.00 offsetLeft:239.00 offsetWidth:16.00 offsetHeight:16.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><span class="cx"> offsetTop:124.00 offsetLeft:256.00 offsetWidth:16.00 offsetHeight:16.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:15.00
-offsetTop:125.00 offsetLeft:273.00 offsetWidth:17.00 offsetHeight:17.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><ins>+offsetTop:125.00 offsetLeft:273.00 offsetWidth:16.00 offsetHeight:16.00
+clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</ins><span class="cx"> offsetTop:127.00 offsetLeft:291.00 offsetWidth:16.00 offsetHeight:16.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><span class="cx"> offsetTop:128.00 offsetLeft:308.00 offsetWidth:16.00 offsetHeight:16.00
</span><span class="lines">@@ -322,202 +322,202 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><span class="cx"> offsetTop:130.00 offsetLeft:24.00 offsetWidth:17.00 offsetHeight:17.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><del>-offsetTop:132.00 offsetLeft:40.00 offsetWidth:16.00 offsetHeight:17.00
</del><ins>+offsetTop:132.00 offsetLeft:40.00 offsetWidth:17.00 offsetHeight:17.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><del>-offsetTop:133.00 offsetLeft:57.00 offsetWidth:17.00 offsetHeight:16.00
</del><ins>+offsetTop:133.00 offsetLeft:57.00 offsetWidth:17.00 offsetHeight:17.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</span><span class="cx"> offsetTop:135.00 offsetLeft:74.00 offsetWidth:17.00 offsetHeight:17.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:17.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
</ins><span class="cx"> offsetTop:137.00 offsetLeft:91.00 offsetWidth:17.00 offsetHeight:17.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:17.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</ins><span class="cx"> offsetTop:139.00 offsetLeft:108.00 offsetWidth:17.00 offsetHeight:17.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:17.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</ins><span class="cx"> offsetTop:141.00 offsetLeft:125.00 offsetWidth:17.00 offsetHeight:17.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><span class="cx"> offsetTop:142.00 offsetLeft:142.00 offsetWidth:17.00 offsetHeight:17.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:16.00 clientHeight:16.00
-offsetTop:144.00 offsetLeft:160.00 offsetWidth:18.00 offsetHeight:18.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><ins>+offsetTop:144.00 offsetLeft:160.00 offsetWidth:17.00 offsetHeight:17.00
+clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</ins><span class="cx"> offsetTop:146.00 offsetLeft:178.00 offsetWidth:18.00 offsetHeight:18.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><span class="cx"> offsetTop:148.00 offsetLeft:196.00 offsetWidth:18.00 offsetHeight:18.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><del>-offsetTop:150.00 offsetLeft:214.00 offsetWidth:17.00 offsetHeight:18.00
</del><ins>+offsetTop:150.00 offsetLeft:214.00 offsetWidth:18.00 offsetHeight:18.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><del>-offsetTop:151.00 offsetLeft:233.00 offsetWidth:18.00 offsetHeight:17.00
</del><ins>+offsetTop:151.00 offsetLeft:233.00 offsetWidth:18.00 offsetHeight:18.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</span><span class="cx"> offsetTop:153.00 offsetLeft:252.00 offsetWidth:18.00 offsetHeight:18.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:18.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
</ins><span class="cx"> offsetTop:155.00 offsetLeft:271.00 offsetWidth:18.00 offsetHeight:18.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:18.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</ins><span class="cx"> offsetTop:157.00 offsetLeft:290.00 offsetWidth:18.00 offsetHeight:18.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:18.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</ins><span class="cx"> offsetTop:159.00 offsetLeft:309.00 offsetWidth:18.00 offsetHeight:18.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</span><span class="cx"> offsetTop:160.00 offsetLeft:328.00 offsetWidth:18.00 offsetHeight:18.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:17.00 clientHeight:17.00
-offsetTop:162.00 offsetLeft:348.00 offsetWidth:19.00 offsetHeight:19.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</span><ins>+offsetTop:162.00 offsetLeft:348.00 offsetWidth:18.00 offsetHeight:18.00
+clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</ins><span class="cx"> offsetTop:162.00 offsetLeft:10.00 offsetWidth:19.00 offsetHeight:19.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</span><span class="cx"> offsetTop:164.00 offsetLeft:28.00 offsetWidth:19.00 offsetHeight:19.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</span><del>-offsetTop:166.00 offsetLeft:46.00 offsetWidth:18.00 offsetHeight:19.00
</del><ins>+offsetTop:166.00 offsetLeft:46.00 offsetWidth:19.00 offsetHeight:19.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</span><span class="cx"> offsetTop:168.00 offsetLeft:65.00 offsetWidth:19.00 offsetHeight:19.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:19.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</ins><span class="cx"> offsetTop:170.00 offsetLeft:84.00 offsetWidth:19.00 offsetHeight:19.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:19.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:18.00
</ins><span class="cx"> offsetTop:172.00 offsetLeft:102.00 offsetWidth:19.00 offsetHeight:19.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:19.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</ins><span class="cx"> offsetTop:174.00 offsetLeft:122.00 offsetWidth:19.00 offsetHeight:19.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:19.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</ins><span class="cx"> offsetTop:176.00 offsetLeft:141.00 offsetWidth:19.00 offsetHeight:19.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</span><del>-offsetTop:178.00 offsetLeft:160.00 offsetWidth:19.00 offsetHeight:20.00
-clientTop:0.00 clientLeft:0.00 clientWidth:18.00 clientHeight:19.00
-offsetTop:180.00 offsetLeft:180.00 offsetWidth:20.00 offsetHeight:20.00
</del><ins>+offsetTop:178.00 offsetLeft:160.00 offsetWidth:19.00 offsetHeight:19.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</span><ins>+offsetTop:180.00 offsetLeft:180.00 offsetWidth:19.00 offsetHeight:19.00
+clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</ins><span class="cx"> offsetTop:182.00 offsetLeft:200.00 offsetWidth:20.00 offsetHeight:20.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</span><span class="cx"> offsetTop:184.00 offsetLeft:220.00 offsetWidth:20.00 offsetHeight:20.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</span><del>-offsetTop:186.00 offsetLeft:240.00 offsetWidth:19.00 offsetHeight:20.00
</del><ins>+offsetTop:186.00 offsetLeft:240.00 offsetWidth:20.00 offsetHeight:20.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</span><span class="cx"> offsetTop:188.00 offsetLeft:261.00 offsetWidth:20.00 offsetHeight:20.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:20.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</ins><span class="cx"> offsetTop:190.00 offsetLeft:282.00 offsetWidth:20.00 offsetHeight:20.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:20.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:19.00
</ins><span class="cx"> offsetTop:192.00 offsetLeft:302.00 offsetWidth:20.00 offsetHeight:20.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:20.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</ins><span class="cx"> offsetTop:194.00 offsetLeft:324.00 offsetWidth:20.00 offsetHeight:20.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:20.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</ins><span class="cx"> offsetTop:196.00 offsetLeft:345.00 offsetWidth:20.00 offsetHeight:20.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><del>-offsetTop:198.00 offsetLeft:366.00 offsetWidth:20.00 offsetHeight:21.00
-clientTop:0.00 clientLeft:0.00 clientWidth:19.00 clientHeight:20.00
-offsetTop:200.00 offsetLeft:388.00 offsetWidth:21.00 offsetHeight:21.00
</del><ins>+offsetTop:198.00 offsetLeft:366.00 offsetWidth:20.00 offsetHeight:20.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><ins>+offsetTop:200.00 offsetLeft:388.00 offsetWidth:20.00 offsetHeight:20.00
+clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</ins><span class="cx"> offsetTop:200.00 offsetLeft:12.00 offsetWidth:21.00 offsetHeight:21.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><span class="cx"> offsetTop:202.00 offsetLeft:32.00 offsetWidth:21.00 offsetHeight:21.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:21.00
-offsetTop:204.00 offsetLeft:52.00 offsetWidth:20.00 offsetHeight:20.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><ins>+offsetTop:204.00 offsetLeft:52.00 offsetWidth:21.00 offsetHeight:21.00
+clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</ins><span class="cx"> offsetTop:207.00 offsetLeft:73.00 offsetWidth:21.00 offsetHeight:21.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><span class="cx"> offsetTop:209.00 offsetLeft:94.00 offsetWidth:21.00 offsetHeight:21.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:20.00
</span><span class="cx"> offsetTop:211.00 offsetLeft:115.00 offsetWidth:21.00 offsetHeight:21.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:21.00
-offsetTop:213.00 offsetLeft:136.00 offsetWidth:21.00 offsetHeight:22.00
-clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:21.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
+offsetTop:213.00 offsetLeft:136.00 offsetWidth:21.00 offsetHeight:21.00
+clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</ins><span class="cx"> offsetTop:215.00 offsetLeft:157.00 offsetWidth:21.00 offsetHeight:21.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:20.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</ins><span class="cx"> offsetTop:218.00 offsetLeft:178.00 offsetWidth:21.00 offsetHeight:21.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:20.00 clientHeight:21.00
-offsetTop:220.00 offsetLeft:200.00 offsetWidth:22.00 offsetHeight:22.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</span><ins>+offsetTop:220.00 offsetLeft:200.00 offsetWidth:21.00 offsetHeight:21.00
+clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</ins><span class="cx"> offsetTop:222.00 offsetLeft:222.00 offsetWidth:22.00 offsetHeight:22.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</span><span class="cx"> offsetTop:224.00 offsetLeft:244.00 offsetWidth:22.00 offsetHeight:22.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:22.00
-offsetTop:226.00 offsetLeft:266.00 offsetWidth:21.00 offsetHeight:21.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</span><ins>+offsetTop:226.00 offsetLeft:266.00 offsetWidth:22.00 offsetHeight:22.00
+clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</ins><span class="cx"> offsetTop:229.00 offsetLeft:289.00 offsetWidth:22.00 offsetHeight:22.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</span><span class="cx"> offsetTop:231.00 offsetLeft:312.00 offsetWidth:22.00 offsetHeight:22.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:21.00
</span><span class="cx"> offsetTop:233.00 offsetLeft:335.00 offsetWidth:22.00 offsetHeight:22.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:22.00
-offsetTop:235.00 offsetLeft:358.00 offsetWidth:22.00 offsetHeight:23.00
-clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:22.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
+offsetTop:235.00 offsetLeft:358.00 offsetWidth:22.00 offsetHeight:22.00
+clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</ins><span class="cx"> offsetTop:237.00 offsetLeft:381.00 offsetWidth:22.00 offsetHeight:22.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:21.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</ins><span class="cx"> offsetTop:240.00 offsetLeft:404.00 offsetWidth:22.00 offsetHeight:22.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:21.00 clientHeight:22.00
-offsetTop:242.00 offsetLeft:428.00 offsetWidth:23.00 offsetHeight:23.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</span><del>-offsetTop:242.00 offsetLeft:14.00 offsetWidth:22.00 offsetHeight:23.00
</del><ins>+offsetTop:242.00 offsetLeft:428.00 offsetWidth:22.00 offsetHeight:22.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</span><del>-offsetTop:244.00 offsetLeft:36.00 offsetWidth:22.00 offsetHeight:22.00
</del><ins>+offsetTop:242.00 offsetLeft:14.00 offsetWidth:23.00 offsetHeight:23.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</span><ins>+offsetTop:244.00 offsetLeft:36.00 offsetWidth:23.00 offsetHeight:23.00
+clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</ins><span class="cx"> offsetTop:247.00 offsetLeft:59.00 offsetWidth:23.00 offsetHeight:23.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</span><del>-offsetTop:249.00 offsetLeft:81.00 offsetWidth:22.00 offsetHeight:22.00
</del><ins>+offsetTop:249.00 offsetLeft:81.00 offsetWidth:23.00 offsetHeight:23.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</span><span class="cx"> offsetTop:252.00 offsetLeft:104.00 offsetWidth:23.00 offsetHeight:23.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:22.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:22.00
</ins><span class="cx"> offsetTop:254.00 offsetLeft:127.00 offsetWidth:23.00 offsetHeight:23.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><span class="cx"> offsetTop:256.00 offsetLeft:150.00 offsetWidth:23.00 offsetHeight:23.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:22.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</ins><span class="cx"> offsetTop:259.00 offsetLeft:173.00 offsetWidth:23.00 offsetHeight:23.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:22.00 clientHeight:23.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</ins><span class="cx"> offsetTop:261.00 offsetLeft:197.00 offsetWidth:23.00 offsetHeight:23.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:22.00
-offsetTop:264.00 offsetLeft:220.00 offsetWidth:23.00 offsetHeight:23.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><del>-offsetTop:266.00 offsetLeft:244.00 offsetWidth:23.00 offsetHeight:24.00
</del><ins>+offsetTop:264.00 offsetLeft:220.00 offsetWidth:24.00 offsetHeight:24.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><del>-offsetTop:268.00 offsetLeft:268.00 offsetWidth:23.00 offsetHeight:23.00
</del><ins>+offsetTop:266.00 offsetLeft:244.00 offsetWidth:24.00 offsetHeight:24.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><ins>+offsetTop:268.00 offsetLeft:268.00 offsetWidth:24.00 offsetHeight:24.00
+clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</ins><span class="cx"> offsetTop:271.00 offsetLeft:293.00 offsetWidth:24.00 offsetHeight:24.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><del>-offsetTop:273.00 offsetLeft:317.00 offsetWidth:23.00 offsetHeight:23.00
</del><ins>+offsetTop:273.00 offsetLeft:317.00 offsetWidth:24.00 offsetHeight:24.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</span><span class="cx"> offsetTop:276.00 offsetLeft:342.00 offsetWidth:24.00 offsetHeight:24.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:23.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:23.00
</ins><span class="cx"> offsetTop:278.00 offsetLeft:367.00 offsetWidth:24.00 offsetHeight:24.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><span class="cx"> offsetTop:280.00 offsetLeft:392.00 offsetWidth:24.00 offsetHeight:24.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:23.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</ins><span class="cx"> offsetTop:283.00 offsetLeft:417.00 offsetWidth:24.00 offsetHeight:24.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:23.00 clientHeight:24.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</ins><span class="cx"> offsetTop:285.00 offsetLeft:443.00 offsetWidth:24.00 offsetHeight:24.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:23.00
-offsetTop:288.00 offsetLeft:468.00 offsetWidth:24.00 offsetHeight:24.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><ins>+offsetTop:288.00 offsetLeft:468.00 offsetWidth:25.00 offsetHeight:25.00
+clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</ins><span class="cx"> offsetTop:288.00 offsetLeft:17.00 offsetWidth:25.00 offsetHeight:25.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><span class="cx"> offsetTop:291.00 offsetLeft:41.00 offsetWidth:25.00 offsetHeight:25.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><del>-offsetTop:293.00 offsetLeft:65.00 offsetWidth:24.00 offsetHeight:24.00
</del><ins>+offsetTop:293.00 offsetLeft:65.00 offsetWidth:25.00 offsetHeight:25.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><span class="cx"> offsetTop:296.00 offsetLeft:90.00 offsetWidth:25.00 offsetHeight:25.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><span class="cx"> offsetTop:298.00 offsetLeft:114.00 offsetWidth:25.00 offsetHeight:25.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:24.00
</span><del>-offsetTop:301.00 offsetLeft:139.00 offsetWidth:25.00 offsetHeight:26.00
-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:25.00
</del><ins>+offsetTop:301.00 offsetLeft:139.00 offsetWidth:25.00 offsetHeight:25.00
+clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</ins><span class="cx"> offsetTop:304.00 offsetLeft:164.00 offsetWidth:25.00 offsetHeight:25.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:25.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</ins><span class="cx"> offsetTop:306.00 offsetLeft:190.00 offsetWidth:25.00 offsetHeight:25.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:24.00
-offsetTop:309.00 offsetLeft:215.00 offsetWidth:25.00 offsetHeight:26.00
-clientTop:0.00 clientLeft:0.00 clientWidth:24.00 clientHeight:25.00
-offsetTop:311.00 offsetLeft:241.00 offsetWidth:26.00 offsetHeight:25.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><ins>+offsetTop:309.00 offsetLeft:215.00 offsetWidth:25.00 offsetHeight:25.00
+clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
+offsetTop:311.00 offsetLeft:241.00 offsetWidth:26.00 offsetHeight:26.00
+clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</ins><span class="cx"> offsetTop:314.00 offsetLeft:267.00 offsetWidth:26.00 offsetHeight:26.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><span class="cx"> offsetTop:317.00 offsetLeft:293.00 offsetWidth:26.00 offsetHeight:26.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><del>-offsetTop:319.00 offsetLeft:319.00 offsetWidth:25.00 offsetHeight:25.00
</del><ins>+offsetTop:319.00 offsetLeft:319.00 offsetWidth:26.00 offsetHeight:26.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><span class="cx"> offsetTop:322.00 offsetLeft:346.00 offsetWidth:26.00 offsetHeight:26.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><span class="cx"> offsetTop:324.00 offsetLeft:372.00 offsetWidth:26.00 offsetHeight:26.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:25.00
</span><del>-offsetTop:327.00 offsetLeft:399.00 offsetWidth:26.00 offsetHeight:27.00
-clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:26.00
</del><ins>+offsetTop:327.00 offsetLeft:399.00 offsetWidth:26.00 offsetHeight:26.00
+clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</ins><span class="cx"> offsetTop:330.00 offsetLeft:426.00 offsetWidth:26.00 offsetHeight:26.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:26.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</ins><span class="cx"> offsetTop:332.00 offsetLeft:454.00 offsetWidth:26.00 offsetHeight:26.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:25.00
-offsetTop:335.00 offsetLeft:481.00 offsetWidth:26.00 offsetHeight:27.00
-clientTop:0.00 clientLeft:0.00 clientWidth:25.00 clientHeight:26.00
-offsetTop:337.00 offsetLeft:509.00 offsetWidth:27.00 offsetHeight:26.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</span><ins>+offsetTop:335.00 offsetLeft:481.00 offsetWidth:26.00 offsetHeight:26.00
+clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
+offsetTop:337.00 offsetLeft:509.00 offsetWidth:27.00 offsetHeight:27.00
+clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</ins><span class="cx"> offsetTop:338.00 offsetLeft:20.00 offsetWidth:27.00 offsetHeight:27.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</span><span class="cx"> offsetTop:341.00 offsetLeft:46.00 offsetWidth:27.00 offsetHeight:27.00
</span><span class="lines">@@ -526,18 +526,18 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</span><span class="cx"> offsetTop:346.00 offsetLeft:98.00 offsetWidth:27.00 offsetHeight:27.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
</span><del>-offsetTop:349.00 offsetLeft:125.00 offsetWidth:28.00 offsetHeight:27.00
-clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:26.00
-offsetTop:352.00 offsetLeft:152.00 offsetWidth:28.00 offsetHeight:28.00
</del><ins>+offsetTop:349.00 offsetLeft:125.00 offsetWidth:27.00 offsetHeight:27.00
+clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:26.00
+offsetTop:352.00 offsetLeft:152.00 offsetWidth:27.00 offsetHeight:27.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><del>-offsetTop:355.00 offsetLeft:179.00 offsetWidth:28.00 offsetHeight:28.00
</del><ins>+offsetTop:355.00 offsetLeft:179.00 offsetWidth:27.00 offsetHeight:27.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><span class="cx"> offsetTop:358.00 offsetLeft:206.00 offsetWidth:27.00 offsetHeight:27.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:26.00 clientHeight:27.00
-offsetTop:360.00 offsetLeft:234.00 offsetWidth:28.00 offsetHeight:27.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><del>-offsetTop:363.00 offsetLeft:262.00 offsetWidth:28.00 offsetHeight:27.00
-clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:26.00
</del><ins>+offsetTop:360.00 offsetLeft:234.00 offsetWidth:28.00 offsetHeight:28.00
+clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
+offsetTop:363.00 offsetLeft:262.00 offsetWidth:28.00 offsetHeight:28.00
+clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</ins><span class="cx"> offsetTop:366.00 offsetLeft:290.00 offsetWidth:28.00 offsetHeight:28.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><span class="cx"> offsetTop:369.00 offsetLeft:318.00 offsetWidth:28.00 offsetHeight:28.00
</span><span class="lines">@@ -546,34 +546,34 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><span class="cx"> offsetTop:374.00 offsetLeft:374.00 offsetWidth:28.00 offsetHeight:28.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
</span><del>-offsetTop:377.00 offsetLeft:403.00 offsetWidth:29.00 offsetHeight:28.00
-clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:27.00
-offsetTop:380.00 offsetLeft:432.00 offsetWidth:29.00 offsetHeight:29.00
</del><ins>+offsetTop:377.00 offsetLeft:403.00 offsetWidth:28.00 offsetHeight:28.00
+clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:27.00
+offsetTop:380.00 offsetLeft:432.00 offsetWidth:28.00 offsetHeight:28.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</span><del>-offsetTop:383.00 offsetLeft:461.00 offsetWidth:29.00 offsetHeight:29.00
</del><ins>+offsetTop:383.00 offsetLeft:461.00 offsetWidth:28.00 offsetHeight:28.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</span><span class="cx"> offsetTop:386.00 offsetLeft:490.00 offsetWidth:28.00 offsetHeight:28.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:27.00 clientHeight:28.00
-offsetTop:388.00 offsetLeft:520.00 offsetWidth:29.00 offsetHeight:28.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</span><del>-offsetTop:391.00 offsetLeft:550.00 offsetWidth:29.00 offsetHeight:28.00
-clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:27.00
</del><ins>+offsetTop:388.00 offsetLeft:520.00 offsetWidth:29.00 offsetHeight:29.00
+clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
+offsetTop:391.00 offsetLeft:550.00 offsetWidth:29.00 offsetHeight:29.00
+clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</ins><span class="cx"> offsetTop:392.00 offsetLeft:22.00 offsetWidth:29.00 offsetHeight:29.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</span><span class="cx"> offsetTop:395.00 offsetLeft:51.00 offsetWidth:29.00 offsetHeight:29.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</span><span class="cx"> offsetTop:398.00 offsetLeft:79.00 offsetWidth:29.00 offsetHeight:29.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:29.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
</ins><span class="cx"> offsetTop:401.00 offsetLeft:107.00 offsetWidth:29.00 offsetHeight:29.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:29.00
-offsetTop:404.00 offsetLeft:136.00 offsetWidth:30.00 offsetHeight:30.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
+offsetTop:404.00 offsetLeft:136.00 offsetWidth:29.00 offsetHeight:29.00
+clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:28.00
+offsetTop:407.00 offsetLeft:165.00 offsetWidth:29.00 offsetHeight:29.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</span><del>-offsetTop:407.00 offsetLeft:165.00 offsetWidth:30.00 offsetHeight:30.00
</del><ins>+offsetTop:410.00 offsetLeft:194.00 offsetWidth:29.00 offsetHeight:29.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</span><del>-offsetTop:410.00 offsetLeft:194.00 offsetWidth:30.00 offsetHeight:30.00
</del><ins>+offsetTop:413.00 offsetLeft:223.00 offsetWidth:29.00 offsetHeight:29.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</span><del>-offsetTop:413.00 offsetLeft:223.00 offsetWidth:29.00 offsetHeight:30.00
-clientTop:0.00 clientLeft:0.00 clientWidth:28.00 clientHeight:29.00
</del><span class="cx"> offsetTop:416.00 offsetLeft:253.00 offsetWidth:30.00 offsetHeight:30.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</span><span class="cx"> offsetTop:419.00 offsetLeft:283.00 offsetWidth:30.00 offsetHeight:30.00
</span><span class="lines">@@ -583,17 +583,17 @@
</span><span class="cx"> offsetTop:425.00 offsetLeft:343.00 offsetWidth:30.00 offsetHeight:30.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</span><span class="cx"> offsetTop:428.00 offsetLeft:373.00 offsetWidth:30.00 offsetHeight:30.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:30.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
</ins><span class="cx"> offsetTop:431.00 offsetLeft:403.00 offsetWidth:30.00 offsetHeight:30.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:30.00
-offsetTop:434.00 offsetLeft:434.00 offsetWidth:31.00 offsetHeight:31.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
+offsetTop:434.00 offsetLeft:434.00 offsetWidth:30.00 offsetHeight:30.00
+clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:29.00
+offsetTop:437.00 offsetLeft:465.00 offsetWidth:30.00 offsetHeight:30.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><del>-offsetTop:437.00 offsetLeft:465.00 offsetWidth:31.00 offsetHeight:31.00
</del><ins>+offsetTop:440.00 offsetLeft:496.00 offsetWidth:30.00 offsetHeight:30.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><del>-offsetTop:440.00 offsetLeft:496.00 offsetWidth:31.00 offsetHeight:31.00
</del><ins>+offsetTop:443.00 offsetLeft:527.00 offsetWidth:30.00 offsetHeight:30.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><del>-offsetTop:443.00 offsetLeft:527.00 offsetWidth:30.00 offsetHeight:31.00
-clientTop:0.00 clientLeft:0.00 clientWidth:29.00 clientHeight:30.00
</del><span class="cx"> offsetTop:446.00 offsetLeft:559.00 offsetWidth:31.00 offsetHeight:31.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><span class="cx"> offsetTop:449.00 offsetLeft:591.00 offsetWidth:31.00 offsetHeight:31.00
</span><span class="lines">@@ -603,17 +603,17 @@
</span><span class="cx"> offsetTop:453.00 offsetLeft:56.00 offsetWidth:31.00 offsetHeight:31.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><span class="cx"> offsetTop:456.00 offsetLeft:86.00 offsetWidth:31.00 offsetHeight:31.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:30.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</ins><span class="cx"> offsetTop:460.00 offsetLeft:116.00 offsetWidth:31.00 offsetHeight:31.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
</span><span class="cx"> offsetTop:463.00 offsetLeft:147.00 offsetWidth:31.00 offsetHeight:31.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:31.00
-offsetTop:466.00 offsetLeft:178.00 offsetWidth:32.00 offsetHeight:32.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
+offsetTop:466.00 offsetLeft:178.00 offsetWidth:31.00 offsetHeight:31.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</span><span class="cx"> offsetTop:469.00 offsetLeft:209.00 offsetWidth:31.00 offsetHeight:31.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:30.00 clientHeight:30.00
-offsetTop:472.00 offsetLeft:240.00 offsetWidth:31.00 offsetHeight:31.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</span><ins>+offsetTop:472.00 offsetLeft:240.00 offsetWidth:32.00 offsetHeight:32.00
+clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</ins><span class="cx"> offsetTop:476.00 offsetLeft:272.00 offsetWidth:32.00 offsetHeight:32.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</span><span class="cx"> offsetTop:479.00 offsetLeft:304.00 offsetWidth:32.00 offsetHeight:32.00
</span><span class="lines">@@ -623,17 +623,17 @@
</span><span class="cx"> offsetTop:485.00 offsetLeft:368.00 offsetWidth:32.00 offsetHeight:32.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</span><span class="cx"> offsetTop:488.00 offsetLeft:400.00 offsetWidth:32.00 offsetHeight:32.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:31.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</ins><span class="cx"> offsetTop:492.00 offsetLeft:432.00 offsetWidth:32.00 offsetHeight:32.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
</span><span class="cx"> offsetTop:495.00 offsetLeft:465.00 offsetWidth:32.00 offsetHeight:32.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:32.00
-offsetTop:498.00 offsetLeft:498.00 offsetWidth:33.00 offsetHeight:33.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
+offsetTop:498.00 offsetLeft:498.00 offsetWidth:32.00 offsetHeight:32.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</span><span class="cx"> offsetTop:501.00 offsetLeft:531.00 offsetWidth:32.00 offsetHeight:32.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:31.00 clientHeight:31.00
-offsetTop:504.00 offsetLeft:564.00 offsetWidth:32.00 offsetHeight:32.00
</del><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</span><ins>+offsetTop:504.00 offsetLeft:564.00 offsetWidth:33.00 offsetHeight:33.00
+clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</ins><span class="cx"> offsetTop:508.00 offsetLeft:598.00 offsetWidth:33.00 offsetHeight:33.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</span><span class="cx"> offsetTop:511.00 offsetLeft:632.00 offsetWidth:33.00 offsetHeight:33.00
</span><span class="lines">@@ -648,14 +648,14 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</span><span class="cx"> offsetTop:526.00 offsetLeft:158.00 offsetWidth:33.00 offsetHeight:33.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</span><del>-offsetTop:529.00 offsetLeft:191.00 offsetWidth:33.00 offsetHeight:34.00
-clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:33.00
</del><ins>+offsetTop:529.00 offsetLeft:191.00 offsetWidth:33.00 offsetHeight:33.00
+clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</ins><span class="cx"> offsetTop:532.00 offsetLeft:224.00 offsetWidth:33.00 offsetHeight:33.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</ins><span class="cx"> offsetTop:536.00 offsetLeft:258.00 offsetWidth:34.00 offsetHeight:34.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</span><del>-offsetTop:539.00 offsetLeft:291.00 offsetWidth:33.00 offsetHeight:33.00
-clientTop:0.00 clientLeft:0.00 clientWidth:32.00 clientHeight:32.00
</del><ins>+offsetTop:539.00 offsetLeft:291.00 offsetWidth:34.00 offsetHeight:34.00
+clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</ins><span class="cx"> offsetTop:543.00 offsetLeft:325.00 offsetWidth:34.00 offsetHeight:34.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</span><span class="cx"> offsetTop:546.00 offsetLeft:359.00 offsetWidth:34.00 offsetHeight:34.00
</span><span class="lines">@@ -668,14 +668,14 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</span><span class="cx"> offsetTop:560.00 offsetLeft:496.00 offsetWidth:34.00 offsetHeight:34.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</span><del>-offsetTop:563.00 offsetLeft:531.00 offsetWidth:34.00 offsetHeight:35.00
-clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:34.00
</del><ins>+offsetTop:563.00 offsetLeft:531.00 offsetWidth:34.00 offsetHeight:34.00
+clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</ins><span class="cx"> offsetTop:566.00 offsetLeft:566.00 offsetWidth:34.00 offsetHeight:34.00
</span><del>-clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</del><ins>+clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</ins><span class="cx"> offsetTop:570.00 offsetLeft:602.00 offsetWidth:35.00 offsetHeight:35.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</span><del>-offsetTop:573.00 offsetLeft:637.00 offsetWidth:34.00 offsetHeight:34.00
-clientTop:0.00 clientLeft:0.00 clientWidth:33.00 clientHeight:33.00
</del><ins>+offsetTop:573.00 offsetLeft:637.00 offsetWidth:35.00 offsetHeight:35.00
+clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</ins><span class="cx"> offsetTop:577.00 offsetLeft:673.00 offsetWidth:35.00 offsetHeight:35.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</span><span class="cx"> offsetTop:578.00 offsetLeft:32.00 offsetWidth:35.00 offsetHeight:35.00
</span><span class="lines">@@ -684,16 +684,16 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</span><span class="cx"> offsetTop:585.00 offsetLeft:101.00 offsetWidth:35.00 offsetHeight:35.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</span><del>-offsetTop:589.00 offsetLeft:135.00 offsetWidth:35.00 offsetHeight:36.00
-clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:35.00
-offsetTop:592.00 offsetLeft:170.00 offsetWidth:36.00 offsetHeight:35.00
-clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:34.00
-offsetTop:596.00 offsetLeft:205.00 offsetWidth:36.00 offsetHeight:36.00
</del><ins>+offsetTop:589.00 offsetLeft:135.00 offsetWidth:35.00 offsetHeight:35.00
+clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
+offsetTop:592.00 offsetLeft:170.00 offsetWidth:35.00 offsetHeight:35.00
+clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
+offsetTop:596.00 offsetLeft:205.00 offsetWidth:35.00 offsetHeight:35.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</span><span class="cx"> offsetTop:600.00 offsetLeft:240.00 offsetWidth:36.00 offsetHeight:36.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</span><del>-offsetTop:603.00 offsetLeft:275.00 offsetWidth:35.00 offsetHeight:35.00
-clientTop:0.00 clientLeft:0.00 clientWidth:34.00 clientHeight:34.00
</del><ins>+offsetTop:603.00 offsetLeft:275.00 offsetWidth:36.00 offsetHeight:36.00
+clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</ins><span class="cx"> offsetTop:607.00 offsetLeft:311.00 offsetWidth:36.00 offsetHeight:36.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</span><span class="cx"> offsetTop:610.00 offsetLeft:346.00 offsetWidth:36.00 offsetHeight:36.00
</span><span class="lines">@@ -704,16 +704,16 @@
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</span><span class="cx"> offsetTop:621.00 offsetLeft:455.00 offsetWidth:36.00 offsetHeight:36.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</span><del>-offsetTop:625.00 offsetLeft:491.00 offsetWidth:36.00 offsetHeight:37.00
-clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:36.00
-offsetTop:628.00 offsetLeft:528.00 offsetWidth:37.00 offsetHeight:36.00
-clientTop:0.00 clientLeft:0.00 clientWidth:36.00 clientHeight:35.00
-offsetTop:632.00 offsetLeft:565.00 offsetWidth:37.00 offsetHeight:37.00
</del><ins>+offsetTop:625.00 offsetLeft:491.00 offsetWidth:36.00 offsetHeight:36.00
+clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
+offsetTop:628.00 offsetLeft:528.00 offsetWidth:36.00 offsetHeight:36.00
+clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
+offsetTop:632.00 offsetLeft:565.00 offsetWidth:36.00 offsetHeight:36.00
</ins><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:36.00 clientHeight:36.00
</span><span class="cx"> offsetTop:636.00 offsetLeft:602.00 offsetWidth:37.00 offsetHeight:37.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:36.00 clientHeight:36.00
</span><del>-offsetTop:639.00 offsetLeft:639.00 offsetWidth:36.00 offsetHeight:36.00
-clientTop:0.00 clientLeft:0.00 clientWidth:35.00 clientHeight:35.00
</del><ins>+offsetTop:639.00 offsetLeft:639.00 offsetWidth:37.00 offsetHeight:37.00
+clientTop:0.00 clientLeft:0.00 clientWidth:36.00 clientHeight:36.00
</ins><span class="cx"> offsetTop:643.00 offsetLeft:677.00 offsetWidth:37.00 offsetHeight:37.00
</span><span class="cx"> clientTop:0.00 clientLeft:0.00 clientWidth:36.00 clientHeight:36.00
</span><span class="cx"> offsetTop:646.00 offsetLeft:714.00 offsetWidth:37.00 offsetHeight:37.00
</span><span class="lines">@@ -724,78 +724,78 @@
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:36.00 clientHeight:36.00
</span><span class="cx"> offsetTop:656.00 offsetLeft:108.00 offsetWidth:37.00 offsetHeight:37.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:36.00 clientHeight:36.00
</span><del>-offsetTop:659.00 offsetLeft:145.00 offsetWidth:38.00 offsetHeight:37.00
-clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:36.00
</del><ins>+offsetTop:659.00 offsetLeft:145.00 offsetWidth:37.00 offsetHeight:37.00
+clientTop:1.00 clientLeft:1.00 clientWidth:36.00 clientHeight:36.00
</ins><span class="cx"> offsetTop:663.00 offsetLeft:182.00 offsetWidth:37.00 offsetHeight:37.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:36.00 clientHeight:36.00
</span><del>-offsetTop:667.00 offsetLeft:219.00 offsetWidth:38.00 offsetHeight:37.00
-clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:36.00
</del><ins>+offsetTop:667.00 offsetLeft:219.00 offsetWidth:38.00 offsetHeight:38.00
+clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</ins><span class="cx"> offsetTop:671.00 offsetLeft:256.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><span class="cx"> offsetTop:675.00 offsetLeft:293.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><span class="cx"> offsetTop:678.00 offsetLeft:330.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><del>-offsetTop:682.00 offsetLeft:368.00 offsetWidth:37.00 offsetHeight:38.00
-clientTop:1.00 clientLeft:1.00 clientWidth:36.00 clientHeight:37.00
</del><ins>+offsetTop:682.00 offsetLeft:368.00 offsetWidth:38.00 offsetHeight:38.00
+clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</ins><span class="cx"> offsetTop:686.00 offsetLeft:406.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><span class="cx"> offsetTop:690.00 offsetLeft:444.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><span class="cx"> offsetTop:694.00 offsetLeft:482.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><del>-offsetTop:697.00 offsetLeft:521.00 offsetWidth:39.00 offsetHeight:38.00
-clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:37.00
</del><ins>+offsetTop:697.00 offsetLeft:521.00 offsetWidth:38.00 offsetHeight:38.00
+clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</ins><span class="cx"> offsetTop:701.00 offsetLeft:560.00 offsetWidth:38.00 offsetHeight:38.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:37.00
</span><del>-offsetTop:705.00 offsetLeft:599.00 offsetWidth:39.00 offsetHeight:38.00
-clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:37.00
</del><ins>+offsetTop:705.00 offsetLeft:599.00 offsetWidth:39.00 offsetHeight:39.00
+clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</ins><span class="cx"> offsetTop:709.00 offsetLeft:638.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><span class="cx"> offsetTop:713.00 offsetLeft:677.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><span class="cx"> offsetTop:716.00 offsetLeft:716.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><del>-offsetTop:720.00 offsetLeft:756.00 offsetWidth:38.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:37.00 clientHeight:38.00
</del><ins>+offsetTop:720.00 offsetLeft:756.00 offsetWidth:39.00 offsetHeight:39.00
+clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</ins><span class="cx"> offsetTop:722.00 offsetLeft:40.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><span class="cx"> offsetTop:726.00 offsetLeft:78.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><span class="cx"> offsetTop:730.00 offsetLeft:116.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><del>-offsetTop:734.00 offsetLeft:155.00 offsetWidth:40.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:38.00
</del><ins>+offsetTop:734.00 offsetLeft:155.00 offsetWidth:39.00 offsetHeight:39.00
+clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</ins><span class="cx"> offsetTop:738.00 offsetLeft:194.00 offsetWidth:39.00 offsetHeight:39.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</span><del>-offsetTop:742.00 offsetLeft:232.00 offsetWidth:39.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
-offsetTop:746.00 offsetLeft:272.00 offsetWidth:40.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:38.00
-offsetTop:750.00 offsetLeft:311.00 offsetWidth:40.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:38.00
-offsetTop:754.00 offsetLeft:350.00 offsetWidth:40.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:38.00
-offsetTop:758.00 offsetLeft:390.00 offsetWidth:39.00 offsetHeight:39.00
-clientTop:1.00 clientLeft:1.00 clientWidth:38.00 clientHeight:38.00
</del><ins>+offsetTop:742.00 offsetLeft:232.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
+offsetTop:746.00 offsetLeft:272.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
+offsetTop:750.00 offsetLeft:311.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
+offsetTop:754.00 offsetLeft:350.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
+offsetTop:758.00 offsetLeft:390.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</ins><span class="cx"> offsetTop:762.00 offsetLeft:430.00 offsetWidth:40.00 offsetHeight:40.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</span><span class="cx"> offsetTop:766.00 offsetLeft:470.00 offsetWidth:40.00 offsetHeight:40.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</span><span class="cx"> offsetTop:770.00 offsetLeft:510.00 offsetWidth:40.00 offsetHeight:40.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</span><del>-offsetTop:774.00 offsetLeft:551.00 offsetWidth:41.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:39.00
</del><ins>+offsetTop:774.00 offsetLeft:551.00 offsetWidth:40.00 offsetHeight:40.00
+clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</ins><span class="cx"> offsetTop:778.00 offsetLeft:592.00 offsetWidth:40.00 offsetHeight:40.00
</span><span class="cx"> clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</span><del>-offsetTop:782.00 offsetLeft:632.00 offsetWidth:40.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
-offsetTop:786.00 offsetLeft:674.00 offsetWidth:41.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:39.00
-offsetTop:790.00 offsetLeft:715.00 offsetWidth:41.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:39.00
-offsetTop:794.00 offsetLeft:756.00 offsetWidth:41.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:39.00
-offsetTop:798.00 offsetLeft:798.00 offsetWidth:40.00 offsetHeight:40.00
-clientTop:1.00 clientLeft:1.00 clientWidth:39.00 clientHeight:39.00
</del><ins>+offsetTop:782.00 offsetLeft:632.00 offsetWidth:41.00 offsetHeight:41.00
+clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:40.00
+offsetTop:786.00 offsetLeft:674.00 offsetWidth:41.00 offsetHeight:41.00
+clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:40.00
+offsetTop:790.00 offsetLeft:715.00 offsetWidth:41.00 offsetHeight:41.00
+clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:40.00
+offsetTop:794.00 offsetLeft:756.00 offsetWidth:41.00 offsetHeight:41.00
+clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:40.00
+offsetTop:798.00 offsetLeft:798.00 offsetWidth:41.00 offsetHeight:41.00
+clientTop:1.00 clientLeft:1.00 clientWidth:40.00 clientHeight:40.00
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> RenderBlock {H3} at (0,2595) size 769x23
</span><span class="cx"> RenderText {#text} at (0,0) size 509x22
</span><span class="cx"> text run at (0,0) width 509: "Right-To-Left containing replaced content blocking the ellipsis"
</span><del>-layer at (8,49) size 20x310 clip at (9,50) size 18x308 scrollHeight 719
</del><ins>+layer at (8,49) size 20x310 clip at (9,50) size 18x308 scrollHeight 720
</ins><span class="cx"> RenderBlock {DIV} at (0,40) size 20x311 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (1,1) size 18x720
</span><span class="cx"> text run at (1,1) width 719: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> RenderImage {IMG} at (1,182) size 25x26
</span><span class="cx"> RenderText {#text} at (12,207) size 18x543
</span><span class="cx"> text run at (12,207) width 542: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><del>-layer at (8,1161) size 31x310 clip at (9,1162) size 29x308 scrollHeight 744
</del><ins>+layer at (8,1161) size 31x310 clip at (9,1162) size 29x308 scrollHeight 745
</ins><span class="cx"> RenderBlock {DIV} at (0,1152) size 31x311 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (12,1) size 18x272
</span><span class="cx"> text run at (12,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/ChangeLog 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-08-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Subpixel layout: Cleanup snapSizeToPixel/snapSizeToDevicePixel.
+ https://bugs.webkit.org/show_bug.cgi?id=136264
+
+ Reviewed by Simon Fraser.
+
+ 1. Align snapSizeToPixel()/snapSizeToDevicePixel() function names with the rest of snapping
+ functions. ->snappedIntSize()/snapSizeToDevicePixel().
+ 2. Operate on LayoutSize/LayoutPoint instead of LayoutUnit/LayoutUnit to reflect functionality.
+
+ Covered by existing tests.
+
+ * platform/LayoutUnit.h:
+ (WebCore::snapSizeToPixel): Deleted.
+ (WebCore::snapSizeToDevicePixel): Deleted.
+ * platform/graphics/LayoutPoint.h:
+ (WebCore::snappedIntSize):
+ (WebCore::snapSizeToDevicePixel):
+ (WebCore::pixelSnappedIntSize): Deleted.
+ * platform/graphics/LayoutRect.h:
+ (WebCore::LayoutRect::pixelSnappedSize):
+ (WebCore::LayoutRect::pixelSnappedWidth):
+ (WebCore::LayoutRect::pixelSnappedHeight):
+ (WebCore::pixelSnappedIntRect):
+ (WebCore::pixelSnappedIntRectFromEdges):
+ (WebCore::pixelSnappedForPainting):
+ (WebCore::directionalPixelSnappedForPainting):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::pixelSnappedClientWidth):
+ (WebCore::RenderBox::pixelSnappedClientHeight):
+ (WebCore::RenderBox::pixelSnappedOffsetWidth):
+ (WebCore::RenderBox::pixelSnappedOffsetHeight):
+ (WebCore::RenderBox::scrollWidth):
+ (WebCore::RenderBox::scrollHeight):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetWidth):
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetHeight):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPosition):
+ (WebCore::RenderLayer::scrollWidth):
+ (WebCore::RenderLayer::scrollHeight):
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::writeLayers):
+
+2014-08-27 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Subpixel layout: Rename LayoutRect's device pixel snapping functions.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136319
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -866,12 +866,6 @@
</span><span class="cx"> return a;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline int snapSizeToPixel(LayoutUnit size, LayoutUnit location)
-{
- LayoutUnit fraction = location.fraction();
- return (fraction + size).round() - fraction.round();
-}
-
</del><span class="cx"> inline int roundToInt(LayoutUnit value)
</span><span class="cx"> {
</span><span class="cx"> return value.round();
</span><span class="lines">@@ -906,12 +900,6 @@
</span><span class="cx"> return ceilf((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline float snapSizeToDevicePixel(LayoutUnit size, LayoutUnit location, float pixelSnappingFactor)
-{
- LayoutUnit fraction = location.fraction();
- return roundToDevicePixel(fraction + size, pixelSnappingFactor) - roundToDevicePixel(fraction, pixelSnappingFactor);
-}
-
</del><span class="cx"> inline LayoutUnit absoluteValue(const LayoutUnit& value)
</span><span class="cx"> {
</span><span class="cx"> return value.abs();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -179,9 +179,14 @@
</span><span class="cx"> return LayoutPoint(LayoutUnit::fromFloatCeil(p.x()), LayoutUnit::fromFloatCeil(p.y()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline IntSize pixelSnappedIntSize(const LayoutSize& s, const LayoutPoint& p)
</del><ins>+inline IntSize snappedIntSize(const LayoutSize& size, const LayoutPoint& location)
</ins><span class="cx"> {
</span><del>- return IntSize(snapSizeToPixel(s.width(), p.x()), snapSizeToPixel(s.height(), p.y()));
</del><ins>+ auto snap = [] (LayoutUnit a, LayoutUnit b) {
+ LayoutUnit fraction = b.fraction();
+ return roundToInt(fraction + a) - roundToInt(fraction);
+ };
+
+ return IntSize(snap(size.width(), location.x()), snap(size.height(), location.y()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatPoint roundPointToDevicePixels(const LayoutPoint& point, float pixelSnappingFactor, bool directionalRoundingToRight = true, bool directionalRoundingToBottom = true)
</span><span class="lines">@@ -199,6 +204,16 @@
</span><span class="cx"> return FloatPoint(ceilToDevicePixel(point.x(), pixelSnappingFactor), ceilToDevicePixel(point.y(), pixelSnappingFactor));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatSize snapSizeToDevicePixel(const LayoutSize& size, const LayoutPoint& location, float pixelSnappingFactor)
+{
+ auto snap = [&] (LayoutUnit a, LayoutUnit b) {
+ LayoutUnit fraction = b.fraction();
+ return roundToDevicePixel(fraction + a, pixelSnappingFactor) - roundToDevicePixel(fraction, pixelSnappingFactor);
+ };
+
+ return FloatSize(snap(size.width(), location.x()), snap(size.height(), location.y()));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutPoint_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> LayoutSize size() const { return m_size; }
</span><span class="cx">
</span><span class="cx"> IntPoint pixelSnappedLocation() const { return roundedIntPoint(m_location); }
</span><del>- IntSize pixelSnappedSize() const { return IntSize(snapSizeToPixel(m_size.width(), m_location.x()), snapSizeToPixel(m_size.height(), m_location.y())); }
</del><ins>+ IntSize pixelSnappedSize() const { return snappedIntSize(m_size, m_location); }
</ins><span class="cx">
</span><span class="cx"> void setLocation(const LayoutPoint& location) { m_location = location; }
</span><span class="cx"> void setSize(const LayoutSize& size) { m_size = size; }
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx">
</span><span class="cx"> int pixelSnappedX() const { return x().round(); }
</span><span class="cx"> int pixelSnappedY() const { return y().round(); }
</span><del>- int pixelSnappedWidth() const { return snapSizeToPixel(width(), x()); }
- int pixelSnappedHeight() const { return snapSizeToPixel(height(), y()); }
</del><ins>+ int pixelSnappedWidth() const { return snappedIntSize(m_size, m_location).width(); }
+ int pixelSnappedHeight() const { return snappedIntSize(m_size, m_location).height(); }
</ins><span class="cx"> int pixelSnappedMaxX() const { return (m_location.x() + m_size.width()).round(); }
</span><span class="cx"> int pixelSnappedMaxY() const { return (m_location.y() + m_size.height()).round(); }
</span><span class="cx">
</span><span class="lines">@@ -206,30 +206,29 @@
</span><span class="cx">
</span><span class="cx"> inline IntRect snappedIntRect(const LayoutRect& rect)
</span><span class="cx"> {
</span><del>- return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()), snapSizeToPixel(rect.height(), rect.y())));
</del><ins>+ return IntRect(roundedIntPoint(rect.location()), snappedIntSize(rect.size(), rect.location()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline IntRect snappedIntRect(LayoutUnit left, LayoutUnit top, LayoutUnit width, LayoutUnit height)
</span><span class="cx"> {
</span><del>- return IntRect(left.round(), top.round(), snapSizeToPixel(width, left), snapSizeToPixel(height, top));
</del><ins>+ return IntRect(IntPoint(left.round(), top.round()), snappedIntSize(LayoutSize(width, height), LayoutPoint(left, top)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline IntRect snappedIntRectFromEdges(LayoutUnit left, LayoutUnit top, LayoutUnit right, LayoutUnit bottom)
</span><span class="cx"> {
</span><del>- return IntRect(left.round(), top.round(), snapSizeToPixel(right - left, left), snapSizeToPixel(bottom - top, top));
</del><ins>+ return IntRect(IntPoint(left.round(), top.round()), snappedIntSize(LayoutSize(right - left, bottom - top), LayoutPoint(left, top)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline IntRect snappedIntRect(LayoutPoint location, LayoutSize size)
</span><span class="cx"> {
</span><del>- return IntRect(roundedIntPoint(location), pixelSnappedIntSize(size, location));
</del><ins>+ return IntRect(roundedIntPoint(location), snappedIntSize(size, location));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect encloseRectToDevicePixels(const LayoutRect&, float pixelSnappingFactor);
</span><span class="cx">
</span><span class="cx"> inline FloatRect snapRectToDevicePixels(const LayoutRect& rect, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>- return FloatRect(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor),
- snapSizeToDevicePixel(rect.width(), rect.x(), pixelSnappingFactor), snapSizeToDevicePixel(rect.height(), rect.y(), pixelSnappingFactor));
</del><ins>+ return FloatRect(FloatPoint(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor)), snapSizeToDevicePixel(rect.size(), rect.location(), pixelSnappingFactor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatRect snapRectToDevicePixels(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height, float pixelSnappingFactor)
</span><span class="lines">@@ -242,9 +241,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!ltr) {
</span><span class="cx"> FloatPoint snappedTopRight = roundPointToDevicePixels(rect.maxXMinYCorner(), deviceScaleFactor, ltr);
</span><del>- float snappedWidth = snapSizeToDevicePixel(rect.width(), rect.maxX(), deviceScaleFactor);
- float snappedHeight = snapSizeToDevicePixel(rect.height(), rect.y(), deviceScaleFactor);
- return FloatRect(snappedTopRight.x() - snappedWidth, snappedTopRight.y(), snappedWidth, snappedHeight);
</del><ins>+ FloatSize snappedSize = snapSizeToDevicePixel(rect.size(), rect.maxXMinYCorner(), deviceScaleFactor);
+ return FloatRect(snappedTopRight.x() - snappedSize.width(), snappedTopRight.y(), snappedSize.width(), snappedSize.height());
</ins><span class="cx"> }
</span><span class="cx"> return snapRectToDevicePixels(rect, deviceScaleFactor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -522,22 +522,26 @@
</span><span class="cx">
</span><span class="cx"> int RenderBox::pixelSnappedClientWidth() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(clientWidth(), x() + clientLeft());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(clientWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::pixelSnappedClientHeight() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(clientHeight(), y() + clientTop());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(clientHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::pixelSnappedOffsetWidth() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(offsetWidth(), x() + clientLeft());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(offsetWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::pixelSnappedOffsetHeight() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(offsetHeight(), y() + clientTop());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(offsetHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollWidth() const
</span><span class="lines">@@ -546,8 +550,10 @@
</span><span class="cx"> return layer()->scrollWidth();
</span><span class="cx"> // For objects with visible overflow, this matches IE.
</span><span class="cx"> // FIXME: Need to work right with writing modes.
</span><del>- if (style().isLeftToRightDirection())
- return snapSizeToPixel(std::max(clientWidth(), layoutOverflowRect().maxX() - borderLeft()), x() + clientLeft());
</del><ins>+ if (style().isLeftToRightDirection()) {
+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(std::max(clientWidth(), layoutOverflowRect().maxX() - borderLeft()));
+ }
</ins><span class="cx"> return clientWidth() - std::min<LayoutUnit>(0, layoutOverflowRect().x() - borderLeft());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,7 +563,8 @@
</span><span class="cx"> return layer()->scrollHeight();
</span><span class="cx"> // For objects with visible overflow, this matches IE.
</span><span class="cx"> // FIXME: Need to work right with writing modes.
</span><del>- return snapSizeToPixel(std::max(clientHeight(), layoutOverflowRect().maxY() - borderTop()), y() + clientTop());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(std::max(clientHeight(), layoutOverflowRect().maxY() - borderTop()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollLeft() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -494,12 +494,14 @@
</span><span class="cx">
</span><span class="cx"> int RenderBoxModelObject::pixelSnappedOffsetWidth() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(offsetWidth(), offsetLeft());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(offsetWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBoxModelObject::pixelSnappedOffsetHeight() const
</span><span class="cx"> {
</span><del>- return snapSizeToPixel(offsetHeight(), offsetTop());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(offsetHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBoxModelObject::computedCSSPadding(const Length& padding) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -1226,7 +1226,7 @@
</span><span class="cx"> localPoint += inlineBoundingBoxOffset;
</span><span class="cx"> } else if (RenderBox* box = renderBox()) {
</span><span class="cx"> // FIXME: Is snapping the size really needed here for the RenderBox case?
</span><del>- setSize(pixelSnappedIntSize(box->size(), box->location()));
</del><ins>+ setSize(snappedIntSize(box->size(), box->location()));
</ins><span class="cx"> localPoint += box->topLeftLocationOffset();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3162,7 +3162,8 @@
</span><span class="cx"> ASSERT(renderBox());
</span><span class="cx"> if (m_scrollDimensionsDirty)
</span><span class="cx"> const_cast<RenderLayer*>(this)->computeScrollDimensions();
</span><del>- return snapSizeToPixel(m_scrollSize.width(), renderBox()->clientLeft() + renderBox()->x());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(m_scrollSize.width());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderLayer::scrollHeight() const
</span><span class="lines">@@ -3170,7 +3171,8 @@
</span><span class="cx"> ASSERT(renderBox());
</span><span class="cx"> if (m_scrollDimensionsDirty)
</span><span class="cx"> const_cast<RenderLayer*>(this)->computeScrollDimensions();
</span><del>- return snapSizeToPixel(m_scrollSize.height(), renderBox()->clientTop() + renderBox()->y());
</del><ins>+ // FIXME: This should use snappedIntSize() instead with absolute coordinates.
+ return roundToInt(m_scrollSize.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderLayer::overflowTop() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> if (rootLayer == l) {
</span><span class="cx"> paintDirtyRect.setWidth(std::max<LayoutUnit>(paintDirtyRect.width(), rootLayer->renderBox()->layoutOverflowRect().maxX()));
</span><span class="cx"> paintDirtyRect.setHeight(std::max<LayoutUnit>(paintDirtyRect.height(), rootLayer->renderBox()->layoutOverflowRect().maxY()));
</span><del>- l->setSize(l->size().expandedTo(pixelSnappedIntSize(maxLayoutOverflow(l->renderBox()), LayoutPoint(0, 0))));
</del><ins>+ l->setSize(l->size().expandedTo(snappedIntSize(maxLayoutOverflow(l->renderBox()), LayoutPoint(0, 0))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Calculate the clip rects we should use.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Tools/ChangeLog 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Cleanup snapSizeToPixel/snapSizeToDevicePixel.
+ https://bugs.webkit.org/show_bug.cgi?id=136264
+
+ Reviewed by Simon Fraser.
+
+ 1. Align snapSizeToPixel()/snapSizeToDevicePixel() function names with the rest of snapping
+ functions. ->snappedIntSize()/snapSizeToDevicePixel().
+ 2. Operate on LayoutSize/LayoutPoint instead of LayoutUnit/LayoutUnit to reflect functionality.
+
+ Covered by existing tests.
+
+ * TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
+ (TestWebKitAPI::TEST): Deleted.
+
</ins><span class="cx"> 2014-08-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> EWS status link at build.webkit.org/dashboard is incorrect until EWS pop-up is opened
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp (173048 => 173049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2014-08-28 05:19:01 UTC (rev 173048)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2014-08-28 05:27:41 UTC (rev 173049)
</span><span class="lines">@@ -103,28 +103,6 @@
</span><span class="cx"> ASSERT_EQ(LayoutUnit::fromFloatRound(1.51f).round(), 2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WebCoreLayoutUnit, LayoutUnitSnapSizeToPixel)
-{
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1), LayoutUnit(0)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1), LayoutUnit(0.5)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(0)), 2);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(0.49)), 2);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(0.5)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(0.75)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(0.99)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(1)), 2);
-
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(0.5), LayoutUnit(1.5)), 0);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(0.99), LayoutUnit(1.5)), 0);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.0), LayoutUnit(1.5)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.49), LayoutUnit(1.5)), 1);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(1.5), LayoutUnit(1.5)), 1);
-
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(100.5), LayoutUnit(100)), 101);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(intMaxForLayoutUnit), LayoutUnit(0.3)), intMaxForLayoutUnit);
- ASSERT_EQ(snapSizeToPixel(LayoutUnit(intMinForLayoutUnit), LayoutUnit(-0.3)), intMinForLayoutUnit);
-}
-
</del><span class="cx"> TEST(WebCoreLayoutUnit, LayoutUnitMultiplication)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_EQ((LayoutUnit(1) * LayoutUnit(1)).toInt(), 1);
</span></span></pre>
</div>
</div>
</body>
</html>