[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 127260: Experiment: cache svg icons from icon theme
From: David Edmundson <david () davidedmundson ! co ! uk>
Date: 2016-03-31 15:34:12
Message-ID: 20160331153412.12706.87035 () mimi ! kde ! org
[Download RAW message or body]
--===============9191496418246799735==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/127260/#review94156
-----------------------------------------------------------
autotests/themetest.cpp (line 71)
<https://git.reviewboard.kde.org/r/127260/#comment64083>
We need to test the cache aspect of everything, as that's really the entire \
point.
it looks like we can access it with
m_svg->theme()->findInCache() to check things if icons were actually being \
inserted.
and then we can test that the cache *doesn't* contain an entry after the spy \
finishes.
I made a patch:
https://paste.kde.org/pgyzgxmzv
From what I can tell, it doesn't work. Though that's possibly my part new lines?
src/plasma/svg.cpp (line 228)
<https://git.reviewboard.kde.org/r/127260/#comment64082>
I added a debug line in here, and got nothing in plasmashell actually enters \
here. (the test does though)
Are there some other changes needed?
src/plasma/svg.cpp (line 232)
<https://git.reviewboard.kde.org/r/127260/#comment64081>
Don't we need someone to call discardCache somewhere if the icon changes?
(in other words, shouldn't this be in theme.cpp somewhere instead)
- David Edmundson
On March 31, 2016, 1:07 p.m., Marco Martin wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127260/
> -----------------------------------------------------------
>
> (Updated March 31, 2016, 1:07 p.m.)
>
>
> Review request for Plasma.
>
>
> Repository: plasma-framework
>
>
> Description
> -------
>
> this attempts to cache as well svg icons from the icon theme (invalidating as well \
> when the icon theme is updated)
> still to be done, to figure out to invalidate cache when the icon theme is changed \
> in the two cases:
> * theme changed with plasmashell running
> * theme changed with plasma shell not running
>
>
> Diffs
> -----
>
> autotests/CMakeLists.txt d475ac3
> autotests/data/icons/test-theme-two/apps/22/tst-plasma-framework-test-icon.svg \
> PRE-CREATION autotests/data/icons/test-theme-two/index.theme PRE-CREATION
> autotests/themetest.h PRE-CREATION
> autotests/themetest.cpp PRE-CREATION
> src/plasma/private/theme_p.h 69a8934
> src/plasma/private/theme_p.cpp 98bccab
> src/plasma/svg.cpp 6c9c75c
>
> Diff: https://git.reviewboard.kde.org/r/127260/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> Marco Martin
>
>
--===============9191496418246799735==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/127260/">https://git.reviewboard.kde.org/r/127260/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/127260/diff/3/?file=454841#file454841line71" \
style="color: black; font-weight: bold; text-decoration: \
underline;">autotests/themetest.cpp</a> <span style="font-weight: normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">71</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> \
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">We \
need to test the cache aspect of everything, as that's really the entire point.</p> \
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">it looks like we can access it with </p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">m_svg->theme()->findInCache() to check things if icons were actually \
being inserted.</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">and then we can test that the cache <em \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;">doesn't</em> contain an entry after the spy finishes.</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I \
made a patch: https://paste.kde.org/pgyzgxmzv</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">From what I can tell, it doesn't work. Though that's \
possibly my part new lines?</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/127260/diff/3/?file=454844#file454844line229" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/svg.cpp</a> <span style="font-weight: normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">219</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="n"><span class="hl">t</span>heme<span \
class="hl">d</span></span><span class="p">)</span> <span \
class="p">{</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">228</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span \
class="p">(</span><span class="n"><span class="hl">inIconT</span>heme</span><span \
class="p">)</span> <span class="p">{</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I \
added a debug line in here, and got nothing in plasmashell actually enters here. (the \
test does though) </p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">Are there some other changes \
needed?</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/127260/diff/3/?file=454844#file454844line233" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/svg.cpp</a> <span style="font-weight: normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">232</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">QObject</span><span class="o">::</span><span class="n">connect</span><span \
class="p">(</span><span class="n">KIconLoader</span><span class="o">::</span><span \
class="n">global</span><span class="p">(),</span> <span class="n">SIGNAL</span><span \
class="p">(</span><span class="n">iconChanged</span><span class="p">(</span><span \
class="kt">int</span><span class="p">)),</span> <span class="n">q</span><span \
class="p">,</span> <span class="n">SLOT</span><span class="p">(</span><span \
class="n">themeChanged</span><span class="p">()));</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Don't \
we need someone to call discardCache somewhere if the icon changes? (in other words, \
shouldn't this be in theme.cpp somewhere instead)</p></pre> </div>
</div>
<br />
<p>- David Edmundson</p>
<br />
<p>On March 31st, 2016, 1:07 p.m. UTC, Marco Martin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma.</div>
<div>By Marco Martin.</div>
<p style="color: grey;"><i>Updated March 31, 2016, 1:07 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-framework
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">this attempts to cache as well svg icons from the icon \
theme (invalidating as well when the icon theme is updated)</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">still \
to be done, to figure out to invalidate cache when the icon theme is changed in the \
two cases: <em style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;"> theme changed with plasmashell running </em> theme \
changed with plasma shell not running</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>autotests/CMakeLists.txt <span style="color: grey">(d475ac3)</span></li>
<li>autotests/data/icons/test-theme-two/apps/22/tst-plasma-framework-test-icon.svg \
<span style="color: grey">(PRE-CREATION)</span></li>
<li>autotests/data/icons/test-theme-two/index.theme <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>autotests/themetest.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>autotests/themetest.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plasma/private/theme_p.h <span style="color: grey">(69a8934)</span></li>
<li>src/plasma/private/theme_p.cpp <span style="color: grey">(98bccab)</span></li>
<li>src/plasma/svg.cpp <span style="color: grey">(6c9c75c)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/127260/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============9191496418246799735==--
[Attachment #3 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic