Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Apr 2015 02:13:39 +0000 (02:13 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Apr 2015 02:13:39 +0000 (02:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144090

Reviewed by Anders Carlsson.

Source/WebCore:

* Modules/encryptedmedia/CDMPrivateMediaPlayer.h: Removed unneeded include.

* Modules/navigatorcontentutils/NavigatorContentUtils.h: Removed include of
RefCountedSupplement.h.

* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
Pass data using rvalue references, and use new/delete to pass it across
threads, rather than using PassOwnPtr.
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.h: Pass data
in an rvalue reference instead of PassOwnPtr.
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::didReceiveBinaryData): Take an rvalue reference
instead of a PassOwnPtr.
* Modules/websockets/WebSocket.h: Ditto.
* Modules/websockets/WebSocketChannel.cpp: Ditto.
(WebCore::WebSocketChannel::processFrame): Ditto.
* Modules/websockets/WebSocketChannelClient.h:
(WebCore::WebSocketChannelClient::didReceiveBinaryData): Ditto.
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
Ditto.
* Modules/websockets/WorkerThreadableWebSocketChannel.h: Ditto.

* WebCore.xcodeproj/project.pbxproj: Removed RefCountedSupplement.h.

* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation): Fixed comment
to not mention adoptPtr.

* page/make_settings.pl:
(generateInternalSettingsHeaderFile): Removed include of RefCountedSupplement.h.

* platform/ColorChooserClient.h: Removed unneded include.
* platform/ContextMenuItem.h: Ditto.

* platform/RefCountedSupplement.h: Removed.

* platform/ScrollAnimator.cpp: Removed unneeded include.
* platform/ScrollAnimatorNone.h: Ditto.

* platform/ThreadGlobalData.cpp: Added now-needed include of PassOwnPtr.h.

* platform/graphics/GlyphMetricsMap.h: Ditto.
* platform/graphics/MediaPlayer.h: Ditto.
* platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h: Ditto.
* platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp: Ditto.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Ditto.
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h: Ditto.
* platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h: Ditto.
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h: Ditto.
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h: Ditto.

* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::ImageBuffer): Use make_unique instead of adoptPtr.
* platform/graphics/cg/ImageBufferDataCG.cpp:
(WebCore::ImageBufferData::getData): Return a RefPtr instead of a PassRefPtr.
* platform/graphics/cg/ImageBufferDataCG.h: Streamlined the header a bit,
use unique_ptr instead of OwnPtr and RefPtr instead of PassRefPtr.

* platform/graphics/cocoa/IOSurface.h: Use unique_ptr instead of OwnPtr.
* platform/graphics/cocoa/IOSurface.mm:
(IOSurface::ensureGraphicsContext): Use make_unique instead of adoptPtr.

* platform/graphics/egl/GLContextEGL.cpp: Removed unneeded includes.
* platform/graphics/filters/FilterOperation.h: Ditto.
* platform/graphics/harfbuzz/HarfBuzzShaper.h: Ditto.
* platform/ios/DeviceMotionClientIOS.h: Ditto.
* platform/ios/DeviceOrientationClientIOS.h: Ditto.

* platform/ios/LegacyTileCache.h: Use unique_ptr instead of OwnPtr.
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::LegacyTileCache): Use make_unique instead of
a create function, and also get rid of unneeded initialization to null.
(WebCore::LegacyTileCache::commitScaleChange): Ditto.

* platform/ios/LegacyTileGrid.h: Made constructor public and got rid of create
function. Made constructor take a reference to the tile cache, and make both
tileCache() and m_tileCache be references too.

* platform/ios/LegacyTileGrid.mm:
(WebCore::LegacyTileGrid::LegacyTileGrid): Updated to use reference.
(WebCore::LegacyTileGrid::visibleRect): Ditto.
(WebCore::LegacyTileGrid::tileByteSize) Ditto.:
(WebCore::LegacyTileGrid::dropDistantTiles): Ditto.
(WebCore::LegacyTileGrid::updateTileOpacity): Ditto.
(WebCore::LegacyTileGrid::updateTileBorderVisibility): Ditto.
(WebCore::LegacyTileGrid::updateHostLayerSize): Ditto.
(WebCore::LegacyTileGrid::invalidateTiles): Ditto.
(WebCore::LegacyTileGrid::shouldUseMinimalTileCoverage): Ditto.
(WebCore::LegacyTileGrid::tileDistance2): Ditto.
(WebCore::LegacyTileGrid::createTiles): Ditto.
* platform/ios/LegacyTileGridTile.mm:
(WebCore::LegacyTileGridTile::LegacyTileGridTile): Ditto.
(WebCore::LegacyTileGridTile::invalidateRect): Ditto.
(WebCore::LegacyTileGridTile::showBorder): Ditto.
* platform/ios/LegacyTileLayer.mm:
(-[LegacyTileHostLayer renderInContext:]): Ditto.
(-[LegacyTileLayer layoutSublayers]): Ditto.
(-[LegacyTileLayer drawInContext:]): Ditto.

* platform/ios/LegacyTileLayerPool.h: Removed unneeded include.
* platform/ios/ScrollAnimatorIOS.mm: Ditto.
* platform/mac/ScrollAnimatorMac.mm: Ditto.
* platform/mac/WebVideoFullscreenController.h: Ditto.
* platform/network/BlobData.cpp: Ditto.

* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::ResourceHandle): Use make_unique instead of adoptPtr.
* platform/network/ResourceHandle.h: Use unique_ptr instead of OwnPtr.

* platform/network/ResourceHandleInternal.h: Added now-needed include.

* platform/network/ResourceResponseBase.h: Removed unneeded includes and
tweaked formatting a bit.

* platform/network/SynchronousLoaderClient.h: Removed the create function and
the private constructor. Used data member initialize to make the default
empty constructor automatically get generated (and be public now).

* platform/network/cf/FormDataStreamCFNet.cpp:
(WebCore::formFinishFinalizationOnMainThread): Use delete instead of adoptPtr
to delete the context argument.

* platform/network/cf/NetworkStorageSessionCFNet.cpp:
(WebCore::defaultNetworkStorageSession): Return a unique_ptr& instead of an OwnPtr&.
(WebCore::NetworkStorageSession::switchToNewTestingSession): Use make_unique
instead of adoptPtr.
(WebCore::NetworkStorageSession::defaultStorageSession): Ditto.

* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::platformLoadResourceSynchronously): Use a
SynchronousLoaderClient on the stack instead of putting one on the heap with adoptPtr.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::platformLoadResourceSynchronously): Ditto.

* platform/text/TextCodec.h: Removed unneeded include.
* platform/win/CursorWin.cpp: Ditto.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects): Use move instead of release since
we are using RefPtr&& instead of PassRefPtr.

* rendering/RenderLayerFilterInfo.cpp:
(WebCore::RenderLayer::FilterInfo::setRenderer): Use RefPtr&& instead of PassRefPtr.
(WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients): Streamlined to use
modern for loops and auto.
(WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients): Ditto.

* rendering/RenderLayerFilterInfo.h: Streamlined code and removed some stuff that
I think is unneeded on iOS; there is no unused private field and I suspect the problem
that led to the warning is gone. Deleted friending of deleteOwnedPtr.

* rendering/RenderLayerMaskImageInfo.cpp: Removed unneeded includes. Moved private
client classes in here from the header and made them members of MaskImageInfo.
Streamlined them a bit in other ways.
(WebCore::RenderLayer::MaskImageInfo::getIfExists): Use nullptr.
(WebCore::RenderLayer::MaskImageInfo::MaskImageInfo): Use member initialization
and also pass the layer in rather than the MaskImageInfo.
(WebCore::RenderLayer::MaskImageInfo::notifyFinished): Deleted. Moved the code
into the SVGDocumentClient.
(WebCore::RenderLayer::MaskImageInfo::imageChanged): Deleted. Moved the code into
the ImageClient.
(WebCore::RenderLayer::MaskImageInfo::updateMaskImageClients): Streamlined a bit
to use a for loop.
(WebCore::RenderLayer::MaskImageInfo::removeMaskImageClients): Ditto.

* rendering/RenderLayerMaskImageInfo.h: Reduced unneeded includes. Got rid of
definitions of private member classes here in the header; they can be in the cpp
file instead. Also cut down from three classes to two, and gave the classes less
redundant names since they are already members of MaskImageInfo. Removed some
unneeded functions and friending of deleteOwnedPtr.

* testing/InternalSettings.cpp: Got rid of comment about RefCountedSupplement
since no code anywhere was using it, so not using it here was not remarkable.

Source/WebKit/win:

* FullscreenVideoController.cpp:
(FullscreenVideoController::FullscreenVideoController):
(FullscreenVideoController::exitFullscreen):
* FullscreenVideoController.h:
* Plugins/PluginView.h:
* Plugins/PluginViewWin.cpp:
(WebCore::PluginView::wndProc):
* WebCoreSupport/AcceleratedCompositingContext.h:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::WebChromeClient):
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::WebFrameLoaderClient):
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorClient::highlight):
* WebCoreSupport/WebInspectorClient.h:
* WebElementPropertyBag.cpp:
(WebElementPropertyBag::WebElementPropertyBag):
* WebElementPropertyBag.h:
* WebFrame.h:
* WebHistoryItem.cpp:
* WebNodeHighlight.cpp:
* WebNotificationCenter.cpp:
(WebNotificationCenter::WebNotificationCenter):
* WebNotificationCenter.h:
Use make_unique and unique_ptr instead of adoptPtr and OwnPtr.

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm: Removed unneeded include.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183234 268f45cc-cd09-0410-ab3c-d52691b4dbfc

91 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h
Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h
Source/WebCore/Modules/websockets/WebSocket.cpp
Source/WebCore/Modules/websockets/WebSocket.h
Source/WebCore/Modules/websockets/WebSocketChannel.cpp
Source/WebCore/Modules/websockets/WebSocketChannelClient.h
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm
Source/WebCore/page/make_settings.pl
Source/WebCore/platform/ColorChooserClient.h
Source/WebCore/platform/ContextMenuItem.h
Source/WebCore/platform/RefCountedSupplement.h [deleted file]
Source/WebCore/platform/ScrollAnimator.cpp
Source/WebCore/platform/ScrollAnimatorNone.h
Source/WebCore/platform/ThreadGlobalData.cpp
Source/WebCore/platform/graphics/GlyphMetricsMap.h
Source/WebCore/platform/graphics/MediaPlayer.h
Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h
Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
Source/WebCore/platform/graphics/cocoa/IOSurface.h
Source/WebCore/platform/graphics/cocoa/IOSurface.mm
Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
Source/WebCore/platform/graphics/filters/FilterOperation.h
Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h
Source/WebCore/platform/graphics/win/FullScreenController.cpp
Source/WebCore/platform/ios/DeviceMotionClientIOS.h
Source/WebCore/platform/ios/DeviceOrientationClientIOS.h
Source/WebCore/platform/ios/LegacyTileCache.h
Source/WebCore/platform/ios/LegacyTileCache.mm
Source/WebCore/platform/ios/LegacyTileGrid.h
Source/WebCore/platform/ios/LegacyTileGrid.mm
Source/WebCore/platform/ios/LegacyTileGridTile.mm
Source/WebCore/platform/ios/LegacyTileLayer.mm
Source/WebCore/platform/ios/LegacyTileLayerPool.h
Source/WebCore/platform/ios/ScrollAnimatorIOS.mm
Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Source/WebCore/platform/mac/WebVideoFullscreenController.h
Source/WebCore/platform/network/BlobData.cpp
Source/WebCore/platform/network/ResourceHandle.cpp
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/ResourceHandleInternal.h
Source/WebCore/platform/network/ResourceResponseBase.h
Source/WebCore/platform/network/SynchronousLoaderClient.h
Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/mac/ResourceHandleMac.mm
Source/WebCore/platform/text/TextCodec.h
Source/WebCore/platform/win/CursorWin.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayerFilterInfo.cpp
Source/WebCore/rendering/RenderLayerFilterInfo.h
Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp
Source/WebCore/rendering/RenderLayerMaskImageInfo.h
Source/WebCore/testing/InternalSettings.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/FullscreenVideoController.cpp
Source/WebKit/win/FullscreenVideoController.h
Source/WebKit/win/Plugins/PluginView.h
Source/WebKit/win/Plugins/PluginViewWin.cpp
Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h
Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit/win/WebCoreSupport/WebEditorClient.h
Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
Source/WebKit/win/WebElementPropertyBag.cpp
Source/WebKit/win/WebElementPropertyBag.h
Source/WebKit/win/WebFrame.h
Source/WebKit/win/WebHistoryItem.cpp
Source/WebKit/win/WebNodeHighlight.cpp
Source/WebKit/win/WebNotificationCenter.cpp
Source/WebKit/win/WebNotificationCenter.h
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index 9df52b2..d69e922 100644 (file)
@@ -1,3 +1,186 @@
+2015-04-23  Darin Adler  <darin@apple.com>
+
+        Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
+        https://bugs.webkit.org/show_bug.cgi?id=144090
+
+        Reviewed by Anders Carlsson.
+
+        * Modules/encryptedmedia/CDMPrivateMediaPlayer.h: Removed unneeded include.
+
+        * Modules/navigatorcontentutils/NavigatorContentUtils.h: Removed include of
+        RefCountedSupplement.h.
+
+        * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
+        Pass data using rvalue references, and use new/delete to pass it across
+        threads, rather than using PassOwnPtr.
+        * Modules/websockets/ThreadableWebSocketChannelClientWrapper.h: Pass data
+        in an rvalue reference instead of PassOwnPtr.
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::didReceiveBinaryData): Take an rvalue reference
+        instead of a PassOwnPtr.
+        * Modules/websockets/WebSocket.h: Ditto.
+        * Modules/websockets/WebSocketChannel.cpp: Ditto.
+        (WebCore::WebSocketChannel::processFrame): Ditto.
+        * Modules/websockets/WebSocketChannelClient.h:
+        (WebCore::WebSocketChannelClient::didReceiveBinaryData): Ditto.
+        * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
+        Ditto.
+        * Modules/websockets/WorkerThreadableWebSocketChannel.h: Ditto.
+
+        * WebCore.xcodeproj/project.pbxproj: Removed RefCountedSupplement.h.
+
+        * loader/cocoa/DiskCacheMonitorCocoa.mm:
+        (WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation): Fixed comment
+        to not mention adoptPtr.
+
+        * page/make_settings.pl:
+        (generateInternalSettingsHeaderFile): Removed include of RefCountedSupplement.h.
+
+        * platform/ColorChooserClient.h: Removed unneded include.
+        * platform/ContextMenuItem.h: Ditto.
+
+        * platform/RefCountedSupplement.h: Removed.
+
+        * platform/ScrollAnimator.cpp: Removed unneeded include.
+        * platform/ScrollAnimatorNone.h: Ditto.
+
+        * platform/ThreadGlobalData.cpp: Added now-needed include of PassOwnPtr.h.
+
+        * platform/graphics/GlyphMetricsMap.h: Ditto.
+        * platform/graphics/MediaPlayer.h: Ditto.
+        * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h: Ditto.
+        * platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp: Ditto.
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Ditto.
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h: Ditto.
+        * platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h: Ditto.
+        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h: Ditto.
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h: Ditto.
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::ImageBuffer): Use make_unique instead of adoptPtr.
+        * platform/graphics/cg/ImageBufferDataCG.cpp:
+        (WebCore::ImageBufferData::getData): Return a RefPtr instead of a PassRefPtr.
+        * platform/graphics/cg/ImageBufferDataCG.h: Streamlined the header a bit,
+        use unique_ptr instead of OwnPtr and RefPtr instead of PassRefPtr.
+
+        * platform/graphics/cocoa/IOSurface.h: Use unique_ptr instead of OwnPtr.
+        * platform/graphics/cocoa/IOSurface.mm:
+        (IOSurface::ensureGraphicsContext): Use make_unique instead of adoptPtr.
+
+        * platform/graphics/egl/GLContextEGL.cpp: Removed unneeded includes.
+        * platform/graphics/filters/FilterOperation.h: Ditto.
+        * platform/graphics/harfbuzz/HarfBuzzShaper.h: Ditto.
+        * platform/ios/DeviceMotionClientIOS.h: Ditto.
+        * platform/ios/DeviceOrientationClientIOS.h: Ditto.
+
+        * platform/ios/LegacyTileCache.h: Use unique_ptr instead of OwnPtr.
+        * platform/ios/LegacyTileCache.mm:
+        (WebCore::LegacyTileCache::LegacyTileCache): Use make_unique instead of
+        a create function, and also get rid of unneeded initialization to null.
+        (WebCore::LegacyTileCache::commitScaleChange): Ditto.
+
+        * platform/ios/LegacyTileGrid.h: Made constructor public and got rid of create
+        function. Made constructor take a reference to the tile cache, and make both
+        tileCache() and m_tileCache be references too.
+
+        * platform/ios/LegacyTileGrid.mm:
+        (WebCore::LegacyTileGrid::LegacyTileGrid): Updated to use reference.
+        (WebCore::LegacyTileGrid::visibleRect): Ditto.
+        (WebCore::LegacyTileGrid::tileByteSize) Ditto.:
+        (WebCore::LegacyTileGrid::dropDistantTiles): Ditto.
+        (WebCore::LegacyTileGrid::updateTileOpacity): Ditto.
+        (WebCore::LegacyTileGrid::updateTileBorderVisibility): Ditto.
+        (WebCore::LegacyTileGrid::updateHostLayerSize): Ditto.
+        (WebCore::LegacyTileGrid::invalidateTiles): Ditto.
+        (WebCore::LegacyTileGrid::shouldUseMinimalTileCoverage): Ditto.
+        (WebCore::LegacyTileGrid::tileDistance2): Ditto.
+        (WebCore::LegacyTileGrid::createTiles): Ditto.
+        * platform/ios/LegacyTileGridTile.mm:
+        (WebCore::LegacyTileGridTile::LegacyTileGridTile): Ditto.
+        (WebCore::LegacyTileGridTile::invalidateRect): Ditto.
+        (WebCore::LegacyTileGridTile::showBorder): Ditto.
+        * platform/ios/LegacyTileLayer.mm:
+        (-[LegacyTileHostLayer renderInContext:]): Ditto.
+        (-[LegacyTileLayer layoutSublayers]): Ditto.
+        (-[LegacyTileLayer drawInContext:]): Ditto.
+
+        * platform/ios/LegacyTileLayerPool.h: Removed unneeded include.
+        * platform/ios/ScrollAnimatorIOS.mm: Ditto.
+        * platform/mac/ScrollAnimatorMac.mm: Ditto.
+        * platform/mac/WebVideoFullscreenController.h: Ditto.
+        * platform/network/BlobData.cpp: Ditto.
+
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::ResourceHandle): Use make_unique instead of adoptPtr.
+        * platform/network/ResourceHandle.h: Use unique_ptr instead of OwnPtr.
+
+        * platform/network/ResourceHandleInternal.h: Added now-needed include.
+
+        * platform/network/ResourceResponseBase.h: Removed unneeded includes and
+        tweaked formatting a bit.
+
+        * platform/network/SynchronousLoaderClient.h: Removed the create function and
+        the private constructor. Used data member initialize to make the default
+        empty constructor automatically get generated (and be public now).
+
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        (WebCore::formFinishFinalizationOnMainThread): Use delete instead of adoptPtr
+        to delete the context argument.
+
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        (WebCore::defaultNetworkStorageSession): Return a unique_ptr& instead of an OwnPtr&.
+        (WebCore::NetworkStorageSession::switchToNewTestingSession): Use make_unique
+        instead of adoptPtr.
+        (WebCore::NetworkStorageSession::defaultStorageSession): Ditto.
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::platformLoadResourceSynchronously): Use a
+        SynchronousLoaderClient on the stack instead of putting one on the heap with adoptPtr.
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::platformLoadResourceSynchronously): Ditto.
+
+        * platform/text/TextCodec.h: Removed unneeded include.
+        * platform/win/CursorWin.cpp: Ditto.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects): Use move instead of release since
+        we are using RefPtr&& instead of PassRefPtr.
+
+        * rendering/RenderLayerFilterInfo.cpp:
+        (WebCore::RenderLayer::FilterInfo::setRenderer): Use RefPtr&& instead of PassRefPtr.
+        (WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients): Streamlined to use
+        modern for loops and auto.
+        (WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients): Ditto.
+
+        * rendering/RenderLayerFilterInfo.h: Streamlined code and removed some stuff that
+        I think is unneeded on iOS; there is no unused private field and I suspect the problem
+        that led to the warning is gone. Deleted friending of deleteOwnedPtr.
+
+        * rendering/RenderLayerMaskImageInfo.cpp: Removed unneeded includes. Moved private
+        client classes in here from the header and made them members of MaskImageInfo.
+        Streamlined them a bit in other ways.
+        (WebCore::RenderLayer::MaskImageInfo::getIfExists): Use nullptr.
+        (WebCore::RenderLayer::MaskImageInfo::MaskImageInfo): Use member initialization
+        and also pass the layer in rather than the MaskImageInfo.
+        (WebCore::RenderLayer::MaskImageInfo::notifyFinished): Deleted. Moved the code
+        into the SVGDocumentClient.
+        (WebCore::RenderLayer::MaskImageInfo::imageChanged): Deleted. Moved the code into
+        the ImageClient.
+        (WebCore::RenderLayer::MaskImageInfo::updateMaskImageClients): Streamlined a bit
+        to use a for loop.
+        (WebCore::RenderLayer::MaskImageInfo::removeMaskImageClients): Ditto.
+
+        * rendering/RenderLayerMaskImageInfo.h: Reduced unneeded includes. Got rid of
+        definitions of private member classes here in the header; they can be in the cpp
+        file instead. Also cut down from three classes to two, and gave the classes less
+        redundant names since they are already members of MaskImageInfo. Removed some
+        unneeded functions and friending of deleteOwnedPtr.
+
+        * testing/InternalSettings.cpp: Got rid of comment about RefCountedSupplement
+        since no code anywhere was using it, so not using it here was not remarkable.
+
 2015-04-23  Jer Noble  <jer.noble@apple.com>
 
         [iOS] Add a wrapper around the hosted AVPlayerLayer to intercept -setBounds:
index de7e228..eb58510 100644 (file)
@@ -27,7 +27,6 @@
 #define CDMPrivateMediaPlayer_h
 
 #include "CDMPrivate.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
index c455305..c32a0e7 100644 (file)
@@ -30,8 +30,7 @@
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
 
 #include "NavigatorContentUtilsClient.h"
-#include "RefCountedSupplement.h"
-#include <wtf/PassRefPtr.h>
+#include "Supplementable.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index d2a4188..ea73a03 100644 (file)
@@ -180,12 +180,14 @@ void ThreadableWebSocketChannelClientWrapper::didReceiveMessage(const String& me
         processPendingTasks();
 }
 
-void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
+void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(Vector<char>&& binaryData)
 {
     ref();
-    m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, binaryData] (ScriptExecutionContext&) {
+    Vector<char>* capturedData = new Vector<char>(WTF::move(binaryData));
+    m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, capturedData] (ScriptExecutionContext&) {
         if (m_client)
-            m_client->didReceiveBinaryData(binaryData);
+            m_client->didReceiveBinaryData(WTF::move(*capturedData));
+        delete capturedData;
         deref();
     }));
 
index e4bd6b0..d8cfd94 100644 (file)
@@ -79,7 +79,7 @@ public:
 
     void didConnect();
     void didReceiveMessage(const String& message);
-    void didReceiveBinaryData(PassOwnPtr<Vector<char>>);
+    void didReceiveBinaryData(Vector<char>&&);
     void didUpdateBufferedAmount(unsigned long bufferedAmount);
     void didStartClosingHandshake();
     void didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
index 090d954..7f03498 100644 (file)
@@ -547,19 +547,19 @@ void WebSocket::didReceiveMessage(const String& msg)
     dispatchEvent(MessageEvent::create(msg, SecurityOrigin::create(m_url)->toString()));
 }
 
-void WebSocket::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
+void WebSocket::didReceiveBinaryData(Vector<char>&& binaryData)
 {
-    LOG(Network, "WebSocket %p didReceiveBinaryData() %lu byte binary message", this, static_cast<unsigned long>(binaryData->size()));
+    LOG(Network, "WebSocket %p didReceiveBinaryData() %lu byte binary message", this, static_cast<unsigned long>(binaryData.size()));
     switch (m_binaryType) {
     case BinaryTypeBlob: {
         // FIXME: We just received the data from NetworkProcess, and are sending it back. This is inefficient.
-        RefPtr<Blob> blob = Blob::create(WTF::move(*binaryData), emptyString());
+        RefPtr<Blob> blob = Blob::create(WTF::move(binaryData), emptyString());
         dispatchEvent(MessageEvent::create(blob.release(), SecurityOrigin::create(m_url)->toString()));
         break;
     }
 
     case BinaryTypeArrayBuffer:
-        dispatchEvent(MessageEvent::create(ArrayBuffer::create(binaryData->data(), binaryData->size()), SecurityOrigin::create(m_url)->toString()));
+        dispatchEvent(MessageEvent::create(ArrayBuffer::create(binaryData.data(), binaryData.size()), SecurityOrigin::create(m_url)->toString()));
         break;
     }
 }
index 2dc5a89..68e3083 100644 (file)
@@ -100,7 +100,7 @@ public:
     // WebSocketChannelClient functions.
     virtual void didConnect() override;
     virtual void didReceiveMessage(const String& message) override;
-    virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) override;
+    virtual void didReceiveBinaryData(Vector<char>&&) override;
     virtual void didReceiveMessageError() override;
     virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
     virtual void didStartClosingHandshake() override;
index b0498af..8421b77 100644 (file)
@@ -571,22 +571,20 @@ bool WebSocketChannel::processFrame()
             // so we should pretend that we have finished to read this frame and
             // make sure that the member variables are in a consistent state before
             // the handler is invoked.
-            // Vector<char>::swap() is used here to clear m_continuousFrameData.
-            OwnPtr<Vector<char>> continuousFrameData = adoptPtr(new Vector<char>);
-            m_continuousFrameData.swap(*continuousFrameData);
+            Vector<char> continuousFrameData = WTF::move(m_continuousFrameData);
             m_hasContinuousFrame = false;
             if (m_continuousFrameOpCode == WebSocketFrame::OpCodeText) {
                 String message;
-                if (continuousFrameData->size())
-                    message = String::fromUTF8(continuousFrameData->data(), continuousFrameData->size());
+                if (continuousFrameData.size())
+                    message = String::fromUTF8(continuousFrameData.data(), continuousFrameData.size());
                 else
-                    message = "";
+                    message = emptyString();
                 if (message.isNull())
                     fail("Could not decode a text frame as UTF-8.");
                 else
                     m_client->didReceiveMessage(message);
             } else if (m_continuousFrameOpCode == WebSocketFrame::OpCodeBinary)
-                m_client->didReceiveBinaryData(continuousFrameData.release());
+                m_client->didReceiveBinaryData(WTF::move(continuousFrameData));
         }
         break;
 
@@ -596,7 +594,7 @@ bool WebSocketChannel::processFrame()
             if (frame.payloadLength)
                 message = String::fromUTF8(frame.payload, frame.payloadLength);
             else
-                message = "";
+                message = emptyString();
             skipBuffer(frameEnd - m_buffer.data());
             if (message.isNull())
                 fail("Could not decode a text frame as UTF-8.");
@@ -613,10 +611,10 @@ bool WebSocketChannel::processFrame()
 
     case WebSocketFrame::OpCodeBinary:
         if (frame.final) {
-            OwnPtr<Vector<char>> binaryData = adoptPtr(new Vector<char>(frame.payloadLength));
-            memcpy(binaryData->data(), frame.payload, frame.payloadLength);
+            Vector<char> binaryData(frame.payloadLength);
+            memcpy(binaryData.data(), frame.payload, frame.payloadLength);
             skipBuffer(frameEnd - m_buffer.data());
-            m_client->didReceiveBinaryData(binaryData.release());
+            m_client->didReceiveBinaryData(WTF::move(binaryData));
         } else {
             m_hasContinuousFrame = true;
             m_continuousFrameOpCode = WebSocketFrame::OpCodeBinary;
@@ -646,7 +644,7 @@ bool WebSocketChannel::processFrame()
         if (frame.payloadLength >= 3)
             m_closeEventReason = String::fromUTF8(&frame.payload[2], frame.payloadLength - 2);
         else
-            m_closeEventReason = "";
+            m_closeEventReason = emptyString();
         skipBuffer(frameEnd - m_buffer.data());
         m_receivedClosingHandshake = true;
         startClosingHandshake(m_closeEventCode, m_closeEventReason);
index 46641c0..da7928f 100644 (file)
@@ -34,7 +34,6 @@
 #if ENABLE(WEB_SOCKETS)
 
 #include <wtf/Forward.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -44,7 +43,7 @@ namespace WebCore {
         virtual ~WebSocketChannelClient() { }
         virtual void didConnect() { }
         virtual void didReceiveMessage(const String&) { }
-        virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) { }
+        virtual void didReceiveBinaryData(Vector<char>&&) { }
         virtual void didReceiveMessageError() { }
         virtual void didUpdateBufferedAmount(unsigned long /* bufferedAmount */) { }
         virtual void didStartClosingHandshake() { }
index 83c6833..f76b348 100644 (file)
@@ -288,14 +288,16 @@ void WorkerThreadableWebSocketChannel::Peer::didReceiveMessage(const String& mes
     }, m_taskMode);
 }
 
-void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
+void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(Vector<char>&& binaryData)
 {
     ASSERT(isMainThread());
 
     RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
-    m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, binaryData] (ScriptExecutionContext& context) {
+    Vector<char>* capturedData = new Vector<char>(WTF::move(binaryData));
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedData] (ScriptExecutionContext& context) {
         ASSERT_UNUSED(context, context.isWorkerGlobalScope());
-        workerClientWrapper->didReceiveBinaryData(binaryData);
+        workerClientWrapper->didReceiveBinaryData(WTF::move(*capturedData));
+        delete capturedData;
     }, m_taskMode);
 }
 
index 51ecc69..c7586c5 100644 (file)
@@ -100,7 +100,7 @@ public:
         // WebSocketChannelClient functions.
         virtual void didConnect() override;
         virtual void didReceiveMessage(const String& message) override;
-        virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) override;
+        virtual void didReceiveBinaryData(Vector<char>&&) override;
         virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
         virtual void didStartClosingHandshake() override;
         virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
index 237aceb..8cc7b54 100644 (file)
                A7197F2617568AE5007B9442 /* PageThrottler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7197F2517568AE5007B9442 /* PageThrottler.cpp */; };
                A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A72763BF16689BFB002FCACB /* UserActionElementSet.h in Headers */ = {isa = PBXBuildFile; fileRef = A72763BE16689BFB002FCACB /* UserActionElementSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A72EA3BB1585CF55004FAA26 /* RefCountedSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */; };
                A7211F241678A54200957444 /* NodeRenderingTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderingTraversal.h; sourceTree = "<group>"; };
                A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformExportMacros.h; sourceTree = "<group>"; };
                A72763BE16689BFB002FCACB /* UserActionElementSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserActionElementSet.h; sourceTree = "<group>"; };
-               A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCountedSupplement.h; sourceTree = "<group>"; };
                A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
                A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCodePlaceholder.h; sourceTree = "<group>"; };
                                ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */,
                                BC3BE12A0E98092F00835588 /* PopupMenuStyle.h */,
                                0081FEFD16B0A244008AAA7A /* PublicSuffix.h */,
-                               A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */,
                                9831AE49154225A200FE2644 /* ReferrerPolicy.h */,
                                CDFC360318CA61C20026E56F /* RemoteCommandListener.cpp */,
                                CDFC360418CA61C20026E56F /* RemoteCommandListener.h */,
                                FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
                                BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
                                FD45A958175D414C00C21EC8 /* RectangleShape.h in Headers */,
-                               A72EA3BB1585CF55004FAA26 /* RefCountedSupplement.h in Headers */,
                                9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */,
                                BCAB418213E356E800D8AAF3 /* Region.h in Headers */,
                                6CDDE8D01770BB220016E072 /* RegionOversetState.h in Headers */,
index ee3beac..c78ba71 100644 (file)
@@ -60,7 +60,7 @@ void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest& re
         return;
 
     // FIXME: It's not good to have the new here, but the delete inside the constructor. Reconsider this design.
-    new DiskCacheMonitor(request, sessionID, cachedResponse); // Balanced by adoptPtr in the blocks setup in the constructor, one of which is guaranteed to run.
+    new DiskCacheMonitor(request, sessionID, cachedResponse); // Balanced by delete and unique_ptr in the blocks set up in the constructor, one of which is guaranteed to run.
 }
 
 DiskCacheMonitor::DiskCacheMonitor(const ResourceRequest& request, SessionID sessionID, CFCachedURLResponseRef cachedResponse)
index b6356f4..2e78a10 100755 (executable)
@@ -389,8 +389,7 @@ sub generateInternalSettingsHeaderFile($)
 #ifndef InternalSettingsGenerated_h
 #define InternalSettingsGenerated_h
 
-#include "RefCountedSupplement.h"
-#include <wtf/PassRefPtr.h>
+#include "Supplementable.h"
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
index 163a924..bde5e78 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "ColorChooser.h"
 #include "IntRect.h"
-#include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
index d90cbd2..21fe27a 100644 (file)
@@ -30,7 +30,6 @@
 #if ENABLE(CONTEXT_MENUS)
 
 #include "PlatformMenuDescription.h"
-#include <wtf/OwnPtr.h>
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA)
diff --git a/Source/WebCore/platform/RefCountedSupplement.h b/Source/WebCore/platform/RefCountedSupplement.h
deleted file mode 100644 (file)
index 6052363..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2012 Google, 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 RefCountedSupplement_h
-#define RefCountedSupplement_h
-
-#include "Supplementable.h"
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-template<class T, class S>
-class RefCountedSupplement : public RefCounted<S> {
-public:
-    typedef RefCountedSupplement<T, S> ThisType;
-
-    virtual ~RefCountedSupplement() { }
-    virtual void hostDestroyed() { }
-
-    class Wrapper : public Supplement<T> {
-    public:
-        explicit Wrapper(PassRefPtr<ThisType> wrapped) : m_wrapped(wrapped) { }
-        virtual ~Wrapper() { m_wrapped->hostDestroyed();  }
-#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
-        virtual bool isRefCountedWrapper() const override { return true; }
-#endif
-        ThisType* wrapped() const { return m_wrapped.get(); }
-    private:
-
-        RefPtr<ThisType> m_wrapped;
-    };
-
-    static void provideTo(Supplementable<T>* host, const char* key, PassRefPtr<ThisType> supplement)
-    {
-        host->provideSupplement(key, adoptPtr(new Wrapper(supplement)));
-    }
-
-    static ThisType* from(Supplementable<T>* host, const char* key)
-    {
-        Supplement<T>* found = host->requireSupplement(key);
-        if (!found)
-            return 0;
-        ASSERT_WITH_SECURITY_IMPLICATION(found->isRefCountedWrapper());
-        return static_cast<Wrapper*>(found)->wrapped();
-    }
-};
-
-} // namespace WebCore
-
-#endif // RefCountedSupplement_h
index f73bc7f..f75cf6e 100644 (file)
@@ -36,7 +36,6 @@
 #include "PlatformWheelEvent.h"
 #include "ScrollableArea.h"
 #include <algorithm>
-#include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
index 51b81ff..eff6736 100644 (file)
@@ -41,7 +41,6 @@
 #include "FloatPoint.h"
 #include "ScrollAnimator.h"
 #include "Timer.h"
-#include <wtf/OwnPtr.h>
 
 class ScrollAnimatorNoneTest;
 
index 63bc5ab..76d4b12 100644 (file)
@@ -32,6 +32,7 @@
 #include "TextCodecICU.h"
 #include "ThreadTimers.h"
 #include <wtf/MainThread.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/ThreadSpecific.h>
 #include <wtf/Threading.h>
 #include <wtf/WTFThreadData.h>
index b3cdf49..4f5d6b6 100644 (file)
@@ -32,8 +32,6 @@
 #include "Glyph.h"
 #include <array>
 #include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
index c1117f5..778bf9a 100644 (file)
@@ -46,8 +46,6 @@
 #include <wtf/HashSet.h>
 #include <wtf/MediaTime.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringHash.h>
 
 #if ENABLE(AVF_CAPTIONS)
index 0a59cd0..655d44f 100644 (file)
@@ -31,7 +31,6 @@
 #include "InbandTextTrackPrivateClient.h"
 #include "Logging.h"
 #include <CoreMedia/CoreMedia.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/unicode/CharacterNames.h>
index b53240d..59a02b0 100644 (file)
@@ -38,7 +38,6 @@
 #include <runtime/Int8Array.h>
 #include <wtf/MediaTime.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
index b3412ff..276e0d5 100644 (file)
@@ -31,7 +31,6 @@
 #include "Timer.h"
 #include <wtf/HashMap.h>
 #include <wtf/IteratorRange.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
index 3acd1b3..dc50a3c 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "CDMSession.h"
 #include "SourceBufferPrivateAVFObjC.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 
 #if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
index 6f65344..d22c4ca 100644 (file)
@@ -43,6 +43,7 @@
 #include <cairo.h>
 #include <runtime/JSCInlines.h>
 #include <runtime/TypedArrayInlines.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/Base64.h>
 #include <wtf/text/WTFString.h>
index 54a4d6e..f0b8047 100644 (file)
@@ -140,7 +140,7 @@ ImageBuffer::ImageBuffer(const FloatSize& size, float resolutionScale, ColorSpac
         if (!cgContext)
             return;
 
-        m_data.context = adoptPtr(new GraphicsContext(cgContext.get()));
+        m_data.context = std::make_unique<GraphicsContext>(cgContext.get());
     }
 
     context()->scale(FloatSize(1, -1));
index 8a9d21c..1bdb51e 100644 (file)
@@ -109,13 +109,13 @@ static void premultitplyScanline(void* data, size_t tileNumber)
 #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
 #endif // USE(ACCELERATE)
 
-PassRefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale) const
+RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale) const
 {
     Checked<unsigned, RecordOverflow> area = 4;
     area *= rect.width();
     area *= rect.height();
     if (area.hasOverflowed())
-        return 0;
+        return nullptr;
 
     RefPtr<Uint8ClampedArray> result = Uint8ClampedArray::createUninitialized(area.unsafeGet());
     unsigned char* resultData = result->data();
@@ -202,7 +202,7 @@ PassRefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, cons
 
             vImageUnpremultiplyData_RGBA8888(&src, &dst, kvImageNoFlags);
 #endif
-            return result.release();
+            return result;
         }
 #endif
         if (resolutionScale != 1) {
@@ -212,7 +212,7 @@ PassRefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, cons
             CGContextSetBlendMode(destinationContext.get(), kCGBlendModeCopy);
             CGContextDrawImage(destinationContext.get(), CGRectMake(0, 0, width.unsafeGet() / resolutionScale, height.unsafeGet() / resolutionScale), sourceImage.get()); // FIXME: Add subpixel translation.
             if (!unmultiplied)
-                return result.release();
+                return result;
 
             srcRows = destRows;
             srcBytesPerRow = destBytesPerRow;
@@ -378,7 +378,7 @@ PassRefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, cons
 #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
     }
     
-    return result.release();
+    return result;
 }
 
 void ImageBufferData::putData(Uint8ClampedArray*& source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale)
index 3b6c291..3f996c6 100644 (file)
 #include <wtf/RefPtr.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(COCOA) && USE(CA)
-#if !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
 #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
-#endif // !PLATFORM(IOS_SIMULATOR)
 #endif
 
-typedef struct __IOSurface *IOSurfaceRef;
 typedef struct CGColorSpace *CGColorSpaceRef;
 typedef struct CGDataProvider *CGDataProviderRef;
 typedef uint32_t CGBitmapInfo;
@@ -44,7 +41,6 @@ typedef uint32_t CGBitmapInfo;
 namespace WebCore {
 
 class IOSurface;
-class IntSize;
 
 struct ImageBufferData {
     ~ImageBufferData();
@@ -53,18 +49,18 @@ struct ImageBufferData {
     Checked<unsigned, RecordOverflow> bytesPerRow;
     CGColorSpaceRef colorSpace;
 
-    // Only for Software ImageBuffers.
+    // Only for software ImageBuffers.
     void* data { nullptr };
     RetainPtr<CGDataProviderRef> dataProvider;
     CGBitmapInfo bitmapInfo;
-    OwnPtr<GraphicsContext> context;
+    std::unique_ptr<GraphicsContext> context;
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
-    // Only for Accelerated ImageBuffers.
+    // Only for accelerated ImageBuffers.
     std::unique_ptr<IOSurface> surface;
 #endif
 
-    PassRefPtr<Uint8ClampedArray> getData(const IntRect&, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale) const;
+    RefPtr<Uint8ClampedArray> getData(const IntRect&, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale) const;
     void putData(Uint8ClampedArray*& source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale);
 };
 
index ff635ba..186db96 100644 (file)
@@ -94,7 +94,7 @@ private:
     IntSize m_contextSize;
     size_t m_totalBytes;
 
-    OwnPtr<GraphicsContext> m_graphicsContext;
+    std::unique_ptr<GraphicsContext> m_graphicsContext;
     RetainPtr<CGContextRef> m_cgContext;
 
     RetainPtr<IOSurfaceRef> m_surface;
index a8f1190..cbd442a 100644 (file)
@@ -183,7 +183,7 @@ GraphicsContext& IOSurface::ensureGraphicsContext()
     if (m_graphicsContext)
         return *m_graphicsContext;
 
-    m_graphicsContext = adoptPtr(new GraphicsContext(ensurePlatformContext()));
+    m_graphicsContext = std::make_unique<GraphicsContext>(ensurePlatformContext());
     m_graphicsContext->setIsAcceleratedContext(true);
 
     return *m_graphicsContext;
index d235ebd..3a9c46e 100644 (file)
@@ -22,7 +22,6 @@
 #if USE(EGL)
 
 #include "GraphicsContext3D.h"
-#include <wtf/OwnPtr.h>
 
 #if USE(CAIRO)
 #include <cairo.h>
index 5fe2010..dfb746a 100644 (file)
@@ -30,8 +30,6 @@
 #include "FilterEffect.h"
 #include "LayoutSize.h"
 #include "Length.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/TypeCasts.h>
 #include <wtf/text/WTFString.h>
index 936652d..bf76f31 100644 (file)
@@ -37,8 +37,6 @@
 #include "hb.h"
 #include <memory>
 #include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/unicode/CharacterNames.h>
 
index 3dc08d0..c9e938c 100644 (file)
@@ -36,6 +36,7 @@
 #include "MediaPlayerPrivateFullscreenWindow.h"
 #include "Timer.h"
 #include "WebCoreInstanceHandle.h"
+#include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
 using namespace WebCore;
index 7cc7b02..3a875e6 100644 (file)
@@ -29,7 +29,6 @@
 #include "DeviceMotionClient.h"
 #include "DeviceMotionController.h"
 #include "DeviceMotionData.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
 #ifdef __OBJC__
index 422f18a..39e6edb 100644 (file)
@@ -29,7 +29,6 @@
 #include "DeviceOrientationClient.h"
 #include "DeviceOrientationController.h"
 #include "DeviceOrientationData.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
 #ifdef __OBJC__
index 4f3a542..a8a0733 100644 (file)
@@ -34,8 +34,6 @@
 #include "IntSize.h"
 #include "Timer.h"
 #include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Threading.h>
@@ -197,8 +195,8 @@ private:
     bool m_isSpeculativeTileCreationEnabled;
 
     bool m_didCallWillStartScrollingOrZooming;
-    OwnPtr<LegacyTileGrid> m_zoomedOutTileGrid;
-    OwnPtr<LegacyTileGrid> m_zoomedInTileGrid;
+    std::unique_ptr<LegacyTileGrid> m_zoomedOutTileGrid;
+    std::unique_ptr<LegacyTileGrid> m_zoomedInTileGrid;
 
     Timer m_tileCreationTimer;
 
index 221f3f9..960101a 100644 (file)
@@ -82,15 +82,13 @@ LegacyTileCache::LegacyTileCache(WAKWindow* window)
     , m_acceleratedDrawingEnabled(false)
     , m_isSpeculativeTileCreationEnabled(true)
     , m_didCallWillStartScrollingOrZooming(false)
-    , m_zoomedOutTileGrid(PassOwnPtr<LegacyTileGrid>())
-    , m_zoomedInTileGrid(PassOwnPtr<LegacyTileGrid>())
+    , m_zoomedOutTileGrid(std::make_unique<LegacyTileGrid>(*this, m_tileSize))
     , m_tileCreationTimer(*this, &LegacyTileCache::tileCreationTimerFired)
     , m_currentScale(1.f)
     , m_pendingScale(0)
     , m_pendingZoomedOutScale(0)
     , m_tileControllerShouldUseLowScaleTiles(false)
 {
-    m_zoomedOutTileGrid = LegacyTileGrid::create(this, m_tileSize);
     [hostLayer() insertSublayer:m_zoomedOutTileGrid->tileHostLayer() atIndex:0];
     hostLayerSizeChanged();
 }
@@ -133,7 +131,7 @@ LegacyTileGrid* LegacyTileCache::activeTileGrid() const
 
 LegacyTileGrid* LegacyTileCache::inactiveTileGrid() const
 {
-    return activeTileGrid() == m_zoomedOutTileGrid ? m_zoomedInTileGrid.get() : m_zoomedOutTileGrid.get();
+    return activeTileGrid() == m_zoomedOutTileGrid.get() ? m_zoomedInTileGrid.get() : m_zoomedOutTileGrid.get();
 }
 
 void LegacyTileCache::setTilesOpaque(bool opaque)
@@ -243,7 +241,7 @@ void LegacyTileCache::commitScaleChange()
 
     if (m_currentScale != m_zoomedOutTileGrid->scale()) {
         if (!m_zoomedInTileGrid) {
-            m_zoomedInTileGrid = LegacyTileGrid::create(this, m_tileSize);
+            m_zoomedInTileGrid = std::make_unique<LegacyTileGrid>(*this, m_tileSize);
             [hostLayer() addSublayer:m_zoomedInTileGrid->tileHostLayer()];
             hostLayerSizeChanged();
         }
@@ -335,7 +333,7 @@ void LegacyTileCache::removeAllNonVisibleTiles()
 void LegacyTileCache::removeAllNonVisibleTilesInternal()
 {
     LegacyTileGrid* activeGrid = activeTileGrid();
-    if (keepsZoomedOutTiles() && activeGrid == m_zoomedInTileGrid && activeGrid->hasTiles())
+    if (keepsZoomedOutTiles() && activeGrid == m_zoomedInTileGrid.get() && activeGrid->hasTiles())
         m_zoomedOutTileGrid->dropAllTiles();
 
     IntRect activeTileBounds = activeGrid->bounds();
@@ -401,11 +399,11 @@ void LegacyTileCache::finishedCreatingTiles(bool didCreateTiles, bool createMore
         flushSavedDisplayRects();
 
     if (keepsZoomedOutTiles()) {
-        if (m_zoomedInTileGrid && activeTileGrid() == m_zoomedOutTileGrid && m_tilingMode != Zooming && m_zoomedInTileGrid->hasTiles()) {
+        if (m_zoomedInTileGrid && activeTileGrid() == m_zoomedOutTileGrid.get() && m_tilingMode != Zooming && m_zoomedInTileGrid->hasTiles()) {
             // This CA transaction will cover the screen with top level tiles.
             // We can remove zoomed-in tiles without flashing.
             m_zoomedInTileGrid->dropAllTiles();
-        } else if (activeTileGrid() == m_zoomedInTileGrid) {
+        } else if (activeTileGrid() == m_zoomedInTileGrid.get()) {
             // Pass the minimum possible distance to consider all tiles, even visible ones.
             m_zoomedOutTileGrid->dropDistantTiles(0, std::numeric_limits<double>::min());
         }
@@ -458,8 +456,8 @@ unsigned LegacyTileCache::tileCapacityForGrid(LegacyTileGrid* grid)
     else
         gridCapacity = capacity;
 
-    if (keepsZoomedOutTiles() && grid == m_zoomedOutTileGrid) {
-        if (activeTileGrid() == m_zoomedOutTileGrid)
+    if (keepsZoomedOutTiles() && grid == m_zoomedOutTileGrid.get()) {
+        if (activeTileGrid() == m_zoomedOutTileGrid.get())
             return gridCapacity;
         return gridCapacity / 4;
     }
@@ -468,7 +466,7 @@ unsigned LegacyTileCache::tileCapacityForGrid(LegacyTileGrid* grid)
 
 Color LegacyTileCache::colorForGridTileBorder(LegacyTileGrid* grid) const
 {
-    if (grid == m_zoomedOutTileGrid)
+    if (grid == m_zoomedOutTileGrid.get())
         return Color(.3f, .0f, 0.4f, 0.5f);
 
     return Color(.0f, .0f, 0.4f, 0.5f);
@@ -635,7 +633,7 @@ void LegacyTileCache::invalidateTiles(const IntRect& dirtyRect)
     FloatRect scaledRect = dirtyRect;
     scaledRect.scale(zoomedOutScale() / currentScale());
     IntRect zoomedOutDirtyRect = enclosingIntRect(scaledRect);
-    if (activeGrid == m_zoomedOutTileGrid) {
+    if (activeGrid == m_zoomedOutTileGrid.get()) {
         bool dummy;
         IntRect coverRect = m_zoomedOutTileGrid->calculateCoverRect(m_zoomedOutTileGrid->visibleRect(), dummy);
         // Instead of repainting a tile outside the cover rect, just remove it.
@@ -805,13 +803,13 @@ void LegacyTileCache::dumpTiles()
 {
     NSLog(@"=================");
     NSLog(@"ZOOMED OUT");
-    if (m_zoomedOutTileGrid == activeTileGrid())
+    if (m_zoomedOutTileGrid.get() == activeTileGrid())
         NSLog(@"<ACTIVE>");
     m_zoomedOutTileGrid->dumpTiles();
     NSLog(@"=================");
     if (m_zoomedInTileGrid) {
         NSLog(@"ZOOMED IN");
-        if (m_zoomedInTileGrid == activeTileGrid())
+        if (m_zoomedInTileGrid.get() == activeTileGrid())
             NSLog(@"<ACTIVE>");
         m_zoomedInTileGrid->dumpTiles();
         NSLog(@"=================");
index 6c672bf..57b0d7d 100644 (file)
@@ -34,9 +34,6 @@
 #include "IntSize.h"
 #include "LegacyTileCache.h"
 #include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RetainPtr.h>
 
@@ -49,15 +46,13 @@ namespace WebCore {
 class LegacyTileGridTile;
 
 class LegacyTileGrid {
-    WTF_MAKE_NONCOPYABLE(LegacyTileGrid);
 public:
     typedef IntPoint TileIndex;
 
-    static PassOwnPtr<LegacyTileGrid> create(LegacyTileCache* cache, const IntSize& tileSize) { return adoptPtr(new LegacyTileGrid(cache, tileSize)); }
-
+    LegacyTileGrid(LegacyTileCache&, const IntSize&);
     ~LegacyTileGrid();
 
-    LegacyTileCache* tileCache() const { return m_tileCache; }
+    LegacyTileCache& tileCache() const { return m_tileCache; }
 
     CALayer *tileHostLayer() const;
     IntRect bounds() const;
@@ -111,9 +106,7 @@ private:
     bool shouldUseMinimalTileCoverage() const;
 
 private:        
-    LegacyTileGrid(LegacyTileCache*, const IntSize&);
-
-    LegacyTileCache* m_tileCache;
+    LegacyTileCache& m_tileCache;
     RetainPtr<CALayer> m_tileHostLayer;
 
     IntPoint m_origin;
index 09156d2..fd23dd4 100644 (file)
@@ -41,7 +41,7 @@
 
 namespace WebCore {
 
-LegacyTileGrid::LegacyTileGrid(LegacyTileCache* tileCache, const IntSize& tileSize)
+LegacyTileGrid::LegacyTileGrid(LegacyTileCache& tileCache, const IntSize& tileSize)
     : m_tileCache(tileCache)
     , m_tileHostLayer(adoptNS([[LegacyTileHostLayer alloc] initWithTileGrid:this]))
     , m_tileSize(tileSize)
@@ -57,10 +57,10 @@ LegacyTileGrid::~LegacyTileGrid()
 
 IntRect LegacyTileGrid::visibleRect() const
 {
-    IntRect visibleRect = enclosingIntRect(m_tileCache->visibleRectInLayer(m_tileHostLayer.get()));
+    IntRect visibleRect = enclosingIntRect(m_tileCache.visibleRectInLayer(m_tileHostLayer.get()));
 
     // When fast scrolling to the top, move the visible rect there immediately so we have tiles when the scrolling completes.
-    if (m_tileCache->tilingMode() == LegacyTileCache::ScrollToTop)
+    if (m_tileCache.tilingMode() == LegacyTileCache::ScrollToTop)
         visibleRect.setY(0);
 
     return visibleRect;
@@ -98,7 +98,7 @@ void LegacyTileGrid::dropTilesBetweenRects(const IntRect& dropRect, const IntRec
 unsigned LegacyTileGrid::tileByteSize() const
 {
     IntSize tilePixelSize = m_tileSize;
-    tilePixelSize.scale(m_tileCache->screenScale());
+    tilePixelSize.scale(m_tileCache.screenScale());
     return LegacyTileLayerPool::bytesBackingLayerWithPixelSize(tilePixelSize);
 }
 
@@ -113,7 +113,7 @@ bool LegacyTileGrid::dropDistantTiles(unsigned tilesNeeded, double shortestDista
     unsigned bytesPerTile = tileByteSize();
     unsigned bytesNeeded = tilesNeeded * bytesPerTile;
     unsigned bytesUsed = tileCount() * bytesPerTile;
-    unsigned maximumBytes = m_tileCache->tileCapacityForGrid(this);
+    unsigned maximumBytes = m_tileCache.tileCapacityForGrid(this);
 
     int bytesToReclaim = int(bytesUsed) - (int(maximumBytes) - bytesNeeded);
     if (bytesToReclaim <= 0)
@@ -255,14 +255,14 @@ void LegacyTileGrid::updateTileOpacity()
 {
     TileMap::iterator end = m_tiles.end();
     for (TileMap::iterator it = m_tiles.begin(); it != end; ++it)
-        [it->value->tileLayer() setOpaque:m_tileCache->tilesOpaque()];
+        [it->value->tileLayer() setOpaque:m_tileCache.tilesOpaque()];
 }
 
 void LegacyTileGrid::updateTileBorderVisibility()
 {
     TileMap::iterator end = m_tiles.end();
     for (TileMap::iterator it = m_tiles.begin(); it != end; ++it)
-        it->value->showBorder(m_tileCache->tileBordersVisible());
+        it->value->showBorder(m_tileCache.tileBordersVisible());
 }
 
 unsigned LegacyTileGrid::tileCount() const
@@ -297,7 +297,7 @@ bool LegacyTileGrid::checkDoSingleTileLayout()
 
 void LegacyTileGrid::updateHostLayerSize()
 {
-    CALayer* hostLayer = m_tileCache->hostLayer();
+    CALayer* hostLayer = m_tileCache.hostLayer();
     CGRect tileHostBounds = [hostLayer convertRect:[hostLayer bounds] toLayer:tileHostLayer()];
     CGSize transformedSize;
     transformedSize.width = CGRound(tileHostBounds.size.width);
@@ -375,7 +375,7 @@ void LegacyTileGrid::invalidateTiles(const IntRect& dirtyRect)
     // When using minimal coverage, drop speculative tiles instead of updating them.
     if (!shouldUseMinimalTileCoverage())
         return;
-    if (m_tileCache->tilingMode() != LegacyTileCache::Minimal && m_tileCache->tilingMode() != LegacyTileCache::Normal)
+    if (m_tileCache.tilingMode() != LegacyTileCache::Minimal && m_tileCache.tilingMode() != LegacyTileCache::Normal)
         return;
     IntRect visibleRect = this->visibleRect();
     unsigned count = invalidatedTiles.size();
@@ -388,8 +388,8 @@ void LegacyTileGrid::invalidateTiles(const IntRect& dirtyRect)
 
 bool LegacyTileGrid::shouldUseMinimalTileCoverage() const
 {
-    return m_tileCache->tilingMode() == LegacyTileCache::Minimal
-        || !m_tileCache->isSpeculativeTileCreationEnabled()
+    return m_tileCache.tilingMode() == LegacyTileCache::Minimal
+        || !m_tileCache.isSpeculativeTileCreationEnabled()
         || MemoryPressureHandler::singleton().isUnderMemoryPressure();
 }
 
@@ -448,7 +448,7 @@ double LegacyTileGrid::tileDistance2(const IntRect& visibleRect, const IntRect&
     const double tilingBiasVeryLikely = 0.8;
     const double tilingBiasLikely = 0.9;
 
-    switch (m_tileCache->tilingDirection()) {
+    switch (m_tileCache.tilingDirection()) {
     case LegacyTileCache::TilingDirectionUp:
         verticalBias = tilingBiasVeryLikely;
         upwardBias = tilingBiasLikely;
@@ -544,7 +544,7 @@ void LegacyTileGrid::createTiles(LegacyTileCache::SynchronousTileCreationMode cr
 
     bool didCreateTiles = !!tilesToCreateCount;
     bool createMoreTiles = pendingTileCount > tilesToCreateCount;
-    m_tileCache->finishedCreatingTiles(didCreateTiles, createMoreTiles);
+    m_tileCache.finishedCreatingTiles(didCreateTiles, createMoreTiles);
 }
 
 void LegacyTileGrid::dumpTiles()
index 384cc01..2a9a5fc 100644 (file)
@@ -50,7 +50,7 @@ LegacyTileGridTile::LegacyTileGridTile(LegacyTileGrid* tileGrid, const IntRect&
 {
     ASSERT(!tileRect.isEmpty());
     IntSize pixelSize(m_rect.size());
-    const CGFloat screenScale = m_tileGrid->tileCache()->screenScale();
+    const CGFloat screenScale = m_tileGrid->tileCache().screenScale();
     pixelSize.scale(screenScale);
     m_tileLayer = LegacyTileLayerPool::sharedPool()->takeLayerWithSize(pixelSize);
     if (!m_tileLayer) {
@@ -61,18 +61,18 @@ LegacyTileGridTile::LegacyTileGridTile(LegacyTileGrid* tileGrid, const IntRect&
     }
     LegacyTileLayer* layer = m_tileLayer.get();
     [layer setTileGrid:tileGrid];
-    [layer setOpaque:m_tileGrid->tileCache()->tilesOpaque()];
+    [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
     [layer setEdgeAntialiasingMask:0];
     [layer setNeedsLayoutOnGeometryChange:NO];
     [layer setContentsScale:screenScale];
-    [layer setAcceleratesDrawing:m_tileGrid->tileCache()->acceleratedDrawingEnabled()];
+    [layer setAcceleratesDrawing:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
 
     // Host layer may have other sublayers. Keep the tile layers at the beginning of the array
     // so they are painted behind everything else.
     [tileGrid->tileHostLayer() insertSublayer:layer atIndex:tileGrid->tileCount()];
     [layer setFrame:m_rect];
     invalidateRect(m_rect);
-    showBorder(m_tileGrid->tileCache()->tileBordersVisible());
+    showBorder(m_tileGrid->tileCache().tileBordersVisible());
 
 #if LOG_TILING
     ++totalTileCount;
@@ -99,7 +99,7 @@ void LegacyTileGridTile::invalidateRect(const IntRect& windowDirtyRect)
     dirtyRect.move(IntPoint() - m_rect.location());
     [tileLayer() setNeedsDisplayInRect:dirtyRect];
 
-    if (m_tileGrid->tileCache()->tilePaintCountersVisible())
+    if (m_tileGrid->tileCache().tilePaintCountersVisible())
         [tileLayer() setNeedsDisplayInRect:CGRectMake(0, 0, 46, 25)];
 }
 
@@ -117,7 +117,7 @@ void LegacyTileGridTile::showBorder(bool flag)
 {
     LegacyTileLayer* layer = m_tileLayer.get();
     if (flag) {
-        [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache()->colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)];
+        [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache().colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)];
         [layer setBorderWidth:0.5f];
     } else {
         [layer setBorderColor:nil];
index 890542d..8509210 100644 (file)
@@ -54,7 +54,7 @@
 {
     if (pthread_main_np())
         WebThreadLock();
-    _tileGrid->tileCache()->doLayoutTiles();
+    _tileGrid->tileCache().doLayoutTiles();
     [super renderInContext:context];
 }
 @end
@@ -77,13 +77,13 @@ static LegacyTileLayer *layerBeingPainted;
         WebThreadLock();
     // This may trigger WebKit layout and generate more repaint rects.
     if (_tileGrid)
-        _tileGrid->tileCache()->prepareToDraw();
+        _tileGrid->tileCache().prepareToDraw();
 }
 
 - (void)drawInContext:(CGContextRef)context
 {
     if (_tileGrid)
-        _tileGrid->tileCache()->drawLayer(self, context);
+        _tileGrid->tileCache().drawLayer(self, context);
 }
 
 - (id<CAAction>)actionForKey:(NSString *)key
index 6ec44bc..30fe6be 100644 (file)
@@ -34,7 +34,6 @@
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Threading.h>
 #include <wtf/Vector.h>
index bace370..b1a3bb7 100644 (file)
@@ -30,7 +30,6 @@
 #include "Page.h"
 #include "RenderLayer.h"
 #include "ScrollableArea.h"
-#include <wtf/PassOwnPtr.h>
 
 #if ENABLE(TOUCH_EVENTS)
 #include "PlatformTouchEventIOS.h"
index 9a8a983..8c5c76b 100644 (file)
@@ -39,7 +39,6 @@
 #include "ScrollbarTheme.h"
 #include "ScrollbarThemeMac.h"
 #include "WebCoreSystemInterface.h"
-#include <wtf/PassOwnPtr.h>
 
 using namespace WebCore;
 
index 142dc2a..6b86468 100644 (file)
@@ -27,7 +27,6 @@
 
 #import <AppKit/NSWindowController.h>
 #import <AppKit/NSScreen.h>
-#import <wtf/OwnPtr.h>
 #import <wtf/RefPtr.h>
 
 namespace WebCore {
index c03b202..362c72b 100644 (file)
@@ -33,9 +33,6 @@
 
 #include "Blob.h"
 #include "BlobURL.h"
-
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
index d6c315f..8b6a6d9 100644 (file)
@@ -71,7 +71,7 @@ void ResourceHandle::registerBuiltinSynchronousLoader(const AtomicString& protoc
 }
 
 ResourceHandle::ResourceHandle(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
-    : d(adoptPtr(new ResourceHandleInternal(this, context, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url()))))
+    : d(std::make_unique<ResourceHandleInternal>(this, context, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url())))
 {
     if (!request.url().isValid()) {
         scheduleFailure(InvalidURLFailure);
index 78d8fd3..42e8d39 100644 (file)
@@ -30,7 +30,6 @@
 #include "HTTPHeaderMap.h"
 #include "ResourceHandleTypes.h"
 #include "ResourceLoadPriority.h"
-#include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 
 #if PLATFORM(COCOA) || USE(CFNETWORK)
@@ -284,7 +283,7 @@ static void getConnectionTimingData(NSDictionary *timingData, ResourceLoadTiming
 #endif
 
     friend class ResourceHandleInternal;
-    OwnPtr<ResourceHandleInternal> d;
+    std::unique_ptr<ResourceHandleInternal> d;
 
 #if USE(QUICK_LOOK)
     std::unique_ptr<QuickLookHandle> m_quickLook;
index b380f20..772466d 100644 (file)
@@ -31,6 +31,7 @@
 #include "ResourceRequest.h"
 #include "AuthenticationChallenge.h"
 #include "Timer.h"
+#include <wtf/OwnPtr.h>
 
 #if USE(CFNETWORK)
 #include "ResourceHandleCFURLConnectionDelegate.h"
index f70a4dc..fd948fb 100644 (file)
 #include "CacheValidation.h"
 #include "CertificateInfo.h"
 #include "HTTPHeaderMap.h"
-#include "URL.h"
 #include "ResourceLoadTiming.h"
-
-#include <wtf/PassOwnPtr.h>
-#include <wtf/RefPtr.h>
+#include "URL.h"
 
 #if OS(SOLARIS)
 #include <sys/time.h> // For time_t structure.
@@ -58,7 +55,7 @@ public:
     WEBCORE_EXPORT bool isHTTP() const;
 
     WEBCORE_EXPORT const URL& url() const;
-    WEBCORE_EXPORT void setURL(const URL& url);
+    WEBCORE_EXPORT void setURL(const URL&);
 
     WEBCORE_EXPORT const String& mimeType() const;
     WEBCORE_EXPORT void setMimeType(const String& mimeType);
index 09093d7..7c675e7 100644 (file)
 
 namespace WebCore {
 
-class SynchronousLoaderClient : public ResourceHandleClient {
+class SynchronousLoaderClient final : public ResourceHandleClient {
 public:
-    static PassOwnPtr<SynchronousLoaderClient> create()
-    {
-        return adoptPtr(new SynchronousLoaderClient);
-    }
-
     virtual ~SynchronousLoaderClient();
 
     void setAllowStoredCredentials(bool allow) { m_allowStoredCredentials = allow; }
@@ -50,12 +45,6 @@ public:
     WEBCORE_EXPORT static ResourceError platformBadResponseError();
 
 private:
-    SynchronousLoaderClient()
-        : m_allowStoredCredentials(false)
-        , m_isDone(false)
-    {
-    }
-
     virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& /*redirectResponse*/) override;
     virtual bool shouldUseCredentialStorage(ResourceHandle*) override;
     virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) override;
@@ -67,11 +56,11 @@ private:
     virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&) override;
 #endif
 
-    bool m_allowStoredCredentials;
+    bool m_allowStoredCredentials { false };
     ResourceResponse m_response;
     Vector<char> m_data;
     ResourceError m_error;
-    bool m_isDone;
+    bool m_isDone { false };
 };
 }
 
index a026443..5ac5226 100644 (file)
@@ -37,7 +37,6 @@
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
 #include <wtf/MainThread.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/SchedulePair.h>
 #include <wtf/StdLibExtras.h>
@@ -210,9 +209,10 @@ static void* formCreate(CFReadStreamRef stream, void* context)
 
 static void formFinishFinalizationOnMainThread(void* context)
 {
-    OwnPtr<FormStreamFields> form = adoptPtr(static_cast<FormStreamFields*>(context));
+    auto* form = static_cast<FormStreamFields*>(context);
 
-    closeCurrentStream(form.get());
+    closeCurrentStream(form);
+    delete form;
 }
 
 static void formFinalize(CFReadStreamRef stream, void* context)
index a9ce9e0..ee7352e 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/ProcessID.h>
 
 #if PLATFORM(COCOA)
@@ -45,10 +44,10 @@ NetworkStorageSession::NetworkStorageSession(RetainPtr<CFURLStorageSessionRef> p
 {
 }
 
-static OwnPtr<NetworkStorageSession>& defaultNetworkStorageSession()
+static std::unique_ptr<NetworkStorageSession>& defaultNetworkStorageSession()
 {
     ASSERT(isMainThread());
-    static NeverDestroyed<OwnPtr<NetworkStorageSession>> session;
+    static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;
     return session;
 }
 
@@ -57,16 +56,16 @@ void NetworkStorageSession::switchToNewTestingSession()
     // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
     String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
 #if PLATFORM(COCOA)
-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get()))));
+    defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get())));
 #else
-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()->platformSession()))));
+    defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()->platformSession())));
 #endif
 }
 
 NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
 {
     if (!defaultNetworkStorageSession())
-        defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(0));
+        defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(nullptr);
     return *defaultNetworkStorageSession();
 }
 
index 5211e7d..662bb20 100644 (file)
@@ -529,10 +529,10 @@ void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* contex
     ASSERT(response.isNull());
     ASSERT(error.isNull());
 
-    OwnPtr<SynchronousLoaderClient> client = SynchronousLoaderClient::create();
-    client->setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
+    SynchronousLoaderClient client;
+    client.setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
 
-    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, client.get(), false /*defersLoading*/, true /*shouldContentSniff*/));
+    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, &client, false /*defersLoading*/, true /*shouldContentSniff*/));
 
     handle->d->m_storageSession = context->storageSession().platformSession();
 
@@ -548,17 +548,17 @@ void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* contex
     CFURLConnectionScheduleDownloadWithRunLoop(handle->connection(), CFRunLoopGetCurrent(), synchronousLoadRunLoopMode());
     CFURLConnectionStart(handle->connection());
 
-    while (!client->isDone())
+    while (!client.isDone())
         CFRunLoopRunInMode(synchronousLoadRunLoopMode(), UINT_MAX, true);
 
-    error = client->error();
+    error = client.error();
 
     CFURLConnectionCancel(handle->connection());
 
     if (error.isNull())
-        response = client->response();
+        response = client.response();
 
-    data.swap(client->mutableData());
+    data.swap(client.mutableData());
 }
 
 void ResourceHandle::setHostAllowsAnyHTTPSCertificate(const String& host)
index ce5efaa..6935351 100644 (file)
@@ -388,10 +388,10 @@ void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* contex
 
     ASSERT(!request.isEmpty());
     
-    OwnPtr<SynchronousLoaderClient> client = SynchronousLoaderClient::create();
-    client->setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
+    SynchronousLoaderClient client;
+    client.setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
 
-    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, client.get(), false /*defersLoading*/, true /*shouldContentSniff*/));
+    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, &client, false /*defersLoading*/, true /*shouldContentSniff*/));
 
     handle->d->m_storageSession = context->storageSession().platformSession();
 
@@ -419,17 +419,17 @@ void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* contex
     [handle->connection() scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:(NSString *)synchronousLoadRunLoopMode()];
     [handle->connection() start];
     
-    while (!client->isDone())
+    while (!client.isDone())
         [[NSRunLoop currentRunLoop] runMode:(NSString *)synchronousLoadRunLoopMode() beforeDate:[NSDate distantFuture]];
 
-    error = client->error();
+    error = client.error();
     
     [handle->connection() cancel];
 
     if (error.isNull())
-        response = client->response();
+        response = client.response();
 
-    data.swap(client->mutableData());
+    data.swap(client.mutableData());
 }
 
 void ResourceHandle::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
index d9272f9..0db1f87 100644 (file)
@@ -30,7 +30,6 @@
 #include <memory>
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
index e235b81..38811fc 100644 (file)
@@ -32,8 +32,6 @@
 #include "Image.h"
 #include "IntPoint.h"
 #include "SystemInfo.h"
-
-#include <wtf/OwnPtr.h>
 #include <wtf/win/GDIObject.h>
 
 #include <windows.h>
index 6201a8a..d6c9c14 100644 (file)
@@ -6881,7 +6881,7 @@ void RenderLayer::updateOrRemoveFilterEffectRenderer()
         filterRenderer->setFilterScale(renderer().frame().page()->deviceScaleFactor());
         RenderingMode renderingMode = renderer().frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
         filterRenderer->setRenderingMode(renderingMode);
-        filterInfo.setRenderer(filterRenderer.release());
+        filterInfo.setRenderer(WTF::move(filterRenderer));
         
         // We can optimize away code paths in other places if we know that there are no software filters.
         renderer().view().setHasSoftwareFilters(true);
index 6546671..b0bd51f 100644 (file)
  */
 
 #include "config.h"
-
 #include "RenderLayerFilterInfo.h"
 
 #include "CachedSVGDocument.h"
-#include "CachedSVGDocumentReference.h"
 #include "FilterEffectRenderer.h"
-#include "SVGElement.h"
-#include "SVGFilter.h"
-#include "SVGFilterPrimitiveStandardAttributes.h"
+#include "RenderSVGResourceFilter.h"
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
@@ -85,7 +81,7 @@ RenderLayer::FilterInfo::~FilterInfo()
     removeReferenceFilterClients();
 }
 
-void RenderLayer::FilterInfo::setRenderer(PassRefPtr<FilterEffectRenderer> renderer)
+void RenderLayer::FilterInfo::setRenderer(RefPtr<FilterEffectRenderer>&& renderer)
 { 
     m_renderer = renderer; 
 }
@@ -98,23 +94,18 @@ void RenderLayer::FilterInfo::notifyFinished(CachedResource*)
 void RenderLayer::FilterInfo::updateReferenceFilterClients(const FilterOperations& operations)
 {
     removeReferenceFilterClients();
-    for (size_t i = 0, size = operations.size(); i < size; ++i) {
-        FilterOperation& filterOperation = *operations.operations()[i];
-        if (!is<ReferenceFilterOperation>(filterOperation))
+    for (auto& operation : operations.operations()) {
+        if (!is<ReferenceFilterOperation>(*operation))
             continue;
-        ReferenceFilterOperation& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation);
-        auto* documentReference = referenceFilterOperation.cachedSVGDocumentReference();
-        CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference->document() : nullptr;
-
-        if (cachedSVGDocument) {
+        auto& referenceOperation = downcast<ReferenceFilterOperation>(*operation);
+        auto* documentReference = referenceOperation.cachedSVGDocumentReference();
+        if (auto* cachedSVGDocument = documentReference ? documentReference->document() : nullptr) {
             // Reference is external; wait for notifyFinished().
             cachedSVGDocument->addClient(this);
             m_externalSVGReferences.append(cachedSVGDocument);
         } else {
-            // Reference is internal; add layer as a client so we can trigger
-            // filter repaint on SVG attribute change.
-            Element* filter = m_layer.renderer().document().getElementById(referenceFilterOperation.fragment());
-
+            // Reference is internal; add layer as a client so we can trigger filter repaint on SVG attribute change.
+            Element* filter = m_layer.renderer().document().getElementById(referenceOperation.fragment());
             if (!filter || !is<RenderSVGResourceFilter>(filter->renderer()))
                 continue;
             downcast<RenderSVGResourceFilter>(*filter->renderer()).addClientRenderLayer(&m_layer);
@@ -128,10 +119,10 @@ void RenderLayer::FilterInfo::removeReferenceFilterClients()
     for (auto& resourceHandle : m_externalSVGReferences)
         resourceHandle->removeClient(this);
     m_externalSVGReferences.clear();
-    for (const auto& filter : m_internalSVGReferences) {
-        if (!filter->renderer())
-            continue;
-        downcast<RenderSVGResourceContainer>(*filter->renderer()).removeClientRenderLayer(&m_layer);
+
+    for (auto& filter : m_internalSVGReferences) {
+        if (auto* renderer = filter->renderer())
+            downcast<RenderSVGResourceContainer>(*renderer).removeClientRenderLayer(&m_layer);
     }
     m_internalSVGReferences.clear();
 }
index f99de10..0f28f94 100644 (file)
 #include "CachedResourceHandle.h"
 #include "CachedSVGDocumentClient.h"
 #include "RenderLayer.h"
-#include <memory>
 
 namespace WebCore {
 
 class Element;
 
-class RenderLayer::FilterInfo final : public CachedSVGDocumentClient
-{
+class RenderLayer::FilterInfo final : private CachedSVGDocumentClient {
 public:
     static FilterInfo& get(RenderLayer&);
     static FilterInfo* getIfExists(const RenderLayer&);
@@ -55,28 +53,17 @@ public:
     void resetDirtySourceRect() { m_dirtySourceRect = LayoutRect(); }
     
     FilterEffectRenderer* renderer() const { return m_renderer.get(); }
-    void setRenderer(PassRefPtr<FilterEffectRenderer>);
+    void setRenderer(RefPtr<FilterEffectRenderer>&&);
     
     void updateReferenceFilterClients(const FilterOperations&);
     void removeReferenceFilterClients();
 
 private:
-    friend void WTF::deleteOwnedPtr<FilterInfo>(FilterInfo*);
-
     virtual void notifyFinished(CachedResource*) override;
 
     static HashMap<const RenderLayer*, std::unique_ptr<FilterInfo>>& map();
 
-#if PLATFORM(IOS)
-#pragma clang diagnostic push
-#if defined(__has_warning) && __has_warning("-Wunused-private-field")
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-#endif
     RenderLayer& m_layer;
-#if PLATFORM(IOS)
-#pragma clang diagnostic pop
-#endif
 
     RefPtr<FilterEffectRenderer> m_renderer;
     LayoutRect m_dirtySourceRect;
index 51126e8..6ef0d85 100644 (file)
 #include "RenderLayerMaskImageInfo.h"
 
 #include "CachedSVGDocument.h"
-#include "CachedSVGDocumentReference.h"
-#include "RenderSVGResourceContainer.h"
-#include "SVGElement.h"
 #include "SVGMaskElement.h"
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 
+class RenderLayer::MaskImageInfo::SVGDocumentClient : public CachedSVGDocumentClient {
+public:
+    SVGDocumentClient(RenderLayer& layer)
+        : m_layer(layer)
+    {
+    }
+
+private:
+    virtual void notifyFinished(CachedResource*) override
+    {
+        m_layer.renderer().repaint();
+    }
+
+    RenderLayer& m_layer;
+};
+
+class RenderLayer::MaskImageInfo::ImageClient : public CachedImageClient {
+public:
+    ImageClient(RenderLayer& layer)
+        : m_layer(layer)
+    {
+    }
+
+private:
+    virtual void imageChanged(CachedImage*, const IntRect*) override
+    {
+        m_layer.renderer().repaint();
+    }
+
+    RenderLayer& m_layer;
+};
+
 HashMap<const RenderLayer*, std::unique_ptr<RenderLayer::MaskImageInfo>>& RenderLayer::MaskImageInfo::layerToMaskMap()
 {
     static NeverDestroyed<HashMap<const RenderLayer*, std::unique_ptr<MaskImageInfo>>> layerToMaskMap;
@@ -45,7 +74,7 @@ HashMap<const RenderLayer*, std::unique_ptr<RenderLayer::MaskImageInfo>>& Render
 RenderLayer::MaskImageInfo* RenderLayer::MaskImageInfo::getIfExists(const RenderLayer& layer)
 {
     ASSERT(layer.m_hasMaskImageInfo == layerToMaskMap().contains(&layer));
-    return layer.m_hasMaskImageInfo ? layerToMaskMap().get(&layer) : 0;
+    return layer.m_hasMaskImageInfo ? layerToMaskMap().get(&layer) : nullptr;
 }
 
 RenderLayer::MaskImageInfo& RenderLayer::MaskImageInfo::get(RenderLayer& layer)
@@ -70,9 +99,9 @@ void RenderLayer::MaskImageInfo::remove(RenderLayer& layer)
 
 RenderLayer::MaskImageInfo::MaskImageInfo(RenderLayer& layer)
     : m_layer(layer)
+    , m_svgDocumentClient(std::make_unique<SVGDocumentClient>(layer))
+    , m_imageClient(std::make_unique<ImageClient>(layer))
 {
-    m_svgDocumentClient = std::make_unique<MaskSVGDocumentClient>(this);
-    m_imageClient = std::make_unique<MaskImageClient>(this);
 }
 
 RenderLayer::MaskImageInfo::~MaskImageInfo()
@@ -80,60 +109,43 @@ RenderLayer::MaskImageInfo::~MaskImageInfo()
     removeMaskImageClients(m_layer.renderer().style());
 }
 
-void RenderLayer::MaskImageInfo::notifyFinished(CachedResource*)
-{
-    m_layer.renderer().repaint();
-}
-
-void RenderLayer::MaskImageInfo::imageChanged(CachedImage*, const IntRect*)
-{
-    m_layer.renderer().repaint();
-}
-
 void RenderLayer::MaskImageInfo::updateMaskImageClients()
 {
     removeMaskImageClients(m_layer.renderer().style());
     
-    const FillLayer* maskLayer = m_layer.renderer().style().maskLayers();
-    while (maskLayer) {
+    for (auto* maskLayer = m_layer.renderer().style().maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
         const RefPtr<MaskImageOperation> maskImage = maskLayer->maskImage();
         maskImage->setRenderLayerImageClient(m_imageClient.get());
         CachedSVGDocumentReference* documentReference = maskImage->cachedSVGDocumentReference();
         CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference->document() : nullptr;
         
         if (cachedSVGDocument) {
-            // Reference is external; wait for notifyFinished().
+            // Reference is external; wait for notifyFinished and then repaint.
             cachedSVGDocument->addClient(m_svgDocumentClient.get());
             m_externalSVGReferences.append(cachedSVGDocument);
         } else {
-            // Reference is internal; add layer as a client so we can trigger
-            // mask repaint on SVG attribute change.
+            // Reference is internal; add layer as a client so we can trigger mask repaint on SVG attribute change.
             Element* masker = m_layer.renderer().document().getElementById(maskImage->fragment());
-            if (masker && is<SVGMaskElement>(masker)) {
-                downcast<SVGMaskElement>(masker)->addClientRenderLayer(&m_layer);
+            if (is<SVGMaskElement>(masker)) {
+                downcast<SVGMaskElement>(*masker).addClientRenderLayer(&m_layer);
                 m_internalSVGReferences.append(masker);
             }
         }
-        
-        maskLayer = maskLayer->next();
     }
 }
 
 void RenderLayer::MaskImageInfo::removeMaskImageClients(const RenderStyle& oldStyle)
 {
-    const FillLayer* maskLayer = oldStyle.maskLayers();
-    while (maskLayer) {
-        if (maskLayer->maskImage())
-            maskLayer->maskImage()->setRenderLayerImageClient(nullptr);
-
-        maskLayer = maskLayer->next();
+    for (auto* maskLayer = oldStyle.maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
+        if (auto& image = maskLayer->maskImage())
+            image->setRenderLayerImageClient(nullptr);
     }
     
-    for (auto externalSVGReference : m_externalSVGReferences)
+    for (auto& externalSVGReference : m_externalSVGReferences)
         externalSVGReference->removeClient(m_svgDocumentClient.get());
     m_externalSVGReferences.clear();
     
-    for (auto internalSVGReference : m_internalSVGReferences)
+    for (auto& internalSVGReference : m_internalSVGReferences)
         downcast<SVGMaskElement>(internalSVGReference.get())->removeClientRenderLayer(&m_layer);
     m_internalSVGReferences.clear();
 }
index e70279d..143777f 100644 (file)
 #ifndef RenderLayerMaskImageInfo_h
 #define RenderLayerMaskImageInfo_h
 
-#include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
-#include "CachedSVGDocumentClient.h"
-#include "MaskImageOperation.h"
 #include "RenderLayer.h"
-#include <memory>
 
 namespace WebCore {
 
 class Element;
 
 class RenderLayer::MaskImageInfo final {
-private:
-    class MaskResourceClient {
-    public:
-        MaskResourceClient(RenderLayer::MaskImageInfo* maskImageInfo)
-            : m_maskImageInfo(maskImageInfo)
-        {
-            ASSERT(m_maskImageInfo);
-        }
-    protected:
-        RenderLayer::MaskImageInfo* m_maskImageInfo;
-    };
-    
-    class MaskSVGDocumentClient : public MaskResourceClient, public CachedSVGDocumentClient {
-    public:
-        MaskSVGDocumentClient(RenderLayer::MaskImageInfo* maskImageInfo)
-            : MaskResourceClient(maskImageInfo)
-        {
-        }
-        
-        virtual void notifyFinished(CachedResource* resource) override { m_maskImageInfo->notifyFinished(resource); }
-    };
-    
-    class MaskImageClient : public MaskResourceClient, public CachedImageClient {
-    public:
-        MaskImageClient(RenderLayer::MaskImageInfo* maskImageInfo)
-            : MaskResourceClient(maskImageInfo)
-        {
-        }
-        
-        virtual void imageChanged(CachedImage* image, const IntRect* rect = nullptr) override { m_maskImageInfo->imageChanged(image, rect); }
-    };
-
 public:
     static MaskImageInfo& get(RenderLayer&);
     static MaskImageInfo* getIfExists(const RenderLayer&);
@@ -83,19 +47,17 @@ public:
     void removeMaskImageClients(const RenderStyle& oldStyle);
 
 private:
-    friend void WTF::deleteOwnedPtr<MaskImageInfo>(MaskImageInfo*);
-
-    void notifyFinished(CachedResource*);
-    void imageChanged(CachedImage*, const IntRect*);
-
     static HashMap<const RenderLayer*, std::unique_ptr<MaskImageInfo>>& layerToMaskMap();
 
+    class ImageClient;
+    class SVGDocumentClient;
+
     RenderLayer& m_layer;
 
     Vector<RefPtr<Element>> m_internalSVGReferences;
     Vector<CachedResourceHandle<CachedSVGDocument>> m_externalSVGReferences;
-    std::unique_ptr<MaskSVGDocumentClient> m_svgDocumentClient;
-    std::unique_ptr<MaskImageClient> m_imageClient;
+    std::unique_ptr<SVGDocumentClient> m_svgDocumentClient;
+    std::unique_ptr<ImageClient> m_imageClient;
 };
 
 } // namespace WebCore
index 2b1a2a4..14b922a 100644 (file)
@@ -166,9 +166,6 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
     RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
 }
 
-// We can't use RefCountedSupplement because that would try to make InternalSettings RefCounted
-// and InternalSettings is already RefCounted via its base class, InternalSettingsGenerated.
-// Instead, we manually make InternalSettings supplement Page.
 class InternalSettingsWrapper : public Supplement<Page> {
 public:
     explicit InternalSettingsWrapper(Page* page)
index d16aed1..db207cc 100644 (file)
@@ -1,3 +1,39 @@
+2015-04-23  Darin Adler  <darin@apple.com>
+
+        Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
+        https://bugs.webkit.org/show_bug.cgi?id=144090
+
+        Reviewed by Anders Carlsson.
+
+        * FullscreenVideoController.cpp:
+        (FullscreenVideoController::FullscreenVideoController):
+        (FullscreenVideoController::exitFullscreen):
+        * FullscreenVideoController.h:
+        * Plugins/PluginView.h:
+        * Plugins/PluginViewWin.cpp:
+        (WebCore::PluginView::wndProc):
+        * WebCoreSupport/AcceleratedCompositingContext.h:
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::WebChromeClient):
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::WebFrameLoaderClient):
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::highlight):
+        * WebCoreSupport/WebInspectorClient.h:
+        * WebElementPropertyBag.cpp:
+        (WebElementPropertyBag::WebElementPropertyBag):
+        * WebElementPropertyBag.h:
+        * WebFrame.h:
+        * WebHistoryItem.cpp:
+        * WebNodeHighlight.cpp:
+        * WebNotificationCenter.cpp:
+        (WebNotificationCenter::WebNotificationCenter):
+        * WebNotificationCenter.h:
+        Use make_unique and unique_ptr instead of adoptPtr and OwnPtr.
+
 2015-04-23  Andreas Kling  <akling@apple.com>
 
         There should only be one way to get the system memory size.
index eedb789..a6e434c 100644 (file)
@@ -43,8 +43,6 @@
 #include <WebCore/TextRun.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <windowsx.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/StdLibExtras.h>
 
 using namespace std;
@@ -245,9 +243,9 @@ FullscreenVideoController::FullscreenVideoController()
     , m_hitWidget(0)
     , m_movingWindow(false)
     , m_timer(*this, &FullscreenVideoController::timerFired)
-    , m_layerClient(adoptPtr(new LayerClient(this)))
+    , m_layerClient(std::make_unique<LayerClient>(this))
     , m_rootChild(PlatformCALayerWin::create(PlatformCALayer::LayerTypeLayer, m_layerClient.get()))
-    , m_fullscreenWindow(adoptPtr(new MediaPlayerPrivateFullscreenWindow(this)))
+    , m_fullscreenWindow(std::make_unique<MediaPlayerPrivateFullscreenWindow>(this))
 {
 }
 
@@ -298,8 +296,7 @@ void FullscreenVideoController::exitFullscreen()
 {
     SetWindowLongPtr(m_hudWindow, 0, 0);
 
-    if (m_fullscreenWindow)
-        m_fullscreenWindow = nullptr;
+    m_fullscreenWindow = nullptr;
 
     ASSERT(!IsWindow(m_hudWindow));
     m_hudWindow = 0;
index ea8cf26..f2017ad 100644 (file)
@@ -155,11 +155,11 @@ private:
     GDIObject<HBITMAP> m_bitmap;
     WebCore::IntSize m_fullscreenSize;
     WebCore::IntPoint m_hudPosition;
-    OwnPtr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow;
+    std::unique_ptr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow;
 
     class LayerClient;
     friend class LayerClient;
-    OwnPtr<LayerClient> m_layerClient;
+    std::unique_ptr<LayerClient> m_layerClient;
     RefPtr<WebCore::PlatformCALayer> m_rootChild;
 
     HUDButton m_playPauseButton;
index 1562b59..8f9208f 100644 (file)
@@ -36,7 +36,6 @@
 #include "Timer.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
@@ -321,7 +320,7 @@ namespace WebCore {
         bool m_isWaitingToStart;
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-        OwnPtr<PluginMessageThrottlerWin> m_messageThrottler;
+        std::unique_ptr<PluginMessageThrottlerWin> m_messageThrottler;
         WNDPROC m_pluginWndProc;
         unsigned m_lastMessage;
         bool m_isCallingPluginWndProc;
index 6945f22..7a6b2f9 100644 (file)
@@ -316,7 +316,7 @@ PluginView::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     if (message == WM_USER + 1 &&
         m_plugin->quirks().contains(PluginQuirkThrottleWMUserPlusOneMessages)) {
         if (!m_messageThrottler)
-            m_messageThrottler = adoptPtr(new PluginMessageThrottlerWin(this));
+            m_messageThrottler = std::make_unique<PluginMessageThrottlerWin>(this);
 
         m_messageThrottler->appendMessage(hWnd, message, wParam, lParam);
         return 0;
index 9a11428..e8f8802 100644 (file)
@@ -36,7 +36,6 @@
 #include <WebCore/IntSize.h>
 #include <WebCore/TextureMapperFPSCounter.h>
 #include <WebCore/Timer.h>
-#include <wtf/PassOwnPtr.h>
 
 class WebView;
 
index f01476e..99ba2dd 100644 (file)
@@ -71,7 +71,7 @@ static const size_t maxFilePathsListSize = USHRT_MAX;
 WebChromeClient::WebChromeClient(WebView* webView)
     : m_webView(webView)
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    , m_notificationsDelegate(new WebDesktopNotificationsDelegate(webView))
+    , m_notificationsDelegate(std::make_unique<WebDesktopNotificationsDelegate>(webView))
 #endif
 {
 }
index acef50d..19bb4a8 100644 (file)
@@ -179,6 +179,6 @@ private:
     WebView* m_webView;
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    OwnPtr<WebDesktopNotificationsDelegate> m_notificationsDelegate;
+    std::unique_ptr<WebDesktopNotificationsDelegate> m_notificationsDelegate;
 #endif
 };
index 15a0027..96af1b6 100644 (file)
@@ -29,7 +29,6 @@
 #include "WebKit.h"
 #include <WebCore/EditorClient.h>
 #include <WebCore/TextCheckerClient.h>
-#include <wtf/OwnPtr.h>
 
 class WebView;
 class WebNotification;
index 9eadb54..0cbd193 100644 (file)
@@ -107,7 +107,7 @@ public:
 WebFrameLoaderClient::WebFrameLoaderClient(WebFrame* webFrame)
     : m_webFrame(webFrame)
     , m_manualLoader(0)
-    , m_policyListenerPrivate(adoptPtr(new WebFramePolicyListenerPrivate))
+    , m_policyListenerPrivate(std::make_unique<WebFramePolicyListenerPrivate>())
     , m_hasSentResponseToPlugin(false) 
 {
 }
index 7636204..ddc700d 100644 (file)
@@ -199,7 +199,7 @@ public:
 
 protected:
     class WebFramePolicyListenerPrivate;
-    OwnPtr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;
+    std::unique_ptr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;
 
 private:
     PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);
index 68eb1ec..45d4ab0 100644 (file)
@@ -34,7 +34,6 @@
 #include "WebMutableURLRequest.h"
 #include "WebNodeHighlight.h"
 #include "WebView.h"
-
 #include <WebCore/BString.h>
 #include <WebCore/Element.h>
 #include <WebCore/FloatRect.h>
@@ -44,7 +43,6 @@
 #include <WebCore/Page.h>
 #include <WebCore/RenderObject.h>
 #include <WebCore/WindowMessageBroadcaster.h>
-
 #include <inspector/InspectorAgentBase.h>
 #include <wchar.h>
 #include <wtf/RetainPtr.h>
@@ -189,7 +187,7 @@ void WebInspectorClient::highlight()
     bool creatingHighlight = !m_highlight;
 
     if (creatingHighlight)
-        m_highlight = adoptPtr(new WebNodeHighlight(m_inspectedWebView));
+        m_highlight = std::make_unique<WebNodeHighlight>(m_inspectedWebView);
 
     if (m_highlight->isShowing())
         m_highlight->update();
index 47fbea0..09e878f 100644 (file)
@@ -37,7 +37,6 @@
 #include <windows.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
@@ -89,7 +88,7 @@ private:
     HWND m_inspectedWebViewHandle;
     HWND m_frontendHandle;
 
-    OwnPtr<WebNodeHighlight> m_highlight;
+    std::unique_ptr<WebNodeHighlight> m_highlight;
 };
 
 class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal, WebCore::WindowMessageListener {
index 98fa6ef..52b0d01 100644 (file)
@@ -43,7 +43,7 @@ using namespace WebCore;
 
 // WebElementPropertyBag -----------------------------------------------
 WebElementPropertyBag::WebElementPropertyBag(const HitTestResult& result)
-    : m_result(adoptPtr(new HitTestResult(result)))
+    : m_result(std::make_unique<HitTestResult>(result))
     , m_refCount(0)
 {
     gClassCount++;
index d6520e4..1fda14e 100644 (file)
@@ -27,7 +27,6 @@
 #define WebElementPropertyBag_H
 
 #include <ocidl.h>
-#include <wtf/OwnPtr.h>
 
 namespace WebCore {
     class HitTestResult;
@@ -59,7 +58,7 @@ public:
         /* [in] */ VARIANT *pVar);
 
 private:
-    OwnPtr<WebCore::HitTestResult> m_result;
+    std::unique_ptr<WebCore::HitTestResult> m_result;
     ULONG m_refCount;
 };
 
index 4f9ca9e..7c4c00e 100644 (file)
 #include "WebDataSource.h"
 
 #include "AccessibleDocument.h"
-
 #include <WebCore/AdjustViewSizeOrNot.h>
 #include <WebCore/FrameWin.h>
 #include <WebCore/GraphicsContext.h>
-#include <WebCore/URL.h>
 #include <WebCore/ResourceHandleClient.h>
-
-#include <WTF/RefPtr.h>
-#include <WTF/HashMap.h>
-#include <WTF/OwnPtr.h>
+#include <WebCore/URL.h>
+#include <wtf/HashMap.h>
+#include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index e247784..fc988b8 100644 (file)
@@ -33,7 +33,6 @@
 #include <WebCore/COMPtr.h>
 #include <WebCore/HistoryItem.h>
 #include <WebCore/URL.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/CString.h>
 
index 3bac2a9..5a6036e 100644 (file)
@@ -37,7 +37,6 @@
 #include <WebCore/Page.h>
 #include <WebCore/WindowMessageBroadcaster.h>
 #include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/win/GDIObject.h>
 
 using namespace WebCore;
index c656a0b..7bca03a 100644 (file)
@@ -33,7 +33,6 @@
 #include <wchar.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
@@ -55,7 +54,7 @@ IWebNotificationCenter* WebNotificationCenter::m_defaultCenter = 0;
 
 WebNotificationCenter::WebNotificationCenter()
     : m_refCount(0)
-    , d(adoptPtr(new WebNotificationCenterPrivate))
+    , d(std::make_unique<WebNotificationCenterPrivate>())
 {
     gClassCount++;
     gClassNameCount().add("WebNotificationCenter");
index 11533a1..8da8054 100644 (file)
@@ -27,7 +27,6 @@
 #define WebNotificationCenter_H
 
 #include "WebKit.h"
-#include <wtf/OwnPtr.h>
 
 struct WebNotificationCenterPrivate;
 
@@ -73,7 +72,7 @@ public:
 
 protected:
     ULONG m_refCount;
-    OwnPtr<WebNotificationCenterPrivate> d;
+    std::unique_ptr<WebNotificationCenterPrivate> d;
     static IWebNotificationCenter* m_defaultCenter;
 };
 
index ac2ba36..55955f8 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-23  Darin Adler  <darin@apple.com>
+
+        Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
+        https://bugs.webkit.org/show_bug.cgi?id=144090
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm: Removed unneeded include.
+
 2015-04-23  Michael Saboff  <msaboff@apple.com>
 
         lldb macro btjs sometimes can't get a frame description
index 13eee56..6c6d78b 100644 (file)
@@ -87,7 +87,6 @@
 #import <wtf/Assertions.h>
 #import <wtf/FastMalloc.h>
 #import <wtf/ObjcRuntimeExtras.h>
-#import <wtf/OwnPtr.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/Threading.h>
 #import <wtf/text/WTFString.h>