X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Source%2FWebKit2%2FShared%2FEditorState.cpp;h=b79afda21a03d3111979beaaacdaf6f9a8605eca;hb=e840888804f74d2bfee8ed86b6979489fa0e28c5;hp=2d1eaec5b75688fa7b4f0a5898dcbee12d6aae72;hpb=e62f45192276825f16586f9f3db67c5235832720;p=framework%2Fweb%2Fwebkit-efl.git diff --git a/Source/WebKit2/Shared/EditorState.cpp b/Source/WebKit2/Shared/EditorState.cpp index 2d1eaec..b79afda 100755 --- a/Source/WebKit2/Shared/EditorState.cpp +++ b/Source/WebKit2/Shared/EditorState.cpp @@ -42,6 +42,7 @@ void EditorState::encode(CoreIPC::ArgumentEncoder* encoder) const encoder->encode(hasComposition); #if ENABLE(TIZEN_ISF_PORT) + encoder->encode(inputMethodContextID); encoder->encode(inputMethodHints); encoder->encode(surroundingText); encoder->encode(cursorPosition); @@ -50,6 +51,14 @@ void EditorState::encode(CoreIPC::ArgumentEncoder* encoder) const #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION) 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 #if PLATFORM(QT) @@ -88,6 +97,9 @@ bool EditorState::decode(CoreIPC::ArgumentDecoder* decoder, EditorState& result) return false; #if ENABLE(TIZEN_ISF_PORT) + if (!decoder->decode(result.inputMethodContextID)) + return false; + if (!decoder->decode(result.inputMethodHints)) return false; @@ -104,6 +116,26 @@ bool EditorState::decode(CoreIPC::ArgumentDecoder* decoder, EditorState& result) if (!decoder->decode(result.updateEditorRectOnly)) 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 #if PLATFORM(QT)