Revert "Set data of emoji setting to keypad"

This reverts commit b7d08f4eef6ccaf1b78c37a773c07b3a8137e95d.

Conflicts:

	Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp

Change-Id: I0dee5a07eb3ee1c3b625e4ce59a4a2b5a6be7234

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index cf59bb4..507a5a2 100755 (executable)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -541,8 +541,6 @@
 #define ENABLE_TIZEN_2D_CANVAS_ZERO_GRADIENT 1 /* Rashmi Shyamasundar (rashmi.s2@samsung.com) : If the gradient size is zero, then the functions fillXXX/strokeXXX should paint nothing */
 #define ENABLE_TIZEN_CANVAS2D_FILLMAXWIDTH_NEGATIVE 1 /* Rashmi Shyamasundar(rashmi.s2@samsung.com) : Do not paint if maxwidth is zero */
 
-#define ENABLE_TIZEN_SUPPORT_EMOJI 1 /* Sangyong Park(sy302.park@samsung.com) : support emoji */
-
 /* JavaScript JIT */
 #if ENABLE(JIT)
 #define ENABLE_YARR 1

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index 5e7477a..1f146c7 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@ -818,11 +818,6 @@ void PageClientImpl::setInputMethodState(bool active, const String& type, const
 
     inputMethodContext->setType(type);
 
-#if ENABLE(TIZEN_SUPPORT_EMOJI)
-    if (type.isEmpty() && !value.isEmpty())
-        inputMethodContext->setIMData(value);
-#endif
-
     if (!hasFocus)
         return;
 

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index 47a1d0e..48fc39f 100755 (executable)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -483,54 +483,6 @@ void WebEditorClient::setInputMethodState(bool active)
             type = formControl->type();
             value = formControl->value();
         }
-#if ENABLE(TIZEN_SUPPORT_EMOJI)
-        else {
-            Element* element = frame->document()->focusedNode()->rootEditableElement();
-            StringBuilder builder;
-
-            if (equalIgnoringCase(element->getAttribute("emoji-allowemoji"), "true"))
-                builder.append("allowEmoji=true");
-
-            bool allowDecoEmoji = equalIgnoringCase(element->getAttribute("emoji-allowdecoemoji"), "true");
-            unsigned type = 1;
-            if (allowDecoEmoji && element->hasAttribute("emoji-accept")) {
-                Vector<String> list;
-                element->getAttribute("emoji-accept").string().split(",", list);
-
-                type = 0;
-                for (size_t i = 0; i < list.size(); ++i) {
-                    String typeString = list[i].stripWhiteSpace();
-                    if (typeString == "*/*") {
-                        type = 0xf;
-                        break;
-                    } else if (typeString == "picture/*")
-                        type |= 0x8;
-                    else if (typeString == "emoji/*")
-                        type |= 0x7;
-                    else if (typeString == "emoji/square")
-                        type |= 0x3;
-                    else if (typeString == "emoji/square20")
-                        type |= 0x1;
-                    else if (typeString == "emoji/square-not-20")
-                        type |= 0x2;
-                    else if (typeString == "emoji/rect")
-                        type |= 0x4;
-                }
-            }
-
-            if (allowDecoEmoji && type) {
-                if (!builder.isEmpty())
-                    builder.append("&");
-                builder.append("allowDecoEmoji=true");
-                if (type != 1) {
-                    builder.append("&emojiType=");
-                    builder.append(String::number(type));
-                }
-            }
-
-            value = builder.toString();
-        }
-#endif
     }
 
     m_page->send(Messages::WebPageProxy::SetInputMethodState(active, type, value));