Changeset 156968 in webkit
- Timestamp:
- Oct 5, 2013 11:59:00 AM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r156964 r156968 1 2013-10-05 Anders Carlsson <andersca@apple.com> 2 3 Remove createOwned 4 https://bugs.webkit.org/show_bug.cgi?id=122388 5 6 Reviewed by Darin Adler. 7 8 * profiler/ProfilerDatabase.cpp: 9 (JSC::Profiler::Database::save): 10 1 11 2013-10-05 Darin Adler <darin@apple.com> 2 12 -
trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp
r153143 r156968 118 118 bool Database::save(const char* filename) const 119 119 { 120 OwnPtr<FilePrintStream>out = FilePrintStream::open(filename, "w");120 auto out = FilePrintStream::open(filename, "w"); 121 121 if (!out) 122 122 return false; -
trunk/Source/WTF/ChangeLog
r156967 r156968 1 2013-10-05 Anders Carlsson <andersca@apple.com> 2 3 Remove createOwned 4 https://bugs.webkit.org/show_bug.cgi?id=122388 5 6 Reviewed by Darin Adler. 7 8 Since we're going with std::unique_ptr instead of OwnPtr, there's no need for makeOwned to exist. 9 Get rid of it and replace it with calls to std::make_unique. 10 11 * wtf/FilePrintStream.cpp: 12 (WTF::FilePrintStream::open): 13 * wtf/FilePrintStream.h: 14 * wtf/HashTable.h: 15 (WTF::::HashTable): 16 * wtf/ListHashSet.h: 17 (WTF::::ListHashSet): 18 * wtf/OwnPtr.h: 19 * wtf/Threading.cpp: 20 (WTF::compatEntryPoint): 21 (WTF::createThread): 22 * wtf/ThreadingPthreads.cpp: 23 (WTF::wtfThreadEntryPoint): 24 (WTF::createThreadInternal): 25 * wtf/unicode/Collator.h: 26 * wtf/unicode/CollatorDefault.cpp: 27 (WTF::Collator::userDefault): 28 * wtf/unicode/icu/CollatorICU.cpp: 29 (WTF::Collator::userDefault): 30 1 31 2013-10-05 Darin Adler <darin@apple.com> 2 32 -
trunk/Source/WTF/wtf/FilePrintStream.cpp
r155407 r156968 42 42 } 43 43 44 OwnPtr<FilePrintStream> FilePrintStream::open(const char* filename, const char* mode)44 std::unique_ptr<FilePrintStream> FilePrintStream::open(const char* filename, const char* mode) 45 45 { 46 46 FILE* file = fopen(filename, mode); … … 48 48 return nullptr; 49 49 50 return createOwned<FilePrintStream>(file);50 return std::make_unique<FilePrintStream>(file); 51 51 } 52 52 -
trunk/Source/WTF/wtf/FilePrintStream.h
r155407 r156968 43 43 virtual ~FilePrintStream(); 44 44 45 WTF_EXPORT_PRIVATE static OwnPtr<FilePrintStream> open(const char* filename, const char* mode);45 WTF_EXPORT_PRIVATE static std::unique_ptr<FilePrintStream> open(const char* filename, const char* mode); 46 46 47 47 FILE* file() { return m_file; } -
trunk/Source/WTF/wtf/HashTable.h
r156526 r156968 484 484 mutable const_iterator* m_iterators; 485 485 // Use OwnPtr so HashTable can still be memmove'd or memcpy'ed. 486 mutable OwnPtr<Mutex> m_mutex;486 mutable std::unique_ptr<Mutex> m_mutex; 487 487 #endif 488 488 … … 540 540 #if CHECK_HASHTABLE_ITERATORS 541 541 , m_iterators(0) 542 , m_mutex( createOwned<Mutex>())543 #endif 544 #if DUMP_HASHTABLE_STATS_PER_TABLE 545 , m_stats( createOwned<Stats>())542 , m_mutex(std::make_unique<Mutex>()) 543 #endif 544 #if DUMP_HASHTABLE_STATS_PER_TABLE 545 , m_stats(std::make_unique<Stats>()) 546 546 #endif 547 547 { … … 1148 1148 #if CHECK_HASHTABLE_ITERATORS 1149 1149 , m_iterators(0) 1150 , m_mutex( createOwned<Mutex>())1151 #endif 1152 #if DUMP_HASHTABLE_STATS_PER_TABLE 1153 , m_stats( createOwned<Stats>(*other.m_stats))1150 , m_mutex(std::make_unique<Mutex>()) 1151 #endif 1152 #if DUMP_HASHTABLE_STATS_PER_TABLE 1153 , m_stats(std::make_unique<Stats>(*other.m_stats)) 1154 1154 #endif 1155 1155 { -
trunk/Source/WTF/wtf/ListHashSet.h
r156305 r156968 161 161 Node* m_head; 162 162 Node* m_tail; 163 OwnPtr<NodeAllocator> m_allocator;163 std::unique_ptr<NodeAllocator> m_allocator; 164 164 }; 165 165 … … 406 406 : m_head(0) 407 407 , m_tail(0) 408 , m_allocator( createOwned<NodeAllocator>())408 , m_allocator(std::make_unique<NodeAllocator>()) 409 409 { 410 410 } … … 414 414 : m_head(0) 415 415 , m_tail(0) 416 , m_allocator( createOwned<NodeAllocator>())416 , m_allocator(std::make_unique<NodeAllocator>()) 417 417 { 418 418 for (auto it = other.begin(), end = other.end(); it != end; ++it) -
trunk/Source/WTF/wtf/OwnPtr.h
r156353 r156968 76 76 private: 77 77 explicit OwnPtr(PtrType ptr) : m_ptr(ptr) { } 78 79 #if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)80 template<typename U, typename... Args> friend OwnPtr<U> createOwned(Args&&... args);81 #else82 template<typename U> friend OwnPtr<U> createOwned();83 template<typename U, typename A1> friend OwnPtr<U> createOwned(A1&&);84 template<typename U, typename A1, typename A2> friend OwnPtr<U> createOwned(A1&&, A2&&);85 #endif86 78 87 79 // We should never have two OwnPtrs for the same underlying object (otherwise we'll get … … 195 187 } 196 188 197 #if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)198 template<typename T, typename... Args>199 inline OwnPtr<T> createOwned(Args&&... args)200 {201 return OwnPtr<T>(new T(std::forward<Args>(args)...));202 }203 #else204 template<typename T>205 inline OwnPtr<T> createOwned()206 {207 return OwnPtr<T>(new T);208 }209 210 template<typename T, typename A1>211 inline OwnPtr<T> createOwned(A1&& a1)212 {213 return OwnPtr<T>(new T(std::forward<A1>(a1)));214 }215 216 template<typename T, typename A1, typename A2>217 inline OwnPtr<T> createOwned(A1&& a1, A2&& a2)218 {219 return OwnPtr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2)));220 }221 #endif222 223 189 } // namespace WTF 224 190 225 191 using WTF::OwnPtr; 226 using WTF::createOwned;227 192 228 193 #endif // WTF_OwnPtr_h -
trunk/Source/WTF/wtf/Threading.cpp
r155407 r156968 110 110 static void compatEntryPoint(void* param) 111 111 { 112 // Balanced by . leakPtr() in createThread.113 OwnPtr<ThreadFunctionWithReturnValueInvocation> invocation = adoptPtr(static_cast<ThreadFunctionWithReturnValueInvocation*>(param));112 // Balanced by .release() in createThread. 113 auto invocation = std::unique_ptr<ThreadFunctionWithReturnValueInvocation>(static_cast<ThreadFunctionWithReturnValueInvocation*>(param)); 114 114 invocation->function(invocation->data); 115 115 } … … 117 117 ThreadIdentifier createThread(ThreadFunctionWithReturnValue entryPoint, void* data, const char* name) 118 118 { 119 auto invocation = createOwned<ThreadFunctionWithReturnValueInvocation>(entryPoint, data);119 auto invocation = std::make_unique<ThreadFunctionWithReturnValueInvocation>(entryPoint, data); 120 120 121 // Balanced by adoptPtr()in compatEntryPoint.122 return createThread(compatEntryPoint, invocation. leakPtr(), name);121 // Balanced by std::unique_ptr constructor in compatEntryPoint. 122 return createThread(compatEntryPoint, invocation.release(), name); 123 123 } 124 124 … … 137 137 ThreadIdentifier createThread(ThreadFunctionWithReturnValue entryPoint, void* data) 138 138 { 139 auto invocation = createOwned<ThreadFunctionWithReturnValueInvocation>(entryPoint, data);139 auto invocation = std::make_unique<ThreadFunctionWithReturnValueInvocation>(entryPoint, data); 140 140 141 141 // Balanced by adoptPtr() in compatEntryPoint. 142 return createThread(compatEntryPoint, invocation. leakPtr(), 0);142 return createThread(compatEntryPoint, invocation.release(), 0); 143 143 } 144 144 #endif -
trunk/Source/WTF/wtf/ThreadingPthreads.cpp
r156304 r156968 192 192 { 193 193 // Balanced by .leakPtr() in createThreadInternal. 194 OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));194 auto invocation = std::unique_ptr<ThreadFunctionInvocation>(static_cast<ThreadFunctionInvocation*>(param)); 195 195 invocation->function(invocation->data); 196 return 0;196 return nullptr; 197 197 } 198 198 199 199 ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) 200 200 { 201 auto invocation = WTF::createOwned<ThreadFunctionInvocation>(entryPoint, data);201 auto invocation = std::make_unique<ThreadFunctionInvocation>(entryPoint, data); 202 202 pthread_t threadHandle; 203 203 if (pthread_create(&threadHandle, 0, wtfThreadEntryPoint, invocation.get())) { … … 206 206 } 207 207 208 // Balanced by adoptPtr()in wtfThreadEntryPoint.209 ThreadFunctionInvocation* leakedInvocation = invocation. leakPtr();208 // Balanced by std::unique_ptr constructor in wtfThreadEntryPoint. 209 ThreadFunctionInvocation* leakedInvocation = invocation.release(); 210 210 UNUSED_PARAM(leakedInvocation); 211 211 -
trunk/Source/WTF/wtf/unicode/Collator.h
r155407 r156968 49 49 WTF_EXPORT_PRIVATE void setOrderLowerFirst(bool); 50 50 51 WTF_EXPORT_PRIVATE static OwnPtr<Collator> userDefault();51 WTF_EXPORT_PRIVATE static std::unique_ptr<Collator> userDefault(); 52 52 53 53 WTF_EXPORT_PRIVATE Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const; -
trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp
r156401 r156968 48 48 OwnPtr<Collator> Collator::userDefault() 49 49 { 50 return createOwned<Collator>(nullptr);50 return std::make_unique<Collator>(nullptr); 51 51 } 52 52 -
trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp
r155407 r156968 59 59 } 60 60 61 OwnPtr<Collator> Collator::userDefault()61 std::unique_ptr<Collator> Collator::userDefault() 62 62 { 63 63 #if OS(DARWIN) && USE(CF) … … 72 72 char buf[256]; 73 73 if (!collationOrder) 74 return createOwned<Collator>("");74 return std::make_unique<Collator>(""); 75 75 CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII); 76 return createOwned<Collator>(buf);76 return std::make_unique<Collator>(buf); 77 77 #else 78 return createOwned<Collator>(static_cast<const char*>(0));78 return std::make_unique<Collator>(static_cast<const char*>(0)); 79 79 #endif 80 80 } -
trunk/Source/WebCore/ChangeLog
r156967 r156968 1 2013-10-05 Anders Carlsson <andersca@apple.com> 2 3 Remove createOwned 4 https://bugs.webkit.org/show_bug.cgi?id=122388 5 6 Reviewed by Darin Adler. 7 8 * dom/Document.cpp: 9 (WebCore::Document::Document): 10 (WebCore::Document::~Document): 11 (WebCore::Document::createRenderTree): 12 (WebCore::Document::destroyRenderTree): 13 * dom/Document.h: 14 * page/Frame.cpp: 15 (WebCore::Frame::Frame): 16 * page/Frame.h: 17 * page/animation/AnimationController.cpp: 18 (WebCore::AnimationController::AnimationController): 19 * page/animation/AnimationController.h: 20 * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h: 21 * platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h: 22 * platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm: 23 (WebCore::AudioTrackPrivateAVFObjC::AudioTrackPrivateAVFObjC): 24 (WebCore::AudioTrackPrivateAVFObjC::setPlayerItemTrack): 25 * platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp: 26 (WebCore::VideoTrackPrivateAVFObjC::VideoTrackPrivateAVFObjC): 27 (WebCore::VideoTrackPrivateAVFObjC::setPlayerItemTrack): 28 * platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h: 29 * rendering/svg/RenderSVGResourceClipper.cpp: 30 (WebCore::RenderSVGResourceClipper::applyClippingToContext): 31 * rendering/svg/RenderSVGResourceClipper.h: 32 * rendering/svg/RenderSVGResourceFilter.cpp: 33 (WebCore::RenderSVGResourceFilter::applyResource): 34 * rendering/svg/RenderSVGResourceFilter.h: 35 * rendering/svg/RenderSVGResourceMasker.cpp: 36 (WebCore::RenderSVGResourceMasker::applyResource): 37 * rendering/svg/RenderSVGResourceMasker.h: 38 1 39 2013-10-05 Darin Adler <darin@apple.com> 2 40 -
trunk/Source/WebCore/dom/Document.cpp
r156940 r156968 448 448 , m_startTime(monotonicallyIncreasingTimeMS()) 449 449 , m_overMinimumLayoutThreshold(false) 450 , m_scriptRunner( createOwned<ScriptRunner>(*this))450 , m_scriptRunner(std::make_unique<ScriptRunner>(*this)) 451 451 , m_xmlVersion(ASCIILiteral("1.0")) 452 452 , m_xmlStandalone(StandaloneUnspecified) … … 580 580 m_domWindow->resetUnlessSuspendedForPageCache(); 581 581 582 m_scriptRunner .clear();582 m_scriptRunner = nullptr; 583 583 584 584 histogramMutationEventUsage(m_listenerTypes); … … 595 595 detachParser(); 596 596 597 m_renderArena .clear();597 m_renderArena = nullptr; 598 598 599 599 if (this == topDocument()) … … 2012 2012 2013 2013 if (!m_renderArena) 2014 m_renderArena = createOwned<RenderArena>();2014 m_renderArena = std::make_unique<RenderArena>(); 2015 2015 2016 2016 setRenderView(new (*m_renderArena) RenderView(*this)); … … 2119 2119 #endif 2120 2120 2121 m_renderArena .clear();2121 m_renderArena = nullptr; 2122 2122 } 2123 2123 -
trunk/Source/WebCore/dom/Document.h
r156940 r156968 1382 1382 RefPtr<Element> m_titleElement; 1383 1383 1384 OwnPtr<RenderArena> m_renderArena;1384 std::unique_ptr<RenderArena> m_renderArena; 1385 1385 1386 1386 OwnPtr<AXObjectCache> m_axObjectCache; … … 1403 1403 bool m_overMinimumLayoutThreshold; 1404 1404 1405 OwnPtr<ScriptRunner> m_scriptRunner;1406 1407 Vector<RefPtr<HTMLScriptElement> 1405 std::unique_ptr<ScriptRunner> m_scriptRunner; 1406 1407 Vector<RefPtr<HTMLScriptElement>> m_currentScriptStack; 1408 1408 1409 1409 #if ENABLE(XSLT) -
trunk/Source/WebCore/page/Frame.cpp
r156769 r156968 160 160 , m_navigationScheduler(this) 161 161 , m_ownerElement(ownerElement) 162 , m_script( createOwned<ScriptController>(*this))162 , m_script(std::make_unique<ScriptController>(*this)) 163 163 , m_editor(Editor::create(*this)) 164 164 , m_selection(adoptPtr(new FrameSelection(this))) 165 165 , m_eventHandler(adoptPtr(new EventHandler(*this))) 166 , m_animationController( createOwned<AnimationController>(*this))166 , m_animationController(std::make_unique<AnimationController>(*this)) 167 167 , m_pageZoomFactor(parentPageZoomFactor(this)) 168 168 , m_textZoomFactor(parentTextZoomFactor(this)) -
trunk/Source/WebCore/page/Frame.h
r156769 r156968 221 221 RefPtr<Document> m_doc; 222 222 223 const OwnPtr<ScriptController> m_script;223 const std::unique_ptr<ScriptController> m_script; 224 224 const OwnPtr<Editor> m_editor; 225 225 const OwnPtr<FrameSelection> m_selection; 226 226 const OwnPtr<EventHandler> m_eventHandler; 227 const OwnPtr<AnimationController> m_animationController;227 const std::unique_ptr<AnimationController> m_animationController; 228 228 229 229 #if ENABLE(IOS_TEXT_AUTOSIZING) -
trunk/Source/WebCore/page/animation/AnimationController.cpp
r156622 r156968 474 474 475 475 AnimationController::AnimationController(Frame& frame) 476 : m_data( createOwned<AnimationControllerPrivate>(frame))476 : m_data(std::make_unique<AnimationControllerPrivate>(frame)) 477 477 , m_beginAnimationUpdateCount(0) 478 478 { -
trunk/Source/WebCore/page/animation/AnimationController.h
r156622 r156968 84 84 85 85 private: 86 const OwnPtr<AnimationControllerPrivate> m_data;86 const std::unique_ptr<AnimationControllerPrivate> m_data; 87 87 int m_beginAnimationUpdateCount; 88 88 }; -
trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
r156722 r156968 41 41 class AVTrackPrivateAVFObjCImpl { 42 42 public: 43 static OwnPtr<AVTrackPrivateAVFObjCImpl> create(AVPlayerItemTrack* track) 44 { 45 return createOwned<AVTrackPrivateAVFObjCImpl>(track); 46 } 47 AVTrackPrivateAVFObjCImpl(AVPlayerItemTrack*); 43 explicit AVTrackPrivateAVFObjCImpl(AVPlayerItemTrack*); 48 44 49 45 AVPlayerItemTrack* playerItemTrack() const { return m_playerItemTrack.get(); } -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
r156722 r156968 55 55 56 56 void resetPropertiesFromTrack(); 57 OwnPtr<AVTrackPrivateAVFObjCImpl> m_impl;57 std::unique_ptr<AVTrackPrivateAVFObjCImpl> m_impl; 58 58 }; 59 59 -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
r156722 r156968 33 33 34 34 AudioTrackPrivateAVFObjC::AudioTrackPrivateAVFObjC(AVPlayerItemTrack* track) 35 : m_impl( AVTrackPrivateAVFObjCImpl::create(track))35 : m_impl(std::make_unique<AVTrackPrivateAVFObjCImpl>(track)) 36 36 { 37 37 resetPropertiesFromTrack(); … … 49 49 void AudioTrackPrivateAVFObjC::setPlayerItemTrack(AVPlayerItemTrack *track) 50 50 { 51 m_impl = AVTrackPrivateAVFObjCImpl::create(track);51 m_impl = std::make_unique<AVTrackPrivateAVFObjCImpl>(track); 52 52 resetPropertiesFromTrack(); 53 53 } -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
r156722 r156968 33 33 34 34 VideoTrackPrivateAVFObjC::VideoTrackPrivateAVFObjC(AVPlayerItemTrack* track) 35 : m_impl(AVTrackPrivateAVFObjCImpl::create(track))35 : m_impl(std::make_unique<AVTrackPrivateAVFObjCImpl>(track)) 36 36 { 37 37 resetPropertiesFromTrack(); … … 49 49 void VideoTrackPrivateAVFObjC::setPlayerItemTrack(AVPlayerItemTrack *track) 50 50 { 51 m_impl = AVTrackPrivateAVFObjCImpl::create(track);51 m_impl = std::make_unique<AVTrackPrivateAVFObjCImpl>(track); 52 52 resetPropertiesFromTrack(); 53 53 } -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
r156722 r156968 52 52 53 53 private: 54 VideoTrackPrivateAVFObjC(AVPlayerItemTrack*);54 explicit VideoTrackPrivateAVFObjC(AVPlayerItemTrack*); 55 55 56 56 void resetPropertiesFromTrack(); 57 OwnPtr<AVTrackPrivateAVFObjCImpl> m_impl;57 std::unique_ptr<AVTrackPrivateAVFObjCImpl> m_impl; 58 58 }; 59 59 -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
r156954 r156968 148 148 bool missingClipperData = !m_clipper.contains(object); 149 149 if (missingClipperData) 150 m_clipper.set(object, createOwned<ClipperData>().release());150 m_clipper.set(object, std::make_unique<ClipperData>()); 151 151 152 152 bool shouldCreateClipData = false; -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
r156155 r156968 76 76 77 77 FloatRect m_clipBoundaries; 78 HashMap<RenderObject*, OwnPtr<ClipperData>> m_clipper;78 HashMap<RenderObject*, std::unique_ptr<ClipperData>> m_clipper; 79 79 }; 80 80 -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
r155755 r156968 147 147 } 148 148 149 auto filterData = createOwned<FilterData>();149 auto filterData = std::make_unique<FilterData>(); 150 150 FloatRect targetBoundingBox = object->objectBoundingBox(); 151 151 … … 215 215 ASSERT(!m_filter.contains(object)); 216 216 filterData->savedContext = context; 217 m_filter.set(object, filterData.release());217 m_filter.set(object, std::move(filterData)); 218 218 return false; 219 219 } … … 229 229 ASSERT(!m_filter.contains(object)); 230 230 filterData->savedContext = context; 231 m_filter.set(object, filterData.release());231 m_filter.set(object, std::move(filterData)); 232 232 return false; 233 233 } … … 245 245 246 246 ASSERT(!m_filter.contains(object)); 247 m_filter.set(object, filterData.release());247 m_filter.set(object, std::move(filterData)); 248 248 249 249 return true; -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h
r155755 r156968 98 98 bool fitsInMaximumImageSize(const FloatSize&, FloatSize&); 99 99 100 HashMap<RenderObject*, OwnPtr<FilterData>> m_filter;100 HashMap<RenderObject*, std::unique_ptr<FilterData>> m_filter; 101 101 }; 102 102 -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
r156954 r156968 75 75 bool missingMaskerData = !m_masker.contains(object); 76 76 if (missingMaskerData) 77 m_masker.set(object, createOwned<MaskerData>().release());77 m_masker.set(object, std::make_unique<MaskerData>()); 78 78 79 79 MaskerData* maskerData = m_masker.get(object); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h
r155755 r156968 66 66 67 67 FloatRect m_maskContentBoundaries; 68 HashMap<RenderObject*, OwnPtr<MaskerData>> m_masker;68 HashMap<RenderObject*, std::unique_ptr<MaskerData>> m_masker; 69 69 }; 70 70 -
trunk/Source/WebKit2/ChangeLog
r156967 r156968 1 2013-10-05 Anders Carlsson <andersca@apple.com> 2 3 Remove createOwned 4 https://bugs.webkit.org/show_bug.cgi?id=122388 5 6 Reviewed by Darin Adler. 7 8 * UIProcess/API/mac/WKView.mm: 9 (-[WKView _setFindIndicator:fadeOut:animate:]): 10 * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp: 11 (WKBundlePageOverlayCreate): 12 1 13 2013-10-05 Darin Adler <darin@apple.com> 2 14 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r156860 r156968 173 173 ValidationMap _validationMap; 174 174 175 OwnPtr<FindIndicatorWindow> _findIndicatorWindow; 175 std::unique_ptr<FindIndicatorWindow> _findIndicatorWindow; 176 176 177 // We keep here the event when resending it to 177 178 // the application to distinguish the case of a new event from one … … 2606 2607 2607 2608 if (!_data->_findIndicatorWindow) 2608 _data->_findIndicatorWindow = createOwned<FindIndicatorWindow>(self);2609 _data->_findIndicatorWindow = std::make_unique<FindIndicatorWindow>(self); 2609 2610 2610 2611 _data->_findIndicatorWindow->setFindIndicator(findIndicator, fadeOut, animate); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
r156688 r156968 145 145 return 0; 146 146 147 auto clientImpl = createOwned<PageOverlayClientImpl>(wkClient);147 auto clientImpl = std::make_unique<PageOverlayClientImpl>(wkClient); 148 148 149 149 // FIXME: Looks like this leaks the clientImpl. 150 return toAPI(PageOverlay::create(clientImpl. leakPtr()).leakRef());150 return toAPI(PageOverlay::create(clientImpl.release()).leakRef()); 151 151 } 152 152
Note: See TracChangeset
for help on using the changeset viewer.