<!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>[185593] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185593">185593</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-16 10:45:12 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some unused values.
https://bugs.webkit.org/show_bug.cgi?id=145997
Patch by Alex Christensen <achristensen@webkit.org> on 2015-06-16
Reviewed by Gyuyoung Kim.
This patch should have no change in behavior.
* accessibility/AccessibilityObject.cpp:
(WebCore::computeBestScrollOffset):
(WebCore::AccessibilityObject::scrollToMakeVisibleWithSubFocus):
(WebCore::AccessibilityObject::scrollToGlobalPoint):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* html/canvas/WebGL2RenderingContext.cpp:
(WebCore::WebGL2RenderingContext::validateTexFuncData):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::validateTexFuncData):
* platform/graphics/StringTruncator.cpp:
(WebCore::leftTruncateToBuffer):
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::paintCurrentFrameInContext):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::localSelectionRect):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::anchorRect):
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
* rendering/svg/SVGTextQuery.cpp:
(WebCore::SVGTextQuery::modifyStartEndPositionsRespectingLigatures):
Remove unused values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsStringTruncatorcpp">trunk/Source/WebCore/platform/graphics/StringTruncator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextQuerycpp">trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-06-16 Alex Christensen <achristensen@webkit.org>
+
+ Remove some unused values.
+ https://bugs.webkit.org/show_bug.cgi?id=145997
+
+ Reviewed by Gyuyoung Kim.
+
+ This patch should have no change in behavior.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::computeBestScrollOffset):
+ (WebCore::AccessibilityObject::scrollToMakeVisibleWithSubFocus):
+ (WebCore::AccessibilityObject::scrollToGlobalPoint):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::validateTexFuncData):
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::validateTexFuncData):
+ * platform/graphics/StringTruncator.cpp:
+ (WebCore::leftTruncateToBuffer):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::paintCurrentFrameInContext):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::localSelectionRect):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::anchorRect):
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
+ * rendering/svg/SVGTextQuery.cpp:
+ (WebCore::SVGTextQuery::modifyStartEndPositionsRespectingLigatures):
+ Remove unused values.
+
</ins><span class="cx"> 2015-06-16 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Calling controller.error() should trigger storing an undefined error
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -2321,10 +2321,8 @@
</span><span class="cx"> // Note that the return value represents the ideal new scroll offset.
</span><span class="cx"> // This may be out of range - the calling function should clip this
</span><span class="cx"> // to the available range.
</span><del>-static int computeBestScrollOffset(int currentScrollOffset,
- int subfocusMin, int subfocusMax,
- int objectMin, int objectMax,
- int viewportMin, int viewportMax) {
</del><ins>+static int computeBestScrollOffset(int currentScrollOffset, int subfocusMin, int objectMin, int objectMax, int viewportMin, int viewportMax)
+{
</ins><span class="cx"> int viewportSize = viewportMax - viewportMin;
</span><span class="cx">
</span><span class="cx"> // If the focus size is larger than the viewport size, shrink it in the
</span><span class="lines">@@ -2332,12 +2330,8 @@
</span><span class="cx"> if (objectMax - objectMin > viewportSize) {
</span><span class="cx"> // Subfocus must be within focus:
</span><span class="cx"> subfocusMin = std::max(subfocusMin, objectMin);
</span><del>- subfocusMax = std::min(subfocusMax, objectMax);
</del><span class="cx">
</span><span class="cx"> // Subfocus must be no larger than the viewport size; favor top/left.
</span><del>- if (subfocusMax - subfocusMin > viewportSize)
- subfocusMax = subfocusMin + viewportSize;
-
</del><span class="cx"> if (subfocusMin + viewportSize > objectMax)
</span><span class="cx"> objectMin = objectMax - viewportSize;
</span><span class="cx"> else {
</span><span class="lines">@@ -2424,12 +2418,12 @@
</span><span class="cx">
</span><span class="cx"> int desiredX = computeBestScrollOffset(
</span><span class="cx"> scrollPosition.x(),
</span><del>- objectRect.x() + subfocus.x(), objectRect.x() + subfocus.maxX(),
</del><ins>+ objectRect.x() + subfocus.x(),
</ins><span class="cx"> objectRect.x(), objectRect.maxX(),
</span><span class="cx"> 0, scrollVisibleRect.width());
</span><span class="cx"> int desiredY = computeBestScrollOffset(
</span><span class="cx"> scrollPosition.y(),
</span><del>- objectRect.y() + subfocus.y(), objectRect.y() + subfocus.maxY(),
</del><ins>+ objectRect.y() + subfocus.y(),
</ins><span class="cx"> objectRect.y(), objectRect.maxY(),
</span><span class="cx"> 0, scrollVisibleRect.height());
</span><span class="cx">
</span><span class="lines">@@ -2476,13 +2470,13 @@
</span><span class="cx">
</span><span class="cx"> int desiredX = computeBestScrollOffset(
</span><span class="cx"> 0,
</span><ins>+ objectRect.x(),
</ins><span class="cx"> objectRect.x(), objectRect.maxX(),
</span><del>- objectRect.x(), objectRect.maxX(),
</del><span class="cx"> point.x(), point.x());
</span><span class="cx"> int desiredY = computeBestScrollOffset(
</span><span class="cx"> 0,
</span><ins>+ objectRect.y(),
</ins><span class="cx"> objectRect.y(), objectRect.maxY(),
</span><del>- objectRect.y(), objectRect.maxY(),
</del><span class="cx"> point.y(), point.y());
</span><span class="cx"> outer->scrollTo(IntPoint(desiredX, desiredY));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -3604,7 +3604,6 @@
</span><span class="cx"> NSRange range = {0, 0};
</span><span class="cx"> bool rangeSet = false;
</span><span class="cx"> NSRect rect = NSZeroRect;
</span><del>- bool rectSet = false;
</del><span class="cx">
</span><span class="cx"> // basic parameter validation
</span><span class="cx"> if (!m_object || !attribute || !parameter)
</span><span class="lines">@@ -3634,17 +3633,16 @@
</span><span class="cx"> else if ([parameter isKindOfClass:[NSDictionary self]])
</span><span class="cx"> dictionary = parameter;
</span><span class="cx">
</span><del>- else if ([parameter isKindOfClass:[NSValue self]] && strcmp([(NSValue*)parameter objCType], @encode(NSPoint)) == 0) {
</del><ins>+ else if ([parameter isKindOfClass:[NSValue self]] && !strcmp([(NSValue*)parameter objCType], @encode(NSPoint))) {
</ins><span class="cx"> pointSet = true;
</span><span class="cx"> point = [(NSValue*)parameter pointValue];
</span><span class="cx">
</span><del>- } else if ([parameter isKindOfClass:[NSValue self]] && strcmp([(NSValue*)parameter objCType], @encode(NSRange)) == 0) {
</del><ins>+ } else if ([parameter isKindOfClass:[NSValue self]] && !strcmp([(NSValue*)parameter objCType], @encode(NSRange))) {
</ins><span class="cx"> rangeSet = true;
</span><span class="cx"> range = [(NSValue*)parameter rangeValue];
</span><del>- } else if ([parameter isKindOfClass:[NSValue self]] && strcmp([(NSValue*)parameter objCType], @encode(NSRect)) == 0) {
- rectSet = true;
</del><ins>+ } else if ([parameter isKindOfClass:[NSValue self]] && !strcmp([(NSValue*)parameter objCType], @encode(NSRect)))
</ins><span class="cx"> rect = [(NSValue*)parameter rectValue];
</span><del>- } else {
</del><ins>+ else {
</ins><span class="cx"> // Attribute type is not supported. Allow super to handle.
</span><span class="cx"> return [super accessibilityAttributeValue:attribute forParameter:parameter];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -1969,7 +1969,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (pixels->byteLength() < totalBytesRequired) {
</span><span class="cx"> if (m_unpackAlignment != 1) {
</span><del>- error = m_context->computeImageSizeInBytes(format, type, width, height, 1, &totalBytesRequired, 0);
</del><ins>+ m_context->computeImageSizeInBytes(format, type, width, height, 1, &totalBytesRequired, 0);
</ins><span class="cx"> if (pixels->byteLength() == totalBytesRequired) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "ArrayBufferView not big enough for request with UNPACK_ALIGNMENT > 1");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (pixels->byteLength() < totalBytesRequired) {
</span><span class="cx"> if (m_unpackAlignment != 1) {
</span><del>- error = m_context->computeImageSizeInBytes(format, type, width, height, 1, &totalBytesRequired, 0);
</del><ins>+ m_context->computeImageSizeInBytes(format, type, width, height, 1, &totalBytesRequired, 0);
</ins><span class="cx"> if (pixels->byteLength() == totalBytesRequired) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "ArrayBufferView not big enough for request with UNPACK_ALIGNMENT > 1");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsStringTruncatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/StringTruncator.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> NonSharedCharacterBreakIterator it(string);
</span><span class="cx"> unsigned adjustedStartIndex = startIndex;
</span><del>- startIndex = boundedTextBreakFollowing(it, startIndex, length - startIndex);
</del><ins>+ boundedTextBreakFollowing(it, startIndex, length - startIndex);
</ins><span class="cx">
</span><span class="cx"> // Strip single character after ellipsis character, when that character is preceded by a space
</span><span class="cx"> if (adjustedStartIndex < length && string[adjustedStartIndex] != space
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -1191,7 +1191,6 @@
</span><span class="cx"> // Set up a QTVideoRenderer to use, but one that doesn't register for
</span><span class="cx"> // update callbacks. That way, it won't bother us asking to repaint.
</span><span class="cx"> createQTVideoRenderer(QTVideoRendererModeDefault);
</span><del>- qtVideoRenderer = m_qtVideoRenderer.get();
</del><span class="cx"> }
</span><span class="cx"> paint(context, r);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -271,8 +271,6 @@
</span><span class="cx"> String hyphenatedStringBuffer;
</span><span class="cx"> bool respectHyphen = ePos == m_len && hasHyphen();
</span><span class="cx"> TextRun textRun = constructTextRun(lineStyle, font, respectHyphen ? &hyphenatedStringBuffer : 0);
</span><del>- if (respectHyphen)
- endPos = textRun.length();
</del><span class="cx">
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(LayoutPoint(logicalLeft(), selectionTop), LayoutSize(m_logicalWidth, selectionHeight));
</span><span class="cx"> // Avoid computing the font width when the entire line box is selected as an optimization.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -1719,17 +1719,8 @@
</span><span class="cx"> LayoutRect RenderElement::anchorRect() const
</span><span class="cx"> {
</span><span class="cx"> FloatPoint leading, trailing;
</span><del>- bool foundLeading = getLeadingCorner(leading);
- bool foundTrailing = getTrailingCorner(trailing);
-
- // If we've found one corner, but not the other,
- // then we should just return a point at the corner that we did find.
- if (foundLeading != foundTrailing) {
- if (foundLeading)
- foundTrailing = foundLeading;
- else
- foundLeading = foundTrailing;
- }
</del><ins>+ getLeadingCorner(leading);
+ getTrailingCorner(trailing);
</ins><span class="cx">
</span><span class="cx"> FloatPoint upperLeft = leading;
</span><span class="cx"> FloatPoint lowerRight = trailing;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -179,7 +179,6 @@
</span><span class="cx"> bool measureText = positionType != NonWhitespace || !m_style.collapseWhitespace;
</span><span class="cx"> if (measureText) {
</span><span class="cx"> float textWidth = this->textWidth(currentPosition, nextPosition, xPosition);
</span><del>- xPosition += textWidth;
</del><span class="cx"> width += textWidth;
</span><span class="cx"> } else if (startPosition < nextPosition)
</span><span class="cx"> width = m_style.spaceWidth;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp (185592 => 185593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp 2015-06-16 17:36:08 UTC (rev 185592)
+++ trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp 2015-06-16 17:45:12 UTC (rev 185593)
</span><span class="lines">@@ -213,15 +213,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (lastPositionOffset != -1 && lastPositionOffset - positionOffset > 1) {
</span><del>- if (alterStartPosition && startPosition > lastPositionOffset && startPosition < static_cast<int>(positionOffset)) {
</del><ins>+ if (alterStartPosition && startPosition > lastPositionOffset && startPosition < static_cast<int>(positionOffset))
</ins><span class="cx"> startPosition = lastPositionOffset;
</span><del>- alterStartPosition = false;
- }
</del><span class="cx">
</span><del>- if (alterEndPosition && endPosition > lastPositionOffset && endPosition < static_cast<int>(positionOffset)) {
</del><ins>+ if (alterEndPosition && endPosition > lastPositionOffset && endPosition < static_cast<int>(positionOffset))
</ins><span class="cx"> endPosition = positionOffset;
</span><del>- alterEndPosition = false;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>