44
55#include " flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
66
7- #include < assert.h>
87#include < windows.h>
98
109#include < chrono>
1110#include < iostream>
1211#include < string>
1312
13+ #include " flutter/fml/logging.h"
1414#include " flutter/shell/platform/windows/keyboard_utils.h"
1515
1616namespace flutter {
@@ -38,7 +38,7 @@ char _GetBit(char32_t ch, size_t start, size_t end) {
3838
3939std::string ConvertChar32ToUtf8 (char32_t ch) {
4040 std::string result;
41- assert (0 <= ch && ch <= 0x10FFFF );
41+ FML_DCHECK (0 <= ch && ch <= 0x10FFFF ) << " Character out of range " ;
4242 if (ch <= 0x007F ) {
4343 result.push_back (ch);
4444 } else if (ch <= 0x07FF ) {
@@ -160,8 +160,8 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
160160 std::function<void (bool )> callback) {
161161 const uint64_t physical_key = GetPhysicalKey (scancode, extended);
162162 const uint64_t logical_key = GetLogicalKey (key, extended, scancode);
163- assert (action == WM_KEYDOWN || action == WM_KEYUP ||
164- action == WM_SYSKEYDOWN || action == WM_SYSKEYUP);
163+ FML_DCHECK (action == WM_KEYDOWN || action == WM_KEYUP ||
164+ action == WM_SYSKEYDOWN || action == WM_SYSKEYUP);
165165
166166 auto last_logical_record_iter = pressingRecords_.find (physical_key);
167167 bool had_record = last_logical_record_iter != pressingRecords_.end ();
@@ -230,7 +230,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
230230 if (was_down) {
231231 // A normal repeated key.
232232 type = kFlutterKeyEventTypeRepeat ;
233- assert (had_record);
233+ FML_DCHECK (had_record);
234234 ConvertUtf32ToUtf8_ (character_bytes, character);
235235 eventual_logical_record = last_logical_record;
236236 result_logical_key = last_logical_record;
@@ -245,7 +245,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
245245 } else {
246246 // A normal down event (whether the system event is a repeat or not).
247247 type = kFlutterKeyEventTypeDown ;
248- assert (!had_record);
248+ FML_DCHECK (!had_record);
249249 ConvertUtf32ToUtf8_ (character_bytes, character);
250250 eventual_logical_record = logical_key;
251251 result_logical_key = logical_key;
@@ -260,7 +260,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
260260 } else {
261261 // A normal up event.
262262 type = kFlutterKeyEventTypeUp ;
263- assert (had_record);
263+ FML_DCHECK (had_record);
264264 // Up events never have character.
265265 character_bytes[0 ] = ' \0 ' ;
266266 eventual_logical_record = 0 ;
@@ -278,7 +278,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
278278 if (record_iter != pressingRecords_.end ()) {
279279 pressingRecords_.erase (record_iter);
280280 } else {
281- assert (false );
281+ FML_DCHECK (false );
282282 }
283283 }
284284
@@ -375,7 +375,7 @@ void KeyboardKeyEmbedderHandler::SynchronizeCriticalToggledStates(
375375 // Never seen this key.
376376 continue ;
377377 }
378- assert (key_info.logical_key != 0 );
378+ FML_DCHECK (key_info.logical_key != 0 );
379379
380380 // Check toggling state first, because it might alter pressing state.
381381 if (key_info.check_toggled ) {
@@ -440,7 +440,7 @@ void KeyboardKeyEmbedderHandler::SynchronizeCriticalPressedStates(
440440 // Never seen this key.
441441 continue ;
442442 }
443- assert (key_info.logical_key != 0 );
443+ FML_DCHECK (key_info.logical_key != 0 );
444444 if (key_info.check_pressed ) {
445445 SHORT true_pressed = get_key_state_ (virtual_key) & kStateMaskPressed ;
446446 auto pressing_record_iter = pressingRecords_.find (key_info.physical_key );
0 commit comments