projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
editing
/
HTMLInterchange.cpp
diff --git
a/src/third_party/WebKit/Source/core/editing/HTMLInterchange.cpp
b/src/third_party/WebKit/Source/core/editing/HTMLInterchange.cpp
index
7b28f4b
..
2d3a244
100644
(file)
--- a/
src/third_party/WebKit/Source/core/editing/HTMLInterchange.cpp
+++ b/
src/third_party/WebKit/Source/core/editing/HTMLInterchange.cpp
@@
-29,10
+29,11
@@
#include "core/dom/Text.h"
#include "core/editing/htmlediting.h"
#include "core/rendering/RenderObject.h"
#include "core/dom/Text.h"
#include "core/editing/htmlediting.h"
#include "core/rendering/RenderObject.h"
+#include "core/rendering/RenderText.h"
#include "wtf/text/StringBuilder.h"
#include "wtf/unicode/CharacterNames.h"
#include "wtf/text/StringBuilder.h"
#include "wtf/unicode/CharacterNames.h"
-namespace
WebCore
{
+namespace
blink
{
String convertHTMLTextToInterchangeFormat(const String& in, const Text& node)
{
String convertHTMLTextToInterchangeFormat(const String& in, const Text& node)
{
@@
-96,4
+97,4
@@
String convertHTMLTextToInterchangeFormat(const String& in, const Text& node)
return s.toString();
}
return s.toString();
}
-} // namespace
WebCore
+} // namespace
blink