<!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>[166512] 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/166512">166512</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 10:32:32 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix iOS build.
Source/WebCore:
* page/ChromeClient.h:
(WebCore::ChromeClient::updateViewportConstrainedLayers):
Source/WebKit/ios:
* WebCoreSupport/WebChromeClientIOS.h:
* WebCoreSupport/WebChromeClientIOS.mm:
* WebCoreSupport/WebFixedPositionContent.mm:
* WebCoreSupport/WebFixedPositionContentInternal.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSh">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentInternalh">trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContentInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-03-31 Anders Carlsson <andersca@apple.com>
+
+ Fix iOS build.
+
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::updateViewportConstrainedLayers):
+
</ins><span class="cx"> 2014-03-31 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE][Mac] Support lease-renewal.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -250,8 +250,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool fetchCustomFixedPositionLayoutRect(IntRect&) { return false; }
</span><span class="cx">
</span><del>- // FIXME: Use std::unique_ptr instead of OwnPtr.
- virtual void updateViewportConstrainedLayers(HashMap<PlatformLayer*, OwnPtr<ViewportConstraints>>&, HashMap<PlatformLayer*, PlatformLayer*>&) { }
</del><ins>+ virtual void updateViewportConstrainedLayers(HashMap<PlatformLayer*, std::unique_ptr<ViewportConstraints>>&, HashMap<PlatformLayer*, PlatformLayer*>&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void addOrUpdateScrollingLayer(Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer, const IntSize& scrollSize, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) = 0;
</span><span class="cx"> virtual void removeScrollingLayer(Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-31 Anders Carlsson <andersca@apple.com>
+
+ Fix iOS build.
+
+ * WebCoreSupport/WebChromeClientIOS.h:
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ * WebCoreSupport/WebFixedPositionContent.mm:
+ * WebCoreSupport/WebFixedPositionContentInternal.h:
+
</ins><span class="cx"> 2014-03-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Tried to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void didFlushCompositingLayers() override;
</span><span class="cx">
</span><del>- virtual void updateViewportConstrainedLayers(HashMap<PlatformLayer*, OwnPtr<WebCore::ViewportConstraints> >&, HashMap<PlatformLayer*, PlatformLayer*>&) override;
</del><ins>+ virtual void updateViewportConstrainedLayers(HashMap<PlatformLayer*, std::unique_ptr<WebCore::ViewportConstraints>>&, HashMap<PlatformLayer*, PlatformLayer*>&) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool fetchCustomFixedPositionLayoutRect(WebCore::IntRect&) override;
</span><span class="cx"> virtual void addOrUpdateScrollingLayer(WebCore::Node*, PlatformLayer*, PlatformLayer*, const WebCore::IntSize&, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) override;
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClientIOS::updateViewportConstrainedLayers(HashMap<PlatformLayer*, OwnPtr<ViewportConstraints> >& layerMap, HashMap<PlatformLayer*, PlatformLayer*>& stickyContainers)
</del><ins>+void WebChromeClientIOS::updateViewportConstrainedLayers(HashMap<PlatformLayer*, std::unique_ptr<ViewportConstraints>>& layerMap, HashMap<PlatformLayer*, PlatformLayer*>& stickyContainers)
</ins><span class="cx"> {
</span><span class="cx"> [[webView() _fixedPositionContent] setViewportConstrainedLayers:layerMap stickyContainerMap:stickyContainers];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> : m_enclosingAcceleratedScrollLayer(nil)
</span><span class="cx"> { }
</span><span class="cx"> CALayer* m_enclosingAcceleratedScrollLayer; // May be nil.
</span><del>- OwnPtr<ViewportConstraints> m_viewportConstraints;
</del><ins>+ std::unique_ptr<ViewportConstraints> m_viewportConstraints;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-typedef HashMap<RetainPtr<CALayer>, OwnPtr<ViewportConstrainedLayerData> > LayerInfoMap;
</del><ins>+typedef HashMap<RetainPtr<CALayer>, std::unique_ptr<ViewportConstrainedLayerData>> LayerInfoMap;
</ins><span class="cx">
</span><span class="cx"> struct WebFixedPositionContentData {
</span><span class="cx"> public:
</span><span class="lines">@@ -171,21 +171,20 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setViewportConstrainedLayers:(WTF::HashMap<CALayer *, OwnPtr<WebCore::ViewportConstraints> >&)layerMap stickyContainerMap:(WTF::HashMap<CALayer*, CALayer*>&)stickyContainers
</del><ins>+- (void)setViewportConstrainedLayers:(WTF::HashMap<CALayer *, std::unique_ptr<WebCore::ViewportConstraints>>&)layerMap stickyContainerMap:(WTF::HashMap<CALayer*, CALayer*>&)stickyContainers
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker lock(WebFixedPositionContentDataLock());
</span><span class="cx">
</span><span class="cx"> _private->m_viewportConstrainedLayers.clear();
</span><span class="cx">
</span><del>- HashMap<CALayer *, OwnPtr<ViewportConstraints> >::iterator end = layerMap.end();
- for (HashMap<CALayer *, OwnPtr<ViewportConstraints> >::iterator it = layerMap.begin(); it != end; ++it) {
- CALayer* layer = it->key;
- OwnPtr<ViewportConstrainedLayerData> layerData = adoptPtr(new ViewportConstrainedLayerData);
</del><ins>+ for (auto& layerAndConstraints : layerMap) {
+ CALayer* layer = layerAndConstraints.key;
+ auto layerData = std::make_unique<ViewportConstrainedLayerData>();
</ins><span class="cx">
</span><span class="cx"> layerData->m_enclosingAcceleratedScrollLayer = stickyContainers.get(layer);
</span><del>- layerData->m_viewportConstraints = it->value.release();
</del><ins>+ layerData->m_viewportConstraints = std::move(layerAndConstraints.value);
</ins><span class="cx">
</span><del>- _private->m_viewportConstrainedLayers.set(layer, layerData.release());
</del><ins>+ _private->m_viewportConstrainedLayers.set(layer, std::move(layerData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContentInternal.h (166511 => 166512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContentInternal.h 2014-03-31 17:13:43 UTC (rev 166511)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContentInternal.h 2014-03-31 17:32:32 UTC (rev 166512)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> @class CALayer;
</span><span class="cx">
</span><span class="lines">@@ -36,6 +35,6 @@
</span><span class="cx"> @interface WebFixedPositionContent(WebKitInternal)
</span><span class="cx"> // Called from inside WebKit.
</span><span class="cx">
</span><del>-- (void)setViewportConstrainedLayers:(WTF::HashMap<CALayer *, OwnPtr<WebCore::ViewportConstraints> >&)layerMap stickyContainerMap:(WTF::HashMap<CALayer*, CALayer*>&)stickyContainers;
</del><ins>+- (void)setViewportConstrainedLayers:(WTF::HashMap<CALayer *, std::unique_ptr<WebCore::ViewportConstraints>>&)layerMap stickyContainerMap:(WTF::HashMap<CALayer*, CALayer*>&)stickyContainers;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>