<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181076] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181076">181076</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-05 06:05:12 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Crash when "Download Linked File" from MiniBrowser context menu is clicked
https://bugs.webkit.org/show_bug.cgi?id=131162
Patch by Lukasz Bialek <l.bialek@samsung.com> on 2015-03-05
Reviewed by Gyuyoung Kim.
Source/WebKit2:
"Download Linked File" crashes because of null-pointer exception of Download Job.
Due to architectural difficulties, easy fix is not possible (EwkView is needed in
DownloadManager to create DownloadJobs and it is only used to notify the client
about download (finished, error, cancel) via smart callback using EwkView (Evas_Object).
Propose a new callbacks which are view independent and detach EFL's DownloadManager
from EwkView. It makes DownloadManagerEFL consistent with WKContextDownload.
Fix the crash and restore download functionality.
* PlatformEfl.cmake:
Enable newly reimplemented tests
* UIProcess/API/efl/EwkViewCallbacks.h:
Remove old callback mechanism
* UIProcess/API/efl/ewk_context.cpp:
(ewk_context_download_callbacks_set):
* UIProcess/API/efl/ewk_context.h:
Declare new callback functions and registration functions
* UIProcess/API/efl/ewk_download_job.cpp:
(EwkDownloadJob::EwkDownloadJob):
(EwkDownloadJob::view): Deleted.
* UIProcess/API/efl/ewk_download_job.h:
* UIProcess/API/efl/ewk_download_job_private.h:
(EwkDownloadJob::create):
Remove EwkView dependency
* UIProcess/API/efl/ewk_view.h:
* UIProcess/API/efl/tests/test_ewk2_download_job.cpp:
Alter tests to new callback mechanism
* UIProcess/efl/DownloadManagerEfl.cpp:
(WebKit::DownloadManagerEfl::decideDestinationWithSuggestedFilename):
(WebKit::DownloadManagerEfl::didStart):
(WebKit::DownloadManagerEfl::didFail):
(WebKit::DownloadManagerEfl::didCancel):
(WebKit::DownloadManagerEfl::didFinish):
(WebKit::DownloadManagerEfl::DownloadManagerEfl):
(WebKit::DownloadManagerEfl::registerDownloadJob):
(WebKit::DownloadManagerEfl::setCallbacks):
* UIProcess/efl/DownloadManagerEfl.h:
* UIProcess/efl/WebViewEfl.cpp:
(WebKit::WebViewEfl::handleDownloadRequest):
Add support of new callback mechanism
Tools:
* MiniBrowser/efl/main.c:
(on_download_request):
(on_download_finished):
(on_download_failed):
(window_create):
Adapt download callbacks to new callback mechanism</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewCallbacksh">trunk/Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contexth">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_download_jobcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_download_jobh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_download_job_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_viewh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_download_jobcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflDownloadManagerEflcpp">trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflDownloadManagerEflh">trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebViewEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsereflmainc">trunk/Tools/MiniBrowser/efl/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2015-03-05 Lukasz Bialek <l.bialek@samsung.com>
+
+ [EFL][WK2] Crash when "Download Linked File" from MiniBrowser context menu is clicked
+ https://bugs.webkit.org/show_bug.cgi?id=131162
+
+ Reviewed by Gyuyoung Kim.
+
+ "Download Linked File" crashes because of null-pointer exception of Download Job.
+ Due to architectural difficulties, easy fix is not possible (EwkView is needed in
+ DownloadManager to create DownloadJobs and it is only used to notify the client
+ about download (finished, error, cancel) via smart callback using EwkView (Evas_Object).
+
+ Propose a new callbacks which are view independent and detach EFL's DownloadManager
+ from EwkView. It makes DownloadManagerEFL consistent with WKContextDownload.
+ Fix the crash and restore download functionality.
+
+ * PlatformEfl.cmake:
+ Enable newly reimplemented tests
+ * UIProcess/API/efl/EwkViewCallbacks.h:
+ Remove old callback mechanism
+ * UIProcess/API/efl/ewk_context.cpp:
+ (ewk_context_download_callbacks_set):
+ * UIProcess/API/efl/ewk_context.h:
+ Declare new callback functions and registration functions
+ * UIProcess/API/efl/ewk_download_job.cpp:
+ (EwkDownloadJob::EwkDownloadJob):
+ (EwkDownloadJob::view): Deleted.
+ * UIProcess/API/efl/ewk_download_job.h:
+ * UIProcess/API/efl/ewk_download_job_private.h:
+ (EwkDownloadJob::create):
+ Remove EwkView dependency
+ * UIProcess/API/efl/ewk_view.h:
+ * UIProcess/API/efl/tests/test_ewk2_download_job.cpp:
+ Alter tests to new callback mechanism
+ * UIProcess/efl/DownloadManagerEfl.cpp:
+ (WebKit::DownloadManagerEfl::decideDestinationWithSuggestedFilename):
+ (WebKit::DownloadManagerEfl::didStart):
+ (WebKit::DownloadManagerEfl::didFail):
+ (WebKit::DownloadManagerEfl::didCancel):
+ (WebKit::DownloadManagerEfl::didFinish):
+ (WebKit::DownloadManagerEfl::DownloadManagerEfl):
+ (WebKit::DownloadManagerEfl::registerDownloadJob):
+ (WebKit::DownloadManagerEfl::setCallbacks):
+ * UIProcess/efl/DownloadManagerEfl.h:
+ * UIProcess/efl/WebViewEfl.cpp:
+ (WebKit::WebViewEfl::handleDownloadRequest):
+ Add support of new callback mechanism
+
</ins><span class="cx"> 2015-03-05 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Disable RC4
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -507,6 +507,7 @@
</span><span class="cx"> test_ewk2_context_history_callbacks
</span><span class="cx"> test_ewk2_cookie_manager
</span><span class="cx"> test_ewk2_database_manager
</span><ins>+ test_ewk2_download_job
</ins><span class="cx"> test_ewk2_eina_shared_string
</span><span class="cx"> test_ewk2_favicon_database
</span><span class="cx"> test_ewk2_file_chooser_request
</span><span class="lines">@@ -524,7 +525,6 @@
</span><span class="cx"> #
</span><span class="cx"> # webkit.org/b/107422: test_ewk2_auth_request
</span><span class="cx"> # webkit.org/b/132980: test_ewk2_context_menu
</span><del>-# webkit.org/b/132981: test_ewk2_download_job
</del><span class="cx"> # webkit.org/b/141249: test_ewk2_storage_manager
</span><span class="cx">
</span><span class="cx"> if (ENABLE_API_TESTS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewCallbacksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -48,10 +48,6 @@
</span><span class="cx"> BackForwardListChange,
</span><span class="cx"> CancelVibration,
</span><span class="cx"> ContentsSizeChanged,
</span><del>- DownloadJobCancelled,
- DownloadJobFailed,
- DownloadJobFinished,
- DownloadJobRequested,
</del><span class="cx"> FileChooserRequest,
</span><span class="cx"> FocusNotFound,
</span><span class="cx"> NewFormSubmissionRequest,
</span><span class="lines">@@ -176,10 +172,6 @@
</span><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(BackForwardListChange, "back,forward,list,changed", void);
</span><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(CancelVibration, "cancel,vibration", void);
</span><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(ContentsSizeChanged, "contents,size,changed", Ewk_CSS_Size*);
</span><del>-DECLARE_EWK_VIEW_CALLBACK(DownloadJobCancelled, "download,cancelled", Ewk_Download_Job*);
-DECLARE_EWK_VIEW_CALLBACK(DownloadJobFailed, "download,failed", Ewk_Download_Job_Error*);
-DECLARE_EWK_VIEW_CALLBACK(DownloadJobFinished, "download,finished", Ewk_Download_Job*);
-DECLARE_EWK_VIEW_CALLBACK(DownloadJobRequested, "download,request", Ewk_Download_Job*);
</del><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(FileChooserRequest, "file,chooser,request", Ewk_File_Chooser_Request*);
</span><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(FocusNotFound, "focus,notfound", Ewk_Focus_Direction);
</span><span class="cx"> DECLARE_EWK_VIEW_CALLBACK(NewFormSubmissionRequest, "form,submission,request", Ewk_Form_Submission_Request*);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -488,6 +488,13 @@
</span><span class="cx"> impl->historyClient()->setCallbacks(navigate, clientRedirect, serverRedirect, titleUpdate, populateVisitedLinks, data);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ewk_context_download_callbacks_set(Ewk_Context* ewkContext, Ewk_Download_Requested_Cb requested, Ewk_Download_Failed_Cb failed, Ewk_Download_Cancelled_Cb cancelled, Ewk_Download_Finished_Cb finished, void* data)
+{
+ EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl);
+
+ impl->downloadManager()->setClientCallbacks(requested, failed, cancelled, finished, data);
+}
+
</ins><span class="cx"> void ewk_context_visited_link_add(Ewk_Context* ewkContext, const char* visitedURL)
</span><span class="cx"> {
</span><span class="cx"> EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> #include "ewk_application_cache_manager.h"
</span><span class="cx"> #include "ewk_cookie_manager.h"
</span><span class="cx"> #include "ewk_database_manager.h"
</span><ins>+#include "ewk_download_job.h"
+#include "ewk_error.h"
</ins><span class="cx"> #include "ewk_favicon_database.h"
</span><span class="cx"> #include "ewk_navigation_data.h"
</span><span class="cx"> #include "ewk_storage_manager.h"
</span><span class="lines">@@ -50,7 +52,18 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+/// Creates a type name for Ewk_Download_Job_Error.
+typedef struct Ewk_Download_Job_Error Ewk_Download_Job_Error;
+
</ins><span class="cx"> /**
</span><ins>+ * @brief Structure containing details about a download failure.
+ */
+struct Ewk_Download_Job_Error {
+ Ewk_Download_Job *download_job; /**< download that failed */
+ Ewk_Error *error; /**< download error */
+};
+
+/**
</ins><span class="cx"> * Declare Ewk_Context as Ewk_Object.
</span><span class="cx"> *
</span><span class="cx"> * @see Ewk_Object
</span><span class="lines">@@ -131,6 +144,30 @@
</span><span class="cx"> typedef void (*Ewk_History_Title_Update_Cb)(const Evas_Object *view, const char *title, const char *url, void *user_data);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @typedef Ewk_Download_Requested_Cb Ewk_Download_Requested_Cb
+ * @brief Type definition for a function that will be called back when new download job is requested.
+ */
+typedef void (*Ewk_Download_Requested_Cb)(Ewk_Download_Job *download, void *user_data);
+
+/**
+ * @typedef Ewk_Download_Failed_Cb Ewk_Download_Failed_Cb
+ * @brief Type definition for a function that will be called back when a download job has failed.
+ */
+typedef void (*Ewk_Download_Failed_Cb)(Ewk_Download_Job_Error *error, void *user_data);
+
+/**
+ * @typedef Ewk_Download_Cancelled_Cb Ewk_Download_Cancelled_Cb
+ * @brief Type definition for a function that will be called back when a download job is cancelled.
+ */
+typedef void (*Ewk_Download_Cancelled_Cb)(Ewk_Download_Job *download, void *user_data);
+
+/**
+ * @typedef Ewk_Download_Finished_Cb Ewk_Download_Finished_Cb
+ * @brief Type definition for a function that will be called back when a download job is finished.
+ */
+typedef void (*Ewk_Download_Finished_Cb)(Ewk_Download_Job *download, void *user_data);
+
+/**
</ins><span class="cx"> * @typedef Ewk_Context_History_Client_Visited_Links_Populate_Cb Ewk_Context_History_Client_Visited_Links_Populate_Cb
</span><span class="cx"> * @brief Type definition for a function that will be called back when client is asked to provide visited links from a client-managed storage.
</span><span class="cx"> *
</span><span class="lines">@@ -316,6 +353,26 @@
</span><span class="cx"> void *data);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Sets download callbacks for the given @a context.
+ *
+ * To stop listening for download events, you may call this function with @c
+ * NULL for the callbacks.
+ *
+ * @param context context object to set download callbacks
+ * @param download_requested_func the function to call when new download is requested (may be @c NULL).
+ * @param download_failed_func the function to call when a download job has failed (may be @c NULL).
+ * @param download_cancelled_func the function to call when a download job is cancelled (may be @c NULL).
+ * @param download_finished_func the function to call when a download job is finished (may be @c NULL).
+ * @param data User data (may be @c NULL).
+ */
+EAPI void ewk_context_download_callbacks_set(Ewk_Context *context,
+ Ewk_Download_Requested_Cb download_requested_func,
+ Ewk_Download_Failed_Cb download_failed_func,
+ Ewk_Download_Cancelled_Cb download_cancelled_func,
+ Ewk_Download_Finished_Cb download_finished_func,
+ void* data);
+
+/**
</ins><span class="cx"> * Registers the given @a visited_url as visited link in @a context visited link cache.
</span><span class="cx"> *
</span><span class="cx"> * This function shall be invoked as a response to @c populateVisitedLinks callback of the history cient.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_download_jobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -36,9 +36,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-EwkDownloadJob::EwkDownloadJob(WKDownloadRef download, EwkView* viewImpl)
</del><ins>+EwkDownloadJob::EwkDownloadJob(WKDownloadRef download)
</ins><span class="cx"> : m_download(download)
</span><del>- , m_viewImpl(viewImpl)
</del><span class="cx"> , m_state(EWK_DOWNLOAD_JOB_STATE_NOT_STARTED)
</span><span class="cx"> , m_startTime(-1)
</span><span class="cx"> , m_endTime(-1)
</span><span class="lines">@@ -54,16 +53,6 @@
</span><span class="cx"> return WKDownloadGetID(m_download.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * @internal
- * Returns the view this download is attached to.
- * The view is needed to send notification signals.
- */
-EwkView* EwkDownloadJob::view() const
-{
- return m_viewImpl;
-}
-
</del><span class="cx"> Ewk_Download_Job_State ewk_download_job_state_get(const Ewk_Download_Job* download)
</span><span class="cx"> {
</span><span class="cx"> EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, EWK_DOWNLOAD_JOB_STATE_UNKNOWN);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_download_jobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Cancels the download asynchronously.
</span><span class="cx"> *
</span><del>- * When the ongoing download operation is effectively cancelled a "download,cancelled"
- * signal will be emitted on the view.
</del><ins>+ * When the ongoing download operation is effectively cancelled, a "Ewk_Download_Cancelled_Cb"
+ * will be called in DownloadManager.
</ins><span class="cx"> *
</span><span class="cx"> * @param download a #Ewk_Download_Job to cancel.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_download_job_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job_private.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job_private.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job_private.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> public:
</span><span class="cx"> EWK_OBJECT_DECLARE(EwkDownloadJob)
</span><span class="cx">
</span><del>- static PassRefPtr<EwkDownloadJob> create(WKDownloadRef download, EwkView* viewImpl)
</del><ins>+ static PassRefPtr<EwkDownloadJob> create(WKDownloadRef download)
</ins><span class="cx"> {
</span><del>- return adoptRef(new EwkDownloadJob(download, viewImpl));
</del><ins>+ return adoptRef(new EwkDownloadJob(download));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t id() const;
</span><span class="lines">@@ -71,10 +71,9 @@
</span><span class="cx"> uint64_t receivedDataSize() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- EwkDownloadJob(WKDownloadRef download, EwkView* view);
</del><ins>+ explicit EwkDownloadJob(WKDownloadRef download);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKDownloadRef> m_download;
</span><del>- EwkView* m_viewImpl;
</del><span class="cx"> Ewk_Download_Job_State m_state;
</span><span class="cx"> mutable RefPtr<EwkUrlRequest> m_request;
</span><span class="cx"> RefPtr<EwkUrlResponse> m_response;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_viewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -31,11 +31,6 @@
</span><span class="cx"> * - "back,forward,list,changed", void: reports that the view's back / forward list had changed.
</span><span class="cx"> * - "cancel,vibration", void: request to cancel the vibration.
</span><span class="cx"> * - "contents,size,changed", Ewk_CSS_Size*: reports that contents size was changed.
</span><del>- * - "download,cancelled", Ewk_Download_Job*: reports that a download was effectively cancelled.
- * - "download,failed", Ewk_Download_Job_Error*: reports that a download failed with the given error.
- * - "download,finished", Ewk_Download_Job*: reports that a download completed successfully.
- * - "download,request", Ewk_Download_Job*: reports that a new download has been requested. The client should set the
- * destination path by calling ewk_download_job_destination_set() or the download will fail.
</del><span class="cx"> * - "file,chooser,request", Ewk_File_Chooser_Request*: reports that a request has been made for the user to choose
</span><span class="cx"> * a file (or several) on the file system. Call ewk_file_chooser_request_ref() on the request object to process it
</span><span class="cx"> * asynchronously.
</span><span class="lines">@@ -79,7 +74,6 @@
</span><span class="cx"> #include "ewk_context.h"
</span><span class="cx"> #include "ewk_context_menu.h"
</span><span class="cx"> #include "ewk_download_job.h"
</span><del>-#include "ewk_error.h"
</del><span class="cx"> #include "ewk_page_group.h"
</span><span class="cx"> #include "ewk_popup_menu.h"
</span><span class="cx"> #include "ewk_security_origin.h"
</span><span class="lines">@@ -243,17 +237,6 @@
</span><span class="cx"> } changed;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-/// Creates a type name for Ewk_Download_Job_Error.
-typedef struct Ewk_Download_Job_Error Ewk_Download_Job_Error;
-
-/**
- * @brief Structure containing details about a download failure.
- */
-struct Ewk_Download_Job_Error {
- Ewk_Download_Job *download_job; /**< download that failed */
- Ewk_Error *error; /**< download error */
-};
-
</del><span class="cx"> /// Creates a type name for Ewk_CSS_Size.
</span><span class="cx"> typedef struct Ewk_CSS_Size Ewk_CSS_Size;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_download_jobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> eina_file_close(f);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void on_download_requested(void* userData, Evas_Object* webview, void* eventInfo)
</del><ins>+ static void on_download_requested(EwkObject* eventInfo, void* userData)
</ins><span class="cx"> {
</span><span class="cx"> DownloadTestData* testData = static_cast<DownloadTestData*>(userData);
</span><span class="cx"> Ewk_Download_Job* download = static_cast<Ewk_Download_Job*>(eventInfo);
</span><span class="lines">@@ -120,22 +120,21 @@
</span><span class="cx"> EXPECT_STREQ(testData->destinationPath, ewk_download_job_destination_get(download));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void on_download_cancelled(void* userData, Evas_Object* webview, void* eventInfo)
</del><ins>+ static void on_download_cancelled(EwkObject*, void*)
</ins><span class="cx"> {
</span><span class="cx"> fprintf(stderr, "Download was cancelled.\n");
</span><span class="cx"> ecore_main_loop_quit();
</span><span class="cx"> FAIL();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void on_download_failed(void* userData, Evas_Object* webview, void* eventInfo)
</del><ins>+ static void on_download_failed(Ewk_Download_Job_Error* downloadError, void* userData)
</ins><span class="cx"> {
</span><del>- Ewk_Download_Job_Error* downloadError = static_cast<Ewk_Download_Job_Error*>(eventInfo);
</del><span class="cx"> fprintf(stderr, "Download error: %s\n", ewk_error_description_get(downloadError->error));
</span><span class="cx"> ecore_main_loop_quit();
</span><span class="cx"> FAIL();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void on_download_finished(void* userData, Evas_Object* webview, void* eventInfo)
</del><ins>+ static void on_download_finished(EwkObject* eventInfo, void* userData)
</ins><span class="cx"> {
</span><span class="cx"> DownloadTestData* testData = static_cast<DownloadTestData*>(userData);
</span><span class="cx"> Ewk_Download_Job* download = static_cast<Ewk_Download_Job*>(eventInfo);
</span><span class="lines">@@ -166,10 +165,8 @@
</span><span class="cx"> DownloadTestData userData = { fileUrl.data(), destinationPath };
</span><span class="cx"> ASSERT_FALSE(fileExists(destinationPath));
</span><span class="cx">
</span><del>- evas_object_smart_callback_add(webView(), "download,request", on_download_requested, &userData);
- evas_object_smart_callback_add(webView(), "download,cancel", on_download_cancelled, &userData);
- evas_object_smart_callback_add(webView(), "download,failed", on_download_failed, &userData);
- evas_object_smart_callback_add(webView(), "download,finished", on_download_finished, &userData);
</del><ins>+ Ewk_Context* context = ewk_view_context_get(webView());
+ ewk_context_download_callbacks_set(context, on_download_requested, on_download_failed, on_download_cancelled, on_download_finished, &userData);
</ins><span class="cx">
</span><span class="cx"> // Download test pdf
</span><span class="cx"> ewk_view_url_set(webView(), fileUrl.data());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflDownloadManagerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -45,14 +45,16 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef DownloadManagerEfl::decideDestinationWithSuggestedFilename(WKContextRef, WKDownloadRef wkDownload, WKStringRef filename, bool* /*allowOverwrite*/, const void* clientInfo)
</span><span class="cx"> {
</span><del>- EwkDownloadJob* download = toDownloadManagerEfl(clientInfo)->ewkDownloadJob(wkDownload);
</del><ins>+ DownloadManagerEfl* downloadManager = toDownloadManagerEfl(clientInfo);
+ EwkDownloadJob* download = downloadManager->ewkDownloadJob(wkDownload);
</ins><span class="cx"> ASSERT(download);
</span><span class="cx">
</span><span class="cx"> download->setSuggestedFileName(toImpl(filename)->string().utf8().data());
</span><span class="cx">
</span><del>- // We send the new download signal on the Ewk_View only once we have received the response
</del><ins>+ // We call DownloadRequested callback only once we have received the response
</ins><span class="cx"> // and the suggested file name.
</span><del>- download->view()->smartCallback<DownloadJobRequested>().call(download);
</del><ins>+ if (downloadManager->m_clientCallbacks.m_requested)
+ downloadManager->m_clientCallbacks.m_requested(download, downloadManager->m_clientCallbacks.m_userData);
</ins><span class="cx">
</span><span class="cx"> // DownloadSoup expects the destination to be a URL.
</span><span class="cx"> String destination = ASCIILiteral("file://") + String::fromUTF8(download->destination());
</span><span class="lines">@@ -82,6 +84,12 @@
</span><span class="cx"> download->incrementReceivedData(length);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DownloadManagerEfl::didStart(WKContextRef, WKDownloadRef wkDownload, const void* clientInfo)
+{
+ DownloadManagerEfl* downloadManager = toDownloadManagerEfl(clientInfo);
+ downloadManager->registerDownloadJob(wkDownload);
+}
+
</ins><span class="cx"> void DownloadManagerEfl::didFail(WKContextRef, WKDownloadRef wkDownload, WKErrorRef error, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> DownloadManagerEfl* downloadManager = toDownloadManagerEfl(clientInfo);
</span><span class="lines">@@ -91,7 +99,8 @@
</span><span class="cx"> auto ewkError = std::make_unique<EwkError>(error);
</span><span class="cx"> download->setState(EWK_DOWNLOAD_JOB_STATE_FAILED);
</span><span class="cx"> Ewk_Download_Job_Error downloadError = { download, ewkError.get() };
</span><del>- download->view()->smartCallback<DownloadJobFailed>().call(&downloadError);
</del><ins>+ if (downloadManager->m_clientCallbacks.m_failed)
+ downloadManager->m_clientCallbacks.m_failed(&downloadError, downloadManager->m_clientCallbacks.m_userData);
</ins><span class="cx"> downloadManager->unregisterDownloadJob(wkDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +111,8 @@
</span><span class="cx"> ASSERT(download);
</span><span class="cx">
</span><span class="cx"> download->setState(EWK_DOWNLOAD_JOB_STATE_CANCELLED);
</span><del>- download->view()->smartCallback<DownloadJobCancelled>().call(download);
</del><ins>+ if (downloadManager->m_clientCallbacks.m_cancelled)
+ downloadManager->m_clientCallbacks.m_cancelled(download, downloadManager->m_clientCallbacks.m_userData);
</ins><span class="cx"> downloadManager->unregisterDownloadJob(wkDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,13 +123,16 @@
</span><span class="cx"> ASSERT(download);
</span><span class="cx">
</span><span class="cx"> download->setState(EWK_DOWNLOAD_JOB_STATE_FINISHED);
</span><del>- download->view()->smartCallback<DownloadJobFinished>().call(download);
</del><ins>+ if (downloadManager->m_clientCallbacks.m_finished)
+ downloadManager->m_clientCallbacks.m_finished(download, downloadManager->m_clientCallbacks.m_userData);
</ins><span class="cx"> downloadManager->unregisterDownloadJob(wkDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DownloadManagerEfl::DownloadManagerEfl(WKContextRef context)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><ins>+ memset(&m_clientCallbacks, 0, sizeof(ClientDownloadCallbacks));
+
</ins><span class="cx"> WKContextDownloadClientV0 wkDownloadClient;
</span><span class="cx"> memset(&wkDownloadClient, 0, sizeof(WKContextDownloadClient));
</span><span class="cx">
</span><span class="lines">@@ -130,6 +143,7 @@
</span><span class="cx"> wkDownloadClient.didCreateDestination = didCreateDestination;
</span><span class="cx"> wkDownloadClient.didReceiveResponse = didReceiveResponse;
</span><span class="cx"> wkDownloadClient.didReceiveData = didReceiveData;
</span><ins>+ wkDownloadClient.didStart = didStart;
</ins><span class="cx"> wkDownloadClient.didFail = didFail;
</span><span class="cx"> wkDownloadClient.didFinish = didFinish;
</span><span class="cx">
</span><span class="lines">@@ -141,13 +155,13 @@
</span><span class="cx"> WKContextSetDownloadClient(m_context.get(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadManagerEfl::registerDownloadJob(WKDownloadRef download, EwkView* viewImpl)
</del><ins>+void DownloadManagerEfl::registerDownloadJob(WKDownloadRef download)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t downloadId = WKDownloadGetID(download);
</span><span class="cx"> if (m_downloadJobs.contains(downloadId))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<EwkDownloadJob> ewkDownload = EwkDownloadJob::create(download, viewImpl);
</del><ins>+ RefPtr<EwkDownloadJob> ewkDownload = EwkDownloadJob::create(download);
</ins><span class="cx"> m_downloadJobs.add(downloadId, ewkDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -161,4 +175,13 @@
</span><span class="cx"> m_downloadJobs.remove(WKDownloadGetID(wkDownload));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DownloadManagerEfl::setClientCallbacks(Ewk_Download_Requested_Cb requested, Ewk_Download_Failed_Cb failed, Ewk_Download_Cancelled_Cb cancelled, Ewk_Download_Finished_Cb finished, void* userData)
+{
+ m_clientCallbacks.m_requested = requested;
+ m_clientCallbacks.m_failed = failed;
+ m_clientCallbacks.m_cancelled = cancelled;
+ m_clientCallbacks.m_finished = finished;
+ m_clientCallbacks.m_userData = userData;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflDownloadManagerEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.h (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.h 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.h 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DownloadManagerEfl_h
</span><span class="cx"> #define DownloadManagerEfl_h
</span><span class="cx">
</span><ins>+#include "ewk_context.h"
</ins><span class="cx"> #include "ewk_download_job_private.h"
</span><span class="cx"> #include <WebKit/WKRetainPtr.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -33,12 +34,21 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+struct ClientDownloadCallbacks {
+ Ewk_Download_Requested_Cb m_requested;
+ Ewk_Download_Failed_Cb m_failed;
+ Ewk_Download_Cancelled_Cb m_cancelled;
+ Ewk_Download_Finished_Cb m_finished;
+ void* m_userData;
+};
+
</ins><span class="cx"> class DownloadManagerEfl {
</span><span class="cx"> public:
</span><span class="cx"> explicit DownloadManagerEfl(WKContextRef);
</span><span class="cx"> ~DownloadManagerEfl();
</span><span class="cx">
</span><del>- void registerDownloadJob(WKDownloadRef, EwkView*);
</del><ins>+ void registerDownloadJob(WKDownloadRef);
+ void setClientCallbacks(Ewk_Download_Requested_Cb, Ewk_Download_Failed_Cb, Ewk_Download_Cancelled_Cb, Ewk_Download_Finished_Cb, void* userData);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> EwkDownloadJob* ewkDownloadJob(WKDownloadRef);
</span><span class="lines">@@ -49,11 +59,14 @@
</span><span class="cx"> static void didCreateDestination(WKContextRef, WKDownloadRef, WKStringRef path, const void* clientInfo);
</span><span class="cx"> static void didReceiveData(WKContextRef, WKDownloadRef, uint64_t length, const void* clientInfo);
</span><span class="cx"> static void didFail(WKContextRef, WKDownloadRef, WKErrorRef, const void* clientInfo);
</span><ins>+ static void didStart(WKContextRef, WKDownloadRef, const void* clientInfo);
</ins><span class="cx"> static void didCancel(WKContextRef, WKDownloadRef, const void* clientInfo);
</span><span class="cx"> static void didFinish(WKContextRef, WKDownloadRef, const void* clientInfo);
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> m_context;
</span><span class="cx"> HashMap<uint64_t, RefPtr<EwkDownloadJob> > m_downloadJobs;
</span><ins>+
+ ClientDownloadCallbacks m_clientCallbacks;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebViewEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> void WebViewEfl::handleDownloadRequest(DownloadProxy* download)
</span><span class="cx"> {
</span><span class="cx"> EwkContext* context = m_ewkView->ewkContext();
</span><del>- context->downloadManager()->registerDownloadJob(toAPI(download), m_ewkView);
</del><ins>+ context->downloadManager()->registerDownloadJob(toAPI(download));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewEfl::setThemePath(const String& theme)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Tools/ChangeLog 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-05 Lukasz Bialek <l.bialek@samsung.com>
+
+ [EFL][WK2] Crash when "Download Linked File" from MiniBrowser context menu is clicked
+ https://bugs.webkit.org/show_bug.cgi?id=131162
+
+ Reviewed by Gyuyoung Kim.
+
+ * MiniBrowser/efl/main.c:
+ (on_download_request):
+ (on_download_finished):
+ (on_download_failed):
+ (window_create):
+ Adapt download callbacks to new callback mechanism
+
</ins><span class="cx"> 2015-03-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix /webkit2/WebKitWebResource/mime-type after r180927.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (181075 => 181076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2015-03-05 10:45:23 UTC (rev 181075)
+++ trunk/Tools/MiniBrowser/efl/main.c 2015-03-05 14:05:12 UTC (rev 181076)
</span><span class="lines">@@ -732,9 +732,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_request(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+on_download_request(Ewk_Download_Job *download, void *user_data)
</ins><span class="cx"> {
</span><del>- Ewk_Download_Job *download = (Ewk_Download_Job *)event_info;
</del><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> Eina_Strbuf *destination_path = eina_strbuf_new();
</span><span class="lines">@@ -842,16 +841,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_finished(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+on_download_finished(Ewk_Download_Job *download, void *user_data)
</ins><span class="cx"> {
</span><del>- Ewk_Download_Job *download = (Ewk_Download_Job *)event_info;
</del><span class="cx"> INFO("Download finished: %s", ewk_download_job_destination_get(download));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_failed(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+on_download_failed(Ewk_Download_Job_Error *download_error, void *user_data)
</ins><span class="cx"> {
</span><del>- INFO("Download failed!");
</del><ins>+ Ewk_Error *error = download_error->error;
+
+ INFO("Download failed! Error code: %d, Error description: %s, Error URL: %s", ewk_error_code_get(error), ewk_error_description_get(error), ewk_error_url_get(error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="lines">@@ -2257,11 +2257,7 @@
</span><span class="cx"> ewk_settings_preferred_minimum_contents_width_set(settings, 0);
</span><span class="cx"> ewk_text_checker_continuous_spell_checking_enabled_set(spell_checking_enabled);
</span><span class="cx"> ewk_settings_web_security_enabled_set(settings, web_security_enabled);
</span><del>-
</del><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "authentication,request", on_authentication_request, window);
</span><del>- evas_object_smart_callback_add(window->ewk_view, "download,failed", on_download_failed, window);
- evas_object_smart_callback_add(window->ewk_view, "download,finished", on_download_finished, window);
- evas_object_smart_callback_add(window->ewk_view, "download,request", on_download_request, window);
</del><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "file,chooser,request", on_file_chooser_request, window);
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "load,error", on_error, window);
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "load,provisional,failed", on_error, window);
</span><span class="lines">@@ -2427,6 +2423,9 @@
</span><span class="cx"> if (!window)
</span><span class="cx"> return quit(EINA_FALSE, "Could not create browser window.");
</span><span class="cx">
</span><ins>+ // Set callbacks for download events.
+ ewk_context_download_callbacks_set(context, on_download_request, on_download_failed, 0, on_download_finished, window);
+
</ins><span class="cx"> if (args < argc) {
</span><span class="cx"> char *url = url_from_user_input(argv[args]);
</span><span class="cx"> ewk_view_url_set(window->ewk_view, url);
</span></span></pre>
</div>
</div>
</body>
</html>