Title: [117409] trunk
- Revision
- 117409
- Author
- commit-qu...@webkit.org
- Date
- 2012-05-17 00:30:03 -0700 (Thu, 17 May 2012)
Log Message
[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.pozdnya...@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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117408 => 117409)
--- trunk/LayoutTests/ChangeLog 2012-05-17 07:27:40 UTC (rev 117408)
+++ trunk/LayoutTests/ChangeLog 2012-05-17 07:30:03 UTC (rev 117409)
@@ -1,3 +1,12 @@
+2012-05-17 Mikhail Pozdnyakov <mikhail.pozdnya...@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 <morr...@google.com>
Unreviewed, marking input-appearance-range.html as fail.
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (117408 => 117409)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-17 07:27:40 UTC (rev 117408)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-17 07:30:03 UTC (rev 117409)
@@ -386,8 +386,6 @@
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.
Modified: trunk/Source/WebKit/efl/ChangeLog (117408 => 117409)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-17 07:27:40 UTC (rev 117408)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-17 07:30:03 UTC (rev 117409)
@@ -1,3 +1,17 @@
+2012-05-17 Mikhail Pozdnyakov <mikhail.pozdnya...@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.moraw...@samsung.com>
[EFL] Restore accidentally changed copyrights.
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (117408 => 117409)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-05-17 07:27:40 UTC (rev 117408)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-05-17 07:30:03 UTC (rev 117409)
@@ -233,8 +233,9 @@
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;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
