Unverified Commit b83285b8 authored by Alexander Maryanovsky's avatar Alexander Maryanovsky Committed by GitHub

Minor cleanup. (#1038)

parent 34557283
...@@ -89,11 +89,6 @@ internal class MetalRedrawer( ...@@ -89,11 +89,6 @@ internal class MetalRedrawer(
onContextInit() onContextInit()
} }
fun drawSync() {
layer.update(System.nanoTime())
performDraw()
}
override fun dispose() = synchronized(drawLock) { override fun dispose() = synchronized(drawLock) {
frameDispatcher.cancel() frameDispatcher.cancel()
contextHandler.dispose() contextHandler.dispose()
......
...@@ -98,11 +98,11 @@ class SkiaLayerTest { ...@@ -98,11 +98,11 @@ class SkiaLayerTest {
override fun keyTyped(e: KeyEvent?) { override fun keyTyped(e: KeyEvent?) {
launch { launch {
val redrawer = window.layer.redrawer as MetalRedrawer val redrawer = window.layer.redrawer as MetalRedrawer
redrawer.drawSync() redrawer.redrawImmediately()
counter1 += 1 counter1 += 1
redrawer.drawSync() redrawer.redrawImmediately()
counter2 += 1 counter2 += 1
redrawer.drawSync() redrawer.redrawImmediately()
} }
} }
}) })
......
...@@ -59,11 +59,6 @@ internal class UiTestScope( ...@@ -59,11 +59,6 @@ internal class UiTestScope(
init { init {
setupContent() setupContent()
} }
override fun dispose() {
layer.dispose()
super.dispose()
}
} }
} }
......
...@@ -44,7 +44,7 @@ class DefaultConsoleLogger(override val isTraceEnabled: Boolean = false, ...@@ -44,7 +44,7 @@ class DefaultConsoleLogger(override val isTraceEnabled: Boolean = false,
companion object { companion object {
fun fromLevel(level: String): DefaultConsoleLogger { fun fromLevel(level: String): DefaultConsoleLogger {
val logLevel = LogLevel.values().filter { it.name == level }.firstOrNull() ?: LogLevel.INFO val logLevel = LogLevel.entries.firstOrNull { it.name == level } ?: LogLevel.INFO
return DefaultConsoleLogger( return DefaultConsoleLogger(
isTraceEnabled = LogLevel.TRACE.noMoreVerboseThan(logLevel), isTraceEnabled = LogLevel.TRACE.noMoreVerboseThan(logLevel),
isDebugEnabled = LogLevel.DEBUG.noMoreVerboseThan(logLevel), isDebugEnabled = LogLevel.DEBUG.noMoreVerboseThan(logLevel),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment