diff --git a/Userland/Libraries/LibJS/Heap/GCPtr.h b/Userland/Libraries/LibJS/Heap/GCPtr.h index 8ba3654af6..b2c57be3d3 100644 --- a/Userland/Libraries/LibJS/Heap/GCPtr.h +++ b/Userland/Libraries/LibJS/Heap/GCPtr.h @@ -72,20 +72,15 @@ public: return *this; } - T* operator->() { return m_ptr; } - T const* operator->() const { return m_ptr; } + T* operator->() const { return m_ptr; } - T& operator*() { return *m_ptr; } - T const& operator*() const { return *m_ptr; } + T& operator*() const { return *m_ptr; } - T* ptr() { return m_ptr; } - T const* ptr() const { return m_ptr; } + T* ptr() const { return m_ptr; } - operator T*() { return m_ptr; } - operator T const*() const { return m_ptr; } + operator T*() const { return m_ptr; } - operator T&() { return *m_ptr; } - operator T const&() const { return *m_ptr; } + operator T&() const { return *m_ptr; } private: T* m_ptr { nullptr }; @@ -181,20 +176,14 @@ public: return *this; } - T* operator->() { return m_ptr; } - T const* operator->() const { return m_ptr; } - - T& operator*() { return *m_ptr; } - T const& operator*() const { return *m_ptr; } - - T* ptr() { return m_ptr; } - T const* ptr() const { return m_ptr; } + T* operator->() const { return m_ptr; } + T& operator*() const { return *m_ptr; } + T* ptr() const { return m_ptr; } operator bool() const { return !!m_ptr; } bool operator!() const { return !m_ptr; } - operator T*() { return m_ptr; } - operator T const*() const { return m_ptr; } + operator T*() const { return m_ptr; } private: T* m_ptr { nullptr }; diff --git a/Userland/Libraries/LibJS/Heap/Handle.h b/Userland/Libraries/LibJS/Heap/Handle.h index 4b84a7ef37..3daf556829 100644 --- a/Userland/Libraries/LibJS/Heap/Handle.h +++ b/Userland/Libraries/LibJS/Heap/Handle.h @@ -60,25 +60,14 @@ public: { } - T* cell() + T* cell() const { if (!m_impl) return nullptr; return static_cast(m_impl->cell()); } - T const* cell() const - { - if (!m_impl) - return nullptr; - return static_cast(m_impl->cell()); - } - - T* ptr() - { - return cell(); - } - T const* ptr() const + T* ptr() const { return cell(); } @@ -88,20 +77,12 @@ public: return m_impl.is_null(); } - T* operator->() - { - return cell(); - } - T const* operator->() const + T* operator->() const { return cell(); } - T& operator*() - { - return *cell(); - } - T const& operator*() const + T& operator*() const { return *cell(); } @@ -115,8 +96,7 @@ public: return cell(); } - operator T*() { return cell(); } - operator T const*() const { return cell(); } + operator T*() const { return cell(); } private: explicit Handle(NonnullRefPtr impl) diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index 66727385c7..c1b7c1e994 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp @@ -121,7 +121,7 @@ WebIDL::ExceptionOr CanvasRenderingContext2D::draw_image_internal(CanvasIm if (usability == CanvasImageSourceUsability::Bad) return {}; - auto const* bitmap = image.visit([](auto const& source) { return source->bitmap(); }); + auto const* bitmap = image.visit([](auto const& source) -> Gfx::Bitmap const* { return source->bitmap(); }); if (!bitmap) return {};