Modified: trunk/Tools/ChangeLog (170235 => 170236)
--- trunk/Tools/ChangeLog 2014-06-21 08:49:35 UTC (rev 170235)
+++ trunk/Tools/ChangeLog 2014-06-21 08:53:20 UTC (rev 170236)
@@ -1,3 +1,16 @@
+2014-06-21 Tibor Meszaros <[email protected]>
+
+ [Inspector][EFL] Can't resume a special break point on EFL inspector
+ https://bugs.webkit.org/show_bug.cgi?id=129294
+
+ Reviewed by Gyuyoung Kim.
+
+ Patch our EFL 1.9 with the fix landed in upstream EFL 1.10
+ by Ryuan Choi - <https://phab.enlightenment.org/D790>
+
+ * efl/jhbuild.modules:
+ * efl/patches/ecore.patch: Added.
+
2014-06-21 Eva Balazsfalvi <[email protected]>
Removing PAGE_VISIBILITY_API compile guard.
Modified: trunk/Tools/efl/jhbuild.modules (170235 => 170236)
--- trunk/Tools/efl/jhbuild.modules 2014-06-21 08:49:35 UTC (rev 170235)
+++ trunk/Tools/efl/jhbuild.modules 2014-06-21 08:53:20 UTC (rev 170236)
@@ -164,6 +164,7 @@
repo="download.enlightenment.org"
hash="sha256:5dbeb99e1d26ccc74c9d054de5607a7e1020052b313c4b60c9a9794b45307501"
md5sum="51222f49d8faa7e72f097075fec223f5">
+ <patch file="ecore.patch" strip="1"/>
</branch>
</autotools>
Added: trunk/Tools/efl/patches/ecore.patch (0 => 170236)
--- trunk/Tools/efl/patches/ecore.patch (rev 0)
+++ trunk/Tools/efl/patches/ecore.patch 2014-06-21 08:53:20 UTC (rev 170236)
@@ -0,0 +1,102 @@
+diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
+index 705673b..44af8ad 100644
+--- a/src/lib/ecore/ecore_pipe.c
++++ b/src/lib/ecore/ecore_pipe.c
+@@ -586,12 +586,21 @@ _ecore_pipe_handler_call(Ecore_Pipe *p,
+ size_t len)
+ {
+ void *data = "" p->data;
++
++ // clear all values of pipe first.
++ p->passed_data = NULL;
++ p->already_read = 0;
++ p->len = 0;
++ p->message++;
++
+ if (!p->delete_me)
+ {
+ _ecore_unlock();
+ p->handler(data, buf, len);
+ _ecore_lock();
+ }
++ // free p->passed_data
++ free(buf);
+ }
+
+ static Eina_Bool
+@@ -634,11 +643,6 @@ _ecore_pipe_read(void *data,
+ {
+ /* no data on first try through means an error */
+ _ecore_pipe_handler_call(p, NULL, 0);
+- if (p->passed_data) free(p->passed_data);
+- p->passed_data = NULL;
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+ pipe_close(p->fd_read);
+ p->fd_read = PIPE_FD_INVALID;
+ p->fd_handler = NULL;
+@@ -673,11 +677,6 @@ _ecore_pipe_read(void *data,
+ if (WSAGetLastError() != WSAEWOULDBLOCK)
+ {
+ _ecore_pipe_handler_call(p, NULL, 0);
+- if (p->passed_data) free(p->passed_data);
+- p->passed_data = NULL;
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+ pipe_close(p->fd_read);
+ p->fd_read = PIPE_FD_INVALID;
+ p->fd_handler = NULL;
+@@ -694,12 +693,6 @@ _ecore_pipe_read(void *data,
+ if (p->len == 0)
+ {
+ _ecore_pipe_handler_call(p, NULL, 0);
+- /* reset all values to 0 */
+- if (p->passed_data) free(p->passed_data);
+- p->passed_data = NULL;
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+ _ecore_pipe_unhandle(p);
+ return ECORE_CALLBACK_RENEW;
+ }
+@@ -713,9 +706,6 @@ _ecore_pipe_read(void *data,
+ {
+ _ecore_pipe_handler_call(p, NULL, 0);
+ /* close the pipe */
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+ pipe_close(p->fd_read);
+ p->fd_read = PIPE_FD_INVALID;
+ p->fd_handler = NULL;
+@@ -732,15 +722,7 @@ _ecore_pipe_read(void *data,
+ /* catch the non error case first */
+ /* if we read enough data to finish the message/buffer */
+ if (ret == (ssize_t)(p->len - p->already_read))
+- {
+- _ecore_pipe_handler_call(p, p->passed_data, p->len);
+- free(p->passed_data);
+- /* reset all values to 0 */
+- p->passed_data = NULL;
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+- }
++ _ecore_pipe_handler_call(p, p->passed_data, p->len);
+ else if (ret > 0)
+ {
+ /* more data left to read */
+@@ -775,11 +757,6 @@ _ecore_pipe_read(void *data,
+ if (WSAGetLastError() != WSAEWOULDBLOCK)
+ {
+ _ecore_pipe_handler_call(p, NULL, 0);
+- if (p->passed_data) free(p->passed_data);
+- p->passed_data = NULL;
+- p->already_read = 0;
+- p->len = 0;
+- p->message++;
+ pipe_close(p->fd_read);
+ p->fd_read = PIPE_FD_INVALID;
+ p->fd_handler = NULL;
