Changeset 93617 in webkit

Timestamp:

Aug 23, 2011 11:27:51 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Do not treat valid cases in ewk_frame_child_add() as failures.
​https://bugs.webkit.org/show_bug.cgi?id=66692

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-08-23
Rubber-stamped by Kenneth Rohde Christiansen.

Frame::page() and FrameTree::parent() returning 0 were being considered
failure cases, however it is possible for them to return 0 when some
arbitrary JavaScript is run.

The function's return type has been changed to make it easier to convey
these cases to the caller (which is only ewk_view_frame_create).

This should make tests like
fast/dom/null-page-show-modal-dialog-crash.html stop outputting
erroneous messages to stderr.

• ewk/ewk_frame.cpp:

(ewk_frame_child_add):

• ewk/ewk_private.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_frame.cpp (modified) (4 diffs)
• ewk/ewk_private.h (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Do not treat valid cases in ewk_frame_child_add() as failures.
+        https://bugs.webkit.org/show_bug.cgi?id=66692
+
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        Frame::page() and FrameTree::parent() returning 0 were being considered
+        failure cases, however it is possible for them to return 0 when some
+        arbitrary JavaScript is run.
+
+        The function's return type has been changed to make it easier to convey
+        these cases to the caller (which is only ewk_view_frame_create).
+
+        This should make tests like
+        fast/dom/null-page-show-modal-dialog-crash.html stop outputting
+        erroneous messages to stderr.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_child_add):
+        * ewk/ewk_private.h:
+
 2011-08-23  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -1132 +1132 @@
  * Adds child to the frame.
  */
-Evas_Object *ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer)
+Eina_Bool ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
@@ -1142 +1142 @@
     if (!frame) {
         ERR("Could not create ewk_frame object.");
-        return 0;
+        return EINA_FALSE;
     }
 
@@ -1154 +1154 @@
     if (!ewk_frame_init(frame, sd->view, cf)) {
         evas_object_del(frame);
-        return 0;
+        return EINA_FALSE;
     }
     snprintf(buf, sizeof(buf), "EWK_Frame:child/%s", name.utf8().data());
@@ -1161 +1161 @@
     evas_object_show(frame);
 
-    if (!cf->page())
-        goto died;
+    // The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
+    if (!cf->page()) {
+        evas_object_del(frame);
+        return EINA_TRUE;
+    }
 
     sd->frame->loader()->loadURLIntoChildFrame(url, referrer, cf);
-    if (!cf->tree()->parent())
-        goto died;
+
+    // The frame's onload handler may have removed it from the document.
+    // See fast/dom/null-page-show-modal-dialog-crash.html for an example.
+    if (!cf->tree()->parent()) {
+        evas_object_del(frame);
+        return EINA_TRUE;
+    }
 
     // TODO: announce frame was created?
-    return frame;
-
-died:
-    CRITICAL("does this work: BEGIN");
-    ewk_frame_core_gone(frame); // CONFIRM
-    evas_object_del(frame); // CONFIRM
-    CRITICAL("does this work: END");
-    return 0;
+    return EINA_TRUE;
 }
 

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -158 +158 @@
 Evas_Object *ewk_frame_add(Evas *e);
 Eina_Bool ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame);
-Evas_Object *ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer);
+Eina_Bool ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer);
 
 WebCore::Frame *ewk_frame_core_get(const Evas_Object *o);