<!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>[165124] trunk/Source</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/165124">165124</a></dd>

<dt>Author</dt> <dd>benjamin@webkit.org</dd>

<dt>Date</dt> <dd>2014-03-05 13:30:08 -0800 (Wed, 05 Mar 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>[iOS] Rename the various VisibleExtent variations to exposedContentRect

https://bugs.webkit.org/show_bug.cgi?id=129728

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2014-03-05

Reviewed by Simon Fraser.

Source/WebCore: 

Rename DocumentVisibleExtent and VisibleExtentContentRect to ExposedContentRect in a desperate

attempt to make things a tiny little bit less confusing.

The name is ExposedContentRect and not ExposedRect as that rect is exposed on ScrollView, while the

rect is in document coordinates (which does not make any difference on WebKit1...).

* WebCore.exp.in:

* platform/ScrollView.h:

* platform/ios/ScrollViewIOS.mm:

(WebCore::ScrollView::exposedContentRect):

(WebCore::ScrollView::setExposedContentRect):

* platform/ios/wak/WAKScrollView.h:

* platform/ios/wak/WAKScrollView.mm:

(-[WAKScrollView exposedContentRect]):

* rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::flushPendingLayerChanges):

(WebCore::RenderLayerCompositor::didChangeVisibleRect):

Source/WebKit2: 

* WebProcess/WebPage/DrawingArea.h:

* WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::updateVisibleContentRects):

* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:

* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::setExposedContentRect):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>

<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>

<li><a href="#trunkSourceWebCoreplatformiosScrollViewIOSmm">trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm</a></li>

<li><a href="#trunkSourceWebCoreplatformioswakWAKScrollViewh">trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h</a></li>

<li><a href="#trunkSourceWebCoreplatformioswakWAKScrollViewmm">trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</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>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/ChangeLog        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -1,3 +1,28 @@

</span><ins>+2014-03-05  Benjamin Poulain  &lt;bpoulain@apple.com&gt;

+

+        [iOS] Rename the various VisibleExtent variations to exposedContentRect

+        https://bugs.webkit.org/show_bug.cgi?id=129728

+

+        Reviewed by Simon Fraser.

+

+        Rename DocumentVisibleExtent and VisibleExtentContentRect to ExposedContentRect in a desperate

+        attempt to make things a tiny little bit less confusing.

+

+        The name is ExposedContentRect and not ExposedRect as that rect is exposed on ScrollView, while the

+        rect is in document coordinates (which does not make any difference on WebKit1...).

+

+        * WebCore.exp.in:

+        * platform/ScrollView.h:

+        * platform/ios/ScrollViewIOS.mm:

+        (WebCore::ScrollView::exposedContentRect):

+        (WebCore::ScrollView::setExposedContentRect):

+        * platform/ios/wak/WAKScrollView.h:

+        * platform/ios/wak/WAKScrollView.mm:

+        (-[WAKScrollView exposedContentRect]):

+        * rendering/RenderLayerCompositor.cpp:

+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):

+        (WebCore::RenderLayerCompositor::didChangeVisibleRect):

+

</ins><span class="cx"> 2014-03-05  Simon Fraser  &lt;simon.fraser@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         ObjC exception when dropping files into a WKView: drag and drop uses code from WebKit.framework

</span></span></pre></div>

<a id="trunkSourceWebCoreWebCoreexpin"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/WebCore.exp.in        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -2391,7 +2391,7 @@

</span><span class="cx"> _WebUIApplicationWillResignActiveNotification

</span><span class="cx"> __ZN7WebCore10FloatPointC1ERK7CGPoint

</span><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE

</span><del>-__ZN7WebCore10ScrollView27setVisibleExtentContentRectERKNS_7IntRectE

</del><ins>+__ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE

</ins><span class="cx"> __ZN7WebCore10XLinkNames4initEv

</span><span class="cx"> __ZN7WebCore10inSameLineERKNS_15VisiblePositionES2_

</span><span class="cx"> __ZN7WebCore11BidiContext41copyStackRemovingUnicodeEmbeddingContextsEv

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformScrollViewh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/platform/ScrollView.h        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -170,8 +170,8 @@

<span class="cx">     // This is the area that is not covered by UI elements.

</span><span class="cx">     IntRect actualVisibleContentRect() const;

<span class="cx">     // This is the area that is partially or fully exposed, and may extend under overlapping UI elements.

</span><del>-    IntRect visibleExtentContentRect() const;

-    void setVisibleExtentContentRect(const IntRect&amp;);

</del><ins>+    IntRect exposedContentRect() const;

+    void setExposedContentRect(const IntRect&amp;);

</ins><span class="cx"> 

</span><span class="cx">     void setActualScrollPosition(const IntPoint&amp;);

</span><span class="cx">     TileCache* tileCache();

</span><span class="lines">@@ -393,10 +393,10 @@

<span class="cx">     // whether it is safe to blit on scroll.

</span><span class="cx">     bool m_canBlitOnScroll;

</span><span class="cx"> 

</span><del>-    // FIXME: visibleExtentContentRect is a very similar concept to fixedVisibleContentRect except it does not differentiate

</del><ins>+    // FIXME: exposedContentRect is a very similar concept to fixedVisibleContentRect except it does not differentiate

</ins><span class="cx">     // between exposed rect and unobscuredRects. The two attributes should eventually be merged.

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-    IntRect m_visibleExtentContentRect;

</del><ins>+    IntRect m_exposedContentRect;

</ins><span class="cx"> #else

</span><span class="cx">     IntRect m_fixedVisibleContentRect;

</span><span class="cx"> #endif

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -106,13 +106,13 @@

</span><span class="cx">     return enclosingIntRect(r);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-IntRect ScrollView::visibleExtentContentRect() const

</del><ins>+IntRect ScrollView::exposedContentRect() const

</ins><span class="cx"> {

</span><span class="cx">     if (NSScrollView *view = static_cast&lt;NSScrollView *&gt;(platformWidget())) {

</span><span class="cx">         CGRect r = CGRectZero;

</span><span class="cx">         BEGIN_BLOCK_OBJC_EXCEPTIONS;

</span><span class="cx">         if ([view isKindOfClass:[NSScrollView class]])

</span><del>-            r = [view documentVisibleExtent];

</del><ins>+            r = [view exposedContentRect];

</ins><span class="cx">         else {

</span><span class="cx">             r.origin = [view visibleRect].origin;

</span><span class="cx">             r.size = [view bounds].size;

</span><span class="lines">@@ -124,18 +124,18 @@

</span><span class="cx"> 

</span><span class="cx">     const ScrollView* parent = this-&gt;parent();

</span><span class="cx">     if (!parent)

</span><del>-        return m_visibleExtentContentRect;

</del><ins>+        return m_exposedContentRect;

</ins><span class="cx"> 

</span><del>-    IntRect parentViewExtentContentRect = parent-&gt;visibleExtentContentRect();

</del><ins>+    IntRect parentViewExtentContentRect = parent-&gt;exposedContentRect();

</ins><span class="cx">     IntRect selfExtentContentRect = rootViewToContents(parentViewExtentContentRect);

</span><span class="cx">     selfExtentContentRect.intersect(boundsRect());

</span><span class="cx">     return selfExtentContentRect;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void ScrollView::setVisibleExtentContentRect(const IntRect&amp; rect)

</del><ins>+void ScrollView::setExposedContentRect(const IntRect&amp; rect)

</ins><span class="cx"> {

</span><span class="cx">     ASSERT(!platformWidget());

</span><del>-    m_visibleExtentContentRect = rect;

</del><ins>+    m_exposedContentRect = rect;

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void ScrollView::setActualScrollPosition(const IntPoint&amp; position)

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformioswakWAKScrollViewh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -63,7 +63,8 @@

</span><span class="cx"> - (CGRect)actualDocumentVisibleRect;

</span><span class="cx"> - (void)setActualScrollPosition:(CGPoint)point;

</span><span class="cx"> 

<del>-- (CGRect)documentVisibleExtent; // Like actualDocumentVisibleRect, but includes areas possibly covered by translucent UI.

</del><ins>+// Like actualDocumentVisibleRect, but includes areas possibly covered by translucent UI.

+- (CGRect)exposedContentRect;

</ins><span class="cx"> 

</span><span class="cx"> - (BOOL)inProgrammaticScroll;

</span><span class="cx"> @end

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformioswakWAKScrollViewmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -376,9 +376,9 @@

</span><span class="cx">     return [_documentView convertRect:windowVisibleRect fromView:nil];

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-- (CGRect)documentVisibleExtent

</del><ins>+- (CGRect)exposedContentRect

</ins><span class="cx"> {

</span><del>-    // Only called by WebCore::ScrollView::visibleExtentContentRect

</del><ins>+    // Only called by WebCore::ScrollView::exposedContentRect

</ins><span class="cx">     WAKView* view = self;

</span><span class="cx">     while ((view = [view superview])) {

</span><span class="cx">         if ([view isKindOfClass:[WAKScrollView class]])

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -420,7 +420,7 @@

</span><span class="cx"> 

</span><span class="cx">     if (GraphicsLayer* rootLayer = rootGraphicsLayer()) {

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-        rootLayer-&gt;flushCompositingState(frameView.visibleExtentContentRect());

</del><ins>+        rootLayer-&gt;flushCompositingState(frameView.exposedContentRect());

</ins><span class="cx"> #else

<span class="cx">         // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.

</span><span class="cx">         IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.contentsSize()) : frameView.visibleContentRect();

</span><span class="lines">@@ -518,7 +518,7 @@

</span><span class="cx">     const FrameView&amp; frameView = m_renderView.frameView();

</span><span class="cx"> 

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-    IntRect visibleRect = frameView.visibleExtentContentRect();

</del><ins>+    IntRect visibleRect = frameView.exposedContentRect();

</ins><span class="cx"> #else

</span><span class="cx">     IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.contentsSize()) : frameView.visibleContentRect();

</span><span class="cx"> #endif

</span></span></pre></div>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebKit2/ChangeLog        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2014-03-05  Benjamin Poulain  &lt;bpoulain@apple.com&gt;

+

+        [iOS] Rename the various VisibleExtent variations to exposedContentRect

+        https://bugs.webkit.org/show_bug.cgi?id=129728

+

+        Reviewed by Simon Fraser.

+

+        * WebProcess/WebPage/DrawingArea.h:

+        * WebProcess/WebPage/ios/WebPageIOS.mm:

+        (WebKit::WebPage::updateVisibleContentRects):

+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:

+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

+        (WebKit::RemoteLayerTreeDrawingArea::setExposedContentRect):

+

</ins><span class="cx"> 2014-03-05  Dean Jackson  &lt;dino@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Unreviewed. Fix the Apple-internal builds.

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -94,7 +94,7 @@

</span><span class="cx">     virtual void setCustomFixedPositionRect(const WebCore::FloatRect&amp;) = 0;

</span><span class="cx"> #endif

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-    virtual void setVisibleExtentContentRect(const WebCore::FloatRect&amp;) = 0;

</del><ins>+    virtual void setExposedContentRect(const WebCore::FloatRect&amp;) = 0;

</ins><span class="cx"> #endif

</span><span class="cx">     virtual void mainFrameScrollabilityChanged(bool) { }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -1730,7 +1730,7 @@

</span><span class="cx"> void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo&amp; visibleContentRectUpdateInfo)

</span><span class="cx"> {

</span><span class="cx">     FloatRect exposedRect = visibleContentRectUpdateInfo.exposedRect();

</span><del>-    m_drawingArea-&gt;setVisibleExtentContentRect(enclosingIntRect(exposedRect));

</del><ins>+    m_drawingArea-&gt;setExposedContentRect(enclosingIntRect(exposedRect));

</ins><span class="cx"> 

</span><span class="cx">     IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());

</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 (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -76,7 +76,7 @@

</span><span class="cx">     virtual WebCore::FloatRect exposedRect() const override { return m_scrolledExposedRect; }

</span><span class="cx"> 

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-    virtual void setVisibleExtentContentRect(const WebCore::FloatRect&amp;) override;

</del><ins>+    virtual void setExposedContentRect(const WebCore::FloatRect&amp;) override;

</ins><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx">     virtual void setCustomFixedPositionRect(const WebCore::FloatRect&amp;) override;

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (165123 => 165124)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-03-05 21:25:38 UTC (rev 165123)

+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-03-05 21:30:08 UTC (rev 165124)

</span><span class="lines">@@ -247,13 +247,13 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if PLATFORM(IOS)

</span><del>-void RemoteLayerTreeDrawingArea::setVisibleExtentContentRect(const FloatRect&amp; visibleExtentContentRect)

</del><ins>+void RemoteLayerTreeDrawingArea::setExposedContentRect(const FloatRect&amp; exposedContentRect)

</ins><span class="cx"> {

</span><span class="cx">     FrameView* frameView = m_webPage-&gt;corePage()-&gt;mainFrame().view();

</span><span class="cx">     if (!frameView)

</span><span class="cx">         return;

</span><span class="cx"> 

</span><del>-    frameView-&gt;setVisibleExtentContentRect(enclosingIntRect(visibleExtentContentRect));

</del><ins>+    frameView-&gt;setExposedContentRect(enclosingIntRect(exposedContentRect));

</ins><span class="cx">     scheduleCompositingLayerFlush();

</span><span class="cx"> }

</span><span class="cx"> #endif

</span></span></pre>

</div>

</div>

</body>

</html>