<!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>[211019] trunk/Source/WebKit/ios</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/211019">211019</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-01-21 17:52:04 -0800 (Sat, 21 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the unused -[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]
https://bugs.webkit.org/show_bug.cgi?id=167273
Reviewed by Alex Christensen.
This function was added for an experiment, but is no longer used, so remove it.
* WebCoreSupport/WebFixedPositionContent.h:
* WebCoreSupport/WebFixedPositionContent.mm:
(anchorEdgeFlagsForAnchorEdge): Deleted.
(-[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFixedPositionContenth">trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.h</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (211018 => 211019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2017-01-21 22:22:54 UTC (rev 211018)
+++ trunk/Source/WebKit/ios/ChangeLog 2017-01-22 01:52:04 UTC (rev 211019)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-21 Simon Fraser <simon.fraser@apple.com>
+
+ Remove the unused -[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]
+ https://bugs.webkit.org/show_bug.cgi?id=167273
+
+ Reviewed by Alex Christensen.
+
+ This function was added for an experiment, but is no longer used, so remove it.
+
+ * WebCoreSupport/WebFixedPositionContent.h:
+ * WebCoreSupport/WebFixedPositionContent.mm:
+ (anchorEdgeFlagsForAnchorEdge): Deleted.
+ (-[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]): Deleted.
+
</ins><span class="cx"> 2017-01-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from "loader" directory of WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFixedPositionContenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.h (211018 => 211019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.h 2017-01-21 22:22:54 UTC (rev 211018)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.h 2017-01-22 01:52:04 UTC (rev 211019)
</span><span class="lines">@@ -49,7 +49,5 @@
</span><span class="cx"> - (void)overflowScrollPositionForLayer:(CALayer *)scrollLayer changedTo:(CGPoint)scrollPosition;
</span><span class="cx"> - (void)didFinishScrollingOrZooming;
</span><span class="cx"> - (BOOL)hasFixedOrStickyPositionLayers;
</span><del>-// Returns CGFLOAT_MAX if there are no layers anchored to the given edge.
-- (CGFloat)minimumOffsetFromFixedPositionLayersToAnchorEdge:(WebFixedPositionAnchorEdge)anchorEdge ofRect:(CGRect)rect inLayer:(CALayer *)layer;
</del><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm (211018 => 211019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2017-01-21 22:22:54 UTC (rev 211018)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2017-01-22 01:52:04 UTC (rev 211019)
</span><span class="lines">@@ -195,60 +195,6 @@
</span><span class="cx"> return !_private->m_viewportConstrainedLayers.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ViewportConstraints::AnchorEdgeFlags anchorEdgeFlagsForAnchorEdge(WebFixedPositionAnchorEdge edge)
-{
- switch (edge) {
- case WebFixedPositionAnchorEdgeLeft:
- return ViewportConstraints::AnchorEdgeFlags::AnchorEdgeLeft;
- case WebFixedPositionAnchorEdgeRight:
- return ViewportConstraints::AnchorEdgeFlags::AnchorEdgeRight;
- case WebFixedPositionAnchorEdgeTop:
- return ViewportConstraints::AnchorEdgeFlags::AnchorEdgeTop;
- case WebFixedPositionAnchorEdgeBottom:
- return ViewportConstraints::AnchorEdgeFlags::AnchorEdgeBottom;
- }
-}
-
-- (CGFloat)minimumOffsetFromFixedPositionLayersToAnchorEdge:(WebFixedPositionAnchorEdge)anchorEdge ofRect:(CGRect)rect inLayer:(CALayer *)layer
-{
- LockHolder lock(WebFixedPositionContentDataLock());
- ViewportConstraints::AnchorEdgeFlags anchorEdgeFlags = anchorEdgeFlagsForAnchorEdge(anchorEdge);
- CGFloat minimumOffset = CGFLOAT_MAX;
- LayerInfoMap::const_iterator end = _private->m_viewportConstrainedLayers.end();
- for (LayerInfoMap::const_iterator it = _private->m_viewportConstrainedLayers.begin(); it != end; ++it) {
- CALayer *fixedLayer = it->key.get();
- ViewportConstrainedLayerData* constraintData = it->value.get();
- const ViewportConstraints& constraints = *(constraintData->m_viewportConstraints.get());
-
- if (!constraints.hasAnchorEdge(anchorEdgeFlags))
- continue;
- // According to Simon: It's possible that there are windows of time
- // where these CALayers are unparented (because we've flushed on the web
- // thread but haven't updated those layers yet).
- if (![fixedLayer superlayer])
- continue;
-
- CGRect fixedLayerExtent = [layer convertRect:[fixedLayer bounds] fromLayer:fixedLayer];
- CGFloat offset;
- switch (anchorEdge) {
- case WebFixedPositionAnchorEdgeLeft:
- offset = CGRectGetMinX(fixedLayerExtent) - CGRectGetMinX(rect);
- break;
- case WebFixedPositionAnchorEdgeRight:
- offset = CGRectGetMaxX(rect) - CGRectGetMaxX(fixedLayerExtent);
- break;
- case WebFixedPositionAnchorEdgeTop:
- offset = CGRectGetMinY(fixedLayerExtent) - CGRectGetMinY(rect);
- break;
- case WebFixedPositionAnchorEdgeBottom:
- offset = CGRectGetMaxY(rect) - CGRectGetMaxY(fixedLayerExtent);
- break;
- }
- minimumOffset = CGFloatMin(minimumOffset, offset);
- }
- return minimumOffset;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>