- Revision
- 222740
- Author
- [email protected]
- Date
- 2017-10-02 14:06:32 -0700 (Mon, 02 Oct 2017)
Log Message
Make RenderPtr a type alias of std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=177739
Reviewed by Sam Weinig.
It just needs a custom deleter.
* page/FrameView.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::insertChildInternal):
* rendering/RenderMultiColumnFlow.cpp:
(WebCore::RenderMultiColumnFlow::fragmentedFlowDescendantInserted):
(WebCore::RenderMultiColumnFlow::handleSpannerRemoval):
* rendering/RenderObject.cpp:
(WebCore::RenderObjectDeleter::operator() const):
(WebCore::RenderObject::willBeDestroyed):
* rendering/RenderPtr.h:
(WebCore::createRenderer):
(WebCore::static_pointer_cast):
Make this safer with downcast.
(WebCore::RenderPtr::RenderPtr): Deleted.
(WebCore::RenderPtr::~RenderPtr): Deleted.
(WebCore::RenderPtr::get const): Deleted.
(WebCore::RenderPtr::operator* const): Deleted.
(WebCore::RenderPtr::operator-> const): Deleted.
(WebCore::RenderPtr::operator! const): Deleted.
(WebCore::RenderPtr::operator UnspecifiedBoolType const): Deleted.
(WebCore::RenderPtr::operator=): Deleted.
(WebCore::RenderPtr::swap): Deleted.
(WebCore::RenderPtr::operator==): Deleted.
(WebCore::RenderPtr::operator!=): Deleted.
(WebCore::RenderPtr<T>::clear): Deleted.
(WebCore::RenderPtr<T>::leakPtr): Deleted.
(WebCore::RenderPtr<T>::RenderPtr): Deleted.
(WebCore::=): Deleted.
(WebCore::swap): Deleted.
(WebCore::operator==): Deleted.
(WebCore::operator!=): Deleted.
(WebCore::getPtr): Deleted.
(WTF::HashTraits<WebCore::RenderPtr<T>>::emptyValue): Deleted.
(WTF::HashTraits<WebCore::RenderPtr<T>>::peek): Deleted.
We already have hash traits for std::unique_ptr.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222739 => 222740)
--- trunk/Source/WebCore/ChangeLog 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/ChangeLog 2017-10-02 21:06:32 UTC (rev 222740)
@@ -1,3 +1,51 @@
+2017-10-02 Antti Koivisto <[email protected]>
+
+ Make RenderPtr a type alias of std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=177739
+
+ Reviewed by Sam Weinig.
+
+ It just needs a custom deleter.
+
+ * page/FrameView.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::insertChildInternal):
+ * rendering/RenderMultiColumnFlow.cpp:
+ (WebCore::RenderMultiColumnFlow::fragmentedFlowDescendantInserted):
+ (WebCore::RenderMultiColumnFlow::handleSpannerRemoval):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObjectDeleter::operator() const):
+ (WebCore::RenderObject::willBeDestroyed):
+ * rendering/RenderPtr.h:
+ (WebCore::createRenderer):
+ (WebCore::static_pointer_cast):
+
+ Make this safer with downcast.
+
+ (WebCore::RenderPtr::RenderPtr): Deleted.
+ (WebCore::RenderPtr::~RenderPtr): Deleted.
+ (WebCore::RenderPtr::get const): Deleted.
+ (WebCore::RenderPtr::operator* const): Deleted.
+ (WebCore::RenderPtr::operator-> const): Deleted.
+ (WebCore::RenderPtr::operator! const): Deleted.
+ (WebCore::RenderPtr::operator UnspecifiedBoolType const): Deleted.
+ (WebCore::RenderPtr::operator=): Deleted.
+ (WebCore::RenderPtr::swap): Deleted.
+ (WebCore::RenderPtr::operator==): Deleted.
+ (WebCore::RenderPtr::operator!=): Deleted.
+ (WebCore::RenderPtr<T>::clear): Deleted.
+ (WebCore::RenderPtr<T>::leakPtr): Deleted.
+ (WebCore::RenderPtr<T>::RenderPtr): Deleted.
+ (WebCore::=): Deleted.
+ (WebCore::swap): Deleted.
+ (WebCore::operator==): Deleted.
+ (WebCore::operator!=): Deleted.
+ (WebCore::getPtr): Deleted.
+ (WTF::HashTraits<WebCore::RenderPtr<T>>::emptyValue): Deleted.
+ (WTF::HashTraits<WebCore::RenderPtr<T>>::peek): Deleted.
+
+ We already have hash traits for std::unique_ptr.
+
2017-10-02 Joseph Pecoraro <[email protected]>
Web Inspector: Include Beacon and Ping requests in Network tab
Modified: trunk/Source/WebCore/dom/Document.cpp (222739 => 222740)
--- trunk/Source/WebCore/dom/Document.cpp 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-10-02 21:06:32 UTC (rev 222740)
@@ -2259,7 +2259,10 @@
unscheduleStyleRecalc();
- m_renderView = nullptr;
+ // FIXME: RenderObject::view() uses m_renderView and we can't null it before destruction is completed
+ m_renderView->destroy();
+ m_renderView.release();
+
Node::setRenderer(nullptr);
#if ENABLE(TEXT_AUTOSIZING)
Modified: trunk/Source/WebCore/page/FrameView.h (222739 => 222740)
--- trunk/Source/WebCore/page/FrameView.h 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/page/FrameView.h 2017-10-02 21:06:32 UTC (rev 222740)
@@ -483,7 +483,7 @@
// Unlike client coordinates, layout viewport coordinates are affected by page zoom.
FloatPoint clientToLayoutViewportPoint(FloatPoint) const;
- bool isFrameViewScrollCorner(const RenderScrollbarPart& scrollCorner) const { return m_scrollCorner == &scrollCorner; }
+ bool isFrameViewScrollCorner(const RenderScrollbarPart& scrollCorner) const { return m_scrollCorner.get() == &scrollCorner; }
// isScrollable() takes an optional Scrollability parameter that allows the caller to define what they mean by 'scrollable.'
// Most callers are interested in the default value, Scrollability::Scrollable, which means that there is actually content
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (222739 => 222740)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-10-02 21:06:32 UTC (rev 222740)
@@ -523,7 +523,7 @@
ASSERT(!beforeChild || beforeChild->parent() == this);
// Take the ownership.
- auto* newChild = newChildPtr.leakPtr();
+ auto* newChild = newChildPtr.release();
newChild->setParent(this);
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (222739 => 222740)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2017-10-02 21:06:32 UTC (rev 222740)
@@ -108,6 +108,11 @@
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("RenderObject"));
+void RenderObjectDeleter::operator() (RenderObject* renderer) const
+{
+ renderer->destroy();
+}
+
RenderObject::RenderObject(Node& node)
: CachedImageClient()
, m_node(node)
@@ -1431,7 +1436,7 @@
if (m_parent) {
// FIXME: We should have always been removed from the parent before being destroyed.
auto takenThis = m_parent->takeChild(*this);
- auto* leakedPtr = takenThis.leakPtr();
+ auto* leakedPtr = takenThis.release();
UNUSED_PARAM(leakedPtr);
}
Modified: trunk/Source/WebCore/rendering/RenderPtr.h (222739 => 222740)
--- trunk/Source/WebCore/rendering/RenderPtr.h 2017-10-02 20:24:10 UTC (rev 222739)
+++ trunk/Source/WebCore/rendering/RenderPtr.h 2017-10-02 21:06:32 UTC (rev 222740)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,154 +25,27 @@
#pragma once
-#include <algorithm>
-#include <cstddef>
-#include <memory>
-#include <wtf/Assertions.h>
-#include <wtf/HashTraits.h>
+#include <wtf/TypeCasts.h>
namespace WebCore {
-template<typename T> class RenderPtr {
-public:
- typedef T ValueType;
- typedef ValueType* PtrType;
+class RenderObject;
- RenderPtr() : m_ptr(nullptr) { }
- RenderPtr(std::nullptr_t) : m_ptr(nullptr) { }
- explicit RenderPtr(T* ptr) : m_ptr(ptr) { }
-
- ~RenderPtr()
- {
- if (m_ptr)
- m_ptr->destroy();
- }
-
- PtrType get() const { return m_ptr; }
-
- void clear();
- PtrType leakPtr() WARN_UNUSED_RETURN;
-
- ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
- PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
-
- bool operator!() const { return !m_ptr; }
-
- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef PtrType RenderPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &RenderPtr::m_ptr : nullptr; }
-
- RenderPtr& operator=(std::nullptr_t) { clear(); return *this; }
-
- RenderPtr(RenderPtr&&);
- template<typename U> RenderPtr(RenderPtr<U>&&);
-
- RenderPtr& operator=(RenderPtr&&);
- template<typename U> RenderPtr& operator=(RenderPtr<U>&&);
-
- void swap(RenderPtr& o) { std::swap(m_ptr, o.m_ptr); }
-
-private:
- // We should never have two RenderPtrs for the same underlying object (otherwise we'll get
- // double-destruction), so these equality operators should never be needed.
- template<typename U> bool operator==(const RenderPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), RenderPtrs_should_never_be_equal); return false; }
- template<typename U> bool operator!=(const RenderPtr<U>&) { COMPILE_ASSERT(!sizeof(U*), RenderPtrs_should_never_be_equal); return false; }
-
- PtrType m_ptr;
+struct RenderObjectDeleter
+{
+ void operator() (RenderObject*) const;
};
-template<typename T> inline void RenderPtr<T>::clear()
-{
- if (m_ptr)
- m_ptr->destroy();
- m_ptr = nullptr;
-}
+template <typename T> using RenderPtr = std::unique_ptr<T, RenderObjectDeleter>;
-template<typename T> inline typename RenderPtr<T>::PtrType RenderPtr<T>::leakPtr()
+template<typename T, class... Args> inline RenderPtr<T> createRenderer(Args&&... args)
{
- PtrType ptr = m_ptr;
- m_ptr = nullptr;
- return ptr;
-}
-
-template<typename T> inline RenderPtr<T>::RenderPtr(RenderPtr<T>&& o)
- : m_ptr(o.leakPtr())
-{
-}
-
-template<typename T> template<typename U> inline RenderPtr<T>::RenderPtr(RenderPtr<U>&& o)
- : m_ptr(o.leakPtr())
-{
-}
-
-template<typename T> inline auto RenderPtr<T>::operator=(RenderPtr&& o) -> RenderPtr&
-{
- ASSERT(!o || o != m_ptr);
- RenderPtr ptr = WTFMove(o);
- swap(ptr);
- return *this;
-}
-
-template<typename T> template<typename U> inline auto RenderPtr<T>::operator=(RenderPtr<U>&& o) -> RenderPtr&
-{
- ASSERT(!o || o != m_ptr);
- RenderPtr ptr = WTFMove(o);
- swap(ptr);
- return *this;
-}
-
-template<typename T> inline void swap(RenderPtr<T>& a, RenderPtr<T>& b)
-{
- a.swap(b);
-}
-
-template<typename T, typename U> inline bool operator==(const RenderPtr<T>& a, U* b)
-{
- return a.get() == b;
-}
-
-template<typename T, typename U> inline bool operator==(T* a, const RenderPtr<U>& b)
-{
- return a == b.get();
-}
-
-template<typename T, typename U> inline bool operator!=(const RenderPtr<T>& a, U* b)
-{
- return a.get() != b;
-}
-
-template<typename T, typename U> inline bool operator!=(T* a, const RenderPtr<U>& b)
-{
- return a != b.get();
-}
-
-template<typename T> inline typename RenderPtr<T>::PtrType getPtr(const RenderPtr<T>& p)
-{
- return p.get();
-}
-
-template<class T, class... Args> inline RenderPtr<T>
-createRenderer(Args&&... args)
-{
return RenderPtr<T>(new T(std::forward<Args>(args)...));
}
template<typename T, typename U> inline RenderPtr<T> static_pointer_cast(RenderPtr<U>&& p)
{
- return RenderPtr<T>(static_cast<T*>(p.leakPtr()));
+ return RenderPtr<T>(downcast<T>(p.release()));
}
} // namespace WebCore
-
-namespace WTF {
-
-template<typename T> struct HashTraits<WebCore::RenderPtr<T>> : SimpleClassHashTraits<WebCore::RenderPtr<T>> {
- typedef std::nullptr_t EmptyValueType;
- static EmptyValueType emptyValue() { return nullptr; }
-
- typedef T* PeekType;
- static T* peek(const WebCore::RenderPtr<T>& value) { return value.get(); }
- static T* peek(std::nullptr_t) { return nullptr; }
-};
-
-} // namespace WTF
