<!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>[183265] trunk</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/183265">183265</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 09:38:28 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert OwnPtr and PassOwnPtr uses to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=128007
Reviewed by Anders Carlsson.
Source/WebCore:
* PlatformEfl.cmake: Removed OwnPtrCairo source files.
* PlatformGTK.cmake: Ditto.
* PlatformWinCairo.cmake: Ditto.
* WebCore.vcxproj/WebCore.vcxproj: Ditto.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* platform/CrossThreadCopier.cpp: Removed OwnPtr specialization.
* platform/CrossThreadCopier.h: Ditto.
* platform/ScrollAnimatorNone.cpp: Removed unneeded include.
* platform/ThreadGlobalData.cpp: Ditto.
* platform/ThreadGlobalData.h: Ditto.
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h: Ditto.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::AVFWrapper::processNotification): Use unique_ptr.
(WebCore::AVFWrapper::notificationCallback): Use make_unique.
(WebCore::AVFWrapper::platformLayer): Ditto.
* platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::appendPathToCairoContext): Use cairo_path_destroy directly
instead of a smart pointer; the code path is simple enough that it is
clear this way.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::ImageBuffer): Use make_unique.
* platform/graphics/cairo/ImageBufferDataCairo.h: Use unique_ptr.
* platform/graphics/cairo/OwnPtrCairo.cpp: Removed.
* platform/graphics/cairo/OwnPtrCairo.h: Removed.
* platform/graphics/cairo/PathCairo.cpp:
(WebCore::Path::Path): Use cairo_path_destroy directly instead of a
smart pointer; the code path is simple enough that it is clear this way.
(WebCore::Path::operator=): Ditto.
(WebCore::Path::addPath): Ditto.
(WebCore::Path::apply): Ditto.
* platform/graphics/cairo/PlatformContextCairo.cpp:
(WebCore::PlatformContextCairo::clipForPatternFilling): Ditto.
* platform/graphics/freetype/FontCacheFreeType.cpp: Removed unneeded include.
* platform/graphics/glx/GLContextGLX.cpp: Ditto.
* platform/graphics/surfaces/egl/EGLSurface.cpp:
(WebCore::EGLOffScreenSurface::EGLOffScreenSurface): Use make_unique.
* platform/graphics/surfaces/glx/GLXConfigSelector.h:
(WebCore::GLXConfigSelector::findMatchingConfig): Use unique_ptr with X11Deleter.
(WebCore::GLXConfigSelector::findMatchingConfigWithVisualId): Ditto.
* platform/graphics/surfaces/glx/GLXSurface.cpp:
(WebCore::GLXTransportSurface::GLXTransportSurface): Ditto.
(WebCore::GLXOffScreenSurface::initialize): Ditto.
* platform/graphics/surfaces/glx/OwnPtrX11.h: Removed.
* platform/graphics/surfaces/glx/X11Helper.cpp:
(WebCore::X11Helper::createOffScreenWindow): Use unique_ptr with X11Deleter.
(WebCore::X11Helper::createPixmap): Ditto.
* platform/graphics/surfaces/glx/X11Helper.h: Added X11Deleter,
which can be used with unique_ptr to make it call XFree instead of delete.
* platform/graphics/win/FullScreenController.cpp: Use unique_ptr.
(FullScreenController::FullScreenController): Use make_unique.
(FullScreenController::enterFullScreen): Ditto.
* platform/graphics/win/FullScreenController.h: Use unique_ptr.
* platform/graphics/win/GraphicsContext3DWin.cpp: Removed unneeded includes.
* platform/graphics/win/WKCAImageQueue.cpp:
(WebCore::WKCAImageQueue::WKCAImageQueue): Use make_unique.
* platform/graphics/win/WKCAImageQueue.h: Use unique_ptr.
* platform/network/NetworkStorageSessionStub.cpp: Removed unneeded include.
* platform/network/ResourceHandleInternal.h: Use unique_ptr.
* platform/network/curl/MultipartHandle.cpp:
(WebCore::MultipartHandle::create): Deleted.
* platform/network/curl/MultipartHandle.h: Deleted the create function.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::headerCallback): Use make_unique.
Source/WebKit2:
* NetworkProcess/cache/NetworkCacheEncoder.h: Added an include now
needed that was inherited from OwnPtr.h before.
Source/WTF:
* WTF.vcxproj/WTF.vcxproj: Removed OwnPtr source files.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* WTF.xcodeproj/project.pbxproj: Ditto.
* wtf/CMakeLists.txt: Ditto.
* wtf/Forward.h: Removed OwnPtr and PassOwnPtr.
* wtf/HashTraits.h: Ditto.
* wtf/OwnPtr.h: Removed.
* wtf/OwnPtrCommon.h: Removed.
* wtf/PassOwnPtr.h: Removed.
* wtf/SizeLimits.cpp: Removed OwnPtr.
* wtf/VectorTraits.h: Removed OwnPtr specialization.
Tools:
* DumpRenderTree/win/HistoryDelegate.h: Removed unneeded include.
* DumpRenderTree/win/UIDelegate.h: Ditto.
* TestWebKitAPI/Tests/WTF/HashMap.cpp: Removed OwnPtr-specific test cases.
* TestWebKitAPI/Tests/WTF/HashSet.cpp: Ditto.
* TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp: Removed unneeded include.
* TestWebKitAPI/Tests/WebKit2/UserMessage.cpp: Use unique_ptr.
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::SetUp): Use make_unique.
* TestWebKitAPI/Tests/WebKit2/WillLoad.cpp: Ditto.
(TestWebKitAPI::WebKit2WillLoadTest::SetUp): Ditto.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp:
(WebKitDOMDOMWindowTest::create): Ditto.
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
(documentLoadedCallback): Use a queue of DelayedSignal objects instead
of smart pointers to DelayedSIgnal objects.
(uriChangedCallback): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFwtfForwardh">trunk/Source/WTF/wtf/Forward.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTraitsh">trunk/Source/WTF/wtf/HashTraits.h</a></li>
<li><a href="#trunkSourceWTFwtfSizeLimitscpp">trunk/Source/WTF/wtf/SizeLimits.cpp</a></li>
<li><a href="#trunkSourceWTFwtfVectorTraitsh">trunk/Source/WTF/wtf/VectorTraits.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopiercpp">trunk/Source/WebCore/platform/CrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopierh">trunk/Source/WebCore/platform/CrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNonecpp">trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatah">trunk/Source/WebCore/platform/ThreadGlobalData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoPathCairocpp">trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoPlatformContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsglxGLContextGLXcpp">trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfaceseglEGLSurfacecpp">trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesglxGLXConfigSelectorh">trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesglxGLXSurfacecpp">trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesglxX11Helpercpp">trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesglxX11Helperh">trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFullScreenControllercpp">trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFullScreenControllerh">trunk/Source/WebCore/platform/graphics/win/FullScreenController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGraphicsContext3DWincpp">trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinWKCAImageQueuecpp">trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinWKCAImageQueueh">trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStorageSessionStubcpp">trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlMultipartHandlecpp">trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlMultipartHandleh">trunk/Source/WebCore/platform/network/curl/MultipartHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncoderh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinHistoryDelegateh">trunk/Tools/DumpRenderTree/win/HistoryDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreewinUIDelegateh">trunk/Tools/DumpRenderTree/win/UIDelegate.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2UserMessagecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMDOMWindowTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfOwnPtrh">trunk/Source/WTF/wtf/OwnPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfOwnPtrCommonh">trunk/Source/WTF/wtf/OwnPtrCommon.h</a></li>
<li><a href="#trunkSourceWTFwtfPassOwnPtrh">trunk/Source/WTF/wtf/PassOwnPtr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoOwnPtrCairocpp">trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoOwnPtrCairoh">trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesglxOwnPtrX11h">trunk/Source/WebCore/platform/graphics/surfaces/glx/OwnPtrX11.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/ChangeLog 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-04-24 Darin Adler <darin@apple.com>
+
+ Convert OwnPtr and PassOwnPtr uses to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=128007
+
+ Reviewed by Anders Carlsson.
+
+ * WTF.vcxproj/WTF.vcxproj: Removed OwnPtr source files.
+ * WTF.vcxproj/WTF.vcxproj.filters: Ditto.
+ * WTF.xcodeproj/project.pbxproj: Ditto.
+ * wtf/CMakeLists.txt: Ditto.
+
+ * wtf/Forward.h: Removed OwnPtr and PassOwnPtr.
+ * wtf/HashTraits.h: Ditto.
+
+ * wtf/OwnPtr.h: Removed.
+ * wtf/OwnPtrCommon.h: Removed.
+ * wtf/PassOwnPtr.h: Removed.
+
+ * wtf/SizeLimits.cpp: Removed OwnPtr.
+ * wtf/VectorTraits.h: Removed OwnPtr specialization.
+
</ins><span class="cx"> 2015-04-23 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable HAVE_AVKIT on AppleTV
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -237,8 +237,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\Noncopyable.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\NumberOfCores.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\OSRandomSource.h" />
</span><del>- <ClInclude Include="..\wtf\OwnPtr.h" />
- <ClInclude Include="..\wtf\OwnPtrCommon.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\PackedIntVector.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PageAllocation.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PageBlock.h" />
</span><span class="lines">@@ -247,7 +245,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\ParallelJobsGeneric.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\ParallelJobsLibdispatch.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\ParallelJobsOpenMP.h" />
</span><del>- <ClInclude Include="..\wtf\PassOwnPtr.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\PassRefPtr.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\Platform.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PrintStream.h" />
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -528,12 +528,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\OSRandomSource.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\OwnPtr.h">
- <Filter>wtf</Filter>
- </ClInclude>
- <ClInclude Include="..\wtf\OwnPtrCommon.h">
- <Filter>wtf</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\wtf\PackedIntVector.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -558,9 +552,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\ParallelJobsOpenMP.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\PassOwnPtr.h">
- <Filter>wtf</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\wtf\PassRefPtr.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -185,8 +185,6 @@
</span><span class="cx"> A8A473F7151A825B004123FF /* OSAllocatorPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472D8151A825B004123FF /* OSAllocatorPosix.cpp */; };
</span><span class="cx"> A8A473F9151A825B004123FF /* OSRandomSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472DA151A825B004123FF /* OSRandomSource.cpp */; };
</span><span class="cx"> A8A473FA151A825B004123FF /* OSRandomSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DB151A825B004123FF /* OSRandomSource.h */; };
</span><del>- A8A473FC151A825B004123FF /* OwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DD151A825B004123FF /* OwnPtr.h */; };
- A8A473FD151A825B004123FF /* OwnPtrCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DE151A825B004123FF /* OwnPtrCommon.h */; };
</del><span class="cx"> A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DF151A825B004123FF /* PackedIntVector.h */; };
</span><span class="cx"> A8A473FF151A825B004123FF /* PageAllocation.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E0151A825B004123FF /* PageAllocation.h */; };
</span><span class="cx"> A8A47402151A825B004123FF /* PageBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472E3151A825B004123FF /* PageBlock.cpp */; };
</span><span class="lines">@@ -194,7 +192,6 @@
</span><span class="cx"> A8A47404151A825B004123FF /* PageReservation.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E5151A825B004123FF /* PageReservation.h */; };
</span><span class="cx"> A8A47405151A825B004123FF /* ParallelJobs.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E6151A825B004123FF /* ParallelJobs.h */; };
</span><span class="cx"> A8A47408151A825B004123FF /* ParallelJobsLibdispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E9151A825B004123FF /* ParallelJobsLibdispatch.h */; };
</span><del>- A8A4740B151A825B004123FF /* PassOwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472EC151A825B004123FF /* PassOwnPtr.h */; };
</del><span class="cx"> A8A4740C151A825B004123FF /* PassRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472ED151A825B004123FF /* PassRefPtr.h */; };
</span><span class="cx"> A8A47414151A825B004123FF /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472FB151A825B004123FF /* RandomNumber.cpp */; };
</span><span class="cx"> A8A47415151A825B004123FF /* RandomNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472FC151A825B004123FF /* RandomNumber.h */; };
</span><span class="lines">@@ -476,8 +473,6 @@
</span><span class="cx"> A8A472D8151A825B004123FF /* OSAllocatorPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSAllocatorPosix.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8A472DA151A825B004123FF /* OSRandomSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSRandomSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8A472DB151A825B004123FF /* OSRandomSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSRandomSource.h; sourceTree = "<group>"; };
</span><del>- A8A472DD151A825B004123FF /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
- A8A472DE151A825B004123FF /* OwnPtrCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtrCommon.h; sourceTree = "<group>"; };
</del><span class="cx"> A8A472DF151A825B004123FF /* PackedIntVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PackedIntVector.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E0151A825B004123FF /* PageAllocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageAllocation.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E3151A825B004123FF /* PageBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageBlock.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -485,7 +480,6 @@
</span><span class="cx"> A8A472E5151A825B004123FF /* PageReservation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageReservation.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E6151A825B004123FF /* ParallelJobs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelJobs.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E9151A825B004123FF /* ParallelJobsLibdispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelJobsLibdispatch.h; sourceTree = "<group>"; };
</span><del>- A8A472EC151A825B004123FF /* PassOwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassOwnPtr.h; sourceTree = "<group>"; };
</del><span class="cx"> A8A472ED151A825B004123FF /* PassRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassRefPtr.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472FB151A825B004123FF /* RandomNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RandomNumber.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8A472FC151A825B004123FF /* RandomNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomNumber.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -795,8 +789,6 @@
</span><span class="cx"> A8A472DA151A825B004123FF /* OSRandomSource.cpp */,
</span><span class="cx"> A8A472DB151A825B004123FF /* OSRandomSource.h */,
</span><span class="cx"> 1AFDE6521953B23D00C48FFA /* Optional.h */,
</span><del>- A8A472DD151A825B004123FF /* OwnPtr.h */,
- A8A472DE151A825B004123FF /* OwnPtrCommon.h */,
</del><span class="cx"> A8A472DF151A825B004123FF /* PackedIntVector.h */,
</span><span class="cx"> A8A472E0151A825B004123FF /* PageAllocation.h */,
</span><span class="cx"> A8A472E3151A825B004123FF /* PageBlock.cpp */,
</span><span class="lines">@@ -804,7 +796,6 @@
</span><span class="cx"> A8A472E5151A825B004123FF /* PageReservation.h */,
</span><span class="cx"> A8A472E6151A825B004123FF /* ParallelJobs.h */,
</span><span class="cx"> A8A472E9151A825B004123FF /* ParallelJobsLibdispatch.h */,
</span><del>- A8A472EC151A825B004123FF /* PassOwnPtr.h */,
</del><span class="cx"> A8A472ED151A825B004123FF /* PassRefPtr.h */,
</span><span class="cx"> A876DBD7151816E500DADB95 /* Platform.h */,
</span><span class="cx"> 0F9D335D165DBA73005AD387 /* PrintStream.cpp */,
</span><span class="lines">@@ -1131,8 +1122,6 @@
</span><span class="cx"> 7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */,
</span><span class="cx"> A8A473F6151A825B004123FF /* OSAllocator.h in Headers */,
</span><span class="cx"> A8A473FA151A825B004123FF /* OSRandomSource.h in Headers */,
</span><del>- A8A473FC151A825B004123FF /* OwnPtr.h in Headers */,
- A8A473FD151A825B004123FF /* OwnPtrCommon.h in Headers */,
</del><span class="cx"> 0FB14E1B1810E1DC009B6B4D /* BagToHashMap.h in Headers */,
</span><span class="cx"> A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */,
</span><span class="cx"> A8A473FF151A825B004123FF /* PageAllocation.h in Headers */,
</span><span class="lines">@@ -1140,7 +1129,6 @@
</span><span class="cx"> A8A47404151A825B004123FF /* PageReservation.h in Headers */,
</span><span class="cx"> A8A47405151A825B004123FF /* ParallelJobs.h in Headers */,
</span><span class="cx"> A8A47408151A825B004123FF /* ParallelJobsLibdispatch.h in Headers */,
</span><del>- A8A4740B151A825B004123FF /* PassOwnPtr.h in Headers */,
</del><span class="cx"> A8A4740C151A825B004123FF /* PassRefPtr.h in Headers */,
</span><span class="cx"> A876DBD8151816E500DADB95 /* Platform.h in Headers */,
</span><span class="cx"> 0FB14E19180FA218009B6B4D /* Bag.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> NumberOfCores.h
</span><span class="cx"> OSAllocator.h
</span><span class="cx"> OSRandomSource.h
</span><del>- OwnPtr.h
- OwnPtrCommon.h
</del><span class="cx"> PageAllocation.h
</span><span class="cx"> PageBlock.h
</span><span class="cx"> PageReservation.h
</span><span class="lines">@@ -64,7 +62,6 @@
</span><span class="cx"> ParallelJobsGeneric.h
</span><span class="cx"> ParallelJobsLibdispatch.h
</span><span class="cx"> ParallelJobsOpenMP.h
</span><del>- PassOwnPtr.h
</del><span class="cx"> PassRefPtr.h
</span><span class="cx"> Platform.h
</span><span class="cx"> PrintStream.h
</span></span></pre></div>
<a id="trunkSourceWTFwtfForwardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Forward.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Forward.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/Forward.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> template<typename T> class Function;
</span><span class="cx"> template<typename T> class LazyNeverDestroyed;
</span><span class="cx"> template<typename T> class NeverDestroyed;
</span><del>-template<typename T> class OwnPtr;
-template<typename T> class PassOwnPtr;
</del><span class="cx"> template<typename T> class PassRefPtr;
</span><span class="cx"> template<typename T> class RefPtr;
</span><span class="cx"> template<typename T> class Ref;
</span><span class="lines">@@ -65,8 +63,6 @@
</span><span class="cx"> using WTF::LazyNeverDestroyed;
</span><span class="cx"> using WTF::NeverDestroyed;
</span><span class="cx"> using WTF::OrdinalNumber;
</span><del>-using WTF::OwnPtr;
-using WTF::PassOwnPtr;
</del><span class="cx"> using WTF::PassRefPtr;
</span><span class="cx"> using WTF::PrintStream;
</span><span class="cx"> using WTF::Ref;
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTraits.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTraits.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/HashTraits.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> class String;
</span><span class="cx">
</span><del>-template<typename T> class OwnPtr;
-
</del><span class="cx"> template<typename T> struct HashTraits;
</span><span class="cx">
</span><span class="cx"> template<bool isInteger, typename T> struct GenericHashTraitsBase;
</span><span class="lines">@@ -120,17 +118,8 @@
</span><span class="cx"> static T* peek(std::nullptr_t) { return nullptr; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename T> struct HashTraits<OwnPtr<T>> : SimpleClassHashTraits<OwnPtr<T>> {
- typedef std::nullptr_t EmptyValueType;
- static EmptyValueType emptyValue() { return nullptr; }
-
- typedef T* PeekType;
- static T* peek(const OwnPtr<T>& value) { return value.get(); }
- static T* peek(std::nullptr_t) { return nullptr; }
-};
-
</del><span class="cx"> template<typename P> struct HashTraits<RefPtr<P>> : SimpleClassHashTraits<RefPtr<P>> {
</span><del>- static P* emptyValue() { return 0; }
</del><ins>+ static P* emptyValue() { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> typedef P* PeekType;
</span><span class="cx"> static PeekType peek(const RefPtr<P>& value) { return value.get(); }
</span></span></pre></div>
<a id="trunkSourceWTFwtfOwnPtrh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/OwnPtr.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OwnPtr.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/OwnPtr.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,230 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2014 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WTF_OwnPtr_h
-#define WTF_OwnPtr_h
-
-#include <algorithm>
-#include <cstddef>
-#include <memory>
-#include <wtf/Assertions.h>
-#include <wtf/Atomics.h>
-#include <wtf/GetPtr.h>
-#include <wtf/HashTraits.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtrCommon.h>
-
-namespace WTF {
-
- template<typename T> class PassOwnPtr;
- template<typename T> PassOwnPtr<T> adoptPtr(T*);
-
- template<typename T> class OwnPtr {
- public:
- typedef T ValueType;
- typedef ValueType* PtrType;
-
- OwnPtr() : m_ptr(0) { }
- OwnPtr(std::nullptr_t) : m_ptr(0) { }
-
- // See comment in PassOwnPtr.h for why this takes a const reference.
- template<typename U> OwnPtr(const PassOwnPtr<U>& o);
-
- ~OwnPtr() { deleteOwnedPtr(m_ptr); }
-
- PtrType get() const { return m_ptr; }
-
- void clear();
- PassOwnPtr<T> release();
- PtrType leakPtr() WARN_UNUSED_RETURN;
-
- ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
- PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
-
- bool operator!() const { return !m_ptr; }
-
- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef PtrType OwnPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &OwnPtr::m_ptr : 0; }
-
- OwnPtr& operator=(const PassOwnPtr<T>&);
- OwnPtr& operator=(std::nullptr_t) { clear(); return *this; }
- template<typename U> OwnPtr& operator=(const PassOwnPtr<U>&);
-
- OwnPtr(OwnPtr&&);
- template<typename U> OwnPtr(OwnPtr<U>&&);
-
- OwnPtr& operator=(OwnPtr&&);
- template<typename U> OwnPtr& operator=(OwnPtr<U>&&);
-
- // Hash table deleted values, which are only constructed and never copied or destroyed.
- OwnPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
- bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
-
- void swap(OwnPtr& o) { std::swap(m_ptr, o.m_ptr); }
-
- // Construct an object to store into this OwnPtr, but only so long as this OwnPtr
- // doesn't already point to an object. This will ensure that after you call this,
- // the OwnPtr will point to an instance of T, even if called concurrently. This
- // instance may or may not have been created by this call. Moreover, this call uses
- // an opportunistic transaction, in that we may create an instance of T and then
- // immediately throw it away, if in the process of creating that instance some
- // other thread was doing the same thing and stored its instance into this pointer
- // before we had a chance to do so.
- template<typename... Args>
- void createTransactionally(Args...);
-
- private:
- explicit OwnPtr(PtrType ptr) : m_ptr(ptr) { }
-
- static PtrType hashTableDeletedValue() { return reinterpret_cast<PtrType>(-1); }
-
- // We should never have two OwnPtrs for the same underlying object (otherwise we'll get
- // double-destruction), so these equality operators should never be needed.
- template<typename U> bool operator==(const OwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator!=(const OwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator==(const PassOwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator!=(const PassOwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
-
- PtrType m_ptr;
- };
-
- template<typename T> template<typename U> inline OwnPtr<T>::OwnPtr(const PassOwnPtr<U>& o)
- : m_ptr(o.leakPtr())
- {
- }
-
- template<typename T> inline void OwnPtr<T>::clear()
- {
- deleteOwnedPtr(std::exchange(m_ptr, nullptr));
- }
-
- template<typename T> inline PassOwnPtr<T> OwnPtr<T>::release()
- {
- return adoptPtr(std::exchange(m_ptr, nullptr));
- }
-
- template<typename T> inline typename OwnPtr<T>::PtrType OwnPtr<T>::leakPtr()
- {
- return std::exchange(m_ptr, nullptr);
- }
-
- template<typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<T>& o)
- {
- PtrType ptr = std::exchange(m_ptr, o.leakPtr());
- ASSERT(!ptr || m_ptr != ptr);
- deleteOwnedPtr(ptr);
- return *this;
- }
-
- template<typename T> template<typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<U>& o)
- {
- PtrType ptr = std::exchange(m_ptr, o.leakPtr());
- ASSERT(!ptr || m_ptr != ptr);
- deleteOwnedPtr(ptr);
- return *this;
- }
-
- template<typename T> inline OwnPtr<T>::OwnPtr(OwnPtr<T>&& o)
- : m_ptr(o.leakPtr())
- {
- }
-
- template<typename T> template<typename U> inline OwnPtr<T>::OwnPtr(OwnPtr<U>&& o)
- : m_ptr(o.leakPtr())
- {
- }
-
- template<typename T> inline auto OwnPtr<T>::operator=(OwnPtr&& o) -> OwnPtr&
- {
- ASSERT(!o || o != m_ptr);
- OwnPtr ptr = WTF::move(o);
- swap(ptr);
- return *this;
- }
-
- template<typename T> template<typename U> inline auto OwnPtr<T>::operator=(OwnPtr<U>&& o) -> OwnPtr&
- {
- ASSERT(!o || o != m_ptr);
- OwnPtr ptr = WTF::move(o);
- swap(ptr);
- return *this;
- }
-
- template<typename T> inline void swap(OwnPtr<T>& a, OwnPtr<T>& b)
- {
- a.swap(b);
- }
-
- template<typename T, typename U> inline bool operator==(const OwnPtr<T>& a, U* b)
- {
- return a.get() == b;
- }
-
- template<typename T, typename U> inline bool operator==(T* a, const OwnPtr<U>& b)
- {
- return a == b.get();
- }
-
- template<typename T, typename U> inline bool operator!=(const OwnPtr<T>& a, U* b)
- {
- return a.get() != b;
- }
-
- template<typename T, typename U> inline bool operator!=(T* a, const OwnPtr<U>& b)
- {
- return a != b.get();
- }
-
- template<typename T> template<typename... Args> inline void OwnPtr<T>::createTransactionally(Args... args)
- {
- if (m_ptr) {
- WTF::loadLoadFence();
- return;
- }
-
- T* newObject = new T(args...);
- WTF::storeStoreFence();
-#if ENABLE(COMPARE_AND_SWAP)
- do {
- if (m_ptr) {
- delete newObject;
- WTF::loadLoadFence();
- return;
- }
- } while (!WTF::weakCompareAndSwap(bitwise_cast<void*volatile*>(&m_ptr), nullptr, newObject));
-#else
- m_ptr = newObject;
-#endif
- }
-
- template <typename T> struct IsSmartPtr<OwnPtr<T>> {
- static const bool value = true;
- };
-
- template<typename P> struct DefaultHash<OwnPtr<P>> {
- typedef PtrHash<OwnPtr<P>> Hash;
- };
-
-} // namespace WTF
-
-using WTF::OwnPtr;
-
-#endif // WTF_OwnPtr_h
</del></span></pre></div>
<a id="trunkSourceWTFwtfOwnPtrCommonh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/OwnPtrCommon.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OwnPtrCommon.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/OwnPtrCommon.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Torch Mobile, Inc.
- * Copyright (C) 2010 Company 100 Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WTF_OwnPtrCommon_h
-#define WTF_OwnPtrCommon_h
-
-namespace WTF {
-
- template <typename T> inline void deleteOwnedPtr(T* ptr)
- {
- typedef char known[sizeof(T) ? 1 : -1];
- if (sizeof(known))
- delete ptr;
- }
-
-} // namespace WTF
-
-#endif // WTF_OwnPtrCommon_h
</del></span></pre></div>
<a id="trunkSourceWTFwtfPassOwnPtrh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/PassOwnPtr.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassOwnPtr.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/PassOwnPtr.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,168 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WTF_PassOwnPtr_h
-#define WTF_PassOwnPtr_h
-
-#include <cstddef>
-#include <wtf/Assertions.h>
-#include <wtf/GetPtr.h>
-#include <wtf/OwnPtrCommon.h>
-#include <type_traits>
-
-namespace WTF {
-
- template<typename T> class OwnPtr;
- template<typename T> class PassOwnPtr;
- template<typename T> PassOwnPtr<T> adoptPtr(T*);
-
- class RefCountedBase;
- class ThreadSafeRefCountedBase;
-
- template<typename T> class PassOwnPtr {
- public:
- typedef T ValueType;
- typedef ValueType* PtrType;
-
- PassOwnPtr() : m_ptr(0) { }
- PassOwnPtr(std::nullptr_t) : m_ptr(0) { }
-
- // It somewhat breaks the type system to allow transfer of ownership out of
- // a const PassOwnPtr. However, it makes it much easier to work with PassOwnPtr
- // temporaries, and we don't have a need to use real const PassOwnPtrs anyway.
- PassOwnPtr(const PassOwnPtr& o) : m_ptr(o.leakPtr()) { }
- template<typename U> PassOwnPtr(const PassOwnPtr<U>& o) : m_ptr(o.leakPtr()) { }
-
- ~PassOwnPtr() { deleteOwnedPtr(m_ptr); }
-
- PtrType get() const { return m_ptr; }
-
- PtrType leakPtr() const WARN_UNUSED_RETURN;
-
- ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
- PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
-
- bool operator!() const { return !m_ptr; }
-
- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef PtrType PassOwnPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &PassOwnPtr::m_ptr : 0; }
-
- PassOwnPtr& operator=(const PassOwnPtr&) { COMPILE_ASSERT(!sizeof(T*), PassOwnPtr_should_never_be_assigned_to); return *this; }
-
- template<typename U> friend PassOwnPtr<U> adoptPtr(U*);
-
- private:
- explicit PassOwnPtr(PtrType ptr) : m_ptr(ptr) { }
-
- // We should never have two OwnPtrs for the same underlying object (otherwise we'll get
- // double-destruction), so these equality operators should never be needed.
- template<typename U> bool operator==(const PassOwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator!=(const PassOwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator==(const OwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator!=(const OwnPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), OwnPtrs_should_never_be_equal); return false; }
-
- mutable PtrType m_ptr;
- };
-
- template<typename T> inline typename PassOwnPtr<T>::PtrType PassOwnPtr<T>::leakPtr() const
- {
- return std::exchange(m_ptr, nullptr);
- }
-
- template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b)
- {
- return a.get() == b.get();
- }
-
- template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const OwnPtr<U>& b)
- {
- return a.get() == b.get();
- }
-
- template<typename T, typename U> inline bool operator==(const OwnPtr<T>& a, const PassOwnPtr<U>& b)
- {
- return a.get() == b.get();
- }
-
- template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, U* b)
- {
- return a.get() == b;
- }
-
- template<typename T, typename U> inline bool operator==(T* a, const PassOwnPtr<U>& b)
- {
- return a == b.get();
- }
-
- template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b)
- {
- return a.get() != b.get();
- }
-
- template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const OwnPtr<U>& b)
- {
- return a.get() != b.get();
- }
-
- template<typename T, typename U> inline bool operator!=(const OwnPtr<T>& a, const PassOwnPtr<U>& b)
- {
- return a.get() != b.get();
- }
-
- template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, U* b)
- {
- return a.get() != b;
- }
-
- template<typename T, typename U> inline bool operator!=(T* a, const PassOwnPtr<U>& b)
- {
- return a != b.get();
- }
-
- template<typename T> inline PassOwnPtr<T> adoptPtr(T* ptr)
- {
- static_assert(!std::is_convertible<T*, RefCountedBase*>::value, "Do not use adoptPtr with RefCounted, use adoptRef!");
- static_assert(!std::is_convertible<T*, ThreadSafeRefCountedBase*>::value, "Do not use adoptPtr with ThreadSafeRefCounted, use adoptRef!");
-
- return PassOwnPtr<T>(ptr);
- }
-
- template<typename T, typename U> inline PassOwnPtr<T> static_pointer_cast(const PassOwnPtr<U>& p)
- {
- return adoptPtr(static_cast<T*>(p.leakPtr()));
- }
-
- template <typename T> struct IsSmartPtr<PassOwnPtr<T>> {
- static const bool value = true;
- };
-
-} // namespace WTF
-
-using WTF::PassOwnPtr;
-using WTF::adoptPtr;
-using WTF::static_pointer_cast;
-
-#endif // WTF_PassOwnPtr_h
</del></span></pre></div>
<a id="trunkSourceWTFwtfSizeLimitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SizeLimits.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SizeLimits.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/SizeLimits.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include <type_traits>
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -55,7 +54,6 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static_assert(sizeof(OwnPtr<int>) == sizeof(int*), "OwnPtr should stay small!");
</del><span class="cx"> static_assert(sizeof(PassRefPtr<RefCounted<int>>) == sizeof(int*), "PassRefPtr should stay small!");
</span><span class="cx"> static_assert(sizeof(RefCounted<int>) == sizeof(SameSizeAsRefCounted), "RefCounted should stay small!");
</span><span class="cx"> static_assert(sizeof(RefPtr<RefCounted<int>>) == sizeof(int*), "RefPtr should stay small!");
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/VectorTraits.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/VectorTraits.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WTF/wtf/VectorTraits.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #ifndef WTF_VectorTraits_h
</span><span class="cx"> #define WTF_VectorTraits_h
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <utility>
</span><span class="lines">@@ -66,23 +65,14 @@
</span><span class="cx"> static const bool canCompareWithMemcmp = true;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // We know OwnPtr and RefPtr are simple enough that initializing to 0 and moving with memcpy
- // (and then not destructing the original) will totally work
- template<typename P>
- struct VectorTraits<RefPtr<P>> : SimpleClassVectorTraits { };
</del><ins>+ // We know smart pointers are simple enough that initializing to 0 and moving with memcpy
+ // (and then not destructing the original) will work.
</ins><span class="cx">
</span><del>- template<typename P>
- struct VectorTraits<OwnPtr<P>> : SimpleClassVectorTraits { };
</del><ins>+ template<typename P> struct VectorTraits<RefPtr<P>> : SimpleClassVectorTraits { };
+ template<typename P> struct VectorTraits<std::unique_ptr<P>> : SimpleClassVectorTraits { };
+ template<typename P> struct VectorTraits<Ref<P>> : SimpleClassVectorTraits { };
+ template<> struct VectorTraits<AtomicString> : SimpleClassVectorTraits { };
</ins><span class="cx">
</span><del>- template<typename P>
- struct VectorTraits<std::unique_ptr<P>> : SimpleClassVectorTraits { };
-
- template<typename P>
- struct VectorTraits<Ref<P>> : SimpleClassVectorTraits { };
-
- template<>
- struct VectorTraits<AtomicString> : SimpleClassVectorTraits { };
-
</del><span class="cx"> template<typename First, typename Second>
</span><span class="cx"> struct VectorTraits<std::pair<First, Second>>
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,3 +1,94 @@
</span><ins>+2015-04-24 Darin Adler <darin@apple.com>
+
+ Convert OwnPtr and PassOwnPtr uses to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=128007
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformEfl.cmake: Removed OwnPtrCairo source files.
+ * PlatformGTK.cmake: Ditto.
+ * PlatformWinCairo.cmake: Ditto.
+ * WebCore.vcxproj/WebCore.vcxproj: Ditto.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+
+ * platform/CrossThreadCopier.cpp: Removed OwnPtr specialization.
+ * platform/CrossThreadCopier.h: Ditto.
+
+ * platform/ScrollAnimatorNone.cpp: Removed unneeded include.
+ * platform/ThreadGlobalData.cpp: Ditto.
+ * platform/ThreadGlobalData.h: Ditto.
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h: Ditto.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::processNotification): Use unique_ptr.
+ (WebCore::AVFWrapper::notificationCallback): Use make_unique.
+ (WebCore::AVFWrapper::platformLayer): Ditto.
+
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::appendPathToCairoContext): Use cairo_path_destroy directly
+ instead of a smart pointer; the code path is simple enough that it is
+ clear this way.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::ImageBuffer): Use make_unique.
+ * platform/graphics/cairo/ImageBufferDataCairo.h: Use unique_ptr.
+
+ * platform/graphics/cairo/OwnPtrCairo.cpp: Removed.
+ * platform/graphics/cairo/OwnPtrCairo.h: Removed.
+
+ * platform/graphics/cairo/PathCairo.cpp:
+ (WebCore::Path::Path): Use cairo_path_destroy directly instead of a
+ smart pointer; the code path is simple enough that it is clear this way.
+ (WebCore::Path::operator=): Ditto.
+ (WebCore::Path::addPath): Ditto.
+ (WebCore::Path::apply): Ditto.
+ * platform/graphics/cairo/PlatformContextCairo.cpp:
+ (WebCore::PlatformContextCairo::clipForPatternFilling): Ditto.
+
+ * platform/graphics/freetype/FontCacheFreeType.cpp: Removed unneeded include.
+ * platform/graphics/glx/GLContextGLX.cpp: Ditto.
+
+ * platform/graphics/surfaces/egl/EGLSurface.cpp:
+ (WebCore::EGLOffScreenSurface::EGLOffScreenSurface): Use make_unique.
+
+ * platform/graphics/surfaces/glx/GLXConfigSelector.h:
+ (WebCore::GLXConfigSelector::findMatchingConfig): Use unique_ptr with X11Deleter.
+ (WebCore::GLXConfigSelector::findMatchingConfigWithVisualId): Ditto.
+ * platform/graphics/surfaces/glx/GLXSurface.cpp:
+ (WebCore::GLXTransportSurface::GLXTransportSurface): Ditto.
+ (WebCore::GLXOffScreenSurface::initialize): Ditto.
+
+ * platform/graphics/surfaces/glx/OwnPtrX11.h: Removed.
+
+ * platform/graphics/surfaces/glx/X11Helper.cpp:
+ (WebCore::X11Helper::createOffScreenWindow): Use unique_ptr with X11Deleter.
+ (WebCore::X11Helper::createPixmap): Ditto.
+
+ * platform/graphics/surfaces/glx/X11Helper.h: Added X11Deleter,
+ which can be used with unique_ptr to make it call XFree instead of delete.
+
+ * platform/graphics/win/FullScreenController.cpp: Use unique_ptr.
+ (FullScreenController::FullScreenController): Use make_unique.
+ (FullScreenController::enterFullScreen): Ditto.
+ * platform/graphics/win/FullScreenController.h: Use unique_ptr.
+
+ * platform/graphics/win/GraphicsContext3DWin.cpp: Removed unneeded includes.
+
+ * platform/graphics/win/WKCAImageQueue.cpp:
+ (WebCore::WKCAImageQueue::WKCAImageQueue): Use make_unique.
+ * platform/graphics/win/WKCAImageQueue.h: Use unique_ptr.
+
+ * platform/network/NetworkStorageSessionStub.cpp: Removed unneeded include.
+
+ * platform/network/ResourceHandleInternal.h: Use unique_ptr.
+
+ * platform/network/curl/MultipartHandle.cpp:
+ (WebCore::MultipartHandle::create): Deleted.
+ * platform/network/curl/MultipartHandle.h: Deleted the create function.
+
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::headerCallback): Use make_unique.
+
</ins><span class="cx"> 2015-04-24 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Popup menu is not accessible.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> platform/graphics/cairo/ImageBufferCairo.cpp
</span><span class="cx"> platform/graphics/cairo/ImageCairo.cpp
</span><span class="cx"> platform/graphics/cairo/IntRectCairo.cpp
</span><del>- platform/graphics/cairo/OwnPtrCairo.cpp
</del><span class="cx"> platform/graphics/cairo/PathCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PatternCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PlatformContextCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx"> platform/graphics/cairo/ImageBufferCairo.cpp
</span><span class="cx"> platform/graphics/cairo/ImageCairo.cpp
</span><span class="cx"> platform/graphics/cairo/IntRectCairo.cpp
</span><del>- platform/graphics/cairo/OwnPtrCairo.cpp
</del><span class="cx"> platform/graphics/cairo/PathCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PatternCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PlatformContextCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> platform/graphics/cairo/ImageBufferCairo.cpp
</span><span class="cx"> platform/graphics/cairo/ImageCairo.cpp
</span><span class="cx"> platform/graphics/cairo/IntRectCairo.cpp
</span><del>- platform/graphics/cairo/OwnPtrCairo.cpp
</del><span class="cx"> platform/graphics/cairo/PathCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PatternCairo.cpp
</span><span class="cx"> platform/graphics/cairo/PlatformContextCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -8582,16 +8582,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\graphics\cairo\OwnPtrCairo.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\graphics\cairo\PathCairo.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20118,16 +20108,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </CustomBuildStep>
</span><del>- <CustomBuildStep Include="..\platform\graphics\cairo\OwnPtrCairo.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
</del><span class="cx"> <CustomBuildStep Include="..\platform\graphics\cairo\PlatformPathCairo.h">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1584,9 +1584,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\cairo\IntRectCairo.cpp">
</span><span class="cx"> <Filter>platform\graphics\cairo</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\graphics\cairo\OwnPtrCairo.cpp">
- <Filter>platform\graphics\cairo</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\graphics\cairo\PathCairo.cpp">
</span><span class="cx"> <Filter>platform\graphics\cairo</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -15371,9 +15368,6 @@
</span><span class="cx"> <CustomBuildStep Include="..\platform\graphics\cairo\GraphicsContextPlatformPrivateCairo.h">
</span><span class="cx"> <Filter>platform\graphics\cairo</Filter>
</span><span class="cx"> </CustomBuildStep>
</span><del>- <CustomBuildStep Include="..\platform\graphics\cairo\OwnPtrCairo.h">
- <Filter>platform\graphics\cairo</Filter>
- </CustomBuildStep>
</del><span class="cx"> <CustomBuildStep Include="..\platform\graphics\cairo\PlatformPathCairo.h">
</span><span class="cx"> <Filter>platform\graphics\cairo</Filter>
</span><span class="cx"> </CustomBuildStep>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -179,18 +179,4 @@
</span><span class="cx"> >::value),
</span><span class="cx"> RawPointerRefCountedTest);
</span><span class="cx">
</span><del>-// Verify that PassOwnPtr gets passed through.
-COMPILE_ASSERT((std::is_same<
- PassOwnPtr<float>,
- CrossThreadCopier<PassOwnPtr<float>>::Type
- >::value),
- PassOwnPtrTest);
-
-// Verify that PassOwnPtr does not get passed through.
-COMPILE_ASSERT((std::is_same<
- int,
- CrossThreadCopier<OwnPtr<float>>::Type
- >::value),
- OwnPtrTest);
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -110,14 +109,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename T> struct CrossThreadCopierBase<false, false, PassOwnPtr<T>> {
- typedef PassOwnPtr<T> Type;
- static Type copy(Type ownPtr)
- {
- return ownPtr;
- }
- };
-
</del><span class="cx"> template<> struct CrossThreadCopierBase<false, false, URL> {
</span><span class="cx"> typedef URL Type;
</span><span class="cx"> static Type copy(const URL&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "ScrollbarTheme.h"
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "TextCodecICU.h"
</span><span class="cx"> #include "ThreadTimers.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/ThreadSpecific.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/WTFThreadData.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> #include <wtf/ThreadSpecific.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define CDMSessionAVFoundationCF_h
</span><span class="cx">
</span><span class="cx"> #include "CDMSession.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> mutable RetainPtr<CACFLayerRef> m_caVideoLayer;
</span><span class="cx"> RefPtr<PlatformCALayer> m_videoLayerWrapper;
</span><span class="cx">
</span><del>- OwnPtr<LayerClient> m_layerClient;
</del><ins>+ std::unique_ptr<LayerClient> m_layerClient;
</ins><span class="cx"> COMPtr<IDirect3DDevice9Ex> m_d3dDevice;
</span><span class="cx">
</span><span class="cx"> InbandTextTrackPrivateAVF* m_currentTextTrack;
</span><span class="lines">@@ -1623,7 +1623,7 @@
</span><span class="cx"> if (!context)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OwnPtr<NotificationCallbackData> notificationData = adoptPtr(reinterpret_cast<NotificationCallbackData*>(context));
</del><ins>+ std::unique_ptr<NotificationCallbackData> notificationData { static_cast<NotificationCallbackData*>(context) };
</ins><span class="cx">
</span><span class="cx"> MutexLocker locker(mapLock());
</span><span class="cx"> AVFWrapper* self = avfWrapperForCallbackContext(notificationData->m_context);
</span><span class="lines">@@ -1673,9 +1673,9 @@
</span><span class="cx"> LOG(Media, "AVFWrapper::notificationCallback(if=%d) %s", reinterpret_cast<uintptr_t>(observer), notificationName);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<NotificationCallbackData> notificationData = adoptPtr(new NotificationCallbackData(propertyName, observer));
</del><ins>+ auto notificationData = std::make_unique<NotificationCallbackData>(propertyName, observer);
</ins><span class="cx">
</span><del>- dispatch_async_f(dispatch_get_main_queue(), notificationData.leakPtr(), processNotification);
</del><ins>+ dispatch_async_f(dispatch_get_main_queue(), notificationData.release(), processNotification);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AVFWrapper::loadPlayableCompletionCallback(AVCFAssetRef, void* context)
</span><span class="lines">@@ -1917,7 +1917,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Create a PlatformCALayer so we can resize the video layer to match the element size.
</span><del>- m_layerClient = adoptPtr(new LayerClient(this));
</del><ins>+ m_layerClient = std::make_unique<LayerClient>(this);
</ins><span class="cx"> if (!m_layerClient)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "IntRect.h"
</span><del>-#include "OwnPtrCairo.h"
</del><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "PlatformPathCairo.h"
</span><span class="cx"> #include "RefPtrCairo.h"
</span><span class="lines">@@ -73,8 +72,9 @@
</span><span class="cx">
</span><span class="cx"> void appendPathToCairoContext(cairo_t* to, cairo_t* from)
</span><span class="cx"> {
</span><del>- OwnPtr<cairo_path_t> cairoPath = adoptPtr(cairo_copy_path(from));
- cairo_append_path(to, cairoPath.get());
</del><ins>+ auto cairoPath = cairo_copy_path(from);
+ cairo_append_path(to, cairoPath);
+ cairo_path_destroy(cairoPath);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setPathOnCairoContext(cairo_t* to, cairo_t* from)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -119,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_t> cr = adoptRef(cairo_create(m_data.m_surface.get()));
</span><span class="cx"> m_data.m_platformContext.setCr(cr.get());
</span><del>- m_data.m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
</del><ins>+ m_data.m_context = std::make_unique<GraphicsContext>(&m_data.m_platformContext);
</ins><span class="cx"> success = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_surface_t> m_surface;
</span><span class="cx"> PlatformContextCairo m_platformContext;
</span><del>- OwnPtr<GraphicsContext> m_context;
</del><ins>+ std::unique_ptr<GraphicsContext> m_context;
</ins><span class="cx"> IntSize m_size;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoOwnPtrCairocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "OwnPtrCairo.h"
-
-#if USE(CAIRO)
-
-#if USE(FREETYPE)
-#include <cairo-ft.h>
-#include <fontconfig/fcfreetype.h>
-#endif
-
-#include <cairo.h>
-
-namespace WTF {
-
-#if USE(FREETYPE)
-template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet* ptr)
-{
- if (ptr)
- FcObjectSetDestroy(ptr);
-}
-
-template <> void deleteOwnedPtr<FcFontSet>(FcFontSet* ptr)
-{
- if (ptr)
- FcFontSetDestroy(ptr);
-}
-#endif
-
-} // namespace WTF
-
-#endif // USE(CAIRO)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoOwnPtrCairoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#ifndef OwnPtrCairo_h
-#define OwnPtrCairo_h
-
-#if USE(CAIRO)
-
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
-#if USE(FREETYPE)
-typedef struct _FcObjectSet FcObjectSet;
-typedef struct _FcFontSet FcFontSet;
-#endif
-
-typedef struct cairo_path cairo_path_t;
-
-namespace WTF {
-
-#if USE(FREETYPE)
-template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet*);
-template <> void deleteOwnedPtr<FcFontSet>(FcFontSet*);
-#endif
-
-} // namespace WTF
-
-#endif // USE(CAIRO)
-
-#endif // OwnPtrCairo_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoPathCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><del>-#include "OwnPtrCairo.h"
</del><span class="cx"> #include "PlatformPathCairo.h"
</span><span class="cx"> #include "StrokeStyleApplier.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="lines">@@ -59,8 +58,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cairo_t* cr = ensurePlatformPath()->context();
</span><del>- OwnPtr<cairo_path_t> pathCopy = adoptPtr(cairo_copy_path(other.platformPath()->context()));
- cairo_append_path(cr, pathCopy.get());
</del><ins>+ auto pathCopy = cairo_copy_path(other.platformPath()->context());
+ cairo_append_path(cr, pathCopy);
+ cairo_path_destroy(pathCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformPathPtr Path::ensurePlatformPath()
</span><span class="lines">@@ -83,8 +83,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> clear();
</span><span class="cx"> cairo_t* cr = ensurePlatformPath()->context();
</span><del>- OwnPtr<cairo_path_t> pathCopy = adoptPtr(cairo_copy_path(other.platformPath()->context()));
- cairo_append_path(cr, pathCopy.get());
</del><ins>+ auto pathCopy = cairo_copy_path(other.platformPath()->context());
+ cairo_append_path(cr, pathCopy);
+ cairo_path_destroy(pathCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return *this;
</span><span class="lines">@@ -323,11 +324,10 @@
</span><span class="cx"> cairo_t* cr = path.platformPath()->context();
</span><span class="cx"> cairo_save(cr);
</span><span class="cx"> cairo_transform(cr, &matrix);
</span><del>- std::unique_ptr<cairo_path_t, void(*)(cairo_path_t*)> pathCopy(cairo_copy_path(cr), [](cairo_path_t* path) {
- cairo_path_destroy(path);
- });
</del><ins>+ auto pathCopy = cairo_copy_path(cr);
</ins><span class="cx"> cairo_restore(cr);
</span><del>- cairo_append_path(ensurePlatformPath()->context(), pathCopy.get());
</del><ins>+ cairo_append_path(ensurePlatformPath()->context(), pathCopy);
+ cairo_path_destroy(pathCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Path::closeSubpath()
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cairo_t* cr = platformPath()->context();
</span><del>- OwnPtr<cairo_path_t> pathCopy = adoptPtr(cairo_copy_path(cr));
</del><ins>+ auto pathCopy = cairo_copy_path(cr);
</ins><span class="cx"> cairo_path_data_t* data;
</span><span class="cx"> PathElement pelement;
</span><span class="cx"> FloatPoint points[3];
</span><span class="lines">@@ -428,6 +428,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ cairo_path_destroy(pathCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Path::transform(const AffineTransform& trans)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoPlatformContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "CairoUtilities.h"
</span><span class="cx"> #include "Gradient.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><del>-#include "OwnPtrCairo.h"
</del><span class="cx"> #include "Pattern.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx">
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx"> ASSERT(state.fillPattern);
</span><span class="cx">
</span><span class="cx"> // Hold current cairo path in a variable for restoring it after configuring the pattern clip rectangle.
</span><del>- OwnPtr<cairo_path_t> currentPath = adoptPtr(cairo_copy_path(m_cr.get()));
</del><ins>+ auto currentPath = cairo_copy_path(m_cr.get());
</ins><span class="cx"> cairo_new_path(m_cr.get());
</span><span class="cx">
</span><span class="cx"> // Initialize clipping extent from current cairo clip extents, then shrink if needed according to pattern.
</span><span class="lines">@@ -337,7 +336,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Restoring cairo path.
</span><del>- cairo_append_path(m_cr.get(), currentPath.get());
</del><ins>+ cairo_append_path(m_cr.get(), currentPath);
+ cairo_path_destroy(currentPath);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx">
</span><span class="cx"> #include "Font.h"
</span><del>-#include "OwnPtrCairo.h"
</del><span class="cx"> #include "RefPtrCairo.h"
</span><span class="cx"> #include "UTF16UChar32Iterator.h"
</span><span class="cx"> #include <cairo-ft.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsglxGLContextGLXcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "OpenGLShims.h"
</span><span class="cx"> #include <GL/glx.h>
</span><span class="cx"> #include <cairo.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> #include <cairo-gl.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfaceseglEGLSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> if (m_sharedDisplay == EGL_NO_DISPLAY)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_configSelector = adoptPtr(new EGLConfigSelector(surfaceAttributes));
</del><ins>+ m_configSelector = std::make_unique<EGLConfigSelector>(surfaceAttributes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EGLOffScreenSurface::~EGLOffScreenSurface()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesglxGLXConfigSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -140,14 +140,13 @@
</span><span class="cx"> GLXFBConfig findMatchingConfig(const int attributes[], int depth = 32)
</span><span class="cx"> {
</span><span class="cx"> int numAvailableConfigs;
</span><del>- OwnPtrX11<GLXFBConfig> temp(glXChooseFBConfig(X11Helper::nativeDisplay(), DefaultScreen(X11Helper::nativeDisplay()), attributes, &numAvailableConfigs));
</del><ins>+ std::unique_ptr<GLXFBConfig[], X11Deleter> temp(glXChooseFBConfig(X11Helper::nativeDisplay(), DefaultScreen(X11Helper::nativeDisplay()), attributes, &numAvailableConfigs));
</ins><span class="cx">
</span><span class="cx"> if (!numAvailableConfigs || !temp.get())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- OwnPtrX11<XVisualInfo> scopedVisualInfo;
</del><span class="cx"> for (int i = 0; i < numAvailableConfigs; ++i) {
</span><del>- scopedVisualInfo = glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[i]);
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> scopedVisualInfo { glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[i]) };
</ins><span class="cx"> if (!scopedVisualInfo.get())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -169,7 +168,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Did not find any visual supporting alpha, select the first available config.
</span><del>- scopedVisualInfo = glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[0]);
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> scopedVisualInfo { glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[0]) };
</ins><span class="cx">
</span><span class="cx"> if ((m_attributes & GLPlatformSurface::SupportAlpha) && (scopedVisualInfo->depth != 32))
</span><span class="cx"> m_attributes &= ~GLPlatformSurface::SupportAlpha;
</span><span class="lines">@@ -180,14 +179,13 @@
</span><span class="cx"> GLXFBConfig findMatchingConfigWithVisualId(const int attributes[], int depth, VisualID id)
</span><span class="cx"> {
</span><span class="cx"> int numAvailableConfigs;
</span><del>- OwnPtrX11<GLXFBConfig> temp(glXChooseFBConfig(X11Helper::nativeDisplay(), DefaultScreen(X11Helper::nativeDisplay()), attributes, &numAvailableConfigs));
</del><ins>+ std::unique_ptr<GLXFBConfig[], X11Deleter> temp(glXChooseFBConfig(X11Helper::nativeDisplay(), DefaultScreen(X11Helper::nativeDisplay()), attributes, &numAvailableConfigs));
</ins><span class="cx">
</span><span class="cx"> if (!numAvailableConfigs || !temp.get())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- OwnPtrX11<XVisualInfo> scopedVisualInfo;
</del><span class="cx"> for (int i = 0; i < numAvailableConfigs; ++i) {
</span><del>- scopedVisualInfo = glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[i]);
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> scopedVisualInfo { glXGetVisualFromFBConfig(X11Helper::nativeDisplay(), temp[i]) };
</ins><span class="cx"> if (!scopedVisualInfo.get())
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesglxGLXSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_sharedDisplay = X11Helper::nativeDisplay();
</span><span class="cx"> attributes |= GLPlatformSurface::DoubleBuffered;
</span><span class="cx"> m_configSelector = std::make_unique<GLXConfigSelector>(attributes);
</span><del>- OwnPtrX11<XVisualInfo> visInfo(m_configSelector->visualInfo(m_configSelector->surfaceContextConfig()));
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> visInfo(m_configSelector->visualInfo(m_configSelector->surfaceContextConfig()));
</ins><span class="cx">
</span><span class="cx"> if (!visInfo.get()) {
</span><span class="cx"> destroy();
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> m_configSelector = std::make_unique<GLXConfigSelector>(attributes);
</span><span class="cx">
</span><del>- OwnPtrX11<XVisualInfo> visualInfo(m_configSelector->visualInfo(m_configSelector->pixmapContextConfig()));
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> visualInfo(m_configSelector->visualInfo(m_configSelector->pixmapContextConfig()));
</ins><span class="cx"> X11Helper::createPixmap(&m_pixmap, *visualInfo.get());
</span><span class="cx">
</span><span class="cx"> if (!m_pixmap) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesglxOwnPtrX11h"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/surfaces/glx/OwnPtrX11.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/glx/OwnPtrX11.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/OwnPtrX11.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef OwnPtrX11_h
-#define OwnPtrX11_h
-
-namespace WebCore {
-
-template<typename T>
-struct OwnPtrX11 {
-
- OwnPtrX11() : m_xResource(0) { }
- OwnPtrX11(T* xResource) : m_xResource(xResource) { }
-
- ~OwnPtrX11()
- {
- if (m_xResource)
- XFree(m_xResource);
- }
-
- OwnPtrX11& operator=(T* xResource)
- {
- if (m_xResource)
- XFree(m_xResource);
-
- m_xResource = xResource;
- return *this;
- }
-
- operator T*() const { return m_xResource; }
- T* operator->() const { return m_xResource; }
- T* get() const { return m_xResource; }
-
-private:
- OwnPtrX11(const OwnPtrX11&);
- OwnPtrX11& operator=(const OwnPtrX11&);
- static void* operator new (size_t);
- static void operator delete (void*);
- T* m_xResource;
-};
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesglxX11Helpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
</span><span class="cx"> visualInfoTemplate.visualid = visualId;
</span><span class="cx"> int matchingCount = 0;
</span><del>- OwnPtrX11<XVisualInfo> matchingVisuals(XGetVisualInfo(nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount));
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> matchingVisuals(XGetVisualInfo(nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount));
</ins><span class="cx"> XVisualInfo* foundVisual = 0;
</span><span class="cx">
</span><span class="cx"> if (matchingVisuals) {
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
</span><span class="cx"> visualInfoTemplate.visualid = visualId;
</span><span class="cx"> int matchingCount = 0;
</span><del>- OwnPtrX11<XVisualInfo> matchingVisuals(XGetVisualInfo(nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount));
</del><ins>+ std::unique_ptr<XVisualInfo, X11Deleter> matchingVisuals(XGetVisualInfo(nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount));
</ins><span class="cx"> XVisualInfo* foundVisual = 0;
</span><span class="cx"> int requiredDepth = hasAlpha ? 32 : 24;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesglxX11Helperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define X11Helper_h
</span><span class="cx">
</span><span class="cx"> #include "IntRect.h"
</span><del>-#include "OwnPtrX11.h"
</del><span class="cx">
</span><span class="cx"> #if USE(EGL)
</span><span class="cx"> #include <opengl/GLDefs.h>
</span><span class="lines">@@ -43,8 +42,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class X11Deleter {
+public:
+ template<typename T> void operator()(T* resource)
+ {
+ if (resource)
+ XFree(resource);
+ }
+};
+
</ins><span class="cx"> class X11Helper {
</span><del>-
</del><span class="cx"> public:
</span><span class="cx"> static void createPixmap(Pixmap*, const XVisualInfo&, const IntSize& = IntSize(1, 1));
</span><span class="cx"> static void createOffScreenWindow(uint32_t*, const XVisualInfo&, const IntSize& = IntSize(1, 1));
</span><span class="lines">@@ -61,7 +68,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScopedXPixmapCreationErrorHandler {
</span><del>-
</del><span class="cx"> public:
</span><span class="cx"> ScopedXPixmapCreationErrorHandler();
</span><span class="cx"> ~ScopedXPixmapCreationErrorHandler();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFullScreenControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "MediaPlayerPrivateFullscreenWindow.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "WebCoreInstanceHandle.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -60,8 +59,8 @@
</span><span class="cx">
</span><span class="cx"> FullScreenController* m_controller;
</span><span class="cx"> FullScreenControllerClient* m_client;
</span><del>- OwnPtr<MediaPlayerPrivateFullscreenWindow> m_fullScreenWindow;
- OwnPtr<MediaPlayerPrivateFullscreenWindow> m_backgroundWindow;
</del><ins>+ std::unique_ptr<MediaPlayerPrivateFullscreenWindow> m_fullScreenWindow;
+ std::unique_ptr<MediaPlayerPrivateFullscreenWindow> m_backgroundWindow;
</ins><span class="cx"> IntRect m_fullScreenFrame;
</span><span class="cx"> IntRect m_originalFrame;
</span><span class="cx"> HWND m_originalHost;
</span><span class="lines">@@ -104,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FullScreenController::FullScreenController(FullScreenControllerClient* client)
</span><del>- : m_private(adoptPtr(new FullScreenController::Private(this, client)))
</del><ins>+ : m_private(std::make_unique<Private>(this, client))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(client, client);
</span><span class="cx"> }
</span><span class="lines">@@ -134,13 +133,13 @@
</span><span class="cx"> m_private->m_originalFrame = originalFrame;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_private->m_backgroundWindow);
</span><del>- m_private->m_backgroundWindow = adoptPtr(new MediaPlayerPrivateFullscreenWindow(m_private.get()));
</del><ins>+ m_private->m_backgroundWindow = std::make_unique<MediaPlayerPrivateFullscreenWindow>(m_private.get());
</ins><span class="cx"> m_private->m_backgroundWindow->createWindow(0);
</span><span class="cx"> ::AnimateWindow(m_private->m_backgroundWindow->hwnd(), kFullScreenAnimationDuration, AW_BLEND | AW_ACTIVATE);
</span><span class="cx">
</span><span class="cx"> m_private->m_client->fullScreenClientWillEnterFullScreen();
</span><span class="cx"> ASSERT(!m_private->m_fullScreenWindow);
</span><del>- m_private->m_fullScreenWindow = adoptPtr(new MediaPlayerPrivateFullscreenWindow(m_private.get()));
</del><ins>+ m_private->m_fullScreenWindow = std::make_unique<MediaPlayerPrivateFullscreenWindow>(m_private.get());
</ins><span class="cx"> ASSERT(m_private->m_fullScreenWindow);
</span><span class="cx"> m_private->m_fullScreenWindow->createWindow(0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFullScreenControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FullScreenController.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FullScreenController.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/win/FullScreenController.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> class Private;
</span><span class="cx"> friend class Private;
</span><del>- OwnPtr<FullScreenController::Private> m_private;
</del><ins>+ std::unique_ptr<FullScreenController::Private> m_private;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGraphicsContext3DWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "GraphicsContext3DPrivate.h"
</span><span class="cx"> #include <WebCore/PlatformCALayerWin.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #include <GLSLANG/ShaderLang.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinWKCAImageQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -52,13 +51,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKCAImageQueue::WKCAImageQueue(uint32_t width, uint32_t height, uint32_t capacity)
</span><del>- : m_private(adoptPtr(new WKCAImageQueuePrivate()))
</del><ins>+ : m_private(std::make_unique<WKCAImageQueuePrivate>())
</ins><span class="cx"> {
</span><span class="cx"> m_private->m_imageQueue = adoptCF(wkCAImageQueueCreate(width, height, capacity));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKCAImageQueue::WKCAImageQueue(const WKCAImageQueue& o)
</span><del>- : m_private(adoptPtr(new WKCAImageQueuePrivate()))
</del><ins>+ : m_private(std::make_unique<WKCAImageQueuePrivate>())
</ins><span class="cx"> {
</span><span class="cx"> m_private->m_imageQueue = o.m_private->m_imageQueue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinWKCAImageQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> typedef const void * CFTypeRef;
</span><span class="cx"> typedef const struct __CFDictionary * CFDictionaryRef;
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <stdint.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> private:
</span><span class="cx"> WKCAImageQueue(const WKCAImageQueue&);
</span><span class="cx"> WKCAImageQueue& operator=(const WKCAImageQueue&);
</span><del>- OwnPtr<WKCAImageQueuePrivate> m_private;
</del><ins>+ std::unique_ptr<WKCAImageQueuePrivate> m_private;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStorageSessionStubcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkingContext.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include "ResourceHandleCFURLConnectionDelegate.h"
</span><span class="lines">@@ -163,7 +162,7 @@
</span><span class="cx"> unsigned m_sslErrors;
</span><span class="cx"> Vector<char> m_postBytes;
</span><span class="cx">
</span><del>- OwnPtr<MultipartHandle> m_multipartHandle;
</del><ins>+ std::unique_ptr<MultipartHandle> m_multipartHandle;
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> GRefPtr<SoupMessage> m_soupMessage;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlMultipartHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/network/curl/MultipartHandle.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</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<MultipartHandle> MultipartHandle::create(ResourceHandle* handle, const String& boundary)
-{
- return adoptPtr(new MultipartHandle(handle, boundary));
-}
-
</del><span class="cx"> bool MultipartHandle::extractBoundary(const String& contentType, String& boundary)
</span><span class="cx"> {
</span><span class="cx"> static const size_t length = strlen("boundary=");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlMultipartHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/MultipartHandle.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/MultipartHandle.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/network/curl/MultipartHandle.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -28,17 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><del>-
-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MultipartHandle {
</span><del>-
</del><span class="cx"> public:
</span><del>- static PassOwnPtr<MultipartHandle> create(ResourceHandle* handle, const String& boundary);
</del><span class="cx"> static bool extractBoundary(const String& contentType, String& boundary);
</span><span class="cx">
</span><span class="cx"> MultipartHandle(ResourceHandle* handle, const String& boundary)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> String boundary;
</span><span class="cx"> bool parsed = MultipartHandle::extractBoundary(d->m_response.httpHeaderField(HTTPHeaderName::ContentType), boundary);
</span><span class="cx"> if (parsed)
</span><del>- d->m_multipartHandle = MultipartHandle::create(job, boundary);
</del><ins>+ d->m_multipartHandle = std::make_unique<MultipartHandle>(job, boundary);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-24 Darin Adler <darin@apple.com>
+
+ Convert OwnPtr and PassOwnPtr uses to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=128007
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/cache/NetworkCacheEncoder.h: Added an include now
+ needed that was inherited from OwnPtr.h before.
+
</ins><span class="cx"> 2015-04-24 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Make path functions members
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><span class="cx"> #include "NetworkCacheCoder.h"
</span><del>-
</del><ins>+#include <wtf/HashFunctions.h>
</ins><span class="cx"> #include <wtf/StringHasher.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/ChangeLog 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-04-24 Darin Adler <darin@apple.com>
+
+ Convert OwnPtr and PassOwnPtr uses to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=128007
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/win/HistoryDelegate.h: Removed unneeded include.
+ * DumpRenderTree/win/UIDelegate.h: Ditto.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp: Removed OwnPtr-specific test cases.
+ * TestWebKitAPI/Tests/WTF/HashSet.cpp: Ditto.
+
+ * TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp: Removed unneeded include.
+
+ * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp: Use unique_ptr.
+ (TestWebKitAPI::WebKit2UserMessageRoundTripTest::SetUp): Use make_unique.
+ * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp: Ditto.
+ (TestWebKitAPI::WebKit2WillLoadTest::SetUp): Ditto.
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp:
+ (WebKitDOMDOMWindowTest::create): Ditto.
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (documentLoadedCallback): Use a queue of DelayedSignal objects instead
+ of smart pointers to DelayedSIgnal objects.
+ (uriChangedCallback): Ditto.
+
</ins><span class="cx"> 2015-04-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Unreviewed test fix.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinHistoryDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/HistoryDelegate.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/HistoryDelegate.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/DumpRenderTree/win/HistoryDelegate.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define HistoryDelegate_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit/WebKit.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> class HistoryDelegate : public IWebHistoryDelegate {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/UIDelegate.h (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/UIDelegate.h 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/DumpRenderTree/win/UIDelegate.h 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebKit/WebKit.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <windef.h>
</span><span class="cx">
</span><span class="cx"> class DRTUndoManager;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include "RefLogger.h"
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="lines">@@ -174,101 +172,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF_HashMap, OwnPtrKey)
-{
- ConstructorDestructorCounter::TestingScope scope;
-
- HashMap<OwnPtr<ConstructorDestructorCounter>, int> map;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- map.add(WTF::move(ownPtr), 2);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- map.clear();
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
-TEST(WTF_HashMap, OwnPtrKey_FindUsingRawPointer)
-{
- HashMap<OwnPtr<int>, int> map;
-
- OwnPtr<int> ownPtr = adoptPtr(new int(5));
- int* ptr = ownPtr.get();
- map.add(WTF::move(ownPtr), 2);
-
- auto it = map.find(ptr);
- ASSERT_TRUE(it != map.end());
- EXPECT_EQ(ptr, it->key.get());
- EXPECT_EQ(2, it->value);
-}
-
-TEST(WTF_HashMap, OwnPtrKey_ContainsUsingRawPointer)
-{
- HashMap<OwnPtr<int>, int> map;
-
- OwnPtr<int> ownPtr = adoptPtr(new int(5));
- int* ptr = ownPtr.get();
- map.add(WTF::move(ownPtr), 2);
-
- EXPECT_EQ(true, map.contains(ptr));
-}
-
-TEST(WTF_HashMap, OwnPtrKey_GetUsingRawPointer)
-{
- HashMap<OwnPtr<int>, int> map;
-
- OwnPtr<int> ownPtr = adoptPtr(new int(5));
- int* ptr = ownPtr.get();
- map.add(WTF::move(ownPtr), 2);
-
- int value = map.get(ptr);
- EXPECT_EQ(2, value);
-}
-
-TEST(WTF_HashMap, OwnPtrKey_RemoveUsingRawPointer)
-{
- ConstructorDestructorCounter::TestingScope scope;
-
- HashMap<OwnPtr<ConstructorDestructorCounter>, int> map;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- ConstructorDestructorCounter* ptr = ownPtr.get();
- map.add(WTF::move(ownPtr), 2);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- bool result = map.remove(ptr);
- EXPECT_EQ(true, result);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
-TEST(WTF_HashMap, OwnPtrKey_TakeUsingRawPointer)
-{
- ConstructorDestructorCounter::TestingScope scope;
-
- HashMap<OwnPtr<ConstructorDestructorCounter>, int> map;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- ConstructorDestructorCounter* ptr = ownPtr.get();
- map.add(WTF::move(ownPtr), 2);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- int result = map.take(ptr);
- EXPECT_EQ(2, result);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
</del><span class="cx"> TEST(WTF_HashMap, UniquePtrKey)
</span><span class="cx"> {
</span><span class="cx"> ConstructorDestructorCounter::TestingScope scope;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "Counters.h"
</span><span class="cx"> #include "MoveOnly.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="lines">@@ -119,94 +117,7 @@
</span><span class="cx"> EXPECT_TRUE(secondSet.contains(MoveOnly(i + 1)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF_HashSet, OwnPtrKey)
-{
- ConstructorDestructorCounter::TestingScope scope;
</del><span class="cx">
</span><del>- HashSet<OwnPtr<ConstructorDestructorCounter>> set;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- set.add(WTF::move(ownPtr));
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- set.clear();
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
-TEST(WTF_HashSet, OwnPtrKey_FindUsingRawPointer)
-{
- HashSet<OwnPtr<int>> set;
-
- OwnPtr<int> ownPtr = adoptPtr(new int(5));
- int* ptr = ownPtr.get();
- set.add(WTF::move(ownPtr));
-
- auto it = set.find(ptr);
- ASSERT_TRUE(it != set.end());
- EXPECT_EQ(ptr, it->get());
- EXPECT_EQ(5, *it->get());
-}
-
-TEST(WTF_HashSet, OwnPtrKey_ContainsUsingRawPointer)
-{
- HashSet<OwnPtr<int>> set;
-
- OwnPtr<int> ownPtr = adoptPtr(new int(5));
- int* ptr = ownPtr.get();
- set.add(WTF::move(ownPtr));
-
- EXPECT_EQ(true, set.contains(ptr));
-}
-
-TEST(WTF_HashSet, OwnPtrKey_RemoveUsingRawPointer)
-{
- ConstructorDestructorCounter::TestingScope scope;
-
- HashSet<OwnPtr<ConstructorDestructorCounter>> set;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- ConstructorDestructorCounter* ptr = ownPtr.get();
- set.add(WTF::move(ownPtr));
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- bool result = set.remove(ptr);
- EXPECT_EQ(true, result);
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
-TEST(WTF_HashSet, OwnPtrKey_TakeUsingRawPointer)
-{
- ConstructorDestructorCounter::TestingScope scope;
-
- HashSet<OwnPtr<ConstructorDestructorCounter>> set;
-
- OwnPtr<ConstructorDestructorCounter> ownPtr = adoptPtr(new ConstructorDestructorCounter);
- ConstructorDestructorCounter* ptr = ownPtr.get();
- set.add(WTF::move(ownPtr));
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- auto result = set.take(ptr);
- EXPECT_EQ(ptr, result.get());
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
-
- result = nullptr;
-
- EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
- EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
-}
-
</del><span class="cx"> TEST(WTF_HashSet, UniquePtrKey)
</span><span class="cx"> {
</span><span class="cx"> ConstructorDestructorCounter::TestingScope scope;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebKit/WebKit.h>
</span><span class="cx"> #include <WebKit/WebKitCOMAPI.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx"> #include "PlatformWebView.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="lines">@@ -45,7 +43,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> context;
</span><del>- OwnPtr<PlatformWebView> webView;
</del><ins>+ std::unique_ptr<PlatformWebView> webView;
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKTypeRef> recievedBody;
</span><span class="cx">
</span><span class="lines">@@ -95,7 +93,7 @@
</span><span class="cx"> context = adoptWK(Util::createContextForInjectedBundleTest("UserMessageTest"));
</span><span class="cx"> setInjectedBundleClient(context.get(), this);
</span><span class="cx">
</span><del>- webView = adoptPtr(new PlatformWebView(context.get()));
</del><ins>+ webView = std::make_unique<PlatformWebView>(context.get());
</ins><span class="cx"> setPageLoaderClient(webView->page(), this);
</span><span class="cx">
</span><span class="cx"> didFinishLoad = false;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx"> #include "PlatformWebView.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="lines">@@ -44,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> context;
</span><del>- OwnPtr<PlatformWebView> webView;
</del><ins>+ std::unique_ptr<PlatformWebView> webView;
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName;
</span><span class="cx"> WKRetainPtr<WKTypeRef> messageBody;
</span><span class="lines">@@ -74,7 +72,7 @@
</span><span class="cx"> context = adoptWK(Util::createContextForInjectedBundleTest("WillLoadTest"));
</span><span class="cx"> setInjectedBundleClient(context.get(), this);
</span><span class="cx">
</span><del>- webView = adoptPtr(new PlatformWebView(context.get()));
</del><ins>+ webView = std::make_unique<PlatformWebView>(context.get());
</ins><span class="cx">
</span><span class="cx"> didReceiveMessage = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMDOMWindowTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> class WebKitDOMDOMWindowTest : public WebProcessTest {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<WebProcessTest> create() { return adoptPtr(new WebKitDOMDOMWindowTest()); }
</del><ins>+ static std::unique_ptr<WebProcessTest> create() { return std::make_unique<WebKitDOMDOMWindowTest>(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> guint64 webPageFromArgs(GVariant* args)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (183264 => 183265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2015-04-24 15:44:16 UTC (rev 183264)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2015-04-24 16:38:28 UTC (rev 183265)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/ProcessID.h>
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="lines">@@ -83,7 +81,7 @@
</span><span class="cx"> CString uri;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Deque<OwnPtr<DelayedSignal>> delayedSignalsQueue;
</del><ins>+Deque<DelayedSignal> delayedSignalsQueue;
</ins><span class="cx">
</span><span class="cx"> static void emitDocumentLoaded(GDBusConnection* connection)
</span><span class="cx"> {
</span><span class="lines">@@ -115,7 +113,7 @@
</span><span class="cx"> if (data)
</span><span class="cx"> emitDocumentLoaded(G_DBUS_CONNECTION(data));
</span><span class="cx"> else
</span><del>- delayedSignalsQueue.append(adoptPtr(new DelayedSignal(DocumentLoadedSignal)));
</del><ins>+ delayedSignalsQueue.append(DelayedSignal(DocumentLoadedSignal));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void emitURIChanged(GDBusConnection* connection, const char* uri)
</span><span class="lines">@@ -137,7 +135,7 @@
</span><span class="cx"> if (data)
</span><span class="cx"> emitURIChanged(G_DBUS_CONNECTION(data), webkit_web_page_get_uri(webPage));
</span><span class="cx"> else
</span><del>- delayedSignalsQueue.append(adoptPtr(new DelayedSignal(URIChangedSignal, webkit_web_page_get_uri(webPage))));
</del><ins>+ delayedSignalsQueue.append(DelayedSignal(URIChangedSignal, webkit_web_page_get_uri(webPage)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse* redirectResponse, gpointer)
</span><span class="lines">@@ -330,13 +328,13 @@
</span><span class="cx">
</span><span class="cx"> g_object_set_data(G_OBJECT(userData), "dbus-connection", connection);
</span><span class="cx"> while (delayedSignalsQueue.size()) {
</span><del>- OwnPtr<DelayedSignal> delayedSignal = delayedSignalsQueue.takeFirst();
- switch (delayedSignal->type) {
</del><ins>+ DelayedSignal delayedSignal = delayedSignalsQueue.takeFirst();
+ switch (delayedSignal.type) {
</ins><span class="cx"> case DocumentLoadedSignal:
</span><span class="cx"> emitDocumentLoaded(connection);
</span><span class="cx"> break;
</span><span class="cx"> case URIChangedSignal:
</span><del>- emitURIChanged(connection, delayedSignal->uri.data());
</del><ins>+ emitURIChanged(connection, delayedSignal.uri.data());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>