<!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>[173046] trunk</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/173046">173046</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-27 20:45:35 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scrollbar corner can be drawn outside containing frame
https://bugs.webkit.org/show_bug.cgi?id=133131
<rdar://problem/16382769>
Reviewed by Simon Fraser.
Source/WebCore:
Merged from Blink (patch by Levi Weintraub):
<https://src.chromium.org/viewvc/blink?revision=170625&view=revision>
Fixes an issue where the scroll corner may be painted outside the rectangle of
its associated frame by setting a clip rectangle before painting the scroll bar(s)
and scroll corner.
Test: scrollbars/custom-scrollbars-paint-outside-iframe.html
* platform/ScrollView.cpp:
(WebCore::ScrollView::paint):
LayoutTests:
Add DRT test that was derived from the test included in
<https://src.chromium.org/viewvc/blink?revision=170625&view=revision>.
* scrollbars/custom-scrollbars-paint-outside-iframe-expected.html: Added.
* scrollbars/custom-scrollbars-paint-outside-iframe.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsscrollbarscustomscrollbarspaintoutsideiframeexpectedhtml">trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe-expected.html</a></li>
<li><a href="#trunkLayoutTestsscrollbarscustomscrollbarspaintoutsideiframehtml">trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173045 => 173046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-28 03:33:02 UTC (rev 173045)
+++ trunk/LayoutTests/ChangeLog 2014-08-28 03:45:35 UTC (rev 173046)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-27 Daniel Bates <dabates@apple.com>
+
+ Scrollbar corner can be drawn outside containing frame
+ https://bugs.webkit.org/show_bug.cgi?id=133131
+ <rdar://problem/16382769>
+
+ Reviewed by Simon Fraser.
+
+ Add DRT test that was derived from the test included in
+ <https://src.chromium.org/viewvc/blink?revision=170625&view=revision>.
+
+ * scrollbars/custom-scrollbars-paint-outside-iframe-expected.html: Added.
+ * scrollbars/custom-scrollbars-paint-outside-iframe.html: Added.
+
</ins><span class="cx"> 2014-08-27 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Update placeholder-shown-basics.html for GTK
</span></span></pre></div>
<a id="trunkLayoutTestsscrollbarscustomscrollbarspaintoutsideiframeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe-expected.html (0 => 173046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe-expected.html (rev 0)
+++ trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe-expected.html 2014-08-28 03:45:35 UTC (rev 173046)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+function done()
+{
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body style="margin: 0px">
+<div style="background-color: green; width: 100px; height: 100px"></div>
+<p>This tests ensures that themed scrollbars are clipped to their iframe. You should see a green box above.</p>
+<iframe style="position: absolute; top: 100px; left: 100px;" width="1" height="1" srcdoc="
+<html><head><style>
+html,body {width:200px; height:100px;}
+::-webkit-scrollbar {height: 1px; width: 1px;}
+::-webkit-scrollbar-corner {background-color: red;}
+</style></head></html>" onload="done()"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsscrollbarscustomscrollbarspaintoutsideiframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe.html (0 => 173046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe.html (rev 0)
+++ trunk/LayoutTests/scrollbars/custom-scrollbars-paint-outside-iframe.html 2014-08-28 03:45:35 UTC (rev 173046)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+function done()
+{
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body style="margin: 0px">
+<div style="background-color: green; width: 100px; height: 100px"></div>
+<p>This tests ensures that themed scrollbars are clipped to their iframe. You should see a green box above.</p>
+<iframe style="position: absolute; top: 100px; left: 100px;" width="1" height="1" srcdoc="
+<html><head><style>
+html,body {width:200px; height:100px;}
+::-webkit-scrollbar {height: 200px; width: 200px;}
+::-webkit-scrollbar-corner {background-color: red;}
+</style></head></html>" onload="done()"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173045 => 173046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-28 03:33:02 UTC (rev 173045)
+++ trunk/Source/WebCore/ChangeLog 2014-08-28 03:45:35 UTC (rev 173046)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-27 Daniel Bates <dabates@apple.com>
+
+ Scrollbar corner can be drawn outside containing frame
+ https://bugs.webkit.org/show_bug.cgi?id=133131
+ <rdar://problem/16382769>
+
+ Reviewed by Simon Fraser.
+
+ Merged from Blink (patch by Levi Weintraub):
+ <https://src.chromium.org/viewvc/blink?revision=170625&view=revision>
+
+ Fixes an issue where the scroll corner may be painted outside the rectangle of
+ its associated frame by setting a clip rectangle before painting the scroll bar(s)
+ and scroll corner.
+
+ Test: scrollbars/custom-scrollbars-paint-outside-iframe.html
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::paint):
+
</ins><span class="cx"> 2014-08-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel layout: Rename FloatPoint/FloatRect device pixel snapping functions.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (173045 => 173046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-08-28 03:33:02 UTC (rev 173045)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-08-28 03:45:35 UTC (rev 173046)
</span><span class="lines">@@ -1218,6 +1218,7 @@
</span><span class="cx"> scrollViewDirtyRect.intersect(visibleAreaWithScrollbars);
</span><span class="cx"> context->translate(x(), y());
</span><span class="cx"> scrollViewDirtyRect.moveBy(-location());
</span><ins>+ context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size()));
</ins><span class="cx">
</span><span class="cx"> paintScrollbars(context, scrollViewDirtyRect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>