~get rid of ArrayQueue

Author: qwwdfsad

kotlinx-coroutines-core/js/src/JSDispatcher.kt

@@ -129,7 +129,7 @@ private class WindowMessageQueue(private val window: Window) : MessageQueue() {
  *
  * Yet there could be a long tail of "slow" reschedules, but it should be amortized by the queue size.
  */
-internal abstract class MessageQueue : ArrayQueue<Runnable>() {
+internal abstract class MessageQueue : MutableList<Runnable> by ArrayDeque() {
     val yieldEvery = 16 // yield to JS macrotask event loop after this many processed messages
     private var scheduled = false
 
@@ -138,7 +138,7 @@ internal abstract class MessageQueue : ArrayQueue<Runnable>() {
     abstract fun reschedule()
 
     fun enqueue(element: Runnable) {
-        addLast(element)
+        add(element)
         if (!scheduled) {
             scheduled = true
             schedule()
@@ -153,7 +153,7 @@ internal abstract class MessageQueue : ArrayQueue<Runnable>() {
                 element.run()
             }
         } finally {
-            if (isEmpty) {
+            if (isEmpty()) {
                 scheduled = false
             } else {
                 reschedule()

kotlinx-coroutines-core/js/src/Window.kt

@@ -4,7 +4,6 @@
 
 package kotlinx.coroutines
 
-import kotlinx.coroutines.internal.*
 import org.w3c.dom.Window
 
 /**
@@ -35,8 +34,8 @@ private fun Window.asWindowAnimationQueue(): WindowAnimationQueue =
 private class WindowAnimationQueue(private val window: Window) {
     private val dispatcher = window.asCoroutineDispatcher()
     private var scheduled = false
-    private var current = ArrayQueue<CancellableContinuation<Double>>()
-    private var next = ArrayQueue<CancellableContinuation<Double>>()
+    private var current = ArrayDeque<CancellableContinuation<Double>>()
+    private var next = ArrayDeque<CancellableContinuation<Double>>()
     private var timestamp = 0.0
 
     fun enqueue(cont: CancellableContinuation<Double>) {

kotlinx-coroutines-core/js/src/internal/ArrayQueue.kt

@@ -36,41 +36,41 @@ class MessageQueueTest {
 
     @Test
     fun testBasic() {
-        assertTrue(queue.isEmpty)
+        assertTrue(queue.isEmpty())
         queue.enqueue(Box(1))
-        assertFalse(queue.isEmpty)
+        assertFalse(queue.isEmpty())
         assertTrue(scheduled)
         queue.enqueue(Box(2))
-        assertFalse(queue.isEmpty)
+        assertFalse(queue.isEmpty())
         scheduled = false
         queue.process()
         assertEquals(listOf(1, 2), processed)
         assertFalse(scheduled)
-        assertTrue(queue.isEmpty)
+        assertTrue(queue.isEmpty())
     }
 
     @Test fun testRescheduleFromProcess()  {
-        assertTrue(queue.isEmpty)
+        assertTrue(queue.isEmpty())
         queue.enqueue(ReBox(1))
-        assertFalse(queue.isEmpty)
+        assertFalse(queue.isEmpty())
         assertTrue(scheduled)
         queue.enqueue(ReBox(2))
-        assertFalse(queue.isEmpty)
+        assertFalse(queue.isEmpty())
         scheduled = false
         queue.process()
         assertEquals(listOf(1, 2, 11, 12), processed)
         assertFalse(scheduled)
-        assertTrue(queue.isEmpty)
+        assertTrue(queue.isEmpty())
     }
 
     @Test
     fun testResizeAndWrap() {
         repeat(10) { phase ->
             val n = 10 * (phase + 1)
-            assertTrue(queue.isEmpty)
+            assertTrue(queue.isEmpty())
             repeat(n) {
                 queue.enqueue(Box(it))
-                assertFalse(queue.isEmpty)
+                assertFalse(queue.isEmpty())
                 assertTrue(scheduled)
             }
             var countYields = 0
@@ -84,4 +84,4 @@ class MessageQueueTest {
             processed.clear()
         }
     }
-}
+}