<!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>[175435] 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/175435">175435</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 16:25:05 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix several warnings reported by clang static analyzer in WebCore
https://bugs.webkit.org/show_bug.cgi?id=138258
Reviewed by Joseph Pecoraro.
Fix several warnings reported by clang static analyzer in WebCore
related to variable unnecessary assignments and scope.
No new tests, no behavior change.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getUpperLeftCorner):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* inspector/InspectorStyleTextEditor.cpp:
(WebCore::InspectorStyleTextEditor::replaceProperty):
* page/ContextMenuController.cpp:
(WebCore::openNewWindow):
* page/DragController.cpp:
(WebCore::createMouseEvent):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paintSelectionBackground):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleTextEditorcpp">trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/ChangeLog 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-10-31 Chris Dumez <cdumez@apple.com>
+
+ Fix several warnings reported by clang static analyzer in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=138258
+
+ Reviewed by Joseph Pecoraro.
+
+ Fix several warnings reported by clang static analyzer in WebCore
+ related to variable unnecessary assignments and scope.
+
+ No new tests, no behavior change.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getUpperLeftCorner):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * inspector/InspectorStyleTextEditor.cpp:
+ (WebCore::InspectorStyleTextEditor::replaceProperty):
+ * page/ContextMenuController.cpp:
+ (WebCore::openNewWindow):
+ * page/DragController.cpp:
+ (WebCore::createMouseEvent):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paintSelectionBackground):
+
</ins><span class="cx"> 2014-10-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Whitespace cleanup in Screen.h
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -809,8 +809,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> // What is this code really trying to do?
</span><span class="cx"> RenderObject* o = renderer();
</span><del>- RenderObject* p = o;
-
</del><span class="cx"> if (!o->isInline() || o->isReplaced()) {
</span><span class="cx"> point = o->localToAbsolute(FloatPoint(), UseTransforms);
</span><span class="cx"> return true;
</span><span class="lines">@@ -818,7 +816,7 @@
</span><span class="cx">
</span><span class="cx"> // find the next text/image child, to get a position
</span><span class="cx"> while (o) {
</span><del>- p = o;
</del><ins>+ RenderObject* p = o;
</ins><span class="cx"> if (RenderObject* child = o->firstChildSlow())
</span><span class="cx"> o = child;
</span><span class="cx"> else if (o->nextSibling())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -3785,7 +3785,7 @@
</span><span class="cx"> if (!captionPreferences)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CaptionUserPreferences::CaptionDisplayMode displayMode = captionPreferences->captionDisplayMode();
</del><ins>+ CaptionUserPreferences::CaptionDisplayMode displayMode;
</ins><span class="cx"> if (trackToSelect == TextTrack::captionMenuOffItem())
</span><span class="cx"> displayMode = CaptionUserPreferences::ForcedOnly;
</span><span class="cx"> else if (trackToSelect == TextTrack::captionMenuAutomaticItem())
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleTextEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -124,17 +124,11 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(index < m_allProperties->size());
</span><span class="cx">
</span><span class="cx"> const InspectorStyleProperty& property = m_allProperties->at(index);
</span><del>- long propertyStart = property.sourceData.range.start;
- long propertyEnd = property.sourceData.range.end;
- long oldLength = propertyEnd - propertyStart;
- long newLength = newText.length();
- long propertyLengthDelta = newLength - oldLength;
-
</del><span class="cx"> if (!property.disabled) {
</span><span class="cx"> SourceRange overwrittenRange;
</span><span class="cx"> unsigned insertedLength;
</span><span class="cx"> internalReplaceProperty(property, newText, &overwrittenRange, &insertedLength);
</span><del>- propertyLengthDelta = static_cast<long>(insertedLength) - static_cast<long>(overwrittenRange.length());
</del><ins>+ long propertyLengthDelta = static_cast<long>(insertedLength) - static_cast<long>(overwrittenRange.length());
</ins><span class="cx">
</span><span class="cx"> // Recompute subsequent disabled property ranges if acting on a non-disabled property.
</span><span class="cx"> shiftDisabledProperties(disabledIndexByOrdinal(index, true), propertyLengthDelta);
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -199,9 +199,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FrameLoadRequest request(frame->document()->securityOrigin(), ResourceRequest(urlToLoad, frame->loader().outgoingReferrer()));
</span><del>- Page* newPage = oldPage;
</del><span class="cx">
</span><del>- newPage = oldPage->chrome().createWindow(frame, request, WindowFeatures(), NavigationAction(request.resourceRequest()));
</del><ins>+ Page* newPage = oldPage->chrome().createWindow(frame, request, WindowFeatures(), NavigationAction(request.resourceRequest()));
</ins><span class="cx"> if (!newPage)
</span><span class="cx"> return;
</span><span class="cx"> newPage->chrome().show();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -84,13 +84,11 @@
</span><span class="cx">
</span><span class="cx"> static PlatformMouseEvent createMouseEvent(DragData& dragData)
</span><span class="cx"> {
</span><del>- bool shiftKey, ctrlKey, altKey, metaKey;
- shiftKey = ctrlKey = altKey = metaKey = false;
</del><span class="cx"> int keyState = dragData.modifierKeyState();
</span><del>- shiftKey = static_cast<bool>(keyState & PlatformEvent::ShiftKey);
- ctrlKey = static_cast<bool>(keyState & PlatformEvent::CtrlKey);
- altKey = static_cast<bool>(keyState & PlatformEvent::AltKey);
- metaKey = static_cast<bool>(keyState & PlatformEvent::MetaKey);
</del><ins>+ bool shiftKey = static_cast<bool>(keyState & PlatformEvent::ShiftKey);
+ bool ctrlKey = static_cast<bool>(keyState & PlatformEvent::CtrlKey);
+ bool altKey = static_cast<bool>(keyState & PlatformEvent::AltKey);
+ bool metaKey = static_cast<bool>(keyState & PlatformEvent::MetaKey);
</ins><span class="cx">
</span><span class="cx"> return PlatformMouseEvent(dragData.clientPosition(), dragData.globalPosition(),
</span><span class="cx"> LeftButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -3944,8 +3944,7 @@
</span><span class="cx"> // Not supporting the quirk has caused us to mis-render some real sites. (See Bugzilla 10517.)
</span><span class="cx"> bool allowImagesToBreak = !document().inQuirksMode() || !isTableCell() || !styleToUse.logicalWidth().isIntrinsicOrAuto();
</span><span class="cx">
</span><del>- bool autoWrap, oldAutoWrap;
- autoWrap = oldAutoWrap = styleToUse.autoWrap();
</del><ins>+ bool oldAutoWrap = styleToUse.autoWrap();
</ins><span class="cx">
</span><span class="cx"> InlineMinMaxIterator childIterator(*this);
</span><span class="cx">
</span><span class="lines">@@ -3959,7 +3958,7 @@
</span><span class="cx"> bool isPrevChildInlineFlow = false;
</span><span class="cx"> bool shouldBreakLineAfterText = false;
</span><span class="cx"> while (RenderObject* child = childIterator.next()) {
</span><del>- autoWrap = child->isReplaced() ? child->parent()->style().autoWrap() :
</del><ins>+ bool autoWrap = child->isReplaced() ? child->parent()->style().autoWrap() :
</ins><span class="cx"> child->style().autoWrap();
</span><span class="cx">
</span><span class="cx"> if (!child->isBR()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (175434 => 175435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-10-31 23:21:36 UTC (rev 175434)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-10-31 23:25:05 UTC (rev 175435)
</span><span class="lines">@@ -207,13 +207,6 @@
</span><span class="cx">
</span><span class="cx"> RenderStyle& style = parentRenderer.style();
</span><span class="cx">
</span><del>- RenderStyle* selectionStyle = &style;
- if (hasSelection) {
- selectionStyle = parentRenderer.getCachedPseudoStyle(SELECTION);
- if (!selectionStyle)
- selectionStyle = &style;
- }
-
</del><span class="cx"> int startPosition, endPosition;
</span><span class="cx"> selectionStartEnd(startPosition, endPosition);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>