<!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>[165422] 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/165422">165422</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-10 18:34:42 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WebKit 2] Wire the unobscured rect in the WebProcess
https://bugs.webkit.org/show_bug.cgi?id=130058
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-10
Reviewed by Simon Fraser.
Source/WebCore:
* WebCore.exp.in:
* platform/ScrollView.h:
* platform/ios/ScrollViewIOS.mm:
(WebCore::ScrollView::unobscuredContentRect):
(WebCore::ScrollView::setUnobscuredContentRect):
Source/WebKit2:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebCore/ChangeLog 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-03-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [iOS][WebKit 2] Wire the unobscured rect in the WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=130058
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.exp.in:
+ * platform/ScrollView.h:
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::unobscuredContentRect):
+ (WebCore::ScrollView::setUnobscuredContentRect):
+
+2014-03-10 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> makeSelectorPseudoTypeMap.py should not be copied in the WebCore bundle
</span><span class="cx">
</span><span class="cx"> * WebCore.xcodeproj/project.pbxproj:
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -2395,6 +2395,7 @@
</span><span class="cx"> __ZN7WebCore10FloatPointC1ERK7CGPoint
</span><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE
</span><ins>+__ZN7WebCore10ScrollView24setUnobscuredContentRectERKNS_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 (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -180,7 +180,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><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><ins>+
+ // The given rects are only used if there is no platform widget.
</ins><span class="cx"> void setExposedContentRect(const IntRect&);
</span><ins>+ void setUnobscuredContentRect(const IntRect&);
</ins><span class="cx">
</span><span class="cx"> void setActualScrollPosition(const IntPoint&);
</span><span class="cx"> TileCache* tileCache();
</span><span class="lines">@@ -406,6 +409,7 @@
</span><span class="cx"> // between exposed rect and unobscuredRects. The two attributes should eventually be merged.
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> IntRect m_exposedContentRect;
</span><ins>+ IntRect m_unobscuredContentRect;
</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 (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -98,14 +98,26 @@
</span><span class="cx">
</span><span class="cx"> IntRect ScrollView::unobscuredContentRect() const
</span><span class="cx"> {
</span><del>- CGRect r = CGRectZero;
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
- WAKScrollView *view = static_cast<WAKScrollView *>(platformWidget());
- r = [view unobscuredContentRect];
- END_BLOCK_OBJC_EXCEPTIONS;
- return enclosingIntRect(r);
</del><ins>+ if (WAKScrollView *view = static_cast<WAKScrollView *>(platformWidget())) {
+ CGRect r = CGRectZero;
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ r = [view unobscuredContentRect];
+ END_BLOCK_OBJC_EXCEPTIONS;
+ return enclosingIntRect(r);
+ }
+
+ if (!m_unobscuredContentRect.isEmpty())
+ return m_unobscuredContentRect;
+
+ return visibleContentRectIncludingScrollbars();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollView::setUnobscuredContentRect(const IntRect& rect)
+{
+ ASSERT(!platformWidget());
+ m_unobscuredContentRect = rect;
+}
+
</ins><span class="cx"> IntRect ScrollView::exposedContentRect() const
</span><span class="cx"> {
</span><span class="cx"> if (NSScrollView *view = static_cast<NSScrollView *>(platformWidget())) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-10 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WebKit 2] Wire the unobscured rect in the WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=130058
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+
</ins><span class="cx"> 2014-03-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix three leaks
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165421 => 165422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-11 00:40:34 UTC (rev 165421)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-11 01:34:42 UTC (rev 165422)
</span><span class="lines">@@ -1734,7 +1734,8 @@
</span><span class="cx"> FloatRect exposedRect = visibleContentRectUpdateInfo.exposedRect();
</span><span class="cx"> m_drawingArea->setExposedContentRect(enclosingIntRect(exposedRect));
</span><span class="cx">
</span><del>- IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());
</del><ins>+ IntRect roundedUnobscuredRect = roundedIntRect(visibleContentRectUpdateInfo.unobscuredRect());
+ IntPoint scrollPosition = roundedUnobscuredRect.location();
</ins><span class="cx">
</span><span class="cx"> double boundedScale = std::min(m_viewportConfiguration.maximumScale(), std::max(m_viewportConfiguration.minimumScale(), visibleContentRectUpdateInfo.scale()));
</span><span class="cx"> float floatBoundedScale = boundedScale;
</span><span class="lines">@@ -1748,11 +1749,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page->mainFrame().view()->setScrollOffset(scrollPosition);
</span><del>-
</del><ins>+ m_page->mainFrame().view()->setUnobscuredContentRect(roundedUnobscuredRect);
+
</ins><span class="cx"> if (visibleContentRectUpdateInfo.inStableState())
</span><span class="cx"> m_page->mainFrame().view()->setCustomFixedPositionLayoutRect(enclosingIntRect(visibleContentRectUpdateInfo.customFixedPositionRect()));
</span><del>-
- // FIXME: we should also update the frame view from unobscured rect. Altenatively, we can have it pull the values from ScrollView.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::willStartUserTriggeredZooming()
</span></span></pre>
</div>
</div>
</body>
</html>