<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183234] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183234">183234</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 19:13:39 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayerh">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsh">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelClienth">trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorepagemake_settingspl">trunk/Source/WebCore/page/make_settings.pl</a></li>
<li><a href="#trunkSourceWebCoreplatformColorChooserClienth">trunk/Source/WebCore/platform/ColorChooserClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemh">trunk/Source/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNoneh">trunk/Source/WebCore/platform/ScrollAnimatorNone.h</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph">trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplh">trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcAudioTrackPrivateAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseglGLContextEGLcpp">trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsharfbuzzHarfBuzzShaperh">trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFullScreenControllercpp">trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDeviceMotionClientIOSh">trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDeviceOrientationClientIOSh">trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCacheh">trunk/Source/WebCore/platform/ios/LegacyTileCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridh">trunk/Source/WebCore/platform/ios/LegacyTileGrid.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridmm">trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridTilemm">trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileLayermm">trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileLayerPoolh">trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollAnimatorIOSmm">trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenControllerh">trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatacpp">trunk/Source/WebCore/platform/network/BlobData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandlecpp">trunk/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSynchronousLoaderClienth">trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp">trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp">trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextCodech">trunk/Source/WebCore/platform/text/TextCodec.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinCursorWincpp">trunk/Source/WebCore/platform/win/CursorWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfoh">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfoh">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllercpp">trunk/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllerh">trunk/Source/WebKit/win/FullscreenVideoController.h</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewh">trunk/Source/WebKit/win/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewWincpp">trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebElementPropertyBagcpp">trunk/Source/WebKit/win/WebElementPropertyBag.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebElementPropertyBagh">trunk/Source/WebKit/win/WebElementPropertyBag.h</a></li>
<li><a href="#trunkSourceWebKitwinWebFrameh">trunk/Source/WebKit/win/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKitwinWebHistoryItemcpp">trunk/Source/WebKit/win/WebHistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebNodeHighlightcpp">trunk/Source/WebKit/win/WebNodeHighlight.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebNotificationCentercpp">trunk/Source/WebKit/win/WebNotificationCenter.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebNotificationCenterh">trunk/Source/WebKit/win/WebNotificationCenter.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformRefCountedSupplementh">trunk/Source/WebCore/platform/RefCountedSupplement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -1,3 +1,186 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-04-23 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add a wrapper around the hosted AVPlayerLayer to intercept -setBounds:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define CDMPrivateMediaPlayer_h
</span><span class="cx">
</span><span class="cx"> #include "CDMPrivate.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,8 +30,7 @@
</span><span class="cx"> #if ENABLE(NAVIGATOR_CONTENT_UTILS)
</span><span class="cx">
</span><span class="cx"> #include "NavigatorContentUtilsClient.h"
</span><del>-#include "RefCountedSupplement.h"
-#include <wtf/PassRefPtr.h>
</del><ins>+#include "Supplementable.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -180,12 +180,14 @@
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(Vector<char>&& binaryData)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, binaryData] (ScriptExecutionContext&) {
</del><ins>+ Vector<char>* capturedData = new Vector<char>(WTF::move(binaryData));
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, capturedData] (ScriptExecutionContext&) {
</ins><span class="cx"> if (m_client)
</span><del>- m_client->didReceiveBinaryData(binaryData);
</del><ins>+ m_client->didReceiveBinaryData(WTF::move(*capturedData));
+ delete capturedData;
</ins><span class="cx"> deref();
</span><span class="cx"> }));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> void didConnect();
</span><span class="cx"> void didReceiveMessage(const String& message);
</span><del>- void didReceiveBinaryData(PassOwnPtr<Vector<char>>);
</del><ins>+ void didReceiveBinaryData(Vector<char>&&);
</ins><span class="cx"> void didUpdateBufferedAmount(unsigned long bufferedAmount);
</span><span class="cx"> void didStartClosingHandshake();
</span><span class="cx"> void didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -547,19 +547,19 @@
</span><span class="cx"> dispatchEvent(MessageEvent::create(msg, SecurityOrigin::create(m_url)->toString()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</del><ins>+void WebSocket::didReceiveBinaryData(Vector<char>&& binaryData)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocket %p didReceiveBinaryData() %lu byte binary message", this, static_cast<unsigned long>(binaryData->size()));
</del><ins>+ LOG(Network, "WebSocket %p didReceiveBinaryData() %lu byte binary message", this, static_cast<unsigned long>(binaryData.size()));
</ins><span class="cx"> switch (m_binaryType) {
</span><span class="cx"> case BinaryTypeBlob: {
</span><span class="cx"> // FIXME: We just received the data from NetworkProcess, and are sending it back. This is inefficient.
</span><del>- RefPtr<Blob> blob = Blob::create(WTF::move(*binaryData), emptyString());
</del><ins>+ RefPtr<Blob> blob = Blob::create(WTF::move(binaryData), emptyString());
</ins><span class="cx"> dispatchEvent(MessageEvent::create(blob.release(), SecurityOrigin::create(m_url)->toString()));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case BinaryTypeArrayBuffer:
</span><del>- dispatchEvent(MessageEvent::create(ArrayBuffer::create(binaryData->data(), binaryData->size()), SecurityOrigin::create(m_url)->toString()));
</del><ins>+ dispatchEvent(MessageEvent::create(ArrayBuffer::create(binaryData.data(), binaryData.size()), SecurityOrigin::create(m_url)->toString()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> // WebSocketChannelClient functions.
</span><span class="cx"> virtual void didConnect() override;
</span><span class="cx"> virtual void didReceiveMessage(const String& message) override;
</span><del>- virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) override;
</del><ins>+ virtual void didReceiveBinaryData(Vector<char>&&) override;
</ins><span class="cx"> virtual void didReceiveMessageError() override;
</span><span class="cx"> virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
</span><span class="cx"> virtual void didStartClosingHandshake() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -571,22 +571,20 @@
</span><span class="cx"> // so we should pretend that we have finished to read this frame and
</span><span class="cx"> // make sure that the member variables are in a consistent state before
</span><span class="cx"> // the handler is invoked.
</span><del>- // Vector<char>::swap() is used here to clear m_continuousFrameData.
- OwnPtr<Vector<char>> continuousFrameData = adoptPtr(new Vector<char>);
- m_continuousFrameData.swap(*continuousFrameData);
</del><ins>+ Vector<char> continuousFrameData = WTF::move(m_continuousFrameData);
</ins><span class="cx"> m_hasContinuousFrame = false;
</span><span class="cx"> if (m_continuousFrameOpCode == WebSocketFrame::OpCodeText) {
</span><span class="cx"> String message;
</span><del>- if (continuousFrameData->size())
- message = String::fromUTF8(continuousFrameData->data(), continuousFrameData->size());
</del><ins>+ if (continuousFrameData.size())
+ message = String::fromUTF8(continuousFrameData.data(), continuousFrameData.size());
</ins><span class="cx"> else
</span><del>- message = "";
</del><ins>+ message = emptyString();
</ins><span class="cx"> if (message.isNull())
</span><span class="cx"> fail("Could not decode a text frame as UTF-8.");
</span><span class="cx"> else
</span><span class="cx"> m_client->didReceiveMessage(message);
</span><span class="cx"> } else if (m_continuousFrameOpCode == WebSocketFrame::OpCodeBinary)
</span><del>- m_client->didReceiveBinaryData(continuousFrameData.release());
</del><ins>+ m_client->didReceiveBinaryData(WTF::move(continuousFrameData));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -596,7 +594,7 @@
</span><span class="cx"> if (frame.payloadLength)
</span><span class="cx"> message = String::fromUTF8(frame.payload, frame.payloadLength);
</span><span class="cx"> else
</span><del>- message = "";
</del><ins>+ message = emptyString();
</ins><span class="cx"> skipBuffer(frameEnd - m_buffer.data());
</span><span class="cx"> if (message.isNull())
</span><span class="cx"> fail("Could not decode a text frame as UTF-8.");
</span><span class="lines">@@ -613,10 +611,10 @@
</span><span class="cx">
</span><span class="cx"> case WebSocketFrame::OpCodeBinary:
</span><span class="cx"> if (frame.final) {
</span><del>- OwnPtr<Vector<char>> binaryData = adoptPtr(new Vector<char>(frame.payloadLength));
- memcpy(binaryData->data(), frame.payload, frame.payloadLength);
</del><ins>+ Vector<char> binaryData(frame.payloadLength);
+ memcpy(binaryData.data(), frame.payload, frame.payloadLength);
</ins><span class="cx"> skipBuffer(frameEnd - m_buffer.data());
</span><del>- m_client->didReceiveBinaryData(binaryData.release());
</del><ins>+ m_client->didReceiveBinaryData(WTF::move(binaryData));
</ins><span class="cx"> } else {
</span><span class="cx"> m_hasContinuousFrame = true;
</span><span class="cx"> m_continuousFrameOpCode = WebSocketFrame::OpCodeBinary;
</span><span class="lines">@@ -646,7 +644,7 @@
</span><span class="cx"> if (frame.payloadLength >= 3)
</span><span class="cx"> m_closeEventReason = String::fromUTF8(&frame.payload[2], frame.payloadLength - 2);
</span><span class="cx"> else
</span><del>- m_closeEventReason = "";
</del><ins>+ m_closeEventReason = emptyString();
</ins><span class="cx"> skipBuffer(frameEnd - m_buffer.data());
</span><span class="cx"> m_receivedClosingHandshake = true;
</span><span class="cx"> startClosingHandshake(m_closeEventCode, m_closeEventReason);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx">
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,7 +43,7 @@
</span><span class="cx"> virtual ~WebSocketChannelClient() { }
</span><span class="cx"> virtual void didConnect() { }
</span><span class="cx"> virtual void didReceiveMessage(const String&) { }
</span><del>- virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) { }
</del><ins>+ virtual void didReceiveBinaryData(Vector<char>&&) { }
</ins><span class="cx"> virtual void didReceiveMessageError() { }
</span><span class="cx"> virtual void didUpdateBufferedAmount(unsigned long /* bufferedAmount */) { }
</span><span class="cx"> virtual void didStartClosingHandshake() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -288,14 +288,16 @@
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</del><ins>+void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(Vector<char>&& binaryData)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, binaryData] (ScriptExecutionContext& context) {
</del><ins>+ Vector<char>* capturedData = new Vector<char>(WTF::move(binaryData));
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedData] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didReceiveBinaryData(binaryData);
</del><ins>+ workerClientWrapper->didReceiveBinaryData(WTF::move(*capturedData));
+ delete capturedData;
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> // WebSocketChannelClient functions.
</span><span class="cx"> virtual void didConnect() override;
</span><span class="cx"> virtual void didReceiveMessage(const String& message) override;
</span><del>- virtual void didReceiveBinaryData(PassOwnPtr<Vector<char>>) override;
</del><ins>+ virtual void didReceiveBinaryData(Vector<char>&&) override;
</ins><span class="cx"> virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
</span><span class="cx"> virtual void didStartClosingHandshake() override;
</span><span class="cx"> virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -3963,7 +3963,6 @@
</span><span class="cx"> A7197F2617568AE5007B9442 /* PageThrottler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7197F2517568AE5007B9442 /* PageThrottler.cpp */; };
</span><span class="cx"> A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A72763BF16689BFB002FCACB /* UserActionElementSet.h in Headers */ = {isa = PBXBuildFile; fileRef = A72763BE16689BFB002FCACB /* UserActionElementSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A72EA3BB1585CF55004FAA26 /* RefCountedSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
</span><span class="cx"> A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */; };
</span><span class="lines">@@ -11264,7 +11263,6 @@
</span><span class="cx"> A7211F241678A54200957444 /* NodeRenderingTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderingTraversal.h; sourceTree = "<group>"; };
</span><span class="cx"> A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformExportMacros.h; sourceTree = "<group>"; };
</span><span class="cx"> A72763BE16689BFB002FCACB /* UserActionElementSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserActionElementSet.h; sourceTree = "<group>"; };
</span><del>- A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCountedSupplement.h; sourceTree = "<group>"; };
</del><span class="cx"> A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
</span><span class="cx"> A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCodePlaceholder.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -21780,7 +21778,6 @@
</span><span class="cx"> ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */,
</span><span class="cx"> BC3BE12A0E98092F00835588 /* PopupMenuStyle.h */,
</span><span class="cx"> 0081FEFD16B0A244008AAA7A /* PublicSuffix.h */,
</span><del>- A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */,
</del><span class="cx"> 9831AE49154225A200FE2644 /* ReferrerPolicy.h */,
</span><span class="cx"> CDFC360318CA61C20026E56F /* RemoteCommandListener.cpp */,
</span><span class="cx"> CDFC360418CA61C20026E56F /* RemoteCommandListener.h */,
</span><span class="lines">@@ -26075,7 +26072,6 @@
</span><span class="cx"> FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
</span><span class="cx"> BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
</span><span class="cx"> FD45A958175D414C00C21EC8 /* RectangleShape.h in Headers */,
</span><del>- A72EA3BB1585CF55004FAA26 /* RefCountedSupplement.h in Headers */,
</del><span class="cx"> 9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */,
</span><span class="cx"> BCAB418213E356E800D8AAF3 /* Region.h in Headers */,
</span><span class="cx"> 6CDDE8D01770BB220016E072 /* RegionOversetState.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: It's not good to have the new here, but the delete inside the constructor. Reconsider this design.
</span><del>- new DiskCacheMonitor(request, sessionID, cachedResponse); // Balanced by adoptPtr in the blocks setup in the constructor, one of which is guaranteed to run.
</del><ins>+ 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.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DiskCacheMonitor::DiskCacheMonitor(const ResourceRequest& request, SessionID sessionID, CFCachedURLResponseRef cachedResponse)
</span></span></pre></div>
<a id="trunkSourceWebCorepagemake_settingspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/make_settings.pl (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/make_settings.pl 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/page/make_settings.pl 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -389,8 +389,7 @@
</span><span class="cx"> #ifndef InternalSettingsGenerated_h
</span><span class="cx"> #define InternalSettingsGenerated_h
</span><span class="cx">
</span><del>-#include "RefCountedSupplement.h"
-#include <wtf/PassRefPtr.h>
</del><ins>+#include "Supplementable.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformColorChooserClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ColorChooserClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ColorChooserClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ColorChooserClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ColorChooser.h"
</span><span class="cx"> #include "IntRect.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "PlatformMenuDescription.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRefCountedSupplementh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/RefCountedSupplement.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RefCountedSupplement.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/RefCountedSupplement.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include <algorithm>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "ScrollAnimator.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> class ScrollAnimatorNoneTest;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "TextCodecICU.h"
</span><span class="cx"> #include "ThreadTimers.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx"> #include <wtf/ThreadSpecific.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/WTFThreadData.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "Glyph.h"
</span><span class="cx"> #include <array>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioTrackPrivate.h"
</span><span class="cx"> #include "VideoTrackPrivate.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "InbandTextTrackPrivateClient.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <CoreMedia/CoreMedia.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include <runtime/Int8Array.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/IteratorRange.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcAudioTrackPrivateAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> #include "AudioTrackPrivateAVF.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> OBJC_CLASS AVAssetTrack;
</span><span class="cx"> OBJC_CLASS AVPlayerItem;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define CDMSessionAVFoundationObjC_h
</span><span class="cx">
</span><span class="cx"> #include "CDMSession.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CDMSession.h"
</span><span class="cx"> #include "SourceBufferPrivateAVFObjC.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> if (!cgContext)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_data.context = adoptPtr(new GraphicsContext(cgContext.get()));
</del><ins>+ m_data.context = std::make_unique<GraphicsContext>(cgContext.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> context()->scale(FloatSize(1, -1));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -109,13 +109,13 @@
</span><span class="cx"> #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> #endif // USE(ACCELERATE)
</span><span class="cx">
</span><del>-PassRefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale) const
</del><ins>+RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale) const
</ins><span class="cx"> {
</span><span class="cx"> Checked<unsigned, RecordOverflow> area = 4;
</span><span class="cx"> area *= rect.width();
</span><span class="cx"> area *= rect.height();
</span><span class="cx"> if (area.hasOverflowed())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Uint8ClampedArray> result = Uint8ClampedArray::createUninitialized(area.unsafeGet());
</span><span class="cx"> unsigned char* resultData = result->data();
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> vImageUnpremultiplyData_RGBA8888(&src, &dst, kvImageNoFlags);
</span><span class="cx"> #endif
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> if (resolutionScale != 1) {
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> CGContextSetBlendMode(destinationContext.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextDrawImage(destinationContext.get(), CGRectMake(0, 0, width.unsafeGet() / resolutionScale, height.unsafeGet() / resolutionScale), sourceImage.get()); // FIXME: Add subpixel translation.
</span><span class="cx"> if (!unmultiplied)
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx">
</span><span class="cx"> srcRows = destRows;
</span><span class="cx"> srcBytesPerRow = destBytesPerRow;
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBufferData::putData(Uint8ClampedArray*& source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,13 +30,10 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA) && USE(CA)
-#if !PLATFORM(IOS_SIMULATOR)
</del><ins>+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
</ins><span class="cx"> #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
</span><del>-#endif // !PLATFORM(IOS_SIMULATOR)
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>-typedef struct __IOSurface *IOSurfaceRef;
</del><span class="cx"> typedef struct CGColorSpace *CGColorSpaceRef;
</span><span class="cx"> typedef struct CGDataProvider *CGDataProviderRef;
</span><span class="cx"> typedef uint32_t CGBitmapInfo;
</span><span class="lines">@@ -44,7 +41,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class IOSurface;
</span><del>-class IntSize;
</del><span class="cx">
</span><span class="cx"> struct ImageBufferData {
</span><span class="cx"> ~ImageBufferData();
</span><span class="lines">@@ -53,18 +49,18 @@
</span><span class="cx"> Checked<unsigned, RecordOverflow> bytesPerRow;
</span><span class="cx"> CGColorSpaceRef colorSpace;
</span><span class="cx">
</span><del>- // Only for Software ImageBuffers.
</del><ins>+ // Only for software ImageBuffers.
</ins><span class="cx"> void* data { nullptr };
</span><span class="cx"> RetainPtr<CGDataProviderRef> dataProvider;
</span><span class="cx"> CGBitmapInfo bitmapInfo;
</span><del>- OwnPtr<GraphicsContext> context;
</del><ins>+ std::unique_ptr<GraphicsContext> context;
</ins><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>- // Only for Accelerated ImageBuffers.
</del><ins>+ // Only for accelerated ImageBuffers.
</ins><span class="cx"> std::unique_ptr<IOSurface> surface;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PassRefPtr<Uint8ClampedArray> getData(const IntRect&, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale) const;
</del><ins>+ RefPtr<Uint8ClampedArray> getData(const IntRect&, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale) const;
</ins><span class="cx"> void putData(Uint8ClampedArray*& source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, const IntSize&, bool accelerateRendering, bool unmultiplied, float resolutionScale);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> IntSize m_contextSize;
</span><span class="cx"> size_t m_totalBytes;
</span><span class="cx">
</span><del>- OwnPtr<GraphicsContext> m_graphicsContext;
</del><ins>+ std::unique_ptr<GraphicsContext> m_graphicsContext;
</ins><span class="cx"> RetainPtr<CGContextRef> m_cgContext;
</span><span class="cx">
</span><span class="cx"> RetainPtr<IOSurfaceRef> m_surface;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> if (m_graphicsContext)
</span><span class="cx"> return *m_graphicsContext;
</span><span class="cx">
</span><del>- m_graphicsContext = adoptPtr(new GraphicsContext(ensurePlatformContext()));
</del><ins>+ m_graphicsContext = std::make_unique<GraphicsContext>(ensurePlatformContext());
</ins><span class="cx"> m_graphicsContext->setIsAcceleratedContext(true);
</span><span class="cx">
</span><span class="cx"> return *m_graphicsContext;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseglGLContextEGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> #if USE(EGL)
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> #include <cairo.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include "FilterEffect.h"
</span><span class="cx"> #include "LayoutSize.h"
</span><span class="cx"> #include "Length.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/TypeCasts.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsharfbuzzHarfBuzzShaperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx"> #include "hb.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFullScreenControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "MediaPlayerPrivateFullscreenWindow.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "WebCoreInstanceHandle.h"
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDeviceMotionClientIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "DeviceMotionClient.h"
</span><span class="cx"> #include "DeviceMotionController.h"
</span><span class="cx"> #include "DeviceMotionData.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDeviceOrientationClientIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "DeviceOrientationClient.h"
</span><span class="cx"> #include "DeviceOrientationController.h"
</span><span class="cx"> #include "DeviceOrientationData.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -197,8 +195,8 @@
</span><span class="cx"> bool m_isSpeculativeTileCreationEnabled;
</span><span class="cx">
</span><span class="cx"> bool m_didCallWillStartScrollingOrZooming;
</span><del>- OwnPtr<LegacyTileGrid> m_zoomedOutTileGrid;
- OwnPtr<LegacyTileGrid> m_zoomedInTileGrid;
</del><ins>+ std::unique_ptr<LegacyTileGrid> m_zoomedOutTileGrid;
+ std::unique_ptr<LegacyTileGrid> m_zoomedInTileGrid;
</ins><span class="cx">
</span><span class="cx"> Timer m_tileCreationTimer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -82,15 +82,13 @@
</span><span class="cx"> , m_acceleratedDrawingEnabled(false)
</span><span class="cx"> , m_isSpeculativeTileCreationEnabled(true)
</span><span class="cx"> , m_didCallWillStartScrollingOrZooming(false)
</span><del>- , m_zoomedOutTileGrid(PassOwnPtr<LegacyTileGrid>())
- , m_zoomedInTileGrid(PassOwnPtr<LegacyTileGrid>())
</del><ins>+ , m_zoomedOutTileGrid(std::make_unique<LegacyTileGrid>(*this, m_tileSize))
</ins><span class="cx"> , m_tileCreationTimer(*this, &LegacyTileCache::tileCreationTimerFired)
</span><span class="cx"> , m_currentScale(1.f)
</span><span class="cx"> , m_pendingScale(0)
</span><span class="cx"> , m_pendingZoomedOutScale(0)
</span><span class="cx"> , m_tileControllerShouldUseLowScaleTiles(false)
</span><span class="cx"> {
</span><del>- m_zoomedOutTileGrid = LegacyTileGrid::create(this, m_tileSize);
</del><span class="cx"> [hostLayer() insertSublayer:m_zoomedOutTileGrid->tileHostLayer() atIndex:0];
</span><span class="cx"> hostLayerSizeChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -133,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> LegacyTileGrid* LegacyTileCache::inactiveTileGrid() const
</span><span class="cx"> {
</span><del>- return activeTileGrid() == m_zoomedOutTileGrid ? m_zoomedInTileGrid.get() : m_zoomedOutTileGrid.get();
</del><ins>+ return activeTileGrid() == m_zoomedOutTileGrid.get() ? m_zoomedInTileGrid.get() : m_zoomedOutTileGrid.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LegacyTileCache::setTilesOpaque(bool opaque)
</span><span class="lines">@@ -243,7 +241,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_currentScale != m_zoomedOutTileGrid->scale()) {
</span><span class="cx"> if (!m_zoomedInTileGrid) {
</span><del>- m_zoomedInTileGrid = LegacyTileGrid::create(this, m_tileSize);
</del><ins>+ m_zoomedInTileGrid = std::make_unique<LegacyTileGrid>(*this, m_tileSize);
</ins><span class="cx"> [hostLayer() addSublayer:m_zoomedInTileGrid->tileHostLayer()];
</span><span class="cx"> hostLayerSizeChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -335,7 +333,7 @@
</span><span class="cx"> void LegacyTileCache::removeAllNonVisibleTilesInternal()
</span><span class="cx"> {
</span><span class="cx"> LegacyTileGrid* activeGrid = activeTileGrid();
</span><del>- if (keepsZoomedOutTiles() && activeGrid == m_zoomedInTileGrid && activeGrid->hasTiles())
</del><ins>+ if (keepsZoomedOutTiles() && activeGrid == m_zoomedInTileGrid.get() && activeGrid->hasTiles())
</ins><span class="cx"> m_zoomedOutTileGrid->dropAllTiles();
</span><span class="cx">
</span><span class="cx"> IntRect activeTileBounds = activeGrid->bounds();
</span><span class="lines">@@ -401,11 +399,11 @@
</span><span class="cx"> flushSavedDisplayRects();
</span><span class="cx">
</span><span class="cx"> if (keepsZoomedOutTiles()) {
</span><del>- if (m_zoomedInTileGrid && activeTileGrid() == m_zoomedOutTileGrid && m_tilingMode != Zooming && m_zoomedInTileGrid->hasTiles()) {
</del><ins>+ if (m_zoomedInTileGrid && activeTileGrid() == m_zoomedOutTileGrid.get() && m_tilingMode != Zooming && m_zoomedInTileGrid->hasTiles()) {
</ins><span class="cx"> // This CA transaction will cover the screen with top level tiles.
</span><span class="cx"> // We can remove zoomed-in tiles without flashing.
</span><span class="cx"> m_zoomedInTileGrid->dropAllTiles();
</span><del>- } else if (activeTileGrid() == m_zoomedInTileGrid) {
</del><ins>+ } else if (activeTileGrid() == m_zoomedInTileGrid.get()) {
</ins><span class="cx"> // Pass the minimum possible distance to consider all tiles, even visible ones.
</span><span class="cx"> m_zoomedOutTileGrid->dropDistantTiles(0, std::numeric_limits<double>::min());
</span><span class="cx"> }
</span><span class="lines">@@ -458,8 +456,8 @@
</span><span class="cx"> else
</span><span class="cx"> gridCapacity = capacity;
</span><span class="cx">
</span><del>- if (keepsZoomedOutTiles() && grid == m_zoomedOutTileGrid) {
- if (activeTileGrid() == m_zoomedOutTileGrid)
</del><ins>+ if (keepsZoomedOutTiles() && grid == m_zoomedOutTileGrid.get()) {
+ if (activeTileGrid() == m_zoomedOutTileGrid.get())
</ins><span class="cx"> return gridCapacity;
</span><span class="cx"> return gridCapacity / 4;
</span><span class="cx"> }
</span><span class="lines">@@ -468,7 +466,7 @@
</span><span class="cx">
</span><span class="cx"> Color LegacyTileCache::colorForGridTileBorder(LegacyTileGrid* grid) const
</span><span class="cx"> {
</span><del>- if (grid == m_zoomedOutTileGrid)
</del><ins>+ if (grid == m_zoomedOutTileGrid.get())
</ins><span class="cx"> return Color(.3f, .0f, 0.4f, 0.5f);
</span><span class="cx">
</span><span class="cx"> return Color(.0f, .0f, 0.4f, 0.5f);
</span><span class="lines">@@ -635,7 +633,7 @@
</span><span class="cx"> FloatRect scaledRect = dirtyRect;
</span><span class="cx"> scaledRect.scale(zoomedOutScale() / currentScale());
</span><span class="cx"> IntRect zoomedOutDirtyRect = enclosingIntRect(scaledRect);
</span><del>- if (activeGrid == m_zoomedOutTileGrid) {
</del><ins>+ if (activeGrid == m_zoomedOutTileGrid.get()) {
</ins><span class="cx"> bool dummy;
</span><span class="cx"> IntRect coverRect = m_zoomedOutTileGrid->calculateCoverRect(m_zoomedOutTileGrid->visibleRect(), dummy);
</span><span class="cx"> // Instead of repainting a tile outside the cover rect, just remove it.
</span><span class="lines">@@ -805,13 +803,13 @@
</span><span class="cx"> {
</span><span class="cx"> NSLog(@"=================");
</span><span class="cx"> NSLog(@"ZOOMED OUT");
</span><del>- if (m_zoomedOutTileGrid == activeTileGrid())
</del><ins>+ if (m_zoomedOutTileGrid.get() == activeTileGrid())
</ins><span class="cx"> NSLog(@"<ACTIVE>");
</span><span class="cx"> m_zoomedOutTileGrid->dumpTiles();
</span><span class="cx"> NSLog(@"=================");
</span><span class="cx"> if (m_zoomedInTileGrid) {
</span><span class="cx"> NSLog(@"ZOOMED IN");
</span><del>- if (m_zoomedInTileGrid == activeTileGrid())
</del><ins>+ if (m_zoomedInTileGrid.get() == activeTileGrid())
</ins><span class="cx"> NSLog(@"<ACTIVE>");
</span><span class="cx"> m_zoomedInTileGrid->dumpTiles();
</span><span class="cx"> NSLog(@"=================");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGrid.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGrid.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGrid.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,9 +34,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "LegacyTileCache.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -49,15 +46,13 @@
</span><span class="cx"> class LegacyTileGridTile;
</span><span class="cx">
</span><span class="cx"> class LegacyTileGrid {
</span><del>- WTF_MAKE_NONCOPYABLE(LegacyTileGrid);
</del><span class="cx"> public:
</span><span class="cx"> typedef IntPoint TileIndex;
</span><span class="cx">
</span><del>- static PassOwnPtr<LegacyTileGrid> create(LegacyTileCache* cache, const IntSize& tileSize) { return adoptPtr(new LegacyTileGrid(cache, tileSize)); }
-
</del><ins>+ LegacyTileGrid(LegacyTileCache&, const IntSize&);
</ins><span class="cx"> ~LegacyTileGrid();
</span><span class="cx">
</span><del>- LegacyTileCache* tileCache() const { return m_tileCache; }
</del><ins>+ LegacyTileCache& tileCache() const { return m_tileCache; }
</ins><span class="cx">
</span><span class="cx"> CALayer *tileHostLayer() const;
</span><span class="cx"> IntRect bounds() const;
</span><span class="lines">@@ -111,9 +106,7 @@
</span><span class="cx"> bool shouldUseMinimalTileCoverage() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LegacyTileGrid(LegacyTileCache*, const IntSize&);
-
- LegacyTileCache* m_tileCache;
</del><ins>+ LegacyTileCache& m_tileCache;
</ins><span class="cx"> RetainPtr<CALayer> m_tileHostLayer;
</span><span class="cx">
</span><span class="cx"> IntPoint m_origin;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-LegacyTileGrid::LegacyTileGrid(LegacyTileCache* tileCache, const IntSize& tileSize)
</del><ins>+LegacyTileGrid::LegacyTileGrid(LegacyTileCache& tileCache, const IntSize& tileSize)
</ins><span class="cx"> : m_tileCache(tileCache)
</span><span class="cx"> , m_tileHostLayer(adoptNS([[LegacyTileHostLayer alloc] initWithTileGrid:this]))
</span><span class="cx"> , m_tileSize(tileSize)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx">
</span><span class="cx"> IntRect LegacyTileGrid::visibleRect() const
</span><span class="cx"> {
</span><del>- IntRect visibleRect = enclosingIntRect(m_tileCache->visibleRectInLayer(m_tileHostLayer.get()));
</del><ins>+ IntRect visibleRect = enclosingIntRect(m_tileCache.visibleRectInLayer(m_tileHostLayer.get()));
</ins><span class="cx">
</span><span class="cx"> // When fast scrolling to the top, move the visible rect there immediately so we have tiles when the scrolling completes.
</span><del>- if (m_tileCache->tilingMode() == LegacyTileCache::ScrollToTop)
</del><ins>+ if (m_tileCache.tilingMode() == LegacyTileCache::ScrollToTop)
</ins><span class="cx"> visibleRect.setY(0);
</span><span class="cx">
</span><span class="cx"> return visibleRect;
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> unsigned LegacyTileGrid::tileByteSize() const
</span><span class="cx"> {
</span><span class="cx"> IntSize tilePixelSize = m_tileSize;
</span><del>- tilePixelSize.scale(m_tileCache->screenScale());
</del><ins>+ tilePixelSize.scale(m_tileCache.screenScale());
</ins><span class="cx"> return LegacyTileLayerPool::bytesBackingLayerWithPixelSize(tilePixelSize);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> unsigned bytesPerTile = tileByteSize();
</span><span class="cx"> unsigned bytesNeeded = tilesNeeded * bytesPerTile;
</span><span class="cx"> unsigned bytesUsed = tileCount() * bytesPerTile;
</span><del>- unsigned maximumBytes = m_tileCache->tileCapacityForGrid(this);
</del><ins>+ unsigned maximumBytes = m_tileCache.tileCapacityForGrid(this);
</ins><span class="cx">
</span><span class="cx"> int bytesToReclaim = int(bytesUsed) - (int(maximumBytes) - bytesNeeded);
</span><span class="cx"> if (bytesToReclaim <= 0)
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> {
</span><span class="cx"> TileMap::iterator end = m_tiles.end();
</span><span class="cx"> for (TileMap::iterator it = m_tiles.begin(); it != end; ++it)
</span><del>- [it->value->tileLayer() setOpaque:m_tileCache->tilesOpaque()];
</del><ins>+ [it->value->tileLayer() setOpaque:m_tileCache.tilesOpaque()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LegacyTileGrid::updateTileBorderVisibility()
</span><span class="cx"> {
</span><span class="cx"> TileMap::iterator end = m_tiles.end();
</span><span class="cx"> for (TileMap::iterator it = m_tiles.begin(); it != end; ++it)
</span><del>- it->value->showBorder(m_tileCache->tileBordersVisible());
</del><ins>+ it->value->showBorder(m_tileCache.tileBordersVisible());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned LegacyTileGrid::tileCount() const
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> void LegacyTileGrid::updateHostLayerSize()
</span><span class="cx"> {
</span><del>- CALayer* hostLayer = m_tileCache->hostLayer();
</del><ins>+ CALayer* hostLayer = m_tileCache.hostLayer();
</ins><span class="cx"> CGRect tileHostBounds = [hostLayer convertRect:[hostLayer bounds] toLayer:tileHostLayer()];
</span><span class="cx"> CGSize transformedSize;
</span><span class="cx"> transformedSize.width = CGRound(tileHostBounds.size.width);
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> // When using minimal coverage, drop speculative tiles instead of updating them.
</span><span class="cx"> if (!shouldUseMinimalTileCoverage())
</span><span class="cx"> return;
</span><del>- if (m_tileCache->tilingMode() != LegacyTileCache::Minimal && m_tileCache->tilingMode() != LegacyTileCache::Normal)
</del><ins>+ if (m_tileCache.tilingMode() != LegacyTileCache::Minimal && m_tileCache.tilingMode() != LegacyTileCache::Normal)
</ins><span class="cx"> return;
</span><span class="cx"> IntRect visibleRect = this->visibleRect();
</span><span class="cx"> unsigned count = invalidatedTiles.size();
</span><span class="lines">@@ -388,8 +388,8 @@
</span><span class="cx">
</span><span class="cx"> bool LegacyTileGrid::shouldUseMinimalTileCoverage() const
</span><span class="cx"> {
</span><del>- return m_tileCache->tilingMode() == LegacyTileCache::Minimal
- || !m_tileCache->isSpeculativeTileCreationEnabled()
</del><ins>+ return m_tileCache.tilingMode() == LegacyTileCache::Minimal
+ || !m_tileCache.isSpeculativeTileCreationEnabled()
</ins><span class="cx"> || MemoryPressureHandler::singleton().isUnderMemoryPressure();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> const double tilingBiasVeryLikely = 0.8;
</span><span class="cx"> const double tilingBiasLikely = 0.9;
</span><span class="cx">
</span><del>- switch (m_tileCache->tilingDirection()) {
</del><ins>+ switch (m_tileCache.tilingDirection()) {
</ins><span class="cx"> case LegacyTileCache::TilingDirectionUp:
</span><span class="cx"> verticalBias = tilingBiasVeryLikely;
</span><span class="cx"> upwardBias = tilingBiasLikely;
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx">
</span><span class="cx"> bool didCreateTiles = !!tilesToCreateCount;
</span><span class="cx"> bool createMoreTiles = pendingTileCount > tilesToCreateCount;
</span><del>- m_tileCache->finishedCreatingTiles(didCreateTiles, createMoreTiles);
</del><ins>+ m_tileCache.finishedCreatingTiles(didCreateTiles, createMoreTiles);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LegacyTileGrid::dumpTiles()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridTilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!tileRect.isEmpty());
</span><span class="cx"> IntSize pixelSize(m_rect.size());
</span><del>- const CGFloat screenScale = m_tileGrid->tileCache()->screenScale();
</del><ins>+ const CGFloat screenScale = m_tileGrid->tileCache().screenScale();
</ins><span class="cx"> pixelSize.scale(screenScale);
</span><span class="cx"> m_tileLayer = LegacyTileLayerPool::sharedPool()->takeLayerWithSize(pixelSize);
</span><span class="cx"> if (!m_tileLayer) {
</span><span class="lines">@@ -61,18 +61,18 @@
</span><span class="cx"> }
</span><span class="cx"> LegacyTileLayer* layer = m_tileLayer.get();
</span><span class="cx"> [layer setTileGrid:tileGrid];
</span><del>- [layer setOpaque:m_tileGrid->tileCache()->tilesOpaque()];
</del><ins>+ [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
</ins><span class="cx"> [layer setEdgeAntialiasingMask:0];
</span><span class="cx"> [layer setNeedsLayoutOnGeometryChange:NO];
</span><span class="cx"> [layer setContentsScale:screenScale];
</span><del>- [layer setAcceleratesDrawing:m_tileGrid->tileCache()->acceleratedDrawingEnabled()];
</del><ins>+ [layer setAcceleratesDrawing:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
</ins><span class="cx">
</span><span class="cx"> // Host layer may have other sublayers. Keep the tile layers at the beginning of the array
</span><span class="cx"> // so they are painted behind everything else.
</span><span class="cx"> [tileGrid->tileHostLayer() insertSublayer:layer atIndex:tileGrid->tileCount()];
</span><span class="cx"> [layer setFrame:m_rect];
</span><span class="cx"> invalidateRect(m_rect);
</span><del>- showBorder(m_tileGrid->tileCache()->tileBordersVisible());
</del><ins>+ showBorder(m_tileGrid->tileCache().tileBordersVisible());
</ins><span class="cx">
</span><span class="cx"> #if LOG_TILING
</span><span class="cx"> ++totalTileCount;
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> dirtyRect.move(IntPoint() - m_rect.location());
</span><span class="cx"> [tileLayer() setNeedsDisplayInRect:dirtyRect];
</span><span class="cx">
</span><del>- if (m_tileGrid->tileCache()->tilePaintCountersVisible())
</del><ins>+ if (m_tileGrid->tileCache().tilePaintCountersVisible())
</ins><span class="cx"> [tileLayer() setNeedsDisplayInRect:CGRectMake(0, 0, 46, 25)];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> LegacyTileLayer* layer = m_tileLayer.get();
</span><span class="cx"> if (flag) {
</span><del>- [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache()->colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)];
</del><ins>+ [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache().colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)];
</ins><span class="cx"> [layer setBorderWidth:0.5f];
</span><span class="cx"> } else {
</span><span class="cx"> [layer setBorderColor:nil];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (pthread_main_np())
</span><span class="cx"> WebThreadLock();
</span><del>- _tileGrid->tileCache()->doLayoutTiles();
</del><ins>+ _tileGrid->tileCache().doLayoutTiles();
</ins><span class="cx"> [super renderInContext:context];
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="lines">@@ -77,13 +77,13 @@
</span><span class="cx"> WebThreadLock();
</span><span class="cx"> // This may trigger WebKit layout and generate more repaint rects.
</span><span class="cx"> if (_tileGrid)
</span><del>- _tileGrid->tileCache()->prepareToDraw();
</del><ins>+ _tileGrid->tileCache().prepareToDraw();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)drawInContext:(CGContextRef)context
</span><span class="cx"> {
</span><span class="cx"> if (_tileGrid)
</span><del>- _tileGrid->tileCache()->drawLayer(self, context);
</del><ins>+ _tileGrid->tileCache().drawLayer(self, context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id<CAAction>)actionForKey:(NSString *)key
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileLayerPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollAnimatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> #include "PlatformTouchEventIOS.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "ScrollbarTheme.h"
</span><span class="cx"> #include "ScrollbarThemeMac.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSWindowController.h>
</span><span class="cx"> #import <AppKit/NSScreen.h>
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/BlobData.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -33,9 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Blob.h"
</span><span class="cx"> #include "BlobURL.h"
</span><del>-
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceHandle::ResourceHandle(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
</span><del>- : d(adoptPtr(new ResourceHandleInternal(this, context, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url()))))
</del><ins>+ : d(std::make_unique<ResourceHandleInternal>(this, context, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url())))
</ins><span class="cx"> {
</span><span class="cx"> if (!request.url().isValid()) {
</span><span class="cx"> scheduleFailure(InvalidURLFailure);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><span class="cx"> #include "ResourceHandleTypes.h"
</span><span class="cx"> #include "ResourceLoadPriority.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><span class="lines">@@ -284,7 +283,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> friend class ResourceHandleInternal;
</span><del>- OwnPtr<ResourceHandleInternal> d;
</del><ins>+ std::unique_ptr<ResourceHandleInternal> d;
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> std::unique_ptr<QuickLookHandle> m_quickLook;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><span class="cx"> #include "Timer.h"
</span><ins>+#include <wtf/OwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include "ResourceHandleCFURLConnectionDelegate.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,12 +30,9 @@
</span><span class="cx"> #include "CacheValidation.h"
</span><span class="cx"> #include "CertificateInfo.h"
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><del>-#include "URL.h"
</del><span class="cx"> #include "ResourceLoadTiming.h"
</span><ins>+#include "URL.h"
</ins><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
-#include <wtf/RefPtr.h>
-
</del><span class="cx"> #if OS(SOLARIS)
</span><span class="cx"> #include <sys/time.h> // For time_t structure.
</span><span class="cx"> #endif
</span><span class="lines">@@ -58,7 +55,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool isHTTP() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT const URL& url() const;
</span><del>- WEBCORE_EXPORT void setURL(const URL& url);
</del><ins>+ WEBCORE_EXPORT void setURL(const URL&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT const String& mimeType() const;
</span><span class="cx"> WEBCORE_EXPORT void setMimeType(const String& mimeType);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSynchronousLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -32,13 +32,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class SynchronousLoaderClient : public ResourceHandleClient {
</del><ins>+class SynchronousLoaderClient final : public ResourceHandleClient {
</ins><span class="cx"> public:
</span><del>- static PassOwnPtr<SynchronousLoaderClient> create()
- {
- return adoptPtr(new SynchronousLoaderClient);
- }
-
</del><span class="cx"> virtual ~SynchronousLoaderClient();
</span><span class="cx">
</span><span class="cx"> void setAllowStoredCredentials(bool allow) { m_allowStoredCredentials = allow; }
</span><span class="lines">@@ -50,12 +45,6 @@
</span><span class="cx"> WEBCORE_EXPORT static ResourceError platformBadResponseError();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SynchronousLoaderClient()
- : m_allowStoredCredentials(false)
- , m_isDone(false)
- {
- }
-
</del><span class="cx"> virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& /*redirectResponse*/) override;
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) override;
</span><span class="cx"> virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) override;
</span><span class="lines">@@ -67,11 +56,11 @@
</span><span class="cx"> virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_allowStoredCredentials;
</del><ins>+ bool m_allowStoredCredentials { false };
</ins><span class="cx"> ResourceResponse m_response;
</span><span class="cx"> Vector<char> m_data;
</span><span class="cx"> ResourceError m_error;
</span><del>- bool m_isDone;
</del><ins>+ bool m_isDone { false };
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/SchedulePair.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -210,9 +209,10 @@
</span><span class="cx">
</span><span class="cx"> static void formFinishFinalizationOnMainThread(void* context)
</span><span class="cx"> {
</span><del>- OwnPtr<FormStreamFields> form = adoptPtr(static_cast<FormStreamFields*>(context));
</del><ins>+ auto* form = static_cast<FormStreamFields*>(context);
</ins><span class="cx">
</span><del>- closeCurrentStream(form.get());
</del><ins>+ closeCurrentStream(form);
+ delete form;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void formFinalize(CFReadStreamRef stream, void* context)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/ProcessID.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -45,10 +44,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static OwnPtr<NetworkStorageSession>& defaultNetworkStorageSession()
</del><ins>+static std::unique_ptr<NetworkStorageSession>& defaultNetworkStorageSession()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- static NeverDestroyed<OwnPtr<NetworkStorageSession>> session;
</del><ins>+ static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;
</ins><span class="cx"> return session;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,16 +56,16 @@
</span><span class="cx"> // 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>).
</span><span class="cx"> String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get()))));
</del><ins>+ defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get())));
</ins><span class="cx"> #else
</span><del>- defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()->platformSession()))));
</del><ins>+ defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()->platformSession())));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
</span><span class="cx"> {
</span><span class="cx"> if (!defaultNetworkStorageSession())
</span><del>- defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(0));
</del><ins>+ defaultNetworkStorageSession() = std::make_unique<NetworkStorageSession>(nullptr);
</ins><span class="cx"> return *defaultNetworkStorageSession();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -529,10 +529,10 @@
</span><span class="cx"> ASSERT(response.isNull());
</span><span class="cx"> ASSERT(error.isNull());
</span><span class="cx">
</span><del>- OwnPtr<SynchronousLoaderClient> client = SynchronousLoaderClient::create();
- client->setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
</del><ins>+ SynchronousLoaderClient client;
+ client.setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
</ins><span class="cx">
</span><del>- RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, client.get(), false /*defersLoading*/, true /*shouldContentSniff*/));
</del><ins>+ RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, &client, false /*defersLoading*/, true /*shouldContentSniff*/));
</ins><span class="cx">
</span><span class="cx"> handle->d->m_storageSession = context->storageSession().platformSession();
</span><span class="cx">
</span><span class="lines">@@ -548,17 +548,17 @@
</span><span class="cx"> CFURLConnectionScheduleDownloadWithRunLoop(handle->connection(), CFRunLoopGetCurrent(), synchronousLoadRunLoopMode());
</span><span class="cx"> CFURLConnectionStart(handle->connection());
</span><span class="cx">
</span><del>- while (!client->isDone())
</del><ins>+ while (!client.isDone())
</ins><span class="cx"> CFRunLoopRunInMode(synchronousLoadRunLoopMode(), UINT_MAX, true);
</span><span class="cx">
</span><del>- error = client->error();
</del><ins>+ error = client.error();
</ins><span class="cx">
</span><span class="cx"> CFURLConnectionCancel(handle->connection());
</span><span class="cx">
</span><span class="cx"> if (error.isNull())
</span><del>- response = client->response();
</del><ins>+ response = client.response();
</ins><span class="cx">
</span><del>- data.swap(client->mutableData());
</del><ins>+ data.swap(client.mutableData());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::setHostAllowsAnyHTTPSCertificate(const String& host)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -388,10 +388,10 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!request.isEmpty());
</span><span class="cx">
</span><del>- OwnPtr<SynchronousLoaderClient> client = SynchronousLoaderClient::create();
- client->setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
</del><ins>+ SynchronousLoaderClient client;
+ client.setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
</ins><span class="cx">
</span><del>- RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, client.get(), false /*defersLoading*/, true /*shouldContentSniff*/));
</del><ins>+ RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(context, request, &client, false /*defersLoading*/, true /*shouldContentSniff*/));
</ins><span class="cx">
</span><span class="cx"> handle->d->m_storageSession = context->storageSession().platformSession();
</span><span class="cx">
</span><span class="lines">@@ -419,17 +419,17 @@
</span><span class="cx"> [handle->connection() scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:(NSString *)synchronousLoadRunLoopMode()];
</span><span class="cx"> [handle->connection() start];
</span><span class="cx">
</span><del>- while (!client->isDone())
</del><ins>+ while (!client.isDone())
</ins><span class="cx"> [[NSRunLoop currentRunLoop] runMode:(NSString *)synchronousLoadRunLoopMode() beforeDate:[NSDate distantFuture]];
</span><span class="cx">
</span><del>- error = client->error();
</del><ins>+ error = client.error();
</ins><span class="cx">
</span><span class="cx"> [handle->connection() cancel];
</span><span class="cx">
</span><span class="cx"> if (error.isNull())
</span><del>- response = client->response();
</del><ins>+ response = client.response();
</ins><span class="cx">
</span><del>- data.swap(client->mutableData());
</del><ins>+ data.swap(client.mutableData());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextCodech"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextCodec.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextCodec.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/text/TextCodec.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinCursorWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include "SystemInfo.h"
</span><del>-
-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/win/GDIObject.h>
</span><span class="cx">
</span><span class="cx"> #include <windows.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -6881,7 +6881,7 @@
</span><span class="cx"> filterRenderer->setFilterScale(renderer().frame().page()->deviceScaleFactor());
</span><span class="cx"> RenderingMode renderingMode = renderer().frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
</span><span class="cx"> filterRenderer->setRenderingMode(renderingMode);
</span><del>- filterInfo.setRenderer(filterRenderer.release());
</del><ins>+ filterInfo.setRenderer(WTF::move(filterRenderer));
</ins><span class="cx">
</span><span class="cx"> // We can optimize away code paths in other places if we know that there are no software filters.
</span><span class="cx"> renderer().view().setHasSoftwareFilters(true);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -29,15 +29,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "RenderLayerFilterInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><del>-#include "CachedSVGDocumentReference.h"
</del><span class="cx"> #include "FilterEffectRenderer.h"
</span><del>-#include "SVGElement.h"
-#include "SVGFilter.h"
-#include "SVGFilterPrimitiveStandardAttributes.h"
</del><ins>+#include "RenderSVGResourceFilter.h"
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -85,7 +81,7 @@
</span><span class="cx"> removeReferenceFilterClients();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::FilterInfo::setRenderer(PassRefPtr<FilterEffectRenderer> renderer)
</del><ins>+void RenderLayer::FilterInfo::setRenderer(RefPtr<FilterEffectRenderer>&& renderer)
</ins><span class="cx"> {
</span><span class="cx"> m_renderer = renderer;
</span><span class="cx"> }
</span><span class="lines">@@ -98,23 +94,18 @@
</span><span class="cx"> void RenderLayer::FilterInfo::updateReferenceFilterClients(const FilterOperations& operations)
</span><span class="cx"> {
</span><span class="cx"> removeReferenceFilterClients();
</span><del>- for (size_t i = 0, size = operations.size(); i < size; ++i) {
- FilterOperation& filterOperation = *operations.operations()[i];
- if (!is<ReferenceFilterOperation>(filterOperation))
</del><ins>+ for (auto& operation : operations.operations()) {
+ if (!is<ReferenceFilterOperation>(*operation))
</ins><span class="cx"> continue;
</span><del>- ReferenceFilterOperation& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation);
- auto* documentReference = referenceFilterOperation.cachedSVGDocumentReference();
- CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference->document() : nullptr;
-
- if (cachedSVGDocument) {
</del><ins>+ auto& referenceOperation = downcast<ReferenceFilterOperation>(*operation);
+ auto* documentReference = referenceOperation.cachedSVGDocumentReference();
+ if (auto* cachedSVGDocument = documentReference ? documentReference->document() : nullptr) {
</ins><span class="cx"> // Reference is external; wait for notifyFinished().
</span><span class="cx"> cachedSVGDocument->addClient(this);
</span><span class="cx"> m_externalSVGReferences.append(cachedSVGDocument);
</span><span class="cx"> } else {
</span><del>- // 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());
-
</del><ins>+ // 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());
</ins><span class="cx"> if (!filter || !is<RenderSVGResourceFilter>(filter->renderer()))
</span><span class="cx"> continue;
</span><span class="cx"> downcast<RenderSVGResourceFilter>(*filter->renderer()).addClientRenderLayer(&m_layer);
</span><span class="lines">@@ -128,10 +119,10 @@
</span><span class="cx"> for (auto& resourceHandle : m_externalSVGReferences)
</span><span class="cx"> resourceHandle->removeClient(this);
</span><span class="cx"> m_externalSVGReferences.clear();
</span><del>- for (const auto& filter : m_internalSVGReferences) {
- if (!filter->renderer())
- continue;
- downcast<RenderSVGResourceContainer>(*filter->renderer()).removeClientRenderLayer(&m_layer);
</del><ins>+
+ for (auto& filter : m_internalSVGReferences) {
+ if (auto* renderer = filter->renderer())
+ downcast<RenderSVGResourceContainer>(*renderer).removeClientRenderLayer(&m_layer);
</ins><span class="cx"> }
</span><span class="cx"> m_internalSVGReferences.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,14 +34,12 @@
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><del>-#include <memory>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Element;
</span><span class="cx">
</span><del>-class RenderLayer::FilterInfo final : public CachedSVGDocumentClient
-{
</del><ins>+class RenderLayer::FilterInfo final : private CachedSVGDocumentClient {
</ins><span class="cx"> public:
</span><span class="cx"> static FilterInfo& get(RenderLayer&);
</span><span class="cx"> static FilterInfo* getIfExists(const RenderLayer&);
</span><span class="lines">@@ -55,28 +53,17 @@
</span><span class="cx"> void resetDirtySourceRect() { m_dirtySourceRect = LayoutRect(); }
</span><span class="cx">
</span><span class="cx"> FilterEffectRenderer* renderer() const { return m_renderer.get(); }
</span><del>- void setRenderer(PassRefPtr<FilterEffectRenderer>);
</del><ins>+ void setRenderer(RefPtr<FilterEffectRenderer>&&);
</ins><span class="cx">
</span><span class="cx"> void updateReferenceFilterClients(const FilterOperations&);
</span><span class="cx"> void removeReferenceFilterClients();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- friend void WTF::deleteOwnedPtr<FilterInfo>(FilterInfo*);
-
</del><span class="cx"> virtual void notifyFinished(CachedResource*) override;
</span><span class="cx">
</span><span class="cx"> static HashMap<const RenderLayer*, std::unique_ptr<FilterInfo>>& map();
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> RenderLayer& m_layer;
</span><del>-#if PLATFORM(IOS)
-#pragma clang diagnostic pop
-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<FilterEffectRenderer> m_renderer;
</span><span class="cx"> LayoutRect m_dirtySourceRect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -28,14 +28,43 @@
</span><span class="cx"> #include "RenderLayerMaskImageInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><del>-#include "CachedSVGDocumentReference.h"
-#include "RenderSVGResourceContainer.h"
-#include "SVGElement.h"
</del><span class="cx"> #include "SVGMaskElement.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+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;
+};
+
</ins><span class="cx"> HashMap<const RenderLayer*, std::unique_ptr<RenderLayer::MaskImageInfo>>& RenderLayer::MaskImageInfo::layerToMaskMap()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashMap<const RenderLayer*, std::unique_ptr<MaskImageInfo>>> layerToMaskMap;
</span><span class="lines">@@ -45,7 +74,7 @@
</span><span class="cx"> RenderLayer::MaskImageInfo* RenderLayer::MaskImageInfo::getIfExists(const RenderLayer& layer)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(layer.m_hasMaskImageInfo == layerToMaskMap().contains(&layer));
</span><del>- return layer.m_hasMaskImageInfo ? layerToMaskMap().get(&layer) : 0;
</del><ins>+ return layer.m_hasMaskImageInfo ? layerToMaskMap().get(&layer) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderLayer::MaskImageInfo& RenderLayer::MaskImageInfo::get(RenderLayer& layer)
</span><span class="lines">@@ -70,9 +99,9 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer::MaskImageInfo::MaskImageInfo(RenderLayer& layer)
</span><span class="cx"> : m_layer(layer)
</span><ins>+ , m_svgDocumentClient(std::make_unique<SVGDocumentClient>(layer))
+ , m_imageClient(std::make_unique<ImageClient>(layer))
</ins><span class="cx"> {
</span><del>- m_svgDocumentClient = std::make_unique<MaskSVGDocumentClient>(this);
- m_imageClient = std::make_unique<MaskImageClient>(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderLayer::MaskImageInfo::~MaskImageInfo()
</span><span class="lines">@@ -80,60 +109,43 @@
</span><span class="cx"> removeMaskImageClients(m_layer.renderer().style());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::MaskImageInfo::notifyFinished(CachedResource*)
-{
- m_layer.renderer().repaint();
-}
-
-void RenderLayer::MaskImageInfo::imageChanged(CachedImage*, const IntRect*)
-{
- m_layer.renderer().repaint();
-}
-
</del><span class="cx"> void RenderLayer::MaskImageInfo::updateMaskImageClients()
</span><span class="cx"> {
</span><span class="cx"> removeMaskImageClients(m_layer.renderer().style());
</span><span class="cx">
</span><del>- const FillLayer* maskLayer = m_layer.renderer().style().maskLayers();
- while (maskLayer) {
</del><ins>+ for (auto* maskLayer = m_layer.renderer().style().maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</ins><span class="cx"> const RefPtr<MaskImageOperation> maskImage = maskLayer->maskImage();
</span><span class="cx"> maskImage->setRenderLayerImageClient(m_imageClient.get());
</span><span class="cx"> CachedSVGDocumentReference* documentReference = maskImage->cachedSVGDocumentReference();
</span><span class="cx"> CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference->document() : nullptr;
</span><span class="cx">
</span><span class="cx"> if (cachedSVGDocument) {
</span><del>- // Reference is external; wait for notifyFinished().
</del><ins>+ // Reference is external; wait for notifyFinished and then repaint.
</ins><span class="cx"> cachedSVGDocument->addClient(m_svgDocumentClient.get());
</span><span class="cx"> m_externalSVGReferences.append(cachedSVGDocument);
</span><span class="cx"> } else {
</span><del>- // Reference is internal; add layer as a client so we can trigger
- // mask repaint on SVG attribute change.
</del><ins>+ // Reference is internal; add layer as a client so we can trigger mask repaint on SVG attribute change.
</ins><span class="cx"> Element* masker = m_layer.renderer().document().getElementById(maskImage->fragment());
</span><del>- if (masker && is<SVGMaskElement>(masker)) {
- downcast<SVGMaskElement>(masker)->addClientRenderLayer(&m_layer);
</del><ins>+ if (is<SVGMaskElement>(masker)) {
+ downcast<SVGMaskElement>(*masker).addClientRenderLayer(&m_layer);
</ins><span class="cx"> m_internalSVGReferences.append(masker);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- maskLayer = maskLayer->next();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::MaskImageInfo::removeMaskImageClients(const RenderStyle& oldStyle)
</span><span class="cx"> {
</span><del>- const FillLayer* maskLayer = oldStyle.maskLayers();
- while (maskLayer) {
- if (maskLayer->maskImage())
- maskLayer->maskImage()->setRenderLayerImageClient(nullptr);
-
- maskLayer = maskLayer->next();
</del><ins>+ for (auto* maskLayer = oldStyle.maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
+ if (auto& image = maskLayer->maskImage())
+ image->setRenderLayerImageClient(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto externalSVGReference : m_externalSVGReferences)
</del><ins>+ for (auto& externalSVGReference : m_externalSVGReferences)
</ins><span class="cx"> externalSVGReference->removeClient(m_svgDocumentClient.get());
</span><span class="cx"> m_externalSVGReferences.clear();
</span><span class="cx">
</span><del>- for (auto internalSVGReference : m_internalSVGReferences)
</del><ins>+ for (auto& internalSVGReference : m_internalSVGReferences)
</ins><span class="cx"> downcast<SVGMaskElement>(internalSVGReference.get())->removeClientRenderLayer(&m_layer);
</span><span class="cx"> m_internalSVGReferences.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,50 +27,14 @@
</span><span class="cx"> #ifndef RenderLayerMaskImageInfo_h
</span><span class="cx"> #define RenderLayerMaskImageInfo_h
</span><span class="cx">
</span><del>-#include "CachedImageClient.h"
</del><span class="cx"> #include "CachedResourceHandle.h"
</span><del>-#include "CachedSVGDocumentClient.h"
-#include "MaskImageOperation.h"
</del><span class="cx"> #include "RenderLayer.h"
</span><del>-#include <memory>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Element;
</span><span class="cx">
</span><span class="cx"> class RenderLayer::MaskImageInfo final {
</span><del>-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); }
- };
-
</del><span class="cx"> public:
</span><span class="cx"> static MaskImageInfo& get(RenderLayer&);
</span><span class="cx"> static MaskImageInfo* getIfExists(const RenderLayer&);
</span><span class="lines">@@ -83,19 +47,17 @@
</span><span class="cx"> void removeMaskImageClients(const RenderStyle& oldStyle);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- friend void WTF::deleteOwnedPtr<MaskImageInfo>(MaskImageInfo*);
-
- void notifyFinished(CachedResource*);
- void imageChanged(CachedImage*, const IntRect*);
-
</del><span class="cx"> static HashMap<const RenderLayer*, std::unique_ptr<MaskImageInfo>>& layerToMaskMap();
</span><span class="cx">
</span><ins>+ class ImageClient;
+ class SVGDocumentClient;
+
</ins><span class="cx"> RenderLayer& m_layer;
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<Element>> m_internalSVGReferences;
</span><span class="cx"> Vector<CachedResourceHandle<CachedSVGDocument>> m_externalSVGReferences;
</span><del>- std::unique_ptr<MaskSVGDocumentClient> m_svgDocumentClient;
- std::unique_ptr<MaskImageClient> m_imageClient;
</del><ins>+ std::unique_ptr<SVGDocumentClient> m_svgDocumentClient;
+ std::unique_ptr<ImageClient> m_imageClient;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -166,9 +166,6 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// 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.
</del><span class="cx"> class InternalSettingsWrapper : public Supplement<Page> {
</span><span class="cx"> public:
</span><span class="cx"> explicit InternalSettingsWrapper(Page* page)
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/ChangeLog 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-04-23 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> There should only be one way to get the system memory size.
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> #include <WebCore/TextRun.h>
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #include <windowsx.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="lines">@@ -245,9 +243,9 @@
</span><span class="cx"> , m_hitWidget(0)
</span><span class="cx"> , m_movingWindow(false)
</span><span class="cx"> , m_timer(*this, &FullscreenVideoController::timerFired)
</span><del>- , m_layerClient(adoptPtr(new LayerClient(this)))
</del><ins>+ , m_layerClient(std::make_unique<LayerClient>(this))
</ins><span class="cx"> , m_rootChild(PlatformCALayerWin::create(PlatformCALayer::LayerTypeLayer, m_layerClient.get()))
</span><del>- , m_fullscreenWindow(adoptPtr(new MediaPlayerPrivateFullscreenWindow(this)))
</del><ins>+ , m_fullscreenWindow(std::make_unique<MediaPlayerPrivateFullscreenWindow>(this))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,8 +296,7 @@
</span><span class="cx"> {
</span><span class="cx"> SetWindowLongPtr(m_hudWindow, 0, 0);
</span><span class="cx">
</span><del>- if (m_fullscreenWindow)
- m_fullscreenWindow = nullptr;
</del><ins>+ m_fullscreenWindow = nullptr;
</ins><span class="cx">
</span><span class="cx"> ASSERT(!IsWindow(m_hudWindow));
</span><span class="cx"> m_hudWindow = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/FullscreenVideoController.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -155,11 +155,11 @@
</span><span class="cx"> GDIObject<HBITMAP> m_bitmap;
</span><span class="cx"> WebCore::IntSize m_fullscreenSize;
</span><span class="cx"> WebCore::IntPoint m_hudPosition;
</span><del>- OwnPtr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow;
</del><ins>+ std::unique_ptr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow;
</ins><span class="cx">
</span><span class="cx"> class LayerClient;
</span><span class="cx"> friend class LayerClient;
</span><del>- OwnPtr<LayerClient> m_layerClient;
</del><ins>+ std::unique_ptr<LayerClient> m_layerClient;
</ins><span class="cx"> RefPtr<WebCore::PlatformCALayer> m_rootChild;
</span><span class="cx">
</span><span class="cx"> HUDButton m_playPauseButton;
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/Plugins/PluginView.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -321,7 +320,7 @@
</span><span class="cx"> bool m_isWaitingToStart;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- OwnPtr<PluginMessageThrottlerWin> m_messageThrottler;
</del><ins>+ std::unique_ptr<PluginMessageThrottlerWin> m_messageThrottler;
</ins><span class="cx"> WNDPROC m_pluginWndProc;
</span><span class="cx"> unsigned m_lastMessage;
</span><span class="cx"> bool m_isCallingPluginWndProc;
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> if (message == WM_USER + 1 &&
</span><span class="cx"> m_plugin->quirks().contains(PluginQuirkThrottleWMUserPlusOneMessages)) {
</span><span class="cx"> if (!m_messageThrottler)
</span><del>- m_messageThrottler = adoptPtr(new PluginMessageThrottlerWin(this));
</del><ins>+ m_messageThrottler = std::make_unique<PluginMessageThrottlerWin>(this);
</ins><span class="cx">
</span><span class="cx"> m_messageThrottler->appendMessage(hWnd, message, wParam, lParam);
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include <WebCore/IntSize.h>
</span><span class="cx"> #include <WebCore/TextureMapperFPSCounter.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> class WebView;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> WebChromeClient::WebChromeClient(WebView* webView)
</span><span class="cx"> : m_webView(webView)
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- , m_notificationsDelegate(new WebDesktopNotificationsDelegate(webView))
</del><ins>+ , m_notificationsDelegate(std::make_unique<WebDesktopNotificationsDelegate>(webView))
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -179,6 +179,6 @@
</span><span class="cx"> WebView* m_webView;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- OwnPtr<WebDesktopNotificationsDelegate> m_notificationsDelegate;
</del><ins>+ std::unique_ptr<WebDesktopNotificationsDelegate> m_notificationsDelegate;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "WebKit.h"
</span><span class="cx"> #include <WebCore/EditorClient.h>
</span><span class="cx"> #include <WebCore/TextCheckerClient.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> class WebView;
</span><span class="cx"> class WebNotification;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> WebFrameLoaderClient::WebFrameLoaderClient(WebFrame* webFrame)
</span><span class="cx"> : m_webFrame(webFrame)
</span><span class="cx"> , m_manualLoader(0)
</span><del>- , m_policyListenerPrivate(adoptPtr(new WebFramePolicyListenerPrivate))
</del><ins>+ , m_policyListenerPrivate(std::make_unique<WebFramePolicyListenerPrivate>())
</ins><span class="cx"> , m_hasSentResponseToPlugin(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> class WebFramePolicyListenerPrivate;
</span><del>- OwnPtr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;
</del><ins>+ std::unique_ptr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "WebMutableURLRequest.h"
</span><span class="cx"> #include "WebNodeHighlight.h"
</span><span class="cx"> #include "WebView.h"
</span><del>-
</del><span class="cx"> #include <WebCore/BString.h>
</span><span class="cx"> #include <WebCore/Element.h>
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="lines">@@ -44,7 +43,6 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/RenderObject.h>
</span><span class="cx"> #include <WebCore/WindowMessageBroadcaster.h>
</span><del>-
</del><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><span class="cx"> #include <wchar.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -189,7 +187,7 @@
</span><span class="cx"> bool creatingHighlight = !m_highlight;
</span><span class="cx">
</span><span class="cx"> if (creatingHighlight)
</span><del>- m_highlight = adoptPtr(new WebNodeHighlight(m_inspectedWebView));
</del><ins>+ m_highlight = std::make_unique<WebNodeHighlight>(m_inspectedWebView);
</ins><span class="cx">
</span><span class="cx"> if (m_highlight->isShowing())
</span><span class="cx"> m_highlight->update();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -89,7 +88,7 @@
</span><span class="cx"> HWND m_inspectedWebViewHandle;
</span><span class="cx"> HWND m_frontendHandle;
</span><span class="cx">
</span><del>- OwnPtr<WebNodeHighlight> m_highlight;
</del><ins>+ std::unique_ptr<WebNodeHighlight> m_highlight;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal, WebCore::WindowMessageListener {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebElementPropertyBagcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebElementPropertyBag.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> // WebElementPropertyBag -----------------------------------------------
</span><span class="cx"> WebElementPropertyBag::WebElementPropertyBag(const HitTestResult& result)
</span><del>- : m_result(adoptPtr(new HitTestResult(result)))
</del><ins>+ : m_result(std::make_unique<HitTestResult>(result))
</ins><span class="cx"> , m_refCount(0)
</span><span class="cx"> {
</span><span class="cx"> gClassCount++;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebElementPropertyBagh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebElementPropertyBag.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebElementPropertyBag.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebElementPropertyBag.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebElementPropertyBag_H
</span><span class="cx">
</span><span class="cx"> #include <ocidl.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class HitTestResult;
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> /* [in] */ VARIANT *pVar);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<WebCore::HitTestResult> m_result;
</del><ins>+ std::unique_ptr<WebCore::HitTestResult> m_result;
</ins><span class="cx"> ULONG m_refCount;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebFrame.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -30,16 +30,13 @@
</span><span class="cx"> #include "WebDataSource.h"
</span><span class="cx">
</span><span class="cx"> #include "AccessibleDocument.h"
</span><del>-
</del><span class="cx"> #include <WebCore/AdjustViewSizeOrNot.h>
</span><span class="cx"> #include <WebCore/FrameWin.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><del>-#include <WebCore/URL.h>
</del><span class="cx"> #include <WebCore/ResourceHandleClient.h>
</span><del>-
-#include <WTF/RefPtr.h>
-#include <WTF/HashMap.h>
-#include <WTF/OwnPtr.h>
</del><ins>+#include <WebCore/URL.h>
+#include <wtf/HashMap.h>
+#include <wtf/RefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/HistoryItem.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebNodeHighlightcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebNodeHighlight.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebNodeHighlight.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebNodeHighlight.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/WindowMessageBroadcaster.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/win/GDIObject.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebNotificationCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebNotificationCenter.cpp (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebNotificationCenter.cpp 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebNotificationCenter.cpp 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include <wchar.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashTraits.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> WebNotificationCenter::WebNotificationCenter()
</span><span class="cx"> : m_refCount(0)
</span><del>- , d(adoptPtr(new WebNotificationCenterPrivate))
</del><ins>+ , d(std::make_unique<WebNotificationCenterPrivate>())
</ins><span class="cx"> {
</span><span class="cx"> gClassCount++;
</span><span class="cx"> gClassNameCount().add("WebNotificationCenter");
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebNotificationCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebNotificationCenter.h (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebNotificationCenter.h 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Source/WebKit/win/WebNotificationCenter.h 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebNotificationCenter_H
</span><span class="cx">
</span><span class="cx"> #include "WebKit.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> struct WebNotificationCenterPrivate;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ULONG m_refCount;
</span><del>- OwnPtr<WebNotificationCenterPrivate> d;
</del><ins>+ std::unique_ptr<WebNotificationCenterPrivate> d;
</ins><span class="cx"> static IWebNotificationCenter* m_defaultCenter;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Tools/ChangeLog 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-04-23 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> lldb macro btjs sometimes can't get a frame description
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (183233 => 183234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-04-24 02:08:07 UTC (rev 183233)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-04-24 02:13:39 UTC (rev 183234)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/FastMalloc.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Threading.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span></span></pre>
</div>
</div>
</body>
</html>