[EFL] fast/frames/frame-crash-with-page-cache.html is crashing

https://bugs.webkit.org/show_bug.cgi?id=85879

Patch by Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> on 2012-05-17
Reviewed by Noam Rosenthal.

Source/WebKit/efl:

_ewk_frame_smart_del() is considering now that the frame can be present in cache.
loader()->detachFromParent() is only applied for the main frame.
loader()->cancelAndClear() is not used anymore.

* ewk/ewk_frame.cpp:
(_ewk_frame_smart_del):

LayoutTests:

* platform/efl/test_expectations.txt: Removed fast/frames/frame-crash-with-page-cache.html.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 53777ee..6221607 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-17  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL] fast/frames/frame-crash-with-page-cache.html is crashing
+        https://bugs.webkit.org/show_bug.cgi?id=85879
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/efl/test_expectations.txt: Removed fast/frames/frame-crash-with-page-cache.html.
+
 2012-05-17  MORITA Hajime <morrita@google.com>
 
         Unreviewed, marking input-appearance-range.html as fail.

diff --git a/LayoutTests/platform/efl/test_expectations.txt b/LayoutTests/platform/efl/test_expectations.txt
index c33850e..d5493be 100644 (file)
--- a/LayoutTests/platform/efl/test_expectations.txt
+++ b/LayoutTests/platform/efl/test_expectations.txt
@@ -386,8 +386,6 @@ BUGWK85902 SLOW DEBUG : fast/overflow/lots-of-sibling-inline-boxes.html = PASS
 
 BUGWK85799 : fast/css/font-face-download-error.html = TIMEOUT
 
-BUGWK85879 : fast/frames/frame-crash-with-page-cache.html = CRASH
-
 BUGWKEFL SLOW DEBUG : http/tests/incremental/slow-utf8-html.pl = PASS
 
 // Perf tests are way too slow on debug builds.

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 3257903..4098a7d 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,17 @@
+2012-05-17  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL] fast/frames/frame-crash-with-page-cache.html is crashing
+        https://bugs.webkit.org/show_bug.cgi?id=85879
+
+        Reviewed by Noam Rosenthal.
+
+        _ewk_frame_smart_del() is considering now that the frame can be present in cache.
+        loader()->detachFromParent() is only applied for the main frame.
+        loader()->cancelAndClear() is not used anymore.
+
+        * ewk/ewk_frame.cpp:
+        (_ewk_frame_smart_del):
+
 2012-05-16  Tomasz Morawski  <t.morawski@samsung.com>
 
         [EFL] Restore accidentally changed copyrights.

diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
index 87a93ff..611de17 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
@@ -233,8 +233,9 @@ static void _ewk_frame_smart_del(Evas_Object* ewkFrame)
         if (smartData->frame) {
             WebCore::FrameLoaderClientEfl* flc = _ewk_frame_loader_efl_get(smartData->frame);
             flc->setWebFrame(0);
-            smartData->frame->loader()->detachFromParent();
-            smartData->frame->loader()->cancelAndClear();
+            EWK_FRAME_SD_GET(ewk_view_frame_main_get(smartData->view), mainSmartData);
+            if (mainSmartData->frame == smartData->frame) // applying only for main frame is enough (will traverse through frame tree)
+                smartData->frame->loader()->detachFromParent();
             smartData->frame = 0;
         }