<!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>[183891] 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/183891">183891</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2015-05-06 15:14:34 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid copies in scrollOffsetForFixedPosition() and inline it.
https://bugs.webkit.org/show_bug.cgi?id=144709
Reviewed by Simon Fraser.
* page/FrameView.cpp:
(WebCore::FrameView::frameScaleFactor):
Added so that scrollOffsetForFixedPosition() can be inlined without having to
reference Frame's implementation.
(WebCore::FrameView::scrollOffsetForFixedPosition): Deleted.
Moved this to the header.
* page/FrameView.h:
Inline scrollOffsetForFixedPosition() and get rid of all the copying
it was doing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183890 => 183891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 21:50:11 UTC (rev 183890)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 22:14:34 UTC (rev 183891)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-05-06 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><ins>+ Avoid copies in scrollOffsetForFixedPosition() and inline it.
+ https://bugs.webkit.org/show_bug.cgi?id=144709
+
+ Reviewed by Simon Fraser.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::frameScaleFactor):
+ Added so that scrollOffsetForFixedPosition() can be inlined without having to
+ reference Frame's implementation.
+
+ (WebCore::FrameView::scrollOffsetForFixedPosition): Deleted.
+ Moved this to the header.
+
+ * page/FrameView.h:
+ Inline scrollOffsetForFixedPosition() and get rid of all the copying
+ it was doing.
+
+2015-05-06 David Hyatt <hyatt@apple.com>
+
</ins><span class="cx"> RenderLayer::currentTransform computes a pixel snapped rect it doesn't use.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144708
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (183890 => 183891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-05-06 21:50:11 UTC (rev 183890)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-05-06 22:14:34 UTC (rev 183891)
</span><span class="lines">@@ -1636,6 +1636,11 @@
</span><span class="cx"> return viewportRect;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+float FrameView::frameScaleFactor() const
+{
+ return frame().frameScaleFactor();
+}
+
</ins><span class="cx"> LayoutSize FrameView::scrollOffsetForFixedPosition(const LayoutRect& visibleContentRect, const LayoutSize& totalContentsSize, const LayoutPoint& scrollPosition, const LayoutPoint& scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame, ScrollBehaviorForFixedElements behaviorForFixed, int headerHeight, int footerHeight)
</span><span class="cx"> {
</span><span class="cx"> LayoutPoint position;
</span><span class="lines">@@ -1654,17 +1659,6 @@
</span><span class="cx"> return LayoutSize(position.x() * dragFactorX / frameScaleFactor, position.y() * dragFactorY / frameScaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutSize FrameView::scrollOffsetForFixedPosition() const
-{
- IntRect visibleContentRect = this->visibleContentRect();
- IntSize totalContentsSize = this->totalContentsSize();
- IntPoint scrollPosition = this->scrollPosition();
- IntPoint scrollOrigin = this->scrollOrigin();
- float frameScaleFactor = frame().frameScaleFactor();
- ScrollBehaviorForFixedElements behaviorForFixed = scrollBehaviorForFixedElements();
- return scrollOffsetForFixedPosition(visibleContentRect, totalContentsSize, scrollPosition, scrollOrigin, frameScaleFactor, fixedElementsLayoutRelativeToFrame(), behaviorForFixed, headerHeight(), footerHeight());
-}
-
</del><span class="cx"> float FrameView::yPositionForInsetClipLayer(const FloatPoint& scrollPosition, float topContentInset)
</span><span class="cx"> {
</span><span class="cx"> if (!topContentInset)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (183890 => 183891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-05-06 21:50:11 UTC (rev 183890)
+++ trunk/Source/WebCore/page/FrameView.h 2015-05-06 22:14:34 UTC (rev 183891)
</span><span class="lines">@@ -274,10 +274,16 @@
</span><span class="cx"> void removeViewportConstrainedObject(RenderElement*);
</span><span class="cx"> const ViewportConstrainedObjectSet* viewportConstrainedObjects() const { return m_viewportConstrainedObjects.get(); }
</span><span class="cx"> bool hasViewportConstrainedObjects() const { return m_viewportConstrainedObjects && m_viewportConstrainedObjects->size() > 0; }
</span><ins>+
+ float frameScaleFactor() const;
</ins><span class="cx">
</span><span class="cx"> // Functions for querying the current scrolled position, negating the effects of overhang
</span><span class="cx"> // and adjusting for page scale.
</span><del>- LayoutSize scrollOffsetForFixedPosition() const;
</del><ins>+ LayoutSize scrollOffsetForFixedPosition() const
+ {
+ return scrollOffsetForFixedPosition(visibleContentRect(), totalContentsSize(), scrollPosition(), scrollOrigin(), frameScaleFactor(), fixedElementsLayoutRelativeToFrame(), scrollBehaviorForFixedElements(), headerHeight(), footerHeight());
+ }
+
</ins><span class="cx"> // Static function can be called from another thread.
</span><span class="cx"> static LayoutSize scrollOffsetForFixedPosition(const LayoutRect& visibleContentRect, const LayoutSize& totalContentsSize, const LayoutPoint& scrollPosition, const LayoutPoint& scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame, ScrollBehaviorForFixedElements, int headerHeight, int footerHeight);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>