Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM

4 files changed, 13 insertions, 138 deletions

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bc0a1ccd7..693ae644b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,50 +1,3 @@
-2012-11-09  Simon Hausmann  <simon.hausmann@digia.com>
-
-        [Qt] Build with MSVC fails to use nmake instead of make
-        https://bugs.webkit.org/show_bug.cgi?id=98645
-
-        Reviewed by Tor Arne Vestbø.
-
-        Don't rely on the "default" mkspec but instead query the target
-        mkspec variable from qmake to find the right qmake.conf.
-
-        * Scripts/webkitdirs.pm:
-        (qtMakeCommand):
-
-2012-11-08  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
-
-        [EFL] about:blank should display the blank page
-        https://bugs.webkit.org/show_bug.cgi?id=101566
-
-        Reviewed by Laszlo Gombos.
-
-        Add a check to return early without prepending http:// scheme, if the
-        URL is 'about:blank'.
-
-        * EWebLauncher/url_utils.c:
-        (url_from_user_input):
-
-2012-11-08  Christophe Dumez  <christophe.dumez@intel.com>
-
-        [EFL][WK2] Add proper support for fullscreen API to MiniBrowser
-        https://bugs.webkit.org/show_bug.cgi?id=101615
-
-        Reviewed by Kenneth Rohde Christiansen.
-
-        Implement fullscreen API support in MiniBrowser. When entering
-        fullscreen a popup is shown to notify the user that something
-        is displayed in fullscreen and to advertise that the Escape
-        key can be used to exit fullscreen. This behavior is according
-        to specification.
-
-        * MiniBrowser/efl/main.c:
-        (on_key_down):
-        (on_fullscreen_accept):
-        (on_fullscreen_deny):
-        (on_fullscreen_enter):
-        (on_fullscreen_exit):
-        (window_create):
-
 2012-11-08  Slavomir Kaslev  <skaslev@google.com>
 
         [Chromium] DumpRenderTree fix for canvas in software compositing
diff --git a/Tools/EWebLauncher/url_utils.c b/Tools/EWebLauncher/url_utils.c
index d8cf7cb49..fd92f145d 100644
--- a/Tools/EWebLauncher/url_utils.c
+++ b/Tools/EWebLauncher/url_utils.c
@@ -39,7 +39,7 @@ char *
 url_from_user_input(const char *arg)
 {
     /* If it is already a URL, return the argument as is. */
-    if (has_scheme(arg) || !strcasecmp(arg, "about:blank"))
+    if (has_scheme(arg))
         return strdup(arg);
 
     Eina_Strbuf *buf = eina_strbuf_manage_new(eina_file_path_sanitize(arg));
diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c
index e982a7117..e029936a5 100644
--- a/Tools/MiniBrowser/efl/main.c
+++ b/Tools/MiniBrowser/efl/main.c
@@ -139,11 +139,9 @@ static void window_close(Browser_Window *window)
 }
 
 static void
-on_key_down(void *user_data, Evas *e, Evas_Object *webview, void *event_info)
+on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-    Browser_Window *window = (Browser_Window *)user_data;
     Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*) event_info;
-
     static const char *encodings[] = {
         "ISO-8859-1",
         "UTF-8",
@@ -154,26 +152,26 @@ on_key_down(void *user_data, Evas *e, Evas_Object *webview, void *event_info)
 
     if (!strcmp(ev->key, "F1")) {
         info("Back (F1) was pressed\n");
-        if (!ewk_view_back(webview))
+        if (!ewk_view_back(obj))
             info("Back ignored: No back history\n");
     } else if (!strcmp(ev->key, "F2")) {
         info("Forward (F2) was pressed\n");
-        if (!ewk_view_forward(webview))
+        if (!ewk_view_forward(obj))
             info("Forward ignored: No forward history\n");
     } else if (!strcmp(ev->key, "F3")) {
         currentEncoding = (currentEncoding + 1) % (sizeof(encodings) / sizeof(encodings[0]));
         info("Set encoding (F3) pressed. New encoding to %s", encodings[currentEncoding]);
-        ewk_view_setting_encoding_custom_set(webview, encodings[currentEncoding]);
+        ewk_view_setting_encoding_custom_set(obj, encodings[currentEncoding]);
     } else if (!strcmp(ev->key, "F5")) {
         info("Reload (F5) was pressed, reloading.\n");
-        ewk_view_reload(webview);
+        ewk_view_reload(obj);
     } else if (!strcmp(ev->key, "F6")) {
         info("Stop (F6) was pressed, stop loading.\n");
-        ewk_view_stop(webview);
+        ewk_view_stop(obj);
     } else if  (!strcmp(ev->key, "F7")) {
-        Ewk_Pagination_Mode mode =  ewk_view_pagination_mode_get(webview);
+        Ewk_Pagination_Mode mode =  ewk_view_pagination_mode_get(obj);
         mode = (++mode) % (EWK_PAGINATION_MODE_BOTTOM_TO_TOP + 1);
-        if (ewk_view_pagination_mode_set(webview, mode))
+        if (ewk_view_pagination_mode_set(obj, mode))
             info("Change Pagination Mode (F7) was pressed, changed to: %d\n", mode);
         else
             info("Change Pagination Mode (F7) was pressed, but NOT changed!");
@@ -183,10 +181,7 @@ on_key_down(void *user_data, Evas *e, Evas_Object *webview, void *event_info)
         windows = eina_list_append(windows, window);
     } else if (!strcmp(ev->key, "i") && ctrlPressed) {
         info("Show Inspector (Ctrl+i) was pressed.\n");
-        ewk_view_inspector_show(webview);
-    } else if (!strcmp(ev->key, "Escape")) {
-        if (elm_win_fullscreen_get(window->window))
-            ewk_view_fullscreen_exit(webview);
+        ewk_view_inspector_show(obj);
     }
 }
 
@@ -683,75 +678,6 @@ static Eina_Bool on_window_geometry_set(Ewk_View_Smart_Data *sd, Evas_Coord x, E
 }
 
 typedef struct {
-    Evas_Object *webview;
-    Evas_Object *permission_popup;
-} PermissionData;
-
-static void
-on_fullscreen_accept(void *user_data, Evas_Object *obj, void *event_info)
-{
-    PermissionData *permission_data = (PermissionData *)user_data;
-
-    evas_object_del(permission_data->permission_popup);
-    free(permission_data);
-}
-
-static void
-on_fullscreen_deny(void *user_data, Evas_Object *obj, void *event_info)
-{
-    PermissionData *permission_data = (PermissionData *)user_data;
-
-    ewk_view_fullscreen_exit(permission_data->webview);
-    evas_object_del(permission_data->permission_popup);
-    free(permission_data);
-}
-
-static Eina_Bool on_fullscreen_enter(Ewk_View_Smart_Data *sd, Ewk_Security_Origin *origin)
-{
-    Browser_Window *window = browser_view_find(sd->self);
-
-    /* Go fullscreen */
-    elm_win_fullscreen_set(window->window, EINA_TRUE);
-
-    /* Show user popup */
-    Evas_Object *permission_popup = elm_popup_add(window->window);
-    evas_object_size_hint_weight_set(permission_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-    Eina_Strbuf *message = eina_strbuf_new();
-    eina_strbuf_append_printf(message, "%s is now fullscreen.<br>Press ESC at any time to exit fullscreen.<br>Allow fullscreen?", ewk_security_origin_host_get(origin));
-    elm_object_text_set(permission_popup, eina_strbuf_string_get(message));
-    eina_strbuf_free(message);
-    elm_object_part_text_set(permission_popup, "title,text", "Fullscreen Permission");
-
-    /* Popup buttons */
-    PermissionData *permission_data = (PermissionData *)malloc(sizeof(PermissionData));
-    permission_data->webview = window->webview;
-    permission_data->permission_popup = permission_popup;
-    Evas_Object *accept_button = elm_button_add(permission_popup);
-    elm_object_text_set(accept_button, "Accept");
-    elm_object_part_content_set(permission_popup, "button1", accept_button);
-    evas_object_smart_callback_add(accept_button, "clicked", on_fullscreen_accept, permission_data);
-
-    Evas_Object *deny_button = elm_button_add(permission_popup);
-    elm_object_text_set(deny_button, "Deny");
-    elm_object_part_content_set(permission_popup, "button2", deny_button);
-    evas_object_smart_callback_add(deny_button, "clicked", on_fullscreen_deny, permission_data);
-
-    evas_object_show(permission_popup);
-
-    return EINA_TRUE;
-}
-
-static Eina_Bool on_fullscreen_exit(Ewk_View_Smart_Data *sd)
-{
-    Browser_Window *window = browser_view_find(sd->self);
-
-    elm_win_fullscreen_set(window->window, EINA_FALSE);
-
-    return EINA_TRUE;
-}
-
-typedef struct {
     Evas_Object *popup;
     Ewk_Auth_Request *request;
     Evas_Object *username_entry;
@@ -1023,8 +949,6 @@ static Browser_Window *window_create(const char *url)
     ewkViewClass->run_javascript_prompt = on_javascript_prompt;
     ewkViewClass->window_geometry_get = on_window_geometry_get;
     ewkViewClass->window_geometry_set = on_window_geometry_set;
-    ewkViewClass->fullscreen_enter = on_fullscreen_enter;
-    ewkViewClass->fullscreen_exit = on_fullscreen_exit;
 
     Evas *evas = evas_object_evas_get(app_data->window);
     Evas_Smart *smart = evas_smart_class_new(&ewkViewClass->sc);
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index ea26be405..76770b706 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1873,11 +1873,9 @@ sub retrieveQMakespecVar
 sub qtMakeCommand($)
 {
     my ($qmakebin) = @_;
-    chomp(my $mkspec= `$qmakebin -query QMAKE_XSPEC`);
-    chomp(my $mkspecPath = `$qmakebin -query QT_HOST_DATA`);
-    $mkspecPath .= "/mkspecs/";
-    $mkspecPath .= $mkspec;
-    my $compiler = retrieveQMakespecVar("$mkspecPath/qmake.conf", "QMAKE_CC");
+    chomp(my $mkspec = `$qmakebin -query QT_HOST_DATA`);
+    $mkspec .= "/mkspecs/default";
+    my $compiler = retrieveQMakespecVar("$mkspec/qmake.conf", "QMAKE_CC");
 
     #print "default spec: " . $mkspec . "\n";
     #print "compiler found: " . $compiler . "\n";