Commit a2dd9ddf authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[EFL] FrameLoaderClient should send "load,finished" signal for all frame, not just the main one

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

Patch by Christophe Dumez <christophe.dumez@intel.com> on 2012-04-17
Reviewed by Antonio Gomes.

Source/WebKit/efl:

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):

LayoutTests:

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f0330aae
2012-04-17 Christophe Dumez <christophe.dumez@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.nagineni@linux.intel.com>
 
[EFL] Add setting API to enable/disable XSSAuditor
......@@ -751,7 +751,6 @@ fast/loader/null-request-after-willSendRequest.html
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/drag-drop-same-unique-origin.html
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
......
2012-04-17 Christophe Dumez <christophe.dumez@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.nagineni@linux.intel.com>
[EFL] Add setting API to enable/disable XSSAuditor
......
......@@ -232,16 +232,7 @@ void FrameLoaderClientEfl::postProgressEstimateChangedNotification()
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 @@ bool FrameLoaderClientEfl::hasFrameView() const
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::dispatchDidFailProvisionalLoad(const ResourceError& e
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&)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment