<!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>[185272] 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/185272">185272</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 16:16:26 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lingering checkbox animations when rapidly switching between views on WK1
https://bugs.webkit.org/show_bug.cgi?id=145715
<rdar://problem/17381121>
Reviewed by Simon Fraser.
On WK1, the NSView we use for NSButtonCells is parented in the ScrollView.
Our checkbox and radiobutton animations cause AppKit to create a CALayer which
is parented into that view. As we render the animations, we see the CALayer getting
drawn also.
The fix was to use an unparented layer on WK1 when drawing these controls, the same
way WK2 does. This technique may apply to all controls, but restricting it
to just the buttons at the moment is less risky.
This only happens during the swap between a checked and non-checked state,
and we have no way to test it :(
* platform/mac/ThemeMac.h: New optional parameter to ensuredView.
* platform/mac/ThemeMac.mm:
(WebCore::paintToggleButton): If we're on Yosemite or highter, use an unparented view.
(WebCore::ThemeMac::ensuredView): Return either a parented or unparented view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMach">trunk/Source/WebCore/platform/mac/ThemeMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185271 => 185272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-05 22:59:16 UTC (rev 185271)
+++ trunk/Source/WebCore/ChangeLog 2015-06-05 23:16:26 UTC (rev 185272)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-05 Dean Jackson <dino@apple.com>
+
+ Lingering checkbox animations when rapidly switching between views on WK1
+ https://bugs.webkit.org/show_bug.cgi?id=145715
+ <rdar://problem/17381121>
+
+ Reviewed by Simon Fraser.
+
+ On WK1, the NSView we use for NSButtonCells is parented in the ScrollView.
+ Our checkbox and radiobutton animations cause AppKit to create a CALayer which
+ is parented into that view. As we render the animations, we see the CALayer getting
+ drawn also.
+
+ The fix was to use an unparented layer on WK1 when drawing these controls, the same
+ way WK2 does. This technique may apply to all controls, but restricting it
+ to just the buttons at the moment is less risky.
+
+ This only happens during the swap between a checked and non-checked state,
+ and we have no way to test it :(
+
+ * platform/mac/ThemeMac.h: New optional parameter to ensuredView.
+ * platform/mac/ThemeMac.mm:
+ (WebCore::paintToggleButton): If we're on Yosemite or highter, use an unparented view.
+ (WebCore::ThemeMac::ensuredView): Return either a parented or unparented view.
+
</ins><span class="cx"> 2015-06-05 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaSessions should keep track of their participating media elements.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (185271 => 185272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-06-05 22:59:16 UTC (rev 185271)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-06-05 23:16:26 UTC (rev 185272)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> virtual void inflateControlPaintRect(ControlPart, const ControlStates*, FloatRect&, float zoomFactor) const;
</span><span class="cx">
</span><span class="cx"> // FIXME: Once RenderThemeMac is converted over to use Theme then this can be internal to ThemeMac.
</span><del>- static NSView* ensuredView(ScrollView*, const ControlStates*);
</del><ins>+ static NSView* ensuredView(ScrollView*, const ControlStates*, bool useUnparentedView = false);
</ins><span class="cx"> static void setFocusRingClipRect(const FloatRect&);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (185271 => 185272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-06-05 22:59:16 UTC (rev 185271)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-06-05 23:16:26 UTC (rev 185272)
</span><span class="lines">@@ -417,19 +417,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(context);
</span><del>- NSView *view = ThemeMac::ensuredView(scrollView, controlStates);
</del><span class="cx">
</span><ins>+ bool useUnparentedView = false;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ useUnparentedView = true;
+#endif
+ NSView *view = ThemeMac::ensuredView(scrollView, controlStates, useUnparentedView);
+
</ins><span class="cx"> bool isAnimating = false;
</span><span class="cx"> bool needsRepaint = false;
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if ([toggleButtonCell _stateAnimationRunning]) {
</span><del>- // AppKit's drawWithFrame appears to render the cell centered in the
- // provided rectangle/frame, so we need to manually position the
- // animated cell at the correct location.
</del><span class="cx"> context->translate(inflatedRect.x(), inflatedRect.y());
</span><span class="cx"> context->scale(FloatSize(1, -1));
</span><span class="cx"> context->translate(0, -inflatedRect.height());
</span><ins>+
</ins><span class="cx"> [toggleButtonCell _renderCurrentAnimationFrameInContext:context->platformContext() atLocation:NSMakePoint(0, 0)];
</span><span class="cx"> isAnimating = [toggleButtonCell _stateAnimationRunning];
</span><span class="cx"> } else
</span><span class="lines">@@ -639,10 +642,12 @@
</span><span class="cx">
</span><span class="cx"> // This will ensure that we always return a valid NSView, even if ScrollView doesn't have an associated document NSView.
</span><span class="cx"> // If the ScrollView doesn't have an NSView, we will return a fake NSView set up in the way AppKit expects.
</span><del>-NSView *ThemeMac::ensuredView(ScrollView* scrollView, const ControlStates* controlStates)
</del><ins>+NSView *ThemeMac::ensuredView(ScrollView* scrollView, const ControlStates* controlStates, bool useUnparentedView)
</ins><span class="cx"> {
</span><del>- if (NSView *documentView = scrollView->documentView())
- return documentView;
</del><ins>+ if (!useUnparentedView) {
+ if (NSView *documentView = scrollView->documentView())
+ return documentView;
+ }
</ins><span class="cx">
</span><span class="cx"> // Use a fake view.
</span><span class="cx"> static WebCoreThemeView *themeView = [[WebCoreThemeView alloc] init];
</span></span></pre>
</div>
</div>
</body>
</html>