<!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>[165211] 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/165211">165211</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-06 13:51:19 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Rename the actualVisibleXXXRect to unobscuredContentRect for consistency
https://bugs.webkit.org/show_bug.cgi?id=129773
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-06
Reviewed by Simon Fraser.
* dom/TreeScope.cpp:
(WebCore::nodeFromPoint):
* platform/ScrollView.cpp:
(WebCore::ScrollView::visibleContentRectInternal):
* platform/ScrollView.h:
* platform/ios/ScrollViewIOS.mm:
(WebCore::ScrollView::unoscuredContentRect):
* platform/ios/wak/WAKScrollView.h:
* platform/ios/wak/WAKScrollView.mm:
(-[WAKScrollView unoscuredContentRect]):
(-[WAKScrollView description]):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollRectToVisible):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomTreeScopecpp">trunk/Source/WebCore/dom/TreeScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/ChangeLog 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-06 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] Rename the actualVisibleXXXRect to unobscuredContentRect for consistency
+ https://bugs.webkit.org/show_bug.cgi?id=129773
+
+ Reviewed by Simon Fraser.
+
+ * dom/TreeScope.cpp:
+ (WebCore::nodeFromPoint):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::visibleContentRectInternal):
+ * platform/ScrollView.h:
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::unoscuredContentRect):
+ * platform/ios/wak/WAKScrollView.h:
+ * platform/ios/wak/WAKScrollView.mm:
+ (-[WAKScrollView unoscuredContentRect]):
+ (-[WAKScrollView description]):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollRectToVisible):
+
</ins><span class="cx"> 2014-03-05 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Support caching of custom setters
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScope.cpp (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeScope.cpp 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> #else
</span><span class="cx"> IntPoint point = roundedIntPoint(FloatPoint(x * scaleFactor + frameView->actualScrollX(), y * scaleFactor + frameView->actualScrollY()));
</span><span class="cx">
</span><del>- if (!frameView->actualVisibleContentRect().contains(point))
</del><ins>+ if (!frameView->unobscuredContentRect().contains(point))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> #endif
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (platformWidget())
</span><del>- return actualVisibleContentRect();
</del><ins>+ return unobscuredContentRect();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(visibleContentRectBehavior);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // This is the area that is not covered by UI elements.
</span><del>- IntRect actualVisibleContentRect() const;
</del><ins>+ IntRect unobscuredContentRect() const;
</ins><span class="cx"> // This is the area that is partially or fully exposed, and may extend under overlapping UI elements.
</span><span class="cx"> IntRect exposedContentRect() const;
</span><span class="cx"> void setExposedContentRect(const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx"> return [[scrollView() contentView] copiesOnScroll];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect ScrollView::actualVisibleContentRect() const
</del><ins>+IntRect ScrollView::unobscuredContentRect() const
</ins><span class="cx"> {
</span><span class="cx"> CGRect r = CGRectZero;
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> WAKScrollView *view = static_cast<WAKScrollView *>(platformWidget());
</span><del>- r = [view actualDocumentVisibleRect];
</del><ins>+ r = [view unobscuredContentRect];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> return enclosingIntRect(r);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.h 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx"> - (void)setDelegate:(id)delegate;
</span><span class="cx"> - (id)delegate;
</span><span class="cx">
</span><del>-- (CGRect)actualDocumentVisibleRect;
</del><ins>+- (CGRect)unobscuredContentRect;
</ins><span class="cx"> - (void)setActualScrollPosition:(CGPoint)point;
</span><span class="cx">
</span><del>-// Like actualDocumentVisibleRect, but includes areas possibly covered by translucent UI.
</del><ins>+// Like unobscuredContentRect, but includes areas possibly covered by translucent UI.
</ins><span class="cx"> - (CGRect)exposedContentRect;
</span><span class="cx">
</span><span class="cx"> - (BOOL)inProgrammaticScroll;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKScrollViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -358,9 +358,9 @@
</span><span class="cx"> return [[self nextResponder] scrollWheel:anEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (CGRect)actualDocumentVisibleRect
</del><ins>+- (CGRect)unobscuredContentRect
</ins><span class="cx"> {
</span><del>- // Only called by WebCore::ScrollView::actualVisibleContentRect
</del><ins>+ // Only called by WebCore::ScrollView::unobscuredContentRect
</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 class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> CGRect frame = [self documentVisibleRect];
</span><span class="cx"> [description appendFormat:@"documentVisible = (%g %g; %g %g); ", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height];
</span><span class="cx">
</span><del>- frame = [self actualDocumentVisibleRect];
</del><ins>+ frame = [self unobscuredContentRect];
</ins><span class="cx"> [description appendFormat:@"actualDocumentVisible = (%g %g; %g %g)>", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height];
</span><span class="cx">
</span><span class="cx"> return description;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (165210 => 165211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-06 21:33:11 UTC (rev 165210)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-06 21:51:19 UTC (rev 165211)
</span><span class="lines">@@ -2428,8 +2428,7 @@
</span><span class="cx"> IntSize scrollOffsetRelativeToDocument = frameView.scrollOffsetRelativeToDocument();
</span><span class="cx"> visibleRectRelativeToDocument.setLocation(IntPoint(scrollOffsetRelativeToDocument.width(), scrollOffsetRelativeToDocument.height()));
</span><span class="cx"> #else
</span><del>- // FIXME: is this equivalent to the code above?
- LayoutRect viewRect = frameView.actualVisibleContentRect();
</del><ins>+ LayoutRect viewRect = frameView.unobscuredContentRect();
</ins><span class="cx"> LayoutRect visibleRectRelativeToDocument = viewRect;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>