Changeset 61706 in webkit

Timestamp:

Jun 23, 2010 12:39:54 PM (14 years ago)

Author:

leandro@webkit.org

Message:

2010-06-23 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Gustavo Noronha Silva.

Add implementaion of new windows for EFL port. Both cases of a link
with target="_blank" and a javascript that does window.open() are
treated, delegating to browser the role of actually creating the
window (or blocking it).
​https://bugs.webkit.org/show_bug.cgi?id=40930

• CMakeListsEfl.txt: add new file that wraps the WindowFeatures struct
• efl/WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::createWindow): implement method for creating new window by delegating to browser its creation. Browser might decide to continue on the same window by returning the same view object.
• efl/WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::dispatchCreatePage): implement method for creating new window when its creation is done by a javascript script.
• efl/ewk/EWebKit.h: new header for WindowFeatures.
• efl/ewk/ewk_private.h:
• efl/ewk/ewk_view.cpp: (ewk_view_window_create): call the method implemented by browser.
• efl/ewk/ewk_view.h:
• efl/ewk/ewk_window_features.cpp: Added. (ewk_window_features_unref): (ewk_window_features_ref): (ewk_window_features_bool_property_get): (ewk_window_features_int_property_get): (ewk_window_features_new_from_core): create and wrapped struct containing the core struct.
• efl/ewk/ewk_window_features.h: Added.

Location:

trunk/WebKit

Files:

• CMakeListsEfl.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (1 diff)
• efl/ewk/EWebKit.h (modified) (1 diff)
• efl/ewk/ewk_private.h (modified) (2 diffs)
• efl/ewk/ewk_view.cpp (modified) (2 diffs)
• efl/ewk/ewk_view.h (modified) (2 diffs)
• efl/ewk/ewk_window_features.cpp (added)
• efl/ewk/ewk_window_features.h (added)

trunk/WebKit/CMakeListsEfl.txt

@@ -40 +40 @@
     efl/ewk/ewk_view.cpp
     efl/ewk/ewk_view_single.c
+    efl/ewk/ewk_window_features.cpp
 )
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-06-23  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add implementaion of new windows for EFL port. Both cases of a link
+        with target="_blank" and a javascript that does window.open() are
+        treated, delegating to browser the role of actually creating the
+        window (or blocking it).
+        https://bugs.webkit.org/show_bug.cgi?id=40930
+
+        * CMakeListsEfl.txt: add new file that wraps the WindowFeatures struct
+        * efl/WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::createWindow): implement method for
+        creating new window by delegating to browser its creation. Browser
+        might decide to continue on the same window by returning the same
+        view object.
+        * efl/WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchCreatePage): implement method
+        for creating new window when its creation is done by a javascript
+        script.
+        * efl/ewk/EWebKit.h: new header for WindowFeatures.
+        * efl/ewk/ewk_private.h:
+        * efl/ewk/ewk_view.cpp:
+        (ewk_view_window_create): call the method implemented by browser.
+        * efl/ewk/ewk_view.h:
+        * efl/ewk/ewk_window_features.cpp: Added.
+        (ewk_window_features_unref):
+        (ewk_window_features_ref):
+        (ewk_window_features_bool_property_get):
+        (ewk_window_features_int_property_get):
+        (ewk_window_features_new_from_core): create and wrapped struct
+        containing the core struct.
+        * efl/ewk/ewk_window_features.h: Added.
+
 2010-06-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -118 +118 @@
 }
 
-Page* ChromeClientEfl::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features)
-{
-    notImplemented();
-    return 0;
+Page* ChromeClientEfl::createWindow(Frame*, const FrameLoadRequest& frameLoadRequest, const WindowFeatures& features)
+{
+    Evas_Object* newView = ewk_view_window_create(m_view, EINA_TRUE, &features);
+    if (!newView)
+        return 0;
+
+    if (!frameLoadRequest.isEmpty())
+        ewk_view_uri_set(newView, frameLoadRequest.resourceRequest().url().string().utf8().data());
+
+    return ewk_view_core_page_get(newView);
 }
 

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -817 +817 @@
 Frame* FrameLoaderClientEfl::dispatchCreatePage()
 {
-    notImplemented();
-    return 0;
+    if (!m_view)
+        return 0;
+
+    Evas_Object* newView = ewk_view_window_create(m_view, EINA_FALSE, 0);
+    Evas_Object* mainFrame;
+    if (!newView)
+        mainFrame = m_frame;
+    else
+        mainFrame = ewk_view_frame_main_get(newView);
+
+    return ewk_frame_core_get(mainFrame);
 }
 

trunk/WebKit/efl/ewk/EWebKit.h

@@ -30 +30 @@
 #include "ewk_settings.h"
 #include "ewk_view.h"
+#include "ewk_window_features.h"
 
 #include <Evas.h>

trunk/WebKit/efl/ewk/ewk_private.h

@@ -57 +57 @@
 void             ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error);
 void             ewk_view_load_progress_changed(Evas_Object *o);
+Evas_Object     *ewk_view_window_create(Evas_Object *o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures);
 
 void             ewk_view_mouse_link_hover_in(Evas_Object *o, void *data);
@@ -103 +104 @@
 void              ewk_context_menu_show(Ewk_Context_Menu *o);
 
+Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures* core);
+
 Evas_Object      *ewk_frame_add(Evas *e);
 Eina_Bool         ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame);

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -3151 +3151 @@
  * @internal
  * Delegates to browser the creation of a new window. If it is not implemented,
- * current view is returned, so navigation might continue in same window.
+ * current view is returned, so navigation might continue in same window. If
+ * browser supports the creation of new windows, a new Ewk_Window_Features is
+ * created and passed to browser. If it intends to keep the request for opening
+ * the window later it must increments the Ewk_Winwdow_Features ref count by
+ * calling ewk_window_features_ref(window_features). Otherwise this struct will
+ * be freed after returning to this function.
  *
  * @param o Current view.
+ * @param javascript @c EINA_TRUE if the new window is originated from javascript,
+ * @c EINA_FALSE otherwise
+ * @param window_features Features of the new window being created. If it's @c
+ * NULL, it will be created a window with default features.
  *
  * @return New view, in case smart class implements the creation of new windows;
  * else, current view @param o.
- */
-Evas_Object* ewk_view_window_create(Evas_Object* o)
+ *
+ * @see ewk_window_features_ref().
+ */
+Evas_Object* ewk_view_window_create(Evas_Object* o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures)
 {
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
@@ -3165 +3176 @@
         return o;
 
-    return sd->api->window_create(sd);
+    Ewk_Window_Features* window_features = ewk_window_features_new_from_core(coreFeatures);
+    Evas_Object* view = sd->api->window_create(sd, javascript, window_features);
+    ewk_window_features_unref(window_features);
+
+    return view;
 }
 

trunk/WebKit/efl/ewk/ewk_view.h

@@ -22 +22 @@
 #define ewk_view_h
 
+#include "ewk_history.h"
+#include "ewk_window_features.h"
+
 #include <Evas.h>
 #include <cairo.h>
-#include <ewk_history.h>
 
 #ifdef __cplusplus
@@ -96 +98 @@
     unsigned long version;
 
-    Evas_Object *(*window_create)(Ewk_View_Smart_Data *sd); /**< creates a new window, requested by webkit */
+    Evas_Object *(*window_create)(Ewk_View_Smart_Data *sd, Eina_Bool javascript, const Ewk_Window_Features *window_features); /**< creates a new window, requested by webkit */
     // hooks to allow different backing stores
     Evas_Object *(*backing_store_add)(Ewk_View_Smart_Data *sd); /**< must be defined */