Modified: trunk/LayoutTests/ChangeLog (114419 => 114420)
--- trunk/LayoutTests/ChangeLog 2012-04-17 19:56:47 UTC (rev 114419)
+++ trunk/LayoutTests/ChangeLog 2012-04-17 20:01:15 UTC (rev 114420)
@@ -1,3 +1,16 @@
+2012-04-17 Christophe Dumez <christophe.du...@intel.com>
+
+ [EFL] FrameLoaderClient should send "load,finished" signal for all frame, not just the main one
+ https://bugs.webkit.org/show_bug.cgi?id=84052
+
+ Reviewed by Antonio Gomes.
+
+ Unskip EFL test cases which rely on the DumpRenderTree support for
+ LayoutTestController's dumpFrameLoadCallbacks() and expect notifications for other
+ frame than the main one.
+
+ * platform/efl/Skipped:
+
2012-04-17 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
[EFL] Add setting API to enable/disable XSSAuditor
Modified: trunk/LayoutTests/platform/efl/Skipped (114419 => 114420)
--- trunk/LayoutTests/platform/efl/Skipped 2012-04-17 19:56:47 UTC (rev 114419)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-04-17 20:01:15 UTC (rev 114420)
@@ -751,7 +751,6 @@
fast/history/back-forward-reset-after-error-handling.html
# Missing delegates: tests which need proper frame loader callbacks reporting
-http/tests/security/mixedContent/empty-url-plugin-in-frame.html
fast/loader/file-protocol-fragment.html
# Missing delegates: tests failing because of missing resource load delegate callbacks.
@@ -2326,20 +2325,11 @@
http/tests/security/frameNavigation/not-opener.html
http/tests/security/local-image-from-remote-whitelisted.html
http/tests/security/local-user-CSS-from-remote.html
-http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html
-http/tests/security/mixedContent/data-url-iframe-in-main-frame.html
-http/tests/security/mixedContent/data-url-script-in-iframe.html
-http/tests/security/mixedContent/insecure-css-in-iframe.html
-http/tests/security/mixedContent/insecure-iframe-in-iframe.html
-http/tests/security/mixedContent/insecure-iframe-in-main-frame.html
-http/tests/security/mixedContent/insecure-image-in-iframe.html
http/tests/security/mixedContent/insecure-image-in-main-frame.html
http/tests/security/mixedContent/insecure-plugin-in-iframe.html
http/tests/security/mixedContent/insecure-script-in-iframe.html
http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
-http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html
-http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
http/tests/security/no-referrer.html
http/tests/security/originHeader/origin-header-for-empty.html
http/tests/security/originHeader/origin-header-for-https.html
Modified: trunk/Source/WebKit/efl/ChangeLog (114419 => 114420)
--- trunk/Source/WebKit/efl/ChangeLog 2012-04-17 19:56:47 UTC (rev 114419)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-04-17 20:01:15 UTC (rev 114420)
@@ -1,3 +1,19 @@
+2012-04-17 Christophe Dumez <christophe.du...@intel.com>
+
+ [EFL] FrameLoaderClient should send "load,finished" signal for all frame, not just the main one
+ https://bugs.webkit.org/show_bug.cgi?id=84052
+
+ Reviewed by Antonio Gomes.
+
+ Emit the "load,finished" signal from dispatchDidFinishLoad() / instead of
+ postProgressFinishedNotification() in order to send notifications all frames,
+ not just the main one.
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::postProgressFinishedNotification):
+ (WebCore::FrameLoaderClientEfl::dispatchDidFinishLoad):
+ (WebCore::FrameLoaderClientEfl::dispatchDidFailLoad):
+
2012-04-17 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
[EFL] Add setting API to enable/disable XSSAuditor
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (114419 => 114420)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-04-17 19:56:47 UTC (rev 114419)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-04-17 20:01:15 UTC (rev 114420)
@@ -232,16 +232,7 @@
void FrameLoaderClientEfl::postProgressFinishedNotification()
{
- if (m_loadError.isNull())
- ewk_frame_load_finished(m_frame, 0, 0, 0, 0, 0);
- else {
- ewk_frame_load_finished(m_frame,
- m_loadError.domain().utf8().data(),
- m_loadError.errorCode(),
- m_loadError.isCancellation(),
- m_loadError.localizedDescription().utf8().data(),
- m_loadError.failingURL().utf8().data());
- }
+ notImplemented();
}
void FrameLoaderClientEfl::frameLoaderDestroyed()
@@ -457,7 +448,7 @@
void FrameLoaderClientEfl::dispatchDidFinishLoad()
{
- m_loadError = ResourceError(); /* clears previous error */
+ ewk_frame_load_finished(m_frame, 0, 0, 0, 0, 0);
}
void FrameLoaderClientEfl::frameLoadCompleted()
@@ -765,12 +756,18 @@
void FrameLoaderClientEfl::dispatchDidFailLoad(const ResourceError& err)
{
- m_loadError = err;
ewk_frame_load_error(m_frame,
- m_loadError.domain().utf8().data(),
- m_loadError.errorCode(), m_loadError.isCancellation(),
- m_loadError.localizedDescription().utf8().data(),
- m_loadError.failingURL().utf8().data());
+ err.domain().utf8().data(),
+ err.errorCode(), err.isCancellation(),
+ err.localizedDescription().utf8().data(),
+ err.failingURL().utf8().data());
+
+ ewk_frame_load_finished(m_frame,
+ err.domain().utf8().data(),
+ err.errorCode(),
+ err.isCancellation(),
+ err.localizedDescription().utf8().data(),
+ err.failingURL().utf8().data());
}
void FrameLoaderClientEfl::download(ResourceHandle*, const ResourceRequest& request, const ResourceResponse&)
