<!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>[171224] 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/171224">171224</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-18 10:14:38 -0700 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/171207">r171207</a>.
https://bugs.webkit.org/show_bug.cgi?id=135056
Broke multiple tests on Yosemite (Requested by ap on #webkit).
Reverted changeset:
"Fixed position elements are misplaced when a WK1 view has
contentInsets set"
https://bugs.webkit.org/show_bug.cgi?id=135031
http://trac.webkit.org/changeset/171207</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollViewMacmm">trunk/Source/WebCore/platform/mac/ScrollViewMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171223 => 171224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-18 17:01:44 UTC (rev 171223)
+++ trunk/Source/WebCore/ChangeLog 2014-07-18 17:14:38 UTC (rev 171224)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-07-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r171207.
+ https://bugs.webkit.org/show_bug.cgi?id=135056
+
+ Broke multiple tests on Yosemite (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Fixed position elements are misplaced when a WK1 view has
+ contentInsets set"
+ https://bugs.webkit.org/show_bug.cgi?id=135031
+ http://trac.webkit.org/changeset/171207
+
+2014-07-18 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r171218.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135055
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (171223 => 171224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2014-07-18 17:01:44 UTC (rev 171223)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2014-07-18 17:14:38 UTC (rev 171224)
</span><span class="lines">@@ -81,12 +81,6 @@
</span><span class="cx"> m_height += height;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void contract(int width, int height)
- {
- m_width -= width;
- m_height -= height;
- }
-
</del><span class="cx"> void scale(float widthScale, float heightScale)
</span><span class="cx"> {
</span><span class="cx"> m_width = static_cast<int>(static_cast<float>(m_width) * widthScale);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (171223 => 171224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-07-18 17:01:44 UTC (rev 171223)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-07-18 17:14:38 UTC (rev 171224)
</span><span class="lines">@@ -34,14 +34,6 @@
</span><span class="cx"> #import "NotImplemented.h"
</span><span class="cx"> #import "WebCoreFrameView.h"
</span><span class="cx">
</span><del>-@interface NSClipView (Details)
-- (NSRect)_insetBounds;
-@end
-
-@interface NSScrollView (Details)
-- (NSEdgeInsets)contentInsets;
-@end
-
</del><span class="cx"> @interface NSWindow (WebWindowDetails)
</span><span class="cx"> - (BOOL)_needsToResetDragMargins;
</span><span class="cx"> - (void)_setNeedsToResetDragMargins:(BOOL)needs;
</span><span class="lines">@@ -115,31 +107,23 @@
</span><span class="cx"> IntRect ScrollView::platformVisibleContentRect(bool includeScrollbars) const
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>-
- IntRect visibleContentRect;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- visibleContentRect = enclosingIntRect([[scrollView() contentView] _insetBounds]);
-#else
- visibleContentRect = enclosingIntRect([scrollView() documentVisibleRect]);
-#endif
-
- if (includeScrollbars) {
- IntSize frameSize([scrollView() frame].size);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- frameSize.contract(scrollView().contentInsets.left + scrollView().contentInsets.right, scrollView().contentInsets.top + scrollView().contentInsets.bottom);
-#endif
- visibleContentRect.setSize(frameSize);
- }
-
- return visibleContentRect;
</del><ins>+ IntRect result = enclosingIntRect([scrollView() documentVisibleRect]);
+ if (includeScrollbars)
+ result.setSize(IntSize([scrollView() frame].size));
+ return result;
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><del>-
</del><span class="cx"> return IntRect();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize ScrollView::platformVisibleContentSize(bool includeScrollbars) const
</span><span class="cx"> {
</span><del>- return platformVisibleContentRect(includeScrollbars).size();
</del><ins>+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ if (includeScrollbars)
+ return IntSize([scrollView() frame].size);
+
+ return expandedIntSize(FloatSize([scrollView() documentVisibleRect].size));
+ END_BLOCK_OBJC_EXCEPTIONS;
+ return IntSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollView::platformSetContentsSize()
</span></span></pre>
</div>
</div>
</body>
</html>