Title: [151449] trunk/Source/WebCore
- Revision
- 151449
- Author
- rn...@webkit.org
- Date
- 2013-06-11 11:48:59 -0700 (Tue, 11 Jun 2013)
Log Message
There are unused variables in ApplyStyleCommand::mergeEndWithNextIfIdentical and ReplaceSelectionCommand::removeUnrenderedTextNodesAtEnds
https://bugs.webkit.org/show_bug.cgi?id=117475
Reviewed by Andreas Kling.
Removed.
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical):
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::removeUnrenderedTextNodesAtEnds):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151448 => 151449)
--- trunk/Source/WebCore/ChangeLog 2013-06-11 18:48:44 UTC (rev 151448)
+++ trunk/Source/WebCore/ChangeLog 2013-06-11 18:48:59 UTC (rev 151449)
@@ -1,3 +1,17 @@
+2013-06-11 Ryosuke Niwa <rn...@webkit.org>
+
+ There are unused variables in ApplyStyleCommand::mergeEndWithNextIfIdentical and ReplaceSelectionCommand::removeUnrenderedTextNodesAtEnds
+ https://bugs.webkit.org/show_bug.cgi?id=117475
+
+ Reviewed by Andreas Kling.
+
+ Removed.
+
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical):
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::removeUnrenderedTextNodesAtEnds):
+
2013-06-11 Robert Hogan <rob...@webkit.org>
Fix typo in r151445
Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (151448 => 151449)
--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-06-11 18:48:44 UTC (rev 151448)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-06-11 18:48:59 UTC (rev 151449)
@@ -1303,18 +1303,13 @@
bool ApplyStyleCommand::mergeEndWithNextIfIdentical(const Position& start, const Position& end)
{
Node* endNode = end.containerNode();
- int endOffset = end.computeOffsetInContainerNode();
if (isAtomicNode(endNode)) {
- if (offsetIsBeforeLastNodeOffset(endOffset, endNode))
+ int endOffset = end.computeOffsetInContainerNode();
+ if (offsetIsBeforeLastNodeOffset(endOffset, endNode) || end.deprecatedNode()->nextSibling())
return false;
- unsigned parentLastOffset = end.deprecatedNode()->parentNode()->childNodeCount() - 1;
- if (end.deprecatedNode()->nextSibling())
- return false;
-
endNode = end.deprecatedNode()->parentNode();
- endOffset = parentLastOffset;
}
if (!endNode->isElementNode() || endNode->hasTagName(brTag))
Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (151448 => 151449)
--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-06-11 18:48:44 UTC (rev 151448)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-06-11 18:48:59 UTC (rev 151449)
@@ -676,10 +676,9 @@
removeNode(lastLeafInserted);
}
- // We don't have to make sure that firstNodeInserted isn't inside a select or script element, because
- // it is a top level node in the fragment and the user can't insert into those elements.
+ // We don't have to make sure that firstNodeInserted isn't inside a select or script element
+ // because it is a top level node in the fragment and the user can't insert into those elements.
Node* firstNodeInserted = insertedNodes.firstNodeInserted();
- lastLeafInserted = insertedNodes.lastLeafInserted();
if (firstNodeInserted && firstNodeInserted->isTextNode() && !nodeHasVisibleRenderText(toText(firstNodeInserted))) {
insertedNodes.willRemoveNode(firstNodeInserted);
removeNode(firstNodeInserted);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
