Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

11 files changed, 137 insertions, 18 deletions

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 5dcc5cf..2068ccc 100644
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,105 @@
+2011-02-08  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove orphan code from old parser
+        https://bugs.webkit.org/show_bug.cgi?id=53984
+
+        * WebCoreSupport/ChromeClientEfl.h:
+
+2011-02-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Fix when building with curl backend.
+
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_proxy_uri_get):
+
+2011-02-07  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed Adam Roben and Darin Adler.
+
+        WebKit2: drag and drop support on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=52775
+
+        Removed createDragImageForLink from DragClient.
+
+        * WebCoreSupport/DragClientEfl.cpp:
+        * WebCoreSupport/DragClientEfl.h:
+
+2011-02-07  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [EFL] FrameLoaderClient calls loadURLInChildFrame on the child's frame loader
+        https://bugs.webkit.org/show_bug.cgi?id=53892
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_child_add): Use the loader of the core frame instead.
+
+2011-02-03  Adam Langley  <agl@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Plumb mixed script URL to FrameLoaderClient
+        https://bugs.webkit.org/show_bug.cgi?id=52384
+
+        Regressions covered by http/tests/security/mixedContent/*
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::didRunInsecureContent):
+        * WebCoreSupport/FrameLoaderClientEfl.h:
+
+2011-02-01  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add an API to get proxy address.
+        https://bugs.webkit.org/show_bug.cgi?id=52990
+
+        Gets the proxy URI from network backend. This API returns a proxy URI
+        which is set up by ewk_settings_proxy_uri_set(). But, it only implements
+        this API for libsoup backend.
+
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_proxy_uri_get):
+        * ewk/ewk_settings.h:
+
+2011-01-29  Dan Winship  <danw@gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
+        libsoup 2.33.1 now.
+        https://bugs.webkit.org/show_bug.cgi?id=50675
+
+        * ewk/ewk_cookies.cpp:
+        (ewk_cookies_file_set):
+        (ewk_cookies_policy_set):
+        (ewk_cookies_policy_get):
+
+2011-01-28  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <select> can't display right-to-left (rtl) languages
+        https://bugs.webkit.org/show_bug.cgi?id=19785
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::selectItemAlignmentFollowsMenuWritingDirection): Added.
+        * WebCoreSupport/ChromeClientEfl.h:
+
+2011-01-27  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Use Document::url() instead of FrameLoader::url().
+        https://bugs.webkit.org/show_bug.cgi?id=41165
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_uri_changed):
+
 2011-01-14  Patrick Gansterer  <paroga@webkit.org>
 
         Unreviewed. Try to fix EFL build.
diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
index e9904c6..6425c39 100644
--- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
+++ b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -532,6 +532,11 @@ bool ChromeClientEfl::selectItemWritingDirectionIsNatural()
     return true;
 }
 
+bool ChromeClientEfl::selectItemAlignmentFollowsMenuWritingDirection()
+{
+    return false;
+}
+
 PassRefPtr<PopupMenu> ChromeClientEfl::createPopupMenu(PopupMenuClient* client) const
 {
     return adoptRef(new PopupMenuEfl(client));
diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index a714dd4..c17fe10 100644
--- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -128,8 +128,6 @@ public:
     virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
     virtual void formStateDidChange(const Node*);
 
-    virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
-
     virtual void setCursor(const Cursor&);
 
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
@@ -149,6 +147,7 @@ public:
     virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
 
     virtual bool selectItemWritingDirectionIsNatural();
+    virtual bool selectItemAlignmentFollowsMenuWritingDirection();
     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
 
diff --git a/Source/WebKit/efl/WebCoreSupport/DragClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/DragClientEfl.cpp
index d6610e1..b1f68e0 100644
--- a/Source/WebKit/efl/WebCoreSupport/DragClientEfl.cpp
+++ b/Source/WebKit/efl/WebCoreSupport/DragClientEfl.cpp
@@ -60,11 +60,6 @@ void DragClientEfl::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Cl
     notImplemented();
 }
 
-DragImageRef DragClientEfl::createDragImageForLink(KURL&, const String& label, Frame*)
-{
-    return 0;
-}
-
 void DragClientEfl::dragControllerDestroyed()
 {
     delete this;
diff --git a/Source/WebKit/efl/WebCoreSupport/DragClientEfl.h b/Source/WebKit/efl/WebCoreSupport/DragClientEfl.h
index f73116c..ff098a9 100644
--- a/Source/WebKit/efl/WebCoreSupport/DragClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/DragClientEfl.h
@@ -45,7 +45,6 @@ public:
     virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint);
 
     virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false);
-    virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*);
 
     virtual void dragControllerDestroyed();
 };
diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 929b269..acbab30 100644
--- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -515,7 +515,7 @@ void FrameLoaderClientEfl::didDisplayInsecureContent()
     notImplemented();
 }
 
-void FrameLoaderClientEfl::didRunInsecureContent(SecurityOrigin*)
+void FrameLoaderClientEfl::didRunInsecureContent(SecurityOrigin*, const KURL&)
 {
     notImplemented();
 }
diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index cf7bdf0..14ebc1c 100644
--- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -165,7 +165,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
     virtual void updateGlobalHistoryRedirectLinks();
     virtual bool shouldGoToHistoryItem(HistoryItem*) const;
     virtual void didDisplayInsecureContent();
-    virtual void didRunInsecureContent(SecurityOrigin*);
+    virtual void didRunInsecureContent(SecurityOrigin*, const KURL&);
 
     virtual ResourceError cancelledError(const ResourceRequest&);
     virtual ResourceError blockedError(const ResourceRequest&);
diff --git a/Source/WebKit/efl/ewk/ewk_cookies.cpp b/Source/WebKit/efl/ewk/ewk_cookies.cpp
index 421f8dc..2564fc7 100644
--- a/Source/WebKit/efl/ewk/ewk_cookies.cpp
+++ b/Source/WebKit/efl/ewk/ewk_cookies.cpp
@@ -57,9 +57,7 @@ EAPI Eina_Bool ewk_cookies_file_set(const char *filename)
     if (!cookieJar)
         return EINA_FALSE;
 
-#ifdef HAVE_LIBSOUP_2_29_90
     soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
-#endif
 
     SoupSession* session = WebCore::ResourceHandle::defaultSession();
     SoupSessionFeature* oldjar = soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR);
@@ -187,7 +185,6 @@ EAPI void ewk_cookies_cookie_free(Ewk_Cookie *cookie)
 EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
 {
 #ifdef WTF_USE_SOUP
-#ifdef HAVE_LIBSOUP_2_29_90
     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
     SoupCookieJarAcceptPolicy policy;
 
@@ -206,7 +203,6 @@ EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
 
     soup_cookie_jar_set_accept_policy(cookieJar, policy);
 #endif
-#endif
 }
 
 /*
@@ -218,7 +214,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
 {
     Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
 #ifdef WTF_USE_SOUP
-#ifdef HAVE_LIBSOUP_2_29_90
     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
     SoupCookieJarAcceptPolicy policy;
 
@@ -235,7 +230,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
         break;
     }
 #endif
-#endif
 
     return ewk_policy;
 }
diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
index f41caae..1a159c5 100644
--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
@@ -1681,7 +1681,7 @@ Evas_Object* ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame>
     if (!cf->page())
         goto died;
 
-    cf->loader()->loadURLIntoChildFrame(url, referrer, cf);
+    sd->frame->loader()->loadURLIntoChildFrame(url, referrer, cf);
     if (!cf->tree()->parent())
         goto died;
 
@@ -2008,7 +2008,7 @@ Eina_Bool ewk_frame_uri_changed(Evas_Object* o)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    WTF::CString uri(sd->frame->loader()->url().prettyURL().utf8());
+    WTF::CString uri(sd->frame->document()->url().prettyURL().utf8());
 
     INF("uri=%s", uri.data());
     if (!uri.data()) {
diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp
index 20051ea..54e6645 100644
--- a/Source/WebKit/efl/ewk/ewk_settings.cpp
+++ b/Source/WebKit/efl/ewk/ewk_settings.cpp
@@ -291,6 +291,30 @@ void ewk_settings_proxy_uri_set(const char* proxy)
 }
 
 /**
+ * Gets the proxy URI from the network backend.
+ *
+ * @return current proxy URI or @c 0 if it's not set. 
+ */
+const char* ewk_settings_proxy_uri_get()
+{
+#if USE(SOUP)
+    SoupURI* uri;
+    SoupSession* session = WebCore::ResourceHandle::defaultSession();
+    g_object_get(session, SOUP_SESSION_PROXY_URI, &uri, NULL);
+
+    if (!uri) {
+        ERR("no proxy uri");
+        return 0;
+    }
+
+    WTF::String proxy = soup_uri_to_string(uri, EINA_FALSE);
+    return eina_stringshare_add(proxy.utf8().data());
+#elif USE(CURL)
+    EINA_SAFETY_ON_TRUE_RETURN_VAL(1, NULL);
+#endif
+}
+
+/**
 * @internal
 * Gets the default user agent string.
 *
diff --git a/Source/WebKit/efl/ewk/ewk_settings.h b/Source/WebKit/efl/ewk/ewk_settings.h
index 3c1668f..d1e12c0 100644
--- a/Source/WebKit/efl/ewk/ewk_settings.h
+++ b/Source/WebKit/efl/ewk/ewk_settings.h
@@ -49,6 +49,7 @@ EAPI cairo_surface_t *ewk_settings_icon_database_icon_surface_get(const char *ur
 EAPI Evas_Object     *ewk_settings_icon_database_icon_object_add(const char *url, Evas *canvas);
 
 EAPI void            ewk_settings_proxy_uri_set(const char* proxy);
+EAPI const char*     ewk_settings_proxy_uri_get();
 
 #ifdef __cplusplus
 }