Merge "[Release] Webkit2-efl-123997_0.11.78" into tizen_2.2

[framework/web/webkit-efl.git] / Source / WebKit2 / Shared / EditorState.cpp

diff --git a/Source/WebKit2/Shared/EditorState.cpp b/Source/WebKit2/Shared/EditorState.cpp
index 504e92e..b79afda 100755 (executable)
--- a/Source/WebKit2/Shared/EditorState.cpp
+++ b/Source/WebKit2/Shared/EditorState.cpp
@@ -52,8 +52,12 @@ void EditorState::encode(CoreIPC::ArgumentEncoder* encoder) const
     encoder->encode(editorRect);
     encoder->encode(updateEditorRectOnly);
 #if ENABLE(TIZEN_WEBKIT2_GET_TEXT_STYLE_FOR_SELECTION)
+    encoder->encode(underlineState);
+    encoder->encode(italicState);
+    encoder->encode(boldState);
     encoder->encode(bgColor);
     encoder->encode(color);
+    encoder->encode(fontSize);
 #endif
 #endif
 
@@ -114,11 +118,23 @@ bool EditorState::decode(CoreIPC::ArgumentDecoder* decoder, EditorState& result)
         return false;
 
 #if ENABLE(TIZEN_WEBKIT2_GET_TEXT_STYLE_FOR_SELECTION)
+    if (!decoder->decode(result.underlineState))
+        return false;
+
+    if (!decoder->decode(result.italicState))
+        return false;
+
+    if (!decoder->decode(result.boldState))
+        return false;
+
     if (!decoder->decode(result.bgColor))
         return false;
 
     if (!decoder->decode(result.color))
         return false;
+
+    if (!decoder->decode(result.fontSize))
+        return false;
 #endif
 #endif