Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 10 insertions, 2 deletions

diff --git a/Source/WebKit2/Shared/EditorState.cpp b/Source/WebKit2/Shared/EditorState.cpp
index dc997a329..6e44a0f15 100644
--- a/Source/WebKit2/Shared/EditorState.cpp
+++ b/Source/WebKit2/Shared/EditorState.cpp
@@ -44,8 +44,10 @@ void EditorState::encode(CoreIPC::ArgumentEncoder* encoder) const
 #if PLATFORM(QT)
     encoder->encode(cursorPosition);
     encoder->encode(anchorPosition);
-    encoder->encode(microFocus);
+    encoder->encode(editorRect);
+    encoder->encode(cursorRect);
     encoder->encode(compositionRect);
+    encoder->encode(inputMethodHints);
     encoder->encode(selectedText);
     encoder->encode(surroundingText);
 #endif
@@ -81,12 +83,18 @@ bool EditorState::decode(CoreIPC::ArgumentDecoder* decoder, EditorState& result)
     if (!decoder->decode(result.anchorPosition))
         return false;
 
-    if (!decoder->decode(result.microFocus))
+    if (!decoder->decode(result.editorRect))
+        return false;
+
+    if (!decoder->decode(result.cursorRect))
         return false;
 
     if (!decoder->decode(result.compositionRect))
         return false;
 
+    if (!decoder->decode(result.inputMethodHints))
+        return false;
+
     if (!decoder->decode(result.selectedText))
         return false;