mirror of
https://github.com/fergalmoran/ladybird.git
synced 2026-01-06 16:45:03 +00:00
LibKeyboard: Read keymap through File, not DeprecatedFile
This results in a new OOM prevention. Hooray!
This commit is contained in:
committed by
Sam Atkins
parent
37b5bfa068
commit
97e60f2c7d
@@ -7,7 +7,7 @@
|
||||
#include "CharacterMapFile.h"
|
||||
#include <AK/ByteBuffer.h>
|
||||
#include <AK/Utf8View.h>
|
||||
#include <LibCore/DeprecatedFile.h>
|
||||
#include <LibCore/File.h>
|
||||
|
||||
namespace Keyboard {
|
||||
|
||||
@@ -22,8 +22,8 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(DeprecatedString cons
|
||||
path = full_path.to_deprecated_string();
|
||||
}
|
||||
|
||||
auto file = TRY(Core::DeprecatedFile::open(path, Core::OpenMode::ReadOnly));
|
||||
auto file_contents = file->read_all();
|
||||
auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read));
|
||||
auto file_contents = TRY(file->read_until_eof());
|
||||
auto json_result = TRY(JsonValue::from_string(file_contents));
|
||||
auto const& json = json_result.as_object();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user