<!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>[170546] 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/170546">170546</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-06-27 12:22:44 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom scrollbars should not create ScrollbarPainters on Mac
https://bugs.webkit.org/show_bug.cgi?id=134406
-and corresponding-
<rdar://problem/16178301>
Reviewed by Tim Horton.
The solution here is to return early in ScrollbarThemeMac::registerScrollbar() if
the scrollbar is custom. However, since this function is called during the
RenderScrollbar and Scrollbar constructor, we need to re-implement
Scrollbar::isCustomScrollbar() to return a member variable that is passed into the
constructor. Otherwise, we will get Scrollbar’s implementation is
isCustomScrollbar() wrongfully returning false since instead of the derived
class’s implementation.
Scrollbar constructor now has an option parameter isCustomScrollbar that defaults
to false. That value is returned by isCustomScrollbar()
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::Scrollbar):
* platform/Scrollbar.h:
Return early if this is a custom scrollbar since the rest of the function deals
with creating a native scrollbar and getting it in the right state.
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::registerScrollbar):
Send true to the Scrollbar constructor to indicate that this is a custom
scrollbar.
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::RenderScrollbar):
* rendering/RenderScrollbar.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarh">trunk/Source/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarh">trunk/Source/WebCore/rendering/RenderScrollbar.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-06-27 Beth Dakin <bdakin@apple.com>
+
+ Custom scrollbars should not create ScrollbarPainters on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=134406
+ -and corresponding-
+ <rdar://problem/16178301>
+
+ Reviewed by Tim Horton.
+
+ The solution here is to return early in ScrollbarThemeMac::registerScrollbar() if
+ the scrollbar is custom. However, since this function is called during the
+ RenderScrollbar and Scrollbar constructor, we need to re-implement
+ Scrollbar::isCustomScrollbar() to return a member variable that is passed into the
+ constructor. Otherwise, we will get Scrollbar’s implementation is
+ isCustomScrollbar() wrongfully returning false since instead of the derived
+ class’s implementation.
+
+ Scrollbar constructor now has an option parameter isCustomScrollbar that defaults
+ to false. That value is returned by isCustomScrollbar()
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::Scrollbar):
+ * platform/Scrollbar.h:
+
+ Return early if this is a custom scrollbar since the rest of the function deals
+ with creating a native scrollbar and getting it in the right state.
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::registerScrollbar):
+
+ Send true to the Scrollbar constructor to indicate that this is a custom
+ scrollbar.
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::RenderScrollbar):
+ * rendering/RenderScrollbar.h:
+
</ins><span class="cx"> 2014-06-27 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] AVMetadataKeySpaceISOUserData not defined on 10.8
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Scrollbar::Scrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize,
</span><del>- ScrollbarTheme* theme)
</del><ins>+ ScrollbarTheme* theme, bool isCustomScrollbar)
</ins><span class="cx"> : m_scrollableArea(scrollableArea)
</span><span class="cx"> , m_orientation(orientation)
</span><span class="cx"> , m_controlSize(controlSize)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> , m_overlapsResizer(false)
</span><span class="cx"> , m_suppressInvalidation(false)
</span><span class="cx"> , m_isAlphaLocked(false)
</span><ins>+ , m_isCustomScrollbar(isCustomScrollbar)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_theme)
</span><span class="cx"> m_theme = ScrollbarTheme::theme();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.h (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.h 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/platform/Scrollbar.h 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) override { return Widget::convertFromContainingWindow(windowPoint); }
</span><span class="cx">
</span><del>- virtual bool isCustomScrollbar() const override { return false; }
</del><ins>+ virtual bool isCustomScrollbar() const override final { return m_isCustomScrollbar; }
</ins><span class="cx"> virtual ScrollbarOrientation orientation() const override { return m_orientation; }
</span><span class="cx">
</span><span class="cx"> virtual int value() const override { return lroundf(m_currentPos); }
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> virtual bool supportsUpdateOnSecondaryThread() const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0);
</del><ins>+ Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0, bool isCustomScrollbar = false);
</ins><span class="cx">
</span><span class="cx"> void updateThumb();
</span><span class="cx"> virtual void updateThumbPosition();
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_isAlphaLocked;
</span><span class="cx">
</span><ins>+ bool m_isCustomScrollbar;
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual bool isScrollbar() const override { return true; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -156,6 +156,9 @@
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMac::registerScrollbar(ScrollbarThemeClient* scrollbar)
</span><span class="cx"> {
</span><ins>+ if (scrollbar->isCustomScrollbar())
+ return;
+
</ins><span class="cx"> bool isHorizontal = scrollbar->orientation() == HorizontalScrollbar;
</span><span class="cx"> ScrollbarPainter scrollbarPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(scrollbar->controlSize()) horizontal:isHorizontal replacingScrollerImp:nil];
</span><span class="cx"> scrollbarMap()->add(scrollbar, scrollbarPainter);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderScrollbar::RenderScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
</span><del>- : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
</del><ins>+ : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme(), true)
</ins><span class="cx"> , m_ownerElement(ownerElement)
</span><span class="cx"> , m_owningFrame(owningFrame)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.h (170545 => 170546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-06-27 19:17:44 UTC (rev 170545)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-06-27 19:22:44 UTC (rev 170546)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void styleChanged() override;
</span><span class="cx">
</span><del>- virtual bool isCustomScrollbar() const override { return true; }
-
</del><span class="cx"> void updateScrollbarParts();
</span><span class="cx">
</span><span class="cx"> void updateScrollbarPart(ScrollbarPart);
</span></span></pre>
</div>
</div>
</body>
</html>