Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

9 files changed, 218 insertions, 910 deletions

diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 7b5865b..2ea5ee5 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -24,10 +24,10 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
 IF (ENABLE_VIDEO)
 LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/gstreamer"
-    ${Gstreamer-App_INCLUDE_DIRS}
-    ${Gstreamer-Interfaces_INCLUDE_DIRS}
-    ${Gstreamer-Pbutils_INCLUDE_DIRS}
-    ${Gstreamer-Video_INCLUDE_DIRS}
+    ${GStreamer-App_INCLUDE_DIRS}
+    ${GStreamer-Interfaces_INCLUDE_DIRS}
+    ${GStreamer-Pbutils_INCLUDE_DIRS}
+    ${GStreamer-Video_INCLUDE_DIRS}
 )
 ENDIF()
 
@@ -70,6 +70,7 @@ IF (ENABLE_GLIB_SUPPORT)
   LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     ${Gdk_INCLUDE_DIRS}
     ${Glib_INCLUDE_DIRS}
+    ${JAVASCRIPTCORE_DIR}/wtf/gobject
   )
   LIST(APPEND WebKit_LIBRARIES
     ${Glib_LIBRARIES}
@@ -158,54 +159,10 @@ ADD_CUSTOM_COMMAND(
   VERBATIM
 )
 
-SET(EWebLauncher_SOURCES
-    efl/DefaultTheme/default.edj
-    efl/EWebLauncher/main.c
-)
-
-SET(EWebLauncher_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit_LIBRARY_NAME}
-    ${Cairo_LIBRARIES}
-    ${ECORE_X_LIBRARIES}
-    ${EDJE_LIBRARIES}
-    ${EFLDEPS_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES}
-    ${SQLITE_LIBRARIES}
-)
-
-SET(EWebLauncher_LINK_FLAGS
-    ${ECORE_X_LDFLAGS}
-    ${EDJE_LDFLAGS}
-    ${EFLDEPS_LDFLAGS}
-    ${EVAS_LDFLAGS}
+LIST(APPEND WebKit_SOURCES
+     ${WebKit_THEME}
 )
 
-IF (ENABLE_GLIB_SUPPORT)
-  LIST(APPEND EWebLauncher_LIBRARIES
-    ${Gdk_LIBRARIES}
-    ${Glib_LIBRARIES}
-    ${Gthread_LIBRARIES}
-  )
-ENDIF ()
-
-IF (WTF_USE_SOUP)
-  LIST(APPEND EWebLauncher_LIBRARIES ${LIBSOUP24_LIBRARIES})
-  LIST(APPEND EWebLauncher_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
-ENDIF ()
-
-IF (WTF_USE_CURL)
-  LIST(APPEND EWebLauncher_LIBRARIES ${CURL_LIBRARIES})
-  LIST(APPEND EWebLauncher_LINK_FLAGS ${CURL_LDFLAGS})
-ENDIF ()
-
-ADD_EXECUTABLE(../Programs/EWebLauncher ${EWebLauncher_SOURCES})
-TARGET_LINK_LIBRARIES(../Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
-ADD_TARGET_PROPERTIES(../Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
-
 IF (SHARED_CORE)
     SET(LIBS_PRIVATE "-l${WTF_LIBRARY_NAME} -l${JavaScriptCore_LIBRARY_NAME} -l${WebCore_LIBRARY_NAME}")
 ELSE ()
@@ -225,4 +182,7 @@ FILE(GLOB EWebKit_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/*.h")
 LIST(REMOVE_ITEM EWebKit_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_private.h")
 
 INSTALL(FILES ${EWebKit_HEADERS}
-        DESTINATION include/EWebKit)
+        DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
+
+INSTALL(FILES ${WebKit_THEME}
+        DESTINATION share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}/themes)
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index bafa48d..e805d2c 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,138 @@
+2010-09-08  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Move functions from Frame to Editor as planned
+        https://bugs.webkit.org/show_bug.cgi?id=45218
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_editable_set):
+        (ewk_frame_selection_get):
+        (ewk_frame_text_search):
+        (ewk_frame_text_matches_mark):
+        (ewk_frame_text_matches_highlight_set):
+        (ewk_frame_text_matches_highlight_get):
+        * ewk/ewk_view.cpp:
+        (ewk_view_selection_get):
+        Changed call sites to use editor().
+
+2010-09-09  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL] Fix duplicate gstreamer macro in CMakeListEfl.txt
+        https://bugs.webkit.org/show_bug.cgi?id=45433
+
+        In WebKit/efl/CMakeListEfl.txt, duplicated ENABLE_VIDEO macros were added.
+        So, unnecessary ENABLE_VIDEO macro is deleted.
+
+        * CMakeListsEfl.txt:
+
+2010-09-08  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL] Need to add custom dependencies.
+        https://bugs.webkit.org/show_bug.cgi?id=45247
+
+        Add WebKit_Theme into WebKit_SOURCES to make it while building.
+
+        * CMakeListsEfl.txt:
+
+2010-09-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Export data directory through pkg-config
+        https://bugs.webkit.org/show_bug.cgi?id=45385
+
+        Using pkg-config it's possible for a browser to know the location of
+        installed themes. When compiling the browser, a variable might be
+        defined with the datadir, like below:
+
+        gcc -o browser browser.c $(pkg-config --libs --cflags ewebkit) \
+           -DEWEBKIT_DATA_DIR=$(pkg-config --variable=datadir)
+
+        * ewebkit.pc.in: Export datadir variable.
+
+2010-09-06  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL] REGRESSION(66794) Need to fix build break.
+        https://bugs.webkit.org/show_bug.cgi?id=45241
+
+        Add dummy class(FrameNetworkingContextEfl) like GTK+ port and implement
+        as EFL style.
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::createNetworkingContext):
+        * WebCoreSupport/FrameNetworkingContextEfl.h: Added.
+        (WebCore::FrameNetworkingContextEfl::create):
+        (WebCore::FrameNetworkingContextEfl::coreFrame):
+        (WebCore::FrameNetworkingContextEfl::FrameNetworkingContextEfl):
+
+2010-09-04  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Move test browser to WebKitTools directory
+        https://bugs.webkit.org/show_bug.cgi?id=45212
+
+        Follow other ports like QT and GTK which moved the test browser to
+        WebKitTools directory.
+
+        * CMakeListsEfl.txt: Remove build for test browser.
+        * EWebLauncher/main.c: Removed.
+
+2010-09-03  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Darin Adler.
+
+        Add NetworkingContext to avoid layer violations
+        https://bugs.webkit.org/show_bug.cgi?id=42292
+
+        Add createNetworkingContext to EFL's FrameLoaderClient.
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::createNetworkingContext):
+        * WebCoreSupport/FrameLoaderClientEfl.h:
+
+2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Martin Robinson.
+
+        [EFL] Regression (66531) Build break with Glib Support
+        https://bugs.webkit.org/show_bug.cgi?id=45011
+
+        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
+        since when glib is enabled, EFL port needs it, too.
+
+        * CMakeListsEfl.txt: Include gobject directory to find new header
+        file.
+
+2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Install default theme
+        https://bugs.webkit.org/show_bug.cgi?id=45154
+
+        Since a theme is needed in order to create a new browser, install the
+        default one to serve as example and fall-back.
+
+        * CMakeListsEfl.txt:
+
+2010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Name install directories according to library name
+        https://bugs.webkit.org/show_bug.cgi?id=45126
+
+        * CMakeListsEfl.txt: include diretory follows library name.
+        * ewebkit.pc.in: Ditto.
+
 2010-08-31  Dave Hyatt  <hyatt@apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/efl/EWebLauncher/main.c b/WebKit/efl/EWebLauncher/main.c
deleted file mode 100644
index c1956a2..0000000
--- a/WebKit/efl/EWebLauncher/main.c
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
- * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
- * Copyright (C) 2009, 2010 ProFUSION embedded systems
- * Copyright (C) 2009, 2010 Samsung Electronics
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "EWebKit.h"
-
-#include <ctype.h>
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <Ecore_File.h>
-#include <Ecore_Getopt.h>
-#include <Ecore_X.h>
-#include <Edje.h>
-#include <Evas.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define DEFAULT_WIDTH      800
-#define DEFAULT_HEIGHT     600
-#define DEFAULT_ZOOM_INIT  1.0
-
-#define info(format, args...)       \
-    do {                            \
-        if (verbose)                \
-            printf(format, ##args); \
-    } while (0)
-
-#define MIN_ZOOM_LEVEL 0
-#define DEFAULT_ZOOM_LEVEL 5
-#define MAX_ZOOM_LEVEL 13
-
-static int currentZoomLevel = DEFAULT_ZOOM_LEVEL;
-
-// the zoom values are chosen to be like in Mozilla Firefox 3
-static int zoomLevels[] = {30, 50, 67, 80, 90,
-                            100,
-                            110, 120, 133, 150, 170, 200, 240, 300};
-
-static int verbose = 0;
-
-static Eina_List *windows = NULL;
-
-static char *themePath = NULL;
-
-typedef struct _Window_Properties {
-    Eina_Bool toolbarsVisible:1;
-    Eina_Bool statusbarVisible:1;
-    Eina_Bool scrollbarsVisible:1;
-    Eina_Bool menubarVisible:1;
-} Window_Properties;
-
-Window_Properties windowProperties = { /* Pretend we have them and they are initially visible */
-    EINA_TRUE,
-    EINA_TRUE,
-    EINA_TRUE,
-    EINA_TRUE
-};
-
-static const Ecore_Getopt options = {
-    "EWebLauncher",
-    "%prog [options] [url]",
-    "0.0.1",
-    "(C)2008 INdT (The Nokia Technology Institute)\n"
-    "(C)2009, 2010 ProFUSION embedded systems\n"
-    "(C)2009, 2010 Samsung Electronics",
-    "GPL",
-    "Test Web Browser using the Enlightenment Foundation Libraries of WebKit",
-    EINA_TRUE, {
-        ECORE_GETOPT_STORE_STR
-            ('e', "engine", "ecore-evas engine to use."),
-        ECORE_GETOPT_CALLBACK_NOARGS
-            ('E', "list-engines", "list ecore-evas engines.",
-             ecore_getopt_callback_ecore_evas_list_engines, NULL),
-        ECORE_GETOPT_STORE_DEF_BOOL
-            ('F', "fullscreen", "fullscreen mode.", 0),
-        ECORE_GETOPT_CALLBACK_ARGS
-            ('g', "geometry", "geometry to use in x:y:w:h form.", "X:Y:W:H",
-             ecore_getopt_callback_geometry_parse, NULL),
-        ECORE_GETOPT_STORE_STR
-            ('t', "theme", "path to read the theme file from."),
-        ECORE_GETOPT_STORE_STR
-            ('U', "user-agent", "custom user agent string to use."),
-        ECORE_GETOPT_STORE_DEF_BOOL
-            ('S', "sudo-workaround", "Workaround mode for making Flash work with sudo.", 0),
-        ECORE_GETOPT_COUNT
-            ('v', "verbose", "be more verbose."),
-        ECORE_GETOPT_VERSION
-            ('V', "version"),
-        ECORE_GETOPT_COPYRIGHT
-            ('R', "copyright"),
-        ECORE_GETOPT_LICENSE
-            ('L', "license"),
-        ECORE_GETOPT_HELP
-            ('h', "help"),
-        ECORE_GETOPT_SENTINEL
-    }
-};
-
-typedef struct _Viewport {
-    int w;
-    int h;
-    float initScale;
-    float minScale;
-    float maxScale;
-    Eina_Bool userScalable;
-} Viewport;
-
-typedef struct _ELauncher {
-    Ecore_Evas *ee;
-    Evas *evas;
-    Evas_Object *bg;
-    Evas_Object *browser;
-    const char *theme;
-    const char *userAgent;
-    Viewport viewport;
-} ELauncher;
-
-static void browserDestroy(Ecore_Evas *ee);
-static void closeWindow(Ecore_Evas *ee);
-static int browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen);
-
-static void
-print_history(Eina_List *list)
-{
-    Eina_List *l;
-    void *d;
-
-    if (!verbose)
-       return;
-
-    printf("Session history contains:\n");
-
-    EINA_LIST_FOREACH(list, l, d) {
-       Ewk_History_Item *item = (Ewk_History_Item*)d;
-       cairo_surface_t *cs = ewk_history_item_icon_surface_get(item);
-       char buf[PATH_MAX];
-       int s = snprintf(buf, sizeof(buf), "/tmp/favicon-%s.png", ewk_history_item_uri_original_get(item));
-       for (s--; s >= (int)sizeof("/tmp/favicon-"); s--) {
-           if (!isalnum(buf[s]) && buf[s] != '.')
-               buf[s] = '_';
-       }
-       cs = ewk_history_item_icon_surface_get(item);
-
-       if (cs && cairo_surface_status(cs) == CAIRO_STATUS_SUCCESS)
-           cairo_surface_write_to_png(cs, buf);
-       else
-           buf[0] = '\0';
-
-       printf("* '%s' title='%s' icon='%s'\n",
-              ewk_history_item_uri_original_get(item),
-              ewk_history_item_title_get(item), buf);
-    }
-}
-
-static void
-zoom_level_set(Evas_Object *webview, int level)
-{
-    float factor = ((float) zoomLevels[level]) / 100.0;
-    Evas_Coord ox, oy, mx, my, cx, cy;
-    evas_pointer_canvas_xy_get(evas_object_evas_get(webview), &mx, &my);
-    evas_object_geometry_get(webview, &ox, &oy, NULL, NULL);
-    cx = mx - ox;
-    cy = my - oy;
-    ewk_view_zoom_animated_set(webview, factor, 0.5, cx, cy);
-}
-
-static void
-on_ecore_evas_resize(Ecore_Evas *ee)
-{
-    Evas_Object *webview;
-    Evas_Object *bg;
-    int w, h;
-
-    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-
-    bg = evas_object_name_find(ecore_evas_get(ee), "bg");
-    evas_object_move(bg, 0, 0);
-    evas_object_resize(bg, w, h);
-
-    webview = evas_object_name_find(ecore_evas_get(ee), "browser");
-    evas_object_move(webview, 10, 10);
-    evas_object_resize(webview, w - 20, h - 20);
-}
-
-static void
-title_set(Ecore_Evas *ee, const char *title, int progress)
-{
-    const char *appname = "EFL Test Launcher";
-    const char *separator = " - ";
-    char label[4096];
-    int size;
-
-    if (!title || !strcmp(title, "")) {
-        ecore_evas_title_set(ee, appname);
-        return;
-    }
-
-    if (progress < 100)
-        size = snprintf(label, sizeof(label), "%s (%d%%)%s%s", title, progress, separator, appname);
-    else
-        size = snprintf(label, sizeof(label), "%s %s%s", title, separator, appname);
-
-    if (size >= (int)sizeof(label))
-        return;
-
-    ecore_evas_title_set(ee, label);
-}
-
-/**
- * This is en example function to adjust viewport via viewport tag's arguments.
- * Application can invoke this function in order to adjust viewport tag when it is required.
- */
-static void
-viewport_set()
-{
-    ELauncher *app;
-    app = (ELauncher*) eina_list_data_get(windows);
-
-    ewk_view_fixed_layout_size_set(app->browser, app->viewport.w, app->viewport.h);
-    ewk_view_zoom_set(app->browser, app->viewport.initScale, 0, 0);
-    if (!ewk_view_zoom_range_set(app->browser, app->viewport.minScale, app->viewport.maxScale))
-        info(" Fail to set zoom range. minScale = %f, maxScale = %f\n", app->viewport.minScale, app->viewport.maxScale);
-    ewk_view_user_scalable_set(app->browser, app->viewport.userScalable);
-}
-
-static void
-on_title_changed(void *user_data, Evas_Object *webview, void *event_info)
-{
-    ELauncher *app = (ELauncher *)user_data;
-    const char *title = (const char *)event_info;
-
-    title_set(app->ee, title, 100);
-}
-
-static void
-on_progress(void *user_data, Evas_Object *webview, void *event_info)
-{
-    ELauncher *app = (ELauncher *)user_data;
-    double *progress = (double *)event_info;
-
-    title_set(app->ee, ewk_view_title_get(app->browser), *progress * 100);
-}
-
-static void
-on_load_finished(void *user_data, Evas_Object *webview, void *event_info)
-{
-    const Ewk_Frame_Load_Error *err = (const Ewk_Frame_Load_Error *)event_info;
-
-    if (!err)
-        info("Succeeded loading page.\n");
-    else if (err->is_cancellation)
-        info("Load was cancelled.\n");
-    else
-        info("Failed loading page: %d %s \"%s\", url=%s\n",
-             err->code, err->domain, err->description, err->failing_url);
-}
-
-static void
-on_toolbars_visible_set(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    if (*visible) {
-        info("Toolbars visible changed: show");
-        windowProperties.toolbarsVisible = EINA_TRUE;
-    } else {
-        info("Toolbars visible changed: hide");
-        windowProperties.toolbarsVisible = EINA_FALSE;
-    }
-}
-
-static void
-on_toolbars_visible_get(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    *visible = windowProperties.toolbarsVisible;
-}
-
-static void
-on_statusbar_visible_set(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    if (*visible) {
-        info("Statusbar visible changed: show");
-        windowProperties.statusbarVisible = EINA_TRUE;
-    } else {
-        info("Statusbar visible changed: hide");
-        windowProperties.statusbarVisible = EINA_FALSE;
-    }
-}
-
-static void
-on_statusbar_visible_get(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    *visible = windowProperties.statusbarVisible;
-}
-
-static void
-on_scrollbars_visible_set(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    if (*visible) {
-        info("Scrollbars visible changed: show");
-        windowProperties.scrollbarsVisible = EINA_TRUE;
-    } else {
-        info("Scrollbars visible changed: hide");
-        windowProperties.scrollbarsVisible = EINA_FALSE;
-    }
-}
-
-static void
-on_scrollbars_visible_get(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    *visible = windowProperties.scrollbarsVisible;
-}
-
-static void
-on_menubar_visible_set(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    if (*visible) {
-        info("Menubar visible changed: show");
-        windowProperties.menubarVisible = EINA_TRUE;
-    } else {
-        info("Menubar visible changed: hide");
-        windowProperties.menubarVisible = EINA_FALSE;
-    }
-}
-
-static void
-on_menubar_visible_get(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool *visible = (Eina_Bool *)event_info;
-    *visible = windowProperties.menubarVisible;
-}
-
-static void
-on_tooltip_text_set(void* user_data, Evas_Object* webview, void* event_info)
-{
-    const char *text = (const char *)event_info;
-    if (text && *text != '\0')
-        info("%s\n", text);
-}
-
-static void
-on_inputmethod_changed(void* user_data, Evas_Object* webview, void* event_info)
-{
-    Eina_Bool active = (Eina_Bool)(long)event_info;
-    unsigned int imh;
-    info("Keyboard changed: %d\n", active);
-
-    if (!active)
-        return;
-
-    imh = ewk_view_imh_get(webview);
-    info("    Keyboard flags: %#.2x\n", imh);
-
-}
-
-/**
- * "viewport,changed" signal will be always emitted regardless of the viewport existence.
- *
- * If you don't want to process the viewport tag, you can either do nothing in this callback
- * or simply ignore the signal in your application.
- * 
- * More information about this can be found at http://developer.apple.com/safari/library/docum
- * entation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html
- */
-static void
-on_viewport_changed(void* user_data, Evas_Object* webview, void* event_info)
-{
-    ELauncher *app = (ELauncher *)user_data;
-
-    float w, h, initScale, minScale, maxScale, userScalable;
-
-    ewk_view_viewport_get(webview, &w, &h, &initScale, &maxScale, &minScale, &userScalable);
-
-    /**
-     * If there is no argument in viewport tag, argument's value is -1.
-     */
-    if ((int)w == -1)
-        w = DEFAULT_WIDTH;
-    if ((int)h == -1)
-        h = DEFAULT_HEIGHT;
-    if ((int)initScale == -1)
-        initScale = DEFAULT_ZOOM_INIT; // There's no scale separated from zooming in webkit-efl.
-    if ((int)minScale == -1)
-        minScale = ewk_view_zoom_range_min_get(webview);
-    if ((int)maxScale == -1)
-        maxScale = ewk_view_zoom_range_max_get(webview);
-    if ((int)userScalable == -1)
-        userScalable = EINA_TRUE;
-
-    app->viewport.w = (int)w;
-    app->viewport.h = (int)h;
-    app->viewport.initScale = initScale;
-    app->viewport.minScale = minScale;
-    app->viewport.maxScale = maxScale;
-    app->viewport.userScalable = (Eina_Bool)userScalable;
-    viewport_set();
-}
-
-static void
-on_mouse_down(void* data, Evas* e, Evas_Object* webview, void* event_info)
-{
-    Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down*) event_info;
-    if (ev->button == 2)
-        evas_object_focus_set(webview, !evas_object_focus_get(webview));
-}
-
-static void
-on_focus_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-    info("the webview lost keyboard focus\n");
-}
-
-static void
-on_focus_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-    info("the webview gained keyboard focus\n");
-}
-
-static void
-on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-    Evas_Coord w, h;
-    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-    ewk_view_fixed_layout_size_set(obj, w, h);
-}
-
-static void
-on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-    Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*) event_info;
-    ELauncher *app = data;
-    static const char *encodings[] = {
-        "ISO-8859-1",
-        "UTF-8",
-        NULL
-    };
-    static int currentEncoding = -1;
-
-    if (!strcmp(ev->key, "Escape")) {
-        closeWindow(app->ee);
-    } else if (!strcmp(ev->key, "F1")) {
-        info("Back (F1) was pressed\n");
-        if (ewk_view_back_possible(obj)) {
-            Ewk_History *history = ewk_view_history_get(obj);
-            Eina_List *list = ewk_history_back_list_get(history);
-            print_history(list);
-            ewk_history_item_list_free(list);
-            ewk_view_back(obj);
-        } else
-            info("Back ignored: No back history\n");
-    } else if (!strcmp(ev->key, "F2")) {
-        info("Forward (F2) was pressed\n");
-        if (ewk_view_forward_possible(obj)) {
-            Ewk_History *history = ewk_view_history_get(obj);
-            Eina_List *list = ewk_history_forward_list_get(history);
-            print_history(list);
-            ewk_history_item_list_free(list);
-            ewk_view_forward(obj);
-        } else
-            info("Forward ignored: No forward history\n");
-    } else if (!strcmp(ev->key, "F3")) {
-        currentEncoding++;
-        currentEncoding %= (sizeof(encodings) / sizeof(encodings[0]));
-        info("Set encoding (F3) pressed. New encoding to %s", encodings[currentEncoding]);
-        ewk_view_setting_encoding_custom_set(obj, encodings[currentEncoding]);
-    } else if (!strcmp(ev->key, "F4")) {
-        Evas_Object *frame = ewk_view_frame_main_get(obj);
-        Evas_Coord x, y;
-        Ewk_Hit_Test *ht;
-
-        evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
-        ht = ewk_frame_hit_test_new(frame, x, y);
-        if (!ht)
-            printf("No hit test returned for point %d,%d\n", x, y);
-        else {
-            printf("Hit test for point %d,%d\n"
-                   "  pos=%3d,%3d\n"
-                   "  bounding_box=%d,%d + %dx%d\n"
-                   "  title='%s'\n"
-                   "  alternate_text='%s'\n"
-                   "  frame=%p (%s)\n"
-                   "  link {\n"
-                   "    text='%s'\n"
-                   "    url='%s'\n"
-                   "    title='%s'\n"
-                   "    target frame=%p (%s)\n"
-                   "  }\n"
-                   "  flags {\n"
-                   "    editable=%hhu\n"
-                   "    selected=%hhu\n"
-                   "  }\n",
-                   x, y,
-                   ht->x, ht->y,
-                   ht->bounding_box.x, ht->bounding_box.y, ht->bounding_box.w, ht->bounding_box.h,
-                   ht->title,
-                   ht->alternate_text,
-                   ht->frame, evas_object_name_get(ht->frame),
-                   ht->link.text,
-                   ht->link.url,
-                   ht->link.title,
-                   ht->link.target_frame, evas_object_name_get(ht->link.target_frame),
-                   ht->flags.editable,
-                   ht->flags.selected);
-            ewk_frame_hit_test_free(ht);
-        }
-
-    } else if (!strcmp(ev->key, "F5")) {
-        info("Reload (F5) was pressed, reloading.\n");
-        ewk_view_reload(obj);
-    } else if (!strcmp(ev->key, "F6")) {
-        info("Stop (F6) was pressed, stop loading.\n");
-        ewk_view_stop(obj);
-    /* } FIXME: uncomment code below after Bug 18662 lands upstream.
-    else if (!strcmp(ev->key, "F12")) {
-        bool status = ewk_webframe_object_keyboard_navigation_get(page);
-        ewk_webframe_object_keyboard_navigation_set(page, !status);
-        info("Command::keyboard navigation toggle\n");*/
-    } else if (!strcmp(ev->key, "F7")) {
-        info("Zoom out (F7) was pressed.\n");
-        if (currentZoomLevel > MIN_ZOOM_LEVEL)
-            zoom_level_set(obj, --currentZoomLevel);
-    } else if (!strcmp(ev->key, "F8")) {
-        info("Zoom in (F8) was pressed.\n");
-        if (currentZoomLevel < MAX_ZOOM_LEVEL)
-            zoom_level_set(obj, ++currentZoomLevel);
-    } else if (!strcmp(ev->key, "F9")) {
-        info("Create new window (F9) was pressed.\n");
-        Eina_Rectangle geometry = {0, 0, 0, 0};
-        browserCreate("http://www.google.com",
-                       app->theme, app->userAgent, geometry, NULL, 0);
-    } else if (!strcmp(ev->key, "F10")) {
-        Evas_Coord x, y, w, h;
-        Evas_Object *frame = ewk_view_frame_main_get(obj);
-        float zoom = zoomLevels[currentZoomLevel] / 100.0;
-
-        ewk_frame_visible_content_geometry_get(frame, EINA_FALSE, &x, &y, &w, &h);
-        x -= w;
-        y -= h;
-        w *= 4;
-        h *= 4;
-        info("Pre-render %d,%d + %dx%d\n", x, y, w, h);
-        ewk_view_pre_render_region(obj, x, y, w, h, zoom);
-    }
-}
-
-static void
-on_browser_del(void *data, Evas *evas, Evas_Object *browser, void *event)
-{
-    ELauncher *app = (ELauncher*) data;
-
-    evas_object_event_callback_del(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down);
-    evas_object_event_callback_del(app->browser, EVAS_CALLBACK_MOUSE_DOWN, on_mouse_down);
-    evas_object_event_callback_del(app->browser, EVAS_CALLBACK_FOCUS_IN, on_focus_in);
-    evas_object_event_callback_del(app->browser, EVAS_CALLBACK_FOCUS_OUT, on_focus_out);
-    evas_object_event_callback_del(app->browser, EVAS_CALLBACK_DEL, on_browser_del);
-}
-
-static void
-on_closeWindow(Ecore_Evas *ee)
-{
-    browserDestroy(ee);
-}
-
-static int
-quit(Eina_Bool success, const char *msg)
-{
-    edje_shutdown();
-    ecore_evas_shutdown();
-
-    if (msg)
-        fputs(msg, (success) ? stdout : stderr);
-
-    free(themePath);
-
-    if (!success)
-        return EXIT_FAILURE;
-
-    return EXIT_SUCCESS;
-}
-
-static int
-browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen)
-{
-    if ((geometry.w <= 0) && (geometry.h <= 0)) {
-        geometry.w = DEFAULT_WIDTH;
-        geometry.h = DEFAULT_HEIGHT;
-    }
-
-    ELauncher *app = (ELauncher*) malloc(sizeof(ELauncher));
-    if (!app)
-        return quit(EINA_FALSE, "ERROR: could not create EWebLauncher window\n");
-
-    app->ee = ecore_evas_new(engine, 0, 0, geometry.w, geometry.h, NULL);
-
-    if (!app->ee)
-        return quit(EINA_FALSE, "ERROR: could not construct evas-ecore\n");
-
-    if (isFullscreen)
-        ecore_evas_fullscreen_set(app->ee, EINA_TRUE);
-
-    ecore_evas_title_set(app->ee, "EFL Test Launcher");
-    ecore_evas_callback_resize_set(app->ee, on_ecore_evas_resize);
-    ecore_evas_callback_delete_request_set(app->ee, closeWindow);
-
-    app->evas = ecore_evas_get(app->ee);
-
-    if (!app->evas)
-        return quit(EINA_FALSE, "ERROR: could not get evas from evas-ecore\n");
-
-    if (!theme)
-        theme = themePath;
-
-    app->theme = theme;
-    app->userAgent = userAgent;
-
-    app->bg = evas_object_rectangle_add(app->evas);
-    evas_object_name_set(app->bg, "bg");
-    evas_object_color_set(app->bg, 255, 0, 255, 255);
-    evas_object_move(app->bg, 0, 0);
-    evas_object_resize(app->bg, geometry.w, geometry.h);
-    evas_object_layer_set(app->bg, EVAS_LAYER_MIN);
-    evas_object_show(app->bg);
-    app->browser = ewk_view_single_add(app->evas);
-
-    ewk_view_theme_set(app->browser, theme);
-    if (userAgent)
-        ewk_view_setting_user_agent_set(app->browser, userAgent);
-    evas_object_name_set(app->browser, "browser");
-
-    evas_object_smart_callback_add(app->browser, "title,changed", on_title_changed, app);
-    evas_object_smart_callback_add(app->browser, "load,progress", on_progress, app);
-    evas_object_smart_callback_add(app->browser, "load,finished", on_load_finished, app);
-    evas_object_smart_callback_add(app->browser, "viewport,changed", on_viewport_changed, app);
-
-    evas_object_smart_callback_add(app->browser, "toolbars,visible,set", on_toolbars_visible_set, app);
-    evas_object_smart_callback_add(app->browser, "toolbars,visible,get", on_toolbars_visible_get, app);
-    evas_object_smart_callback_add(app->browser, "statusbar,visible,set", on_statusbar_visible_set, app);
-    evas_object_smart_callback_add(app->browser, "statusbar,visible,get", on_statusbar_visible_get, app);
-    evas_object_smart_callback_add(app->browser, "scrollbars,visible,set", on_scrollbars_visible_set, app);
-    evas_object_smart_callback_add(app->browser, "scrollbars,visible,get", on_scrollbars_visible_get, app);
-    evas_object_smart_callback_add(app->browser, "menubar,visible,set", on_menubar_visible_set, app);
-    evas_object_smart_callback_add(app->browser, "menubar,visible,get", on_menubar_visible_get, app);
-    evas_object_smart_callback_add(app->browser, "tooltip,text,set", on_tooltip_text_set, app);
-    evas_object_smart_callback_add(app->browser, "inputmethod,changed", on_inputmethod_changed, app);
-
-/*     ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */
-
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_RESIZE, on_resized, app);
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app);
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_MOUSE_DOWN, on_mouse_down, app);
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_FOCUS_IN, on_focus_in, app);
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_FOCUS_OUT, on_focus_out, app);
-    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_DEL, on_browser_del, app);
-
-    evas_object_move(app->browser, 10, 10);
-    evas_object_resize(app->browser, geometry.w - 20, geometry.h - 20);
-
-    if (url && (url[0] != '\0'))
-        ewk_view_uri_set(app->browser, url);
-
-    evas_object_show(app->browser);
-    ecore_evas_show(app->ee);
-
-    evas_object_focus_set(app->browser, EINA_TRUE);
-
-    windows = eina_list_append(windows, app);
-
-    return 1;
-}
-
-static void
-browserDestroy(Ecore_Evas *ee)
-{
-    ecore_evas_free(ee);
-    if (!eina_list_count(windows))
-        ecore_main_loop_quit();
-}
-
-static void
-closeWindow(Ecore_Evas *ee)
-{
-    Eina_List *l;
-    void *app;
-    EINA_LIST_FOREACH(windows, l, app)
-    {
-        if (((ELauncher*) app)->ee == ee)
-            break;
-    }
-    windows = eina_list_remove(windows, app);
-    browserDestroy(ee);
-    free(app);
-}
-
-static Eina_Bool
-main_signal_exit(void *data, int ev_type, void *ev)
-{
-    ELauncher *app;
-    while (windows) {
-        app = (ELauncher*) eina_list_data_get(windows);
-        ecore_evas_free(app->ee);
-        windows = eina_list_remove(windows, app);
-    }
-    if (!eina_list_count(windows))
-        ecore_main_loop_quit();
-    return EINA_TRUE;
-}
-
-static char *
-findThemePath(void)
-{
-    const char **itr, *locations[] = {
-        "./default.edj",
-        "./WebKit/efl/DefaultTheme/default.edj",
-        "../WebKit/efl/DefaultTheme/default.edj",
-        DATA_DIR"/themes/default.edj",
-        NULL
-    };
-
-    for (itr = locations; *itr; itr++) {
-        struct stat st;
-        if (!stat(*itr, &st)) {
-            char path[PATH_MAX];
-            if (realpath(*itr, path))
-                return strdup(path);
-        }
-    }
-
-    return NULL;
-}
-
-int
-main(int argc, char *argv[])
-{
-    const char *default_url = "http://www.google.com/";
-
-    Eina_Rectangle geometry = {0, 0, 0, 0};
-    char *url = NULL;
-    char *userAgent = NULL;
-    const char *tmp;
-    const char *proxyUri;
-    char path[PATH_MAX];
-
-    char *engine = NULL;
-    char *theme = NULL;
-
-    unsigned char quitOption = 0;
-    unsigned char isFullscreen = 0;
-    unsigned char sudoWorkaround = 0;
-    int args;
-
-    Ecore_Getopt_Value values[] = {
-        ECORE_GETOPT_VALUE_STR(engine),
-        ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_BOOL(isFullscreen),
-        ECORE_GETOPT_VALUE_PTR_CAST(geometry),
-        ECORE_GETOPT_VALUE_STR(theme),
-        ECORE_GETOPT_VALUE_STR(userAgent),
-        ECORE_GETOPT_VALUE_BOOL(sudoWorkaround),
-        ECORE_GETOPT_VALUE_INT(verbose),
-        ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_NONE
-    };
-
-    if (!ecore_evas_init())
-        return EXIT_FAILURE;
-
-    if (!edje_init()) {
-        ecore_evas_shutdown();
-        return EXIT_FAILURE;
-    }
-
-    ecore_app_args_set(argc, (const char**) argv);
-    args = ecore_getopt_parse(&options, values, argc, argv);
-
-    if (args < 0)
-       return quit(EINA_FALSE, "ERROR: could not parse options.\n");
-
-    if (quitOption)
-        return quit(EINA_TRUE, NULL);
-
-    if (args < argc)
-        url = argv[args];
-    else
-        url = (char*) default_url;
-
-    if (sudoWorkaround)
-        strcat(getenv("HOME"), "blah");
-
-    themePath = findThemePath();
-
-    ewk_init();
-    tmp = getenv("TMPDIR");
-    if (!tmp)
-        tmp = "/tmp";
-    snprintf(path, sizeof(path), "%s/.ewebkit-%u", tmp, getuid());
-    ecore_file_mkpath(path);
-    ewk_settings_icon_database_path_set(path);
-    ewk_settings_web_database_path_set(path);
-
-    proxyUri = getenv("http_proxy");
-    if (proxyUri)
-        ewk_settings_proxy_uri_set(proxyUri);
-
-    browserCreate(url, theme, userAgent, geometry, engine, isFullscreen);
-    ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, &windows);
-
-    ecore_main_loop_begin();
-
-    ewk_shutdown();
-
-    return quit(EINA_TRUE, NULL);
-}
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 499d6c2..8ec783a 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -39,6 +39,7 @@
 #include "EWebKit.h"
 #include "FormState.h"
 #include "FrameLoader.h"
+#include "FrameNetworkingContextEfl.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "HTMLFormElement.h"
@@ -945,4 +946,9 @@ void FrameLoaderClientEfl::transitionToCommittedForNewPage()
         ewk_view_frame_main_cleared(m_view);
 }
 
+PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext()
+{
+    return FrameNetworkingContextEfl::create(ewk_frame_core_get(m_frame));
+}
+
 }
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index 561760c..bd105cd 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -202,6 +202,8 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
 
     virtual bool canCachePage() const;
     virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&);
+
+    virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
  private:
     Evas_Object *m_view;
     Evas_Object *m_frame;
diff --git a/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h b/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
new file mode 100644
index 0000000..4e67512
--- /dev/null
+++ b/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FrameNetworkingContextEfl_h
+#define FrameNetworkingContextEfl_h
+
+#include "FrameNetworkingContext.h"
+
+namespace WebCore {
+
+class FrameNetworkingContextEfl : public WebCore::FrameNetworkingContext {
+public:
+    static PassRefPtr<FrameNetworkingContextEfl> create(WebCore::Frame* frame)
+    {
+        return adoptRef(new FrameNetworkingContextEfl(frame));
+    }
+
+    WebCore::Frame* coreFrame() const { return frame(); }
+
+private:
+    FrameNetworkingContextEfl(WebCore::Frame* frame)
+        : WebCore::FrameNetworkingContext(frame)
+    {
+    }
+};
+
+}
+
+#endif
diff --git a/WebKit/efl/ewebkit.pc.in b/WebKit/efl/ewebkit.pc.in
index d618e30..3a1c8f5 100644
--- a/WebKit/efl/ewebkit.pc.in
+++ b/WebKit/efl/ewebkit.pc.in
@@ -2,6 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
+datadir=${prefix}/share/@WebKit_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
 
 Name: WebKit-EFL
 Description: Web content engine for EFL applications
@@ -9,4 +10,4 @@ Version: @PROJECT_VERSION@
 Requires: cairo evas ecore
 Libs: -L${libdir} -lewebkit @EXTRA_EWEBKIT_LINK@
 Libs.private: @LIBS_PRIVATE@
-Cflags: -I${includedir}/EWebKit
+Cflags: -I${includedir}/@WebKit_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index a7ce1ff..8945ee7 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -636,7 +636,7 @@ Eina_Bool ewk_frame_editable_set(Evas_Object* o, Eina_Bool editable)
     if (sd->editable == editable)
         return EINA_TRUE;
     if (editable)
-        sd->frame->applyEditingStyleToBodyElement();
+        sd->frame->editor()->applyEditingStyleToBodyElement();
     return EINA_TRUE;
 }
 
@@ -651,7 +651,7 @@ char* ewk_frame_selection_get(const Evas_Object* o)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
-    WTF::CString s = sd->frame->selectedText().utf8();
+    WTF::CString s = sd->frame->editor()->selectedText().utf8();
     if (s.isNull())
         return 0;
     return strdup(s.data());
@@ -751,7 +751,7 @@ Eina_Bool ewk_frame_text_search(const Evas_Object* o, const char* string, Eina_B
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, EINA_FALSE);
 
-    return sd->frame->findString(WTF::String::fromUTF8(string), forward, case_sensitive, wrap, true);
+    return sd->frame->editor()->findString(WTF::String::fromUTF8(string), forward, case_sensitive, wrap, true);
 }
 
 /**
@@ -771,8 +771,8 @@ unsigned int ewk_frame_text_matches_mark(Evas_Object* o, const char* string, Ein
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, 0);
 
-    sd->frame->setMarkedTextMatchesAreHighlighted(highlight);
-    return sd->frame->countMatchesForText(WTF::String::fromUTF8(string), case_sensitive, limit, true);
+    sd->frame->editor()->setMarkedTextMatchesAreHighlighted(highlight);
+    return sd->frame->editor()->countMatchesForText(WTF::String::fromUTF8(string), case_sensitive, limit, true);
 }
 
 /**
@@ -803,7 +803,7 @@ Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlig
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    sd->frame->setMarkedTextMatchesAreHighlighted(highlight);
+    sd->frame->editor()->setMarkedTextMatchesAreHighlighted(highlight);
     return EINA_TRUE;
 }
 
@@ -818,7 +818,7 @@ Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object* o)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    return sd->frame->markedTextMatchesAreHighlighted();
+    return sd->frame->editor()->markedTextMatchesAreHighlighted();
 }
 
 /** 
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index ea54167..254fdfd 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -1445,7 +1445,7 @@ char* ewk_view_selection_get(const Evas_Object* o)
 {
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
-    WTF::CString s = priv->page->focusController()->focusedOrMainFrame()->selectedText().utf8();
+    WTF::CString s = priv->page->focusController()->focusedOrMainFrame()->editor()->selectedText().utf8();
     if (s.isNull())
         return 0;
     return strdup(s.data());