<!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>[191720] trunk/Source/WebCore</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/191720">191720</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 22:20:51 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/191673">r191673</a>): [WIN][EFL][GTK] layout tests using data URLs time out
https://bugs.webkit.org/show_bug.cgi?id=150661
Reviewed by Gyuyoung Kim.
Do a partial revert of <a href="http://trac.webkit.org/projects/webkit/changeset/191673">r191673</a>. For some reason, using a Timer in
DataURLDecoder does not work (it does not fire). Since non COCOA ports
don't support RunLoopTimer, this patch reintroduces the use of
callOnMainThread() on non-COCOA ports.
* platform/network/DataURLDecoder.cpp:
(WebCore::DataURLDecoder::decode):
(WebCore::DataURLDecoder::DecodingResultDispatcher::startTimer): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLDecodercpp">trunk/Source/WebCore/platform/network/DataURLDecoder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191719 => 191720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 03:10:15 UTC (rev 191719)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 05:20:51 UTC (rev 191720)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-28 Chris Dumez <cdumez@apple.com>
+
+ Regression(r191673): [WIN][EFL][GTK] layout tests using data URLs time out
+ https://bugs.webkit.org/show_bug.cgi?id=150661
+
+ Reviewed by Gyuyoung Kim.
+
+ Do a partial revert of r191673. For some reason, using a Timer in
+ DataURLDecoder does not work (it does not fire). Since non COCOA ports
+ don't support RunLoopTimer, this patch reintroduces the use of
+ callOnMainThread() on non-COCOA ports.
+
+ * platform/network/DataURLDecoder.cpp:
+ (WebCore::DataURLDecoder::decode):
+ (WebCore::DataURLDecoder::DecodingResultDispatcher::startTimer): Deleted.
+
</ins><span class="cx"> 2015-10-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Rename InspectorResourceAgent to InspectorNetworkAgent
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DataURLDecoder.cpp (191719 => 191720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURLDecoder.cpp 2015-10-29 03:10:15 UTC (rev 191719)
+++ trunk/Source/WebCore/platform/network/DataURLDecoder.cpp 2015-10-29 05:20:51 UTC (rev 191720)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "DecodeEscapeSequences.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><del>-#include "Timer.h"
</del><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -55,6 +54,8 @@
</span><span class="cx"> Result result;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if HAVE(RUNLOOP_TIMER)
+
</ins><span class="cx"> class DecodingResultDispatcher {
</span><span class="cx"> public:
</span><span class="cx"> static void dispatch(std::unique_ptr<DecodeTask> decodeTask)
</span><span class="lines">@@ -73,9 +74,7 @@
</span><span class="cx"> void startTimer()
</span><span class="cx"> {
</span><span class="cx"> m_timer.startOneShot(0);
</span><del>-#if HAVE(RUNLOOP_TIMER)
</del><span class="cx"> m_timer.schedule(m_decodeTask->scheduleContext.scheduledPairs);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void timerFired()
</span><span class="lines">@@ -88,15 +87,12 @@
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(RUNLOOP_TIMER)
- typedef RunLoopTimer<DecodingResultDispatcher> DecodingResultDispatcherTimer;
-#else
- typedef Timer DecodingResultDispatcherTimer;
-#endif
- DecodingResultDispatcherTimer m_timer;
</del><ins>+ RunLoopTimer<DecodingResultDispatcher> m_timer;
</ins><span class="cx"> std::unique_ptr<DecodeTask> m_decodeTask;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#endif // HAVE(RUNLOOP_TIMER)
+
</ins><span class="cx"> static Result parseMediaType(const String& mediaType)
</span><span class="cx"> {
</span><span class="cx"> auto mimeType = extractMIMETypeFromMediaType(mediaType);
</span><span class="lines">@@ -177,7 +173,18 @@
</span><span class="cx"> else
</span><span class="cx"> decodeEscaped(decodeTask);
</span><span class="cx">
</span><ins>+#if HAVE(RUNLOOP_TIMER)
</ins><span class="cx"> DecodingResultDispatcher::dispatch(std::unique_ptr<DecodeTask>(decodeTaskPtr));
</span><ins>+#else
+ callOnMainThread([decodeTaskPtr] {
+ std::unique_ptr<DecodeTask> decodeTask(decodeTaskPtr);
+ if (!decodeTask->result.data) {
+ decodeTask->completionHandler({ });
+ return;
+ }
+ decodeTask->completionHandler(WTF::move(decodeTask->result));
+ });
+#endif
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>