Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1

5 files changed, 44 insertions, 12 deletions

diff --git a/WebCore/platform/efl/ClipboardEfl.cpp b/WebCore/platform/efl/ClipboardEfl.cpp
index 6ef51cf..1633ccb 100644
--- a/WebCore/platform/efl/ClipboardEfl.cpp
+++ b/WebCore/platform/efl/ClipboardEfl.cpp
@@ -27,11 +27,16 @@
 #include "StringHash.h"
 
 namespace WebCore {
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy)
+PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
 {
     return new ClipboardEfl(policy, false);
 }
 
+PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy, DragData*, Frame*)
+{
+    return 0;
+}
+
 ClipboardEfl::ClipboardEfl(ClipboardAccessPolicy policy, bool forDragging)
     : Clipboard(policy, forDragging)
 {
diff --git a/WebCore/platform/efl/DragDataEfl.cpp b/WebCore/platform/efl/DragDataEfl.cpp
index f6b446c..a8458d6 100644
--- a/WebCore/platform/efl/DragDataEfl.cpp
+++ b/WebCore/platform/efl/DragDataEfl.cpp
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "DragData.h"
 
-#include "Clipboard.h"
 #include "Document.h"
 #include "DocumentFragment.h"
 
@@ -61,11 +60,6 @@ Color DragData::asColor() const
     return Color();
 }
 
-PassRefPtr<Clipboard> DragData::createClipboard(ClipboardAccessPolicy) const
-{
-    return 0;
-}
-
 bool DragData::containsCompatibleContent() const
 {
     return false;
diff --git a/WebCore/platform/efl/FileSystemEfl.cpp b/WebCore/platform/efl/FileSystemEfl.cpp
index 31b2e22..cb117bc 100644
--- a/WebCore/platform/efl/FileSystemEfl.cpp
+++ b/WebCore/platform/efl/FileSystemEfl.cpp
@@ -42,7 +42,9 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <fnmatch.h>
+#if ENABLE(GLIB_SUPPORT)
 #include <glib.h> // TODO: remove me after following TODO is solved.
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -55,13 +57,13 @@ CString fileSystemRepresentation(const String& path)
 {
 // WARNING: this is just used by platform/network/soup, thus must be GLIB!!!
 // TODO: move this to CString and use it instead in both, being more standard
-#if PLATFORM(WIN_OS)
-    return path.utf8();
-#else
+#if !PLATFORM(WIN_OS) && defined(WTF_USE_SOUP)
     char* filename = g_uri_unescape_string(path.utf8().data(), 0);
     CString cfilename(filename);
     g_free(filename);
     return cfilename;
+#else
+    return path.utf8();
 #endif
 }
 
diff --git a/WebCore/platform/efl/LoggingEfl.cpp b/WebCore/platform/efl/LoggingEfl.cpp
index 1829c80..55de765 100644
--- a/WebCore/platform/efl/LoggingEfl.cpp
+++ b/WebCore/platform/efl/LoggingEfl.cpp
@@ -23,10 +23,41 @@
 #include "config.h"
 #include "Logging.h"
 
+#include "PlatformString.h"
+#include <Eina.h>
+
 namespace WebCore {
 
 void InitializeLoggingChannelsIfNecessary()
 {
+    static bool didInitializeLoggingChannels = false;
+    if (didInitializeLoggingChannels)
+        return;
+
+    didInitializeLoggingChannels = true;
+
+    char* logEnv = getenv("WEBKIT_DEBUG");
+    if (!logEnv)
+        return;
+
+#if defined(NDEBUG)
+    EINA_LOG_WARN("WEBKIT_DEBUG is not empty, but this is a release build. Notice that many log messages will only appear in a debug build.");
+#endif
+
+    char** logv = eina_str_split(logEnv, ",", -1);
+
+    EINA_SAFETY_ON_NULL_RETURN(logv);
+
+    for (int i = 0; logv[i]; i++) {
+        if (WTFLogChannel* channel = getChannelFromName(logv[i]))
+            channel->state = WTFLogChannelOn;
+    }
+
+    free(*logv);
+    free(logv);
+
+    // To disable logging notImplemented set the DISABLE_NI_WARNING
+    // environment variable to 1.
     LogNotYetImplemented.state = WTFLogChannelOn;
 }
 
diff --git a/WebCore/platform/efl/WidgetEfl.cpp b/WebCore/platform/efl/WidgetEfl.cpp
index 6dbf2c2..d82e99e 100644
--- a/WebCore/platform/efl/WidgetEfl.cpp
+++ b/WebCore/platform/efl/WidgetEfl.cpp
@@ -222,8 +222,8 @@ void Widget::applyFallbackCursor()
         return;
     }
 #endif
-    LOG("Ooops, no fallback to set cursor %s!\n",
-        m_data->m_cursorGroup.utf8().data());
+    LOG_ERROR("Ooops, no fallback to set cursor %s!\n",
+              m_data->m_cursorGroup.utf8().data());
 }
 
 void Widget::applyCursor()