1 files changed, 1 insertions, 19 deletions
diff --git a/WebCore/rendering/RenderTextControl.cpp b/WebCore/rendering/RenderTextControl.cpp
index d18940b..5e19362 100644
--- a/WebCore/rendering/RenderTextControl.cpp
+++ b/WebCore/rendering/RenderTextControl.cpp
@@ -167,15 +167,7 @@ void RenderTextControl::updateFromElement()
 
 void RenderTextControl::setInnerTextValue(const String& innerTextValue)
 {
-    String value;
-
-    if (innerTextValue.isNull())
-        value = "";
-    else {
-        value = innerTextValue; 
-        value = document()->displayStringModifiedByEncoding(value);
-    }
-
+    String value = innerTextValue;
     if (value != text() || !m_innerText->hasChildNodes()) {
         if (value != text()) {
             if (Frame* frame = document()->frame()) {
@@ -266,11 +258,6 @@ void RenderTextControl::setSelectionRange(int start, int end)
 
     if (Frame* frame = document()->frame())
         frame->selection()->setSelection(newSelection);
-
-    // FIXME: Granularity is stored separately on the frame, but also in the selection controller.
-    // The granularity in the selection controller should be used, and then this line of code would not be needed.
-    if (Frame* frame = document()->frame())
-        frame->setSelectionGranularity(CharacterGranularity);
 }
 
 VisibleSelection RenderTextControl::selection(int start, int end) const
@@ -323,9 +310,6 @@ String RenderTextControl::finishText(Vector<UChar>& result) const
     if (size && result[size - 1] == '\n')
         result.shrink(--size);
 
-    // Convert backslash to currency symbol.
-    document()->displayBufferModifiedByEncoding(result.data(), result.size());
-    
     return String::adopt(result);
 }
 
@@ -373,8 +357,6 @@ String RenderTextControl::textWithHardLineBreaks()
     if (!firstChild)
         return "";
 
-    document()->updateLayout();
-
     RenderObject* renderer = firstChild->renderer();
     if (!renderer)
         return "";