Changeset 261073 in webkit

Timestamp:

May 4, 2020, 12:13:21 AM (5 years ago)

Author:

mark.lam@apple.com

Message:

Remove some unused and broken functions in Bitmap.
​https://bugs.webkit.org/show_bug.cgi?id=211368

Reviewed by Yusuke Suzuki.

Bitmap::operator[] never worked. There's currently no way to use it to read a
bit value. We also can't use it to set a bit value because it relies on
Bitmap::iterator::operator= to set the value. However, Bitmap::iterator stores
the Bitmap* as a const pointer, and Bitmap::iterator::operator= calls set() on
the const pointer. If we try to use operator[] to set a bit, we'll get a
compilation error.

This patch removes the 2 variants of Bitmap::operator[] and Bitmap::iterator::operator=.

• wtf/Bitmap.h:

(WTF::WordType>::operator): Deleted.
(WTF::WordType>::operator const const): Deleted.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Bitmap.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-05-03  Mark Lam  <mark.lam@apple.com>
+
+        Remove some unused and broken functions in Bitmap.
+        https://bugs.webkit.org/show_bug.cgi?id=211368
+
+        Reviewed by Yusuke Suzuki.
+
+        Bitmap::operator[] never worked.  There's currently no way to use it to read a
+        bit value.  We also can't use it to set a bit value because it relies on
+        Bitmap::iterator::operator= to set the value.  However, Bitmap::iterator stores
+        the Bitmap* as a const pointer, and Bitmap::iterator::operator= calls set() on
+        the const pointer.  If we try to use operator[] to set a bit, we'll get a
+        compilation error.
+
+        This patch removes the 2 variants of Bitmap::operator[] and Bitmap::iterator::operator=.
+
+        * wtf/Bitmap.h:
+        (WTF::WordType>::operator): Deleted.
+        (WTF::WordType>::operator const const): Deleted.
+
 2020-05-03  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WTF/wtf/Bitmap.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 2010-2019 Apple Inc. All rights reserved.
+ *  Copyright (C) 2010-2020 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -104 +104 @@
         }
 
-        iterator& operator=(bool value)
-        {
-            m_bitmap->set(m_index, value);
-            return *this;
-        }
-
     private:
         const Bitmap* m_bitmap;
@@ -119 +113 @@
     iterator end() const { return iterator(*this, bitmapSize); }
     
-    iterator operator[](size_t);
-    const iterator operator[](size_t) const;
-
     void mergeAndClear(Bitmap&);
     void setAndClear(Bitmap&);
@@ -428 +419 @@
 
 template<size_t bitmapSize, typename WordType>
-inline auto Bitmap<bitmapSize, WordType>::operator[](size_t index) -> iterator
-{
-    ASSERT(index < size());
-    return iterator(*this, index);
-}
-
-template<size_t bitmapSize, typename WordType>
-inline auto Bitmap<bitmapSize, WordType>::operator[](size_t index) const -> const iterator
-{
-    return (*const_cast<Bitmap<bitmapSize, WordType>*>(this))[index];
-}
-
-template<size_t bitmapSize, typename WordType>
 inline unsigned Bitmap<bitmapSize, WordType>::hash() const
 {