Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests

2 files changed, 22 insertions, 3 deletions

diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c
index a979f5e55..b104289e7 100644
--- a/Tools/MiniBrowser/efl/main.c
+++ b/Tools/MiniBrowser/efl/main.c
@@ -49,6 +49,11 @@ static Eina_Bool main_signal_exit(void *data, int ev_type, void *ev)
     return EINA_TRUE;
 }
 
+static void closeWindow(Ecore_Evas *ee)
+{
+    ecore_main_loop_quit();
+}
+
 static void on_ecore_evas_resize(Ecore_Evas *ee)
 {
     Evas_Object *webview;
@@ -70,6 +75,12 @@ 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;
+    static const char *encodings[] = {
+        "ISO-8859-1",
+        "UTF-8",
+        NULL
+    };
+    static int currentEncoding = -1;
     if (!strcmp(ev->key, "F1")) {
         info("Back (F1) was pressed\n");
         if (!ewk_view_back(obj))
@@ -78,6 +89,10 @@ on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
         info("Forward (F2) was pressed\n");
         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(obj, encodings[currentEncoding]);
     } else if (!strcmp(ev->key, "F5")) {
             info("Reload (F5) was pressed, reloading.\n");
             ewk_view_reload(obj);
@@ -149,6 +164,7 @@ static MiniBrowser *browserCreate(const char *url)
     ecore_evas_callback_resize_set(app->ee, on_ecore_evas_resize);
     ecore_evas_borderless_set(app->ee, 0);
     ecore_evas_show(app->ee);
+    ecore_evas_callback_delete_request_set(app->ee, closeWindow);
 
     app->evas = ecore_evas_get(app->ee);
 
diff --git a/Tools/MiniBrowser/qt/qml/ItemSelector.qml b/Tools/MiniBrowser/qt/qml/ItemSelector.qml
index 43022b684..6288d22ba 100644
--- a/Tools/MiniBrowser/qt/qml/ItemSelector.qml
+++ b/Tools/MiniBrowser/qt/qml/ItemSelector.qml
@@ -35,15 +35,18 @@ MouseArea {
 
     Rectangle {
         clip: true
-        x: selectorModel.elementRect.x
-        y: selectorModel.elementRect.y + selectorModel.elementRect.height
-        height: Math.min(400, parent.height - y)
         width: 200
+        height: Math.min(listView.contentItem.height + listView.anchors.topMargin + listView.anchors.bottomMargin
+                         , Math.max(selectorModel.elementRect.y, parent.height - selectorModel.elementRect.y - selectorModel.elementRect.height))
+        x: (selectorModel.elementRect.x + 200 > parent.width) ? parent.width - 200 : selectorModel.elementRect.x
+        y: (selectorModel.elementRect.y + selectorModel.elementRect.height + height < parent.height ) ? selectorModel.elementRect.y + selectorModel.elementRect.height
+                                                         : selectorModel.elementRect.y - height;
         radius: 5
         color: "gainsboro"
         opacity: 0.8
 
         ListView {
+            id: listView
             anchors.fill: parent
             anchors.margins: 10
             spacing: 5