<!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>[248146] trunk/Tools</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/248146">248146</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-08-01 20:50:15 -0700 (Thu, 01 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>results.webkit.org: Force update cache when timeline updated
https://bugs.webkit.org/show_bug.cgi?id=200363

Patch by Zhifei Fang <zhifei_fang@apple.com> on 2019-08-01
Reviewed by Jonathan Bedard.

* resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js:
(offscreenCachedRenderFactory): Add ability to force the redraw.
(Timeline.CanvasSeriesComponent): Force redraw when scales or dots are updated.
(Timeline.CanvasXAxisComponent): Force redraw when scales are updated. Add missing exporter for export scales update API</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsresultsdbpyresultsdbpyviewstaticlibraryjscomponentsTimelineComponentsjs">trunk/Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (248145 => 248146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-08-02 03:45:39 UTC (rev 248145)
+++ trunk/Tools/ChangeLog       2019-08-02 03:50:15 UTC (rev 248146)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-08-01  Zhifei Fang  <zhifei_fang@apple.com>
+
+        results.webkit.org: Force update cache when timeline updated
+        https://bugs.webkit.org/show_bug.cgi?id=200363
+
+        Reviewed by Jonathan Bedard.
+
+        * resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js:
+        (offscreenCachedRenderFactory): Add ability to force the redraw.
+        (Timeline.CanvasSeriesComponent): Force redraw when scales or dots are updated.
+        (Timeline.CanvasXAxisComponent): Force redraw when scales are updated. Add missing exporter for export scales update API
+
</ins><span class="cx"> 2019-08-01  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Do not send NetworkProcessProxy::LogTestingEvent message if we are not testing
</span></span></pre></div>
<a id="trunkToolsresultsdbpyresultsdbpyviewstaticlibraryjscomponentsTimelineComponentsjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js (248145 => 248146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js      2019-08-02 03:45:39 UTC (rev 248145)
+++ trunk/Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js 2019-08-02 03:50:15 UTC (rev 248146)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">     // This function will call redrawCache to render a offscreen cache
</span><span class="cx">     // and copy the viewport area from of it
</span><span class="cx">     // It will trigger redrawCache when cache don't have enough space
</span><del>-    return (redrawCache, element, stateDiff, state) => {
</del><ins>+    return (redrawCache, element, stateDiff, state, forceRedrawCache = false) => {
</ins><span class="cx">         const width = typeof stateDiff.width === 'number' ? stateDiff.width : state.width;
</span><span class="cx">         if (width <= 0)
</span><span class="cx">             // Nothing to render
</span><span class="lines">@@ -141,11 +141,19 @@
</span><span class="cx">         const scrollLeft = typeof stateDiff.scrollLeft === 'number' ? stateDiff.scrollLeft : state.scrollLeft;
</span><span class="cx">         const context = element.getContext('2d');
</span><span class="cx">         let cachePosLeft = scrollLeft - cachedScrollLeft;
</span><ins>+        let needToRedrawCache = forceRedrawCache;
</ins><span class="cx"> 
</span><span class="cx">         if (element.logicWidth != width) {
</span><span class="cx">             // Setup the dpr in case of blur
</span><span class="cx">             setupCanvasWidthWithDpr(element, width);
</span><ins>+            needToRedrawCache = true;
+        } else if (cachePosLeft < 0 || cachePosLeft + width > totalWidth) {
+            if (scrollLeft < 0 )
+                return;
+            needToRedrawCache = true;
+        }
</ins><span class="cx"> 
</span><ins>+        if (needToRedrawCache) {
</ins><span class="cx">             // We draw everything on cache
</span><span class="cx">             redrawCache(offscreenCanvas, element, stateDiff, state, () => {
</span><span class="cx">                 cachedScrollLeft = scrollLeft < padding ? scrollLeft : scrollLeft - padding;
</span><span class="lines">@@ -155,18 +163,6 @@
</span><span class="cx">                 context.clearRect(0, 0, element.width, element.height);
</span><span class="cx">                 context.drawImage(offscreenCanvas, cachePosLeft * getDevicePixelRatio(), 0,    element.width, element.height, 0, 0, width * getDevicePixelRatio(), element.height);
</span><span class="cx">             });
</span><del>-
-        } else if (cachePosLeft < 0 || cachePosLeft + width > totalWidth) {
-            if (scrollLeft < 0 )
-                return;
-            redrawCache(offscreenCanvas, element, stateDiff, state,    () => {
-                cachedScrollLeft = scrollLeft < padding ? scrollLeft : scrollLeft - padding;
-                cachePosLeft = scrollLeft - cachedScrollLeft;
-                if (cachePosLeft < 0)
-                    cachePosLeft = 0;
-                context.clearRect(0, 0, element.width, element.height);
-                context.drawImage(offscreenCanvas, cachePosLeft * getDevicePixelRatio(), 0,    element.width, element.height, 0, 0, width * getDevicePixelRatio(), element.height);
-            });
</del><span class="cx">         } else {
</span><span class="cx">             if (cachePosLeft < 0)
</span><span class="cx">                 cachePosLeft = 0;
</span><span class="lines">@@ -367,9 +363,13 @@
</span><span class="cx">         },
</span><span class="cx">         onStateUpdate: (element, stateDiff, state) => {
</span><span class="cx">             const context = element.getContext("2d");
</span><ins>+            let forceRedrawCache = false;
</ins><span class="cx">             if (stateDiff.scales || stateDiff.dots || typeof stateDiff.scrollLeft === 'number' || typeof stateDiff.width === 'number') {
</span><span class="cx">                 console.assert(dots.length <= scales.length);
</span><del>-                requestAnimationFrame(() => offscreenCachedRender(redrawCache, element, stateDiff, state));
</del><ins>+                if (stateDiff.scales || stateDiff.dots) {
+                    forceRedrawCache = true;
+                }
+                requestAnimationFrame(() => offscreenCachedRender(redrawCache, element, stateDiff, state, forceRedrawCache));
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     });
</span><span class="lines">@@ -711,10 +711,13 @@
</span><span class="cx">             }
</span><span class="cx">         },
</span><span class="cx">         onStateUpdate: (element, stateDiff, state) => {
</span><ins>+            let forceRedrawCache = false;
</ins><span class="cx">             if (stateDiff.scales || typeof stateDiff.scrollLeft === 'number' || typeof stateDiff.width === 'number') {
</span><del>-                if (stateDiff.scales)
</del><ins>+                if (stateDiff.scales) {
</ins><span class="cx">                     state.scalesMapLinkList = getScalesMapLinkList(stateDiff.scales);
</span><del>-                requestAnimationFrame(() => offscreenCachedRender(redrawCache, element, stateDiff, state));
</del><ins>+                    forceRedrawCache = true;
+                }
+                requestAnimationFrame(() => offscreenCachedRender(redrawCache, element, stateDiff, state, forceRedrawCache));
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     });
</span><span class="lines">@@ -722,6 +725,14 @@
</span><span class="cx">     return {
</span><span class="cx">         series: ListProviderReceiver((updateContainerWidth, onContainerScroll, onResize) => {
</span><span class="cx">             updateContainerWidth(scales.length * scaleWidth * getDevicePixelRatio());
</span><ins>+            const updateData = (scales) => {
+                updateContainerWidth(scales.length * scaleWidth * getDevicePixelRatio());
+                canvasRef.setState({
+                    scales: scales
+                });
+            }
+            if (typeof option.exporter === "function")
+                option.exporter(updateData);
</ins><span class="cx">             onContainerScroll.action((e) => {
</span><span class="cx">                 canvasRef.setState({scrollLeft: e.target.scrollLeft / getDevicePixelRatio()});
</span><span class="cx">             });
</span></span></pre>
</div>
</div>

</body>
</html>