Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: sky/engine/core/editing/markup.cpp

Issue 698123002: Remove more API from Node and ContainerNode. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/Node.cpp ('k') | sky/engine/core/frame/UseCounter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/markup.cpp
diff --git a/sky/engine/core/editing/markup.cpp b/sky/engine/core/editing/markup.cpp
index aab538e725ae758cecf17ca0682b5dafa06b0abb..79251deeeb7ee402bc9e27f5187dbf51aabd0dd0 100644
--- a/sky/engine/core/editing/markup.cpp
+++ b/sky/engine/core/editing/markup.cpp
@@ -219,15 +219,16 @@ String StyledMarkupAccumulator::renderedText(Node& node, const Range* range)
String StyledMarkupAccumulator::stringValueForRange(const Node& node, const Range* range)
{
+ if (!node.isTextNode())
+ return emptyString();
+ String text = toText(node).data();
if (!range)
- return node.nodeValue();
-
- String str = node.nodeValue();
+ return text;
if (node == range->endContainer())
- str.truncate(range->endOffset());
+ text.truncate(range->endOffset());
if (node == range->startContainer())
- str.remove(0, range->startOffset());
- return str;
+ text.remove(0, range->startOffset());
+ return text;
}
void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, RangeFullySelectsNode rangeFullySelectsNode)
« no previous file with comments | « sky/engine/core/dom/Node.cpp ('k') | sky/engine/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698