<!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>[165235] trunk/Source/WebKit2</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/165235">165235</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-06 18:01:39 -0800 (Thu, 06 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Send the fixed position rect to the WebProcess along with the other rects
https://bugs.webkit.org/show_bug.cgi?id=129856

Reviewed by Benjamin Poulain.

Remove the functions that pass the custom fixed position rect through
the DrawingArea, and replace them by adding this rect to the
VisibleContentRectUpdateInfo, along with the &quot;is stable&quot; flag. We
then set the custom fixed position rect in the web process for
stable updates.

* Shared/VisibleContentRectUpdateInfo.cpp:
(WebKit::VisibleContentRectUpdateInfo::encode):
(WebKit::VisibleContentRectUpdateInfo::decode):
* Shared/VisibleContentRectUpdateInfo.h:
(WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
(WebKit::VisibleContentRectUpdateInfo::customFixedPositionRect):
(WebKit::VisibleContentRectUpdateInfo::inStableState):
(WebKit::operator==):
* UIProcess/DrawingAreaProxy.cpp:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/DrawingArea.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/ChangeLog        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-03-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Send the fixed position rect to the WebProcess along with the other rects
+        https://bugs.webkit.org/show_bug.cgi?id=129856
+
+        Reviewed by Benjamin Poulain.
+        
+        Remove the functions that pass the custom fixed position rect through
+        the DrawingArea, and replace them by adding this rect to the
+        VisibleContentRectUpdateInfo, along with the &quot;is stable&quot; flag. We
+        then set the custom fixed position rect in the web process for
+        stable updates.
+
+        * Shared/VisibleContentRectUpdateInfo.cpp:
+        (WebKit::VisibleContentRectUpdateInfo::encode):
+        (WebKit::VisibleContentRectUpdateInfo::decode):
+        * Shared/VisibleContentRectUpdateInfo.h:
+        (WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
+        (WebKit::VisibleContentRectUpdateInfo::customFixedPositionRect):
+        (WebKit::VisibleContentRectUpdateInfo::inStableState):
+        (WebKit::operator==):
+        * UIProcess/DrawingAreaProxy.cpp:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/DrawingArea.messages.in:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::updateVisibleContentRects):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+
+2014-03-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         Remove empty class extension in WKContentViewInteraction
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=129849
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -34,7 +34,9 @@
</span><span class="cx"> {
</span><span class="cx">     encoder &lt;&lt; m_exposedRect;
</span><span class="cx">     encoder &lt;&lt; m_unobscuredRect;
</span><ins>+    encoder &lt;&lt; m_customFixedPositionRect;
</ins><span class="cx">     encoder &lt;&lt; m_scale;
</span><ins>+    encoder &lt;&lt; m_inStableState;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool VisibleContentRectUpdateInfo::decode(IPC::ArgumentDecoder&amp; decoder, VisibleContentRectUpdateInfo&amp; result)
</span><span class="lines">@@ -43,8 +45,12 @@
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(result.m_unobscuredRect))
</span><span class="cx">         return false;
</span><ins>+    if (!decoder.decode(result.m_customFixedPositionRect))
+        return false;
</ins><span class="cx">     if (!decoder.decode(result.m_scale))
</span><span class="cx">         return false;
</span><ins>+    if (!decoder.decode(result.m_inStableState))
+        return false;
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -42,16 +42,20 @@
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    VisibleContentRectUpdateInfo(const WebCore::FloatRect&amp; exposedRect, const WebCore::FloatRect&amp; unobscuredRect, double scale)
</del><ins>+    VisibleContentRectUpdateInfo(const WebCore::FloatRect&amp; exposedRect, const WebCore::FloatRect&amp; unobscuredRect, const WebCore::FloatRect&amp; customFixedPositionRect, double scale, bool inStableState)
</ins><span class="cx">         : m_exposedRect(exposedRect)
</span><span class="cx">         , m_unobscuredRect(unobscuredRect)
</span><ins>+        , m_customFixedPositionRect(customFixedPositionRect)
</ins><span class="cx">         , m_scale(scale)
</span><ins>+        , m_inStableState(inStableState)
</ins><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     const WebCore::FloatRect&amp; exposedRect() const { return m_exposedRect; }
</span><span class="cx">     const WebCore::FloatRect&amp; unobscuredRect() const { return m_unobscuredRect; }
</span><ins>+    const WebCore::FloatRect&amp; customFixedPositionRect() const { return m_customFixedPositionRect; }
</ins><span class="cx">     double scale() const { return m_scale; }
</span><ins>+    bool inStableState() const { return m_inStableState; }
</ins><span class="cx"> 
</span><span class="cx">     void encode(IPC::ArgumentEncoder&amp;) const;
</span><span class="cx">     static bool decode(IPC::ArgumentDecoder&amp;, VisibleContentRectUpdateInfo&amp;);
</span><span class="lines">@@ -59,12 +63,18 @@
</span><span class="cx"> private:
</span><span class="cx">     WebCore::FloatRect m_exposedRect;
</span><span class="cx">     WebCore::FloatRect m_unobscuredRect;
</span><ins>+    WebCore::FloatRect m_customFixedPositionRect;
</ins><span class="cx">     double m_scale;
</span><ins>+    bool m_inStableState;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> inline bool operator==(const VisibleContentRectUpdateInfo&amp; a, const VisibleContentRectUpdateInfo&amp; b)
</span><span class="cx"> {
</span><del>-    return a.scale() == b.scale() &amp;&amp; a.exposedRect() == b.exposedRect() &amp;&amp; a.unobscuredRect() == b.unobscuredRect();
</del><ins>+    return a.scale() == b.scale()
+        &amp;&amp; a.exposedRect() == b.exposedRect()
+        &amp;&amp; a.unobscuredRect() == b.unobscuredRect()
+        &amp;&amp; a.customFixedPositionRect() == b.customFixedPositionRect()
+        &amp;&amp; a.inStableState() == b.inStableState();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -87,14 +87,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
-void DrawingAreaProxy::setCustomFixedPositionRect(const FloatRect&amp; fixedPositionRect)
-{
-    if (!m_webPageProxy-&gt;isValid())
-        return;
-
-    m_webPageProxy-&gt;process().send(Messages::DrawingArea::SetCustomFixedPositionRect(fixedPositionRect), m_webPageProxy-&gt;pageID());
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -171,19 +171,15 @@
</span><span class="cx">         // visual noise. We filter those useless updates.
</span><span class="cx">         scale = _page-&gt;displayedContentScale();
</span><span class="cx">     }
</span><del>-    
-    _page-&gt;updateVisibleContentRects(VisibleContentRectUpdateInfo(visibleRect, unobscuredRect, scale));
</del><span class="cx"> 
</span><ins>+    FloatRect fixedPosRect = [self fixedPositionRectFromExposedRect:unobscuredRect scale:scale];
+    _page-&gt;updateVisibleContentRects(VisibleContentRectUpdateInfo(visibleRect, unobscuredRect, fixedPosRect, scale, isStableState));
+
</ins><span class="cx">     RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page-&gt;scrollingCoordinatorProxy();
</span><span class="cx">     scrollingCoordinator-&gt;scrollPositionChangedViaDelegatedScrolling(scrollingCoordinator-&gt;rootScrollingNodeID(), unobscuredRect.origin);
</span><span class="cx"> 
</span><del>-    if (auto drawingArea = _page-&gt;drawingArea()) {
-        if (isStableState) {
-            FloatRect fixedPosRect = [self fixedPositionRectFromExposedRect:unobscuredRect scale:scale];
-            drawingArea-&gt;setCustomFixedPositionRect(fixedPosRect);
-        }
</del><ins>+    if (auto drawingArea = _page-&gt;drawingArea())
</ins><span class="cx">         drawingArea-&gt;updateDebugIndicator();
</span><del>-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)setMinimumSize:(CGSize)size
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     virtual void setExposedRect(const WebCore::FloatRect&amp;) = 0;
</span><span class="cx">     virtual WebCore::FloatRect exposedRect() const = 0;
</span><del>-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&amp;) = 0;
</del><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     virtual void setExposedContentRect(const WebCore::FloatRect&amp;) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">     SetDeviceScaleFactor(float deviceScaleFactor)
</span><span class="cx">     SetColorSpace(WebKit::ColorSpaceData colorSpace)
</span><span class="cx">     SetExposedRect(WebCore::FloatRect exposedRect)
</span><del>-    SetCustomFixedPositionRect(WebCore::FloatRect fixedPositionRect)
</del><span class="cx"> 
</span><span class="cx">     AdjustTransientZoom(double scale, WebCore::FloatPoint origin)
</span><span class="cx">     CommitTransientZoom(double scale, WebCore::FloatPoint origin)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -1746,6 +1746,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_page-&gt;mainFrame().view()-&gt;setScrollOffset(scrollPosition);
</span><ins>+    
+    if (visibleContentRectUpdateInfo.inStableState())
+        m_page-&gt;mainFrame().view()-&gt;setCustomFixedPositionLayoutRect(enclosingIntRect(visibleContentRectUpdateInfo.customFixedPositionRect()));
+
</ins><span class="cx">     // FIXME: we should also update the frame view from unobscured rect. Altenatively, we can have it pull the values from ScrollView.
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -79,8 +79,6 @@
</span><span class="cx">     virtual void setExposedContentRect(const WebCore::FloatRect&amp;) override;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&amp;) override;
-
</del><span class="cx">     // WebCore::GraphicsLayerClient
</span><span class="cx">     virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override { }
</span><span class="cx">     virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) override { }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -283,17 +283,6 @@
</span><span class="cx">     frameView-&gt;adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteLayerTreeDrawingArea::setCustomFixedPositionRect(const FloatRect&amp; fixedPositionRect)
-{
-#if PLATFORM(IOS)
-    FrameView* frameView = m_webPage-&gt;corePage()-&gt;mainFrame().view();
-    if (!frameView)
-        return;
-
-    frameView-&gt;setCustomFixedPositionLayoutRect(enclosingIntRect(fixedPositionRect));
-#endif
-}
-
</del><span class="cx"> TiledBacking* RemoteLayerTreeDrawingArea::mainFrameTiledBacking() const
</span><span class="cx"> {
</span><span class="cx">     FrameView* frameView = m_webPage-&gt;corePage()-&gt;mainFrame().view();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (165234 => 165235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h        2014-03-07 01:31:54 UTC (rev 165234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h        2014-03-07 02:01:39 UTC (rev 165235)
</span><span class="lines">@@ -82,8 +82,6 @@
</span><span class="cx">     virtual void setExposedRect(const WebCore::FloatRect&amp;) override;
</span><span class="cx">     virtual WebCore::FloatRect exposedRect() const override { return m_scrolledExposedRect; }
</span><span class="cx"> 
</span><del>-    virtual void setCustomFixedPositionRect(const WebCore::FloatRect&amp;) override { }
-
</del><span class="cx">     virtual bool supportsAsyncScrolling() override { return true; }
</span><span class="cx"> 
</span><span class="cx">     virtual void didChangeScrollOffsetForAnyFrame() override;
</span></span></pre>
</div>
</div>

</body>
</html>