<!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>[177835] 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/177835">177835</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-31 12:01:02 -0800 (Wed, 31 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the remaining uses of OwnPtr from WebKit2
https://bugs.webkit.org/show_bug.cgi?id=140017
Reviewed by Dan Bernstein.
Source/WebCore:
* WebCore.exp.in:
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::AsyncScrollingCoordinator):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::commit):
(WebCore::ScrollingStateTree::create): Deleted.
* page/scrolling/ScrollingStateTree.h:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::commitNewTreeState):
* page/scrolling/ScrollingTree.h:
* page/scrolling/ThreadedScrollingTree.cpp:
(WebCore::ThreadedScrollingTree::commitNewTreeState):
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/ios/ScrollingTreeIOS.cpp:
(WebCore::ScrollingTreeIOS::commitNewTreeState):
* page/scrolling/ios/ScrollingTreeIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::commitTreeState):
Source/WebKit2:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::RemoteScrollingCoordinatorTransaction::decode):
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
(WebKit::RemoteScrollingCoordinatorTransaction::setStateTreeToEncode):
(WebKit::RemoteScrollingCoordinatorTransaction::scrollingStateTree):
* UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree):
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::PageClientImpl):
* UIProcess/mac/WKFullScreenWindowController.h:
* UIProcess/mac/WKPrintingView.mm:
(-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
(-[WKPrintingView _askPageToComputePageRects]):
(-[WKPrintingView _drawPreview:]):
* WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:</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="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreeh">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactionh">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacDynamicLinkerEnvironmentExtractormm">trunk/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/ChangeLog 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-31 Sam Weinig <sam@webkit.org>
+
+ Remove the remaining uses of OwnPtr from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=140017
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.exp.in:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::AsyncScrollingCoordinator):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingStateTree.cpp:
+ (WebCore::ScrollingStateTree::commit):
+ (WebCore::ScrollingStateTree::create): Deleted.
+ * page/scrolling/ScrollingStateTree.h:
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitNewTreeState):
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::commitNewTreeState):
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/ios/ScrollingTreeIOS.cpp:
+ (WebCore::ScrollingTreeIOS::commitNewTreeState):
+ * page/scrolling/ios/ScrollingTreeIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+
</ins><span class="cx"> 2014-12-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Don’t use AccessibilityAllInOne when building with Xcode
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -2897,7 +2897,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> __ZN7WebCore13ScrollingTree16handleWheelEventERKNS_18PlatformWheelEventE
</span><del>-__ZN7WebCore13ScrollingTree18commitNewTreeStateEN3WTF10PassOwnPtrINS_18ScrollingStateTreeEEE
</del><ins>+__ZN7WebCore13ScrollingTree18commitNewTreeStateENSt3__110unique_ptrINS_18ScrollingStateTreeENS1_14default_deleteIS3_EEEE
</ins><span class="cx"> __ZN7WebCore13ScrollingTree21setCanRubberBandStateEbbbb
</span><span class="cx"> __ZN7WebCore13ScrollingTree31willWheelEventStartSwipeGestureERKNS_18PlatformWheelEventE
</span><span class="cx"> __ZN7WebCore13ScrollingTree32isPointInNonFastScrollableRegionENS_8IntPointE
</span><span class="lines">@@ -2916,7 +2916,7 @@
</span><span class="cx"> __ZN7WebCore18ScrollingStateTree15setRemovedNodesEN3WTF7HashSetIyNS1_7IntHashIyEENS1_10HashTraitsIyEEEE
</span><span class="cx"> __ZN7WebCore18ScrollingStateTree23setHasChangedPropertiesEb
</span><span class="cx"> __ZN7WebCore18ScrollingStateTree6commitENS_19LayerRepresentation4TypeE
</span><del>-__ZN7WebCore18ScrollingStateTree6createEPNS_25AsyncScrollingCoordinatorE
</del><ins>+__ZN7WebCore18ScrollingStateTreeC1EPNS_25AsyncScrollingCoordinatorE
</ins><span class="cx"> __ZN7WebCore18ScrollingStateTreeD1Ev
</span><span class="cx"> __ZN7WebCore20ScrollingCoordinator13pageDestroyedEv
</span><span class="cx"> __ZN7WebCore20ScrollingCoordinator45setForceSynchronousScrollLayerPositionUpdatesEb
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> AsyncScrollingCoordinator::AsyncScrollingCoordinator(Page* page)
</span><span class="cx"> : ScrollingCoordinator(page)
</span><span class="cx"> , m_updateNodeScrollPositionTimer(*this, &AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired)
</span><del>- , m_scrollingStateTree(ScrollingStateTree::create(this))
</del><ins>+ , m_scrollingStateTree(std::make_unique<ScrollingStateTree>(this))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> ScheduledScrollUpdate m_scheduledScrollUpdate;
</span><span class="cx">
</span><del>- OwnPtr<ScrollingStateTree> m_scrollingStateTree;
</del><ins>+ std::unique_ptr<ScrollingStateTree> m_scrollingStateTree;
</ins><span class="cx"> RefPtr<ScrollingTree> m_scrollingTree;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -37,11 +37,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingStateTree> ScrollingStateTree::create(AsyncScrollingCoordinator* scrollingCoordinator)
-{
- return adoptPtr(new ScrollingStateTree(scrollingCoordinator));
-}
-
</del><span class="cx"> ScrollingStateTree::ScrollingStateTree(AsyncScrollingCoordinator* scrollingCoordinator)
</span><span class="cx"> : m_scrollingCoordinator(scrollingCoordinator)
</span><span class="cx"> , m_hasChangedProperties(false)
</span><span class="lines">@@ -156,7 +151,7 @@
</span><span class="cx"> m_orphanedSubframeNodes.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingStateTree> ScrollingStateTree::commit(LayerRepresentation::Type preferredLayerRepresentation)
</del><ins>+std::unique_ptr<ScrollingStateTree> ScrollingStateTree::commit(LayerRepresentation::Type preferredLayerRepresentation)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_orphanedSubframeNodes.isEmpty()) {
</span><span class="cx"> // If we still have orphaned subtrees, remove them from m_stateNodeMap since they will be deleted
</span><span class="lines">@@ -167,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This function clones and resets the current state tree, but leaves the tree structure intact.
</span><del>- OwnPtr<ScrollingStateTree> treeStateClone = ScrollingStateTree::create();
</del><ins>+ std::unique_ptr<ScrollingStateTree> treeStateClone = std::make_unique<ScrollingStateTree>();
</ins><span class="cx"> treeStateClone->setPreferredLayerRepresentation(preferredLayerRepresentation);
</span><span class="cx">
</span><span class="cx"> if (m_rootStateNode)
</span><span class="lines">@@ -183,7 +178,7 @@
</span><span class="cx"> treeStateClone->m_hasNewRootStateNode = m_hasNewRootStateNode;
</span><span class="cx"> m_hasNewRootStateNode = false;
</span><span class="cx">
</span><del>- return treeStateClone.release();
</del><ins>+ return treeStateClone;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingStateTree::addNode(ScrollingStateNode* node)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #include "ScrollingStateFrameScrollingNode.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,8 +43,7 @@
</span><span class="cx"> class ScrollingStateTree {
</span><span class="cx"> friend class ScrollingStateNode;
</span><span class="cx"> public:
</span><del>-
- WEBCORE_EXPORT static PassOwnPtr<ScrollingStateTree> create(AsyncScrollingCoordinator* = 0);
</del><ins>+ WEBCORE_EXPORT ScrollingStateTree(AsyncScrollingCoordinator* = nullptr);
</ins><span class="cx"> WEBCORE_EXPORT ~ScrollingStateTree();
</span><span class="cx">
</span><span class="cx"> ScrollingStateFrameScrollingNode* rootStateNode() const { return m_rootStateNode.get(); }
</span><span class="lines">@@ -60,7 +57,7 @@
</span><span class="cx"> WEBCORE_EXPORT void setRemovedNodes(HashSet<ScrollingNodeID>);
</span><span class="cx">
</span><span class="cx"> // Copies the current tree state and clears the changed properties mask in the original.
</span><del>- WEBCORE_EXPORT PassOwnPtr<ScrollingStateTree> commit(LayerRepresentation::Type preferredLayerRepresentation);
</del><ins>+ WEBCORE_EXPORT std::unique_ptr<ScrollingStateTree> commit(LayerRepresentation::Type preferredLayerRepresentation);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setHasChangedProperties(bool = true);
</span><span class="cx"> bool hasChangedProperties() const { return m_hasChangedProperties; }
</span><span class="lines">@@ -77,8 +74,6 @@
</span><span class="cx"> void setPreferredLayerRepresentation(LayerRepresentation::Type representation) { m_preferredLayerRepresentation = representation; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ScrollingStateTree(AsyncScrollingCoordinator*);
-
</del><span class="cx"> void setRootStateNode(PassRefPtr<ScrollingStateFrameScrollingNode> rootStateNode) { m_rootStateNode = rootStateNode; }
</span><span class="cx"> void addNode(ScrollingStateNode*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> scrollingTreeNodeDidScroll(nodeID, scrollPosition, inUserInteration ? SyncScrollingLayerPosition : SetScrollingLayerPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::commitNewTreeState(PassOwnPtr<ScrollingStateTree> scrollingStateTree)
</del><ins>+void ScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</ins><span class="cx"> {
</span><span class="cx"> bool rootStateNodeChanged = scrollingStateTree->hasNewRootStateNode();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> bool isRubberBandInProgress();
</span><span class="cx">
</span><span class="cx"> virtual void invalidate() { }
</span><del>- WEBCORE_EXPORT virtual void commitNewTreeState(PassOwnPtr<ScrollingStateTree>);
</del><ins>+ WEBCORE_EXPORT virtual void commitNewTreeState(std::unique_ptr<ScrollingStateTree>);
</ins><span class="cx">
</span><span class="cx"> void setMainFramePinState(bool pinnedToTheLeft, bool pinnedToTheRight, bool pinnedToTheTop, bool pinnedToTheBottom);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> RunLoop::main().dispatch(bind(derefScrollingCoordinator, m_scrollingCoordinator.release().leakRef()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedScrollingTree::commitNewTreeState(PassOwnPtr<ScrollingStateTree> scrollingStateTree)
</del><ins>+void ThreadedScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(ScrollingThread::isCurrentThread());
</span><del>- ScrollingTree::commitNewTreeState(scrollingStateTree);
</del><ins>+ ScrollingTree::commitNewTreeState(WTF::move(scrollingStateTree));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ThreadedScrollingTree();
</span><span class="cx">
</span><del>- virtual void commitNewTreeState(PassOwnPtr<ScrollingStateTree>) override;
</del><ins>+ virtual void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
</ins><span class="cx">
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -77,9 +77,9 @@
</span><span class="cx"> callOnMainThread(bind(derefScrollingCoordinator, m_scrollingCoordinator.release().leakRef()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeIOS::commitNewTreeState(PassOwnPtr<ScrollingStateTree> scrollingStateTree)
</del><ins>+void ScrollingTreeIOS::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</ins><span class="cx"> {
</span><del>- ScrollingTree::commitNewTreeState(scrollingStateTree);
</del><ins>+ ScrollingTree::commitNewTreeState(WTF::move(scrollingStateTree));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> static RefPtr<ScrollingTreeIOS> create(AsyncScrollingCoordinator*);
</span><span class="cx"> virtual ~ScrollingTreeIOS();
</span><span class="cx">
</span><del>- virtual void commitNewTreeState(PassOwnPtr<ScrollingStateTree>) override;
</del><ins>+ virtual void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
</ins><span class="cx">
</span><span class="cx"> // No wheel events on iOS
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -115,9 +115,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scrollingStateTree()->hasChangedProperties());
</span><span class="cx">
</span><del>- OwnPtr<ScrollingStateTree> treeState = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation);
- ScrollingThread::dispatch(bind(&ThreadedScrollingTree::commitNewTreeState, downcast<ThreadedScrollingTree>(scrollingTree()), treeState.release()));
</del><ins>+ RefPtr<ThreadedScrollingTree> threadedScrollingTree = downcast<ThreadedScrollingTree>(scrollingTree());
+ ScrollingStateTree* unprotectedTreeState = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation).release();
</ins><span class="cx">
</span><ins>+ ScrollingThread::dispatch([threadedScrollingTree, unprotectedTreeState] {
+ std::unique_ptr<ScrollingStateTree> treeState(unprotectedTreeState);
+ threadedScrollingTree->commitNewTreeState(WTF::move(treeState));
+ });
+
</ins><span class="cx"> updateTiledScrollingIndicator();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-12-31 Sam Weinig <sam@webkit.org>
+
+ Remove the remaining uses of OwnPtr from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=140017
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::RemoteScrollingCoordinatorTransaction::decode):
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
+ (WebKit::RemoteScrollingCoordinatorTransaction::setStateTreeToEncode):
+ (WebKit::RemoteScrollingCoordinatorTransaction::scrollingStateTree):
+ * UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm:
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree):
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::PageClientImpl):
+ * UIProcess/mac/WKFullScreenWindowController.h:
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
+ (-[WKPrintingView _askPageToComputePageRects]):
+ (-[WKPrintingView _drawPreview:]):
+ * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:
+
</ins><span class="cx"> 2014-12-31 Bartlomiej Gajda <b.gajda@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix build warnings after r177792.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> if (!decoder.decode(hasNewRootNode))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_scrollingStateTree = ScrollingStateTree::create();
</del><ins>+ m_scrollingStateTree = std::make_unique<ScrollingStateTree>();
</ins><span class="cx">
</span><span class="cx"> bool hasChangedProperties;
</span><span class="cx"> if (!decoder.decode(hasChangedProperties))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #define RemoteScrollingCoordinatorTransaction_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/ScrollingStateTree.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="lines">@@ -39,10 +37,9 @@
</span><span class="cx">
</span><span class="cx"> class RemoteScrollingCoordinatorTransaction {
</span><span class="cx"> public:
</span><del>-
</del><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>- void setStateTreeToEncode(PassOwnPtr<WebCore::ScrollingStateTree> stateTree) { m_scrollingStateTree = stateTree; }
- OwnPtr<WebCore::ScrollingStateTree>& scrollingStateTree() { return m_scrollingStateTree; }
</del><ins>+ void setStateTreeToEncode(std::unique_ptr<WebCore::ScrollingStateTree> stateTree) { m_scrollingStateTree = WTF::move(stateTree); }
+ std::unique_ptr<WebCore::ScrollingStateTree>& scrollingStateTree() { return m_scrollingStateTree; }
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="lines">@@ -57,7 +54,7 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> bool decode(IPC::ArgumentDecoder&);
</span><span class="cx">
</span><del>- OwnPtr<WebCore::ScrollingStateTree> m_scrollingStateTree;
</del><ins>+ std::unique_ptr<WebCore::ScrollingStateTree> m_scrollingStateTree;
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacDynamicLinkerEnvironmentExtractormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "EnvironmentVariables.h"
</span><span class="cx"> #include <mach-o/loader.h>
</span><span class="cx"> #include <mach-o/swap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -82,8 +82,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_requestedScrollInfo = &requestedScrollInfo;
</span><span class="cx">
</span><del>- OwnPtr<ScrollingStateTree> stateTree = const_cast<RemoteScrollingCoordinatorTransaction&>(transaction).scrollingStateTree().release();
-
</del><ins>+ // FIXME: There must be a better idiom for this.
+ std::unique_ptr<ScrollingStateTree> stateTree(const_cast<RemoteScrollingCoordinatorTransaction&>(transaction).scrollingStateTree().release());
+
</ins><span class="cx"> const RemoteLayerTreeHost* layerTreeHost = this->layerTreeHost();
</span><span class="cx"> if (!layerTreeHost) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> connectStateNodeLayers(*stateTree, *layerTreeHost);
</span><del>- m_scrollingTree->commitNewTreeState(stateTree.release());
</del><ins>+ m_scrollingTree->commitNewTreeState(WTF::move(stateTree));
</ins><span class="cx">
</span><span class="cx"> m_requestedScrollInfo = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> CorrectionPanel m_correctionPanel;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><del>- OwnPtr<WebCore::AlternativeTextUIController> m_alternativeTextUIController;
</del><ins>+ std::unique_ptr<WebCore::AlternativeTextUIController> m_alternativeTextUIController;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> , m_webView(webView)
</span><span class="cx"> , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><del>- , m_alternativeTextUIController(adoptPtr(new AlternativeTextUIController))
</del><ins>+ , m_alternativeTextUIController(std::make_unique<AlternativeTextUIController>())
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> #if !WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><span class="cx"> #import "GenericCallback.h"
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> RefPtr<DataCallback> callback = DataCallback::create([context](API::Data* data, CallbackBase::Error) {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- OwnPtr<IPCCallbackContext> contextDeleter = adoptPtr(context);
</del><ins>+ std::unique_ptr<IPCCallbackContext> contextDeleter(context);
</ins><span class="cx"> WKPrintingView *view = context->view.get();
</span><span class="cx">
</span><span class="cx"> if (context->callbackID == view->_expectedPrintCallback) {
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx">
</span><span class="cx"> IPCCallbackContext* context = new IPCCallbackContext;
</span><span class="cx"> RefPtr<ComputedPagesCallback> callback = ComputedPagesCallback::create([context](const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, CallbackBase::Error) {
</span><del>- OwnPtr<IPCCallbackContext> contextDeleter = adoptPtr(context);
</del><ins>+ std::unique_ptr<IPCCallbackContext> contextDeleter(context);
</ins><span class="cx"> pageDidComputePageRects(pageRects, totalScaleFactorForPrinting, context);
</span><span class="cx"> });
</span><span class="cx"> _expectedComputedPagesCallback = callback->callbackID();
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> IPCCallbackContext* context = new IPCCallbackContext;
</span><span class="cx"> RefPtr<ImageCallback> callback = ImageCallback::create([context](const ShareableBitmap::Handle& imageHandle, CallbackBase::Error) {
</span><del>- OwnPtr<IPCCallbackContext> contextDeleter = adoptPtr(context);
</del><ins>+ std::unique_ptr<IPCCallbackContext> contextDeleter(context);
</ins><span class="cx"> pageDidDrawToImage(imageHandle, context);
</span><span class="cx"> });
</span><span class="cx"> _latestExpectedPreviewCallback = callback->callbackID();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm (177834 => 177835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2014-12-31 19:03:18 UTC (rev 177834)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2014-12-31 20:01:02 UTC (rev 177835)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "PageBanner.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span></span></pre>
</div>
</div>
</body>
</html>