Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
29bcc33
Merge pull request #1 from flutter/master
dkwingsmt Nov 19, 2020
550c23f
Merge branch 'master' of https://github.com/flutter/engine
dkwingsmt Jan 6, 2021
9149220
Split windows and embedder changes out
dkwingsmt Jan 6, 2021
f93d22c
Split out web
dkwingsmt Jan 6, 2021
a11b10a
Fix license
dkwingsmt Jan 6, 2021
1e7d99c
Correctly remove printing
dkwingsmt Jan 6, 2021
4d43b27
Fix license and key map format
dkwingsmt Jan 7, 2021
0af761d
Clang format
dkwingsmt Jan 7, 2021
cf653a2
Fix build gn
dkwingsmt Jan 7, 2021
08c9507
Include embedder changes
dkwingsmt Jan 7, 2021
aac6837
Fix buildgn for embedder
dkwingsmt Jan 7, 2021
a2d0c78
Fix license
dkwingsmt Jan 7, 2021
226cd56
Fix license
dkwingsmt Jan 7, 2021
3828055
Fix VoidCallback
dkwingsmt Jan 7, 2021
99cd26c
Fix tests
dkwingsmt Jan 7, 2021
ee54d7b
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 7, 2021
09ccc39
Fix compile
dkwingsmt Jan 8, 2021
c10ca64
Fix compile: implement virtual methods
dkwingsmt Jan 8, 2021
55b8c42
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 8, 2021
7a3dd53
Better toString
dkwingsmt Jan 8, 2021
bf7c992
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 12, 2021
736d4f6
Fix doc. Add async callback
dkwingsmt Jan 19, 2021
4be1c0f
Rename back to KeyDataPacket
dkwingsmt Jan 19, 2021
26ccf41
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 19, 2021
5089d0f
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 21, 2021
15388e6
Unit test
dkwingsmt Jan 21, 2021
9a097da
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 21, 2021
8baf82b
Fix compile
dkwingsmt Jan 21, 2021
d63c9f2
First unit test passed
dkwingsmt Jan 21, 2021
091765c
Complete tests
dkwingsmt Jan 21, 2021
e80cef7
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 22, 2021
f4c7b41
Rename to type
dkwingsmt Jan 25, 2021
7de3628
Rename callback
dkwingsmt Jan 25, 2021
86c4e9b
Simplify KeyDataPacket's API.
dkwingsmt Jan 25, 2021
b367ce3
More comments
dkwingsmt Jan 25, 2021
855ffde
Rename embedder kind -> type
dkwingsmt Jan 25, 2021
8cbf7e1
All comments
dkwingsmt Jan 26, 2021
41732a5
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 26, 2021
54479e3
Format
dkwingsmt Jan 26, 2021
a31d475
Format
dkwingsmt Jan 26, 2021
9f192ee
Format3
dkwingsmt Jan 26, 2021
bc406f9
Remove unused
dkwingsmt Jan 26, 2021
c6d5221
Fix web compile
dkwingsmt Jan 26, 2021
54f3231
Add return value handling to web
dkwingsmt Jan 26, 2021
5428e99
Add some handling test
dkwingsmt Jan 26, 2021
f2fd10d
Fix signatures
dkwingsmt Jan 26, 2021
bf643a5
Better doc
dkwingsmt Jan 26, 2021
771dfe6
format
dkwingsmt Jan 26, 2021
a657246
Merge remote-tracking branch 'upstream/master' into keyboard-web
dkwingsmt Jan 26, 2021
749c161
Deflake
dkwingsmt Jan 26, 2021
943b842
Merge branch 'keyboard-web' into keyboard-win
dkwingsmt Jan 27, 2021
7e2563e
Compiled (except for tests)
dkwingsmt Jan 28, 2021
b62e35d
keyboard_key_handler
dkwingsmt Jan 29, 2021
951aaa8
channel handler
dkwingsmt Jan 29, 2021
40f0307
embedder handler
dkwingsmt Jan 30, 2021
d24c29e
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 8, 2021
957cfad
Fix compile
dkwingsmt Feb 8, 2021
2318bd0
Fix delegate returning false
dkwingsmt Feb 8, 2021
018ecd2
Some docs
dkwingsmt Feb 9, 2021
7647c39
More docs
dkwingsmt Feb 9, 2021
e4bee5e
Fix license
dkwingsmt Feb 9, 2021
e7a736f
Fix format
dkwingsmt Feb 9, 2021
063878c
Fix build
dkwingsmt Feb 9, 2021
964df62
Fix license
dkwingsmt Feb 9, 2021
24c603f
Fix compile
dkwingsmt Feb 9, 2021
3f230af
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 9, 2021
4b534f8
Fix compile. Remove unused var.
dkwingsmt Feb 10, 2021
65aefdb
Fix format
dkwingsmt Feb 10, 2021
db2309c
Add handle tests
dkwingsmt Feb 10, 2021
8fa509c
Simplify logic
dkwingsmt Feb 10, 2021
85c944f
Rename to RedispatchEvent
dkwingsmt Feb 10, 2021
8791ca8
Remove redundant APIs
dkwingsmt Feb 10, 2021
c5b179d
Fix compile
dkwingsmt Feb 10, 2021
34a54e3
New struct of handler
dkwingsmt Feb 12, 2021
fc9ebaa
Refactor
dkwingsmt Feb 12, 2021
033ddbd
Fix tests
dkwingsmt Feb 12, 2021
0092374
Add regression test
dkwingsmt Feb 12, 2021
a25575f
Renames
dkwingsmt Feb 13, 2021
3c00284
processkey test
dkwingsmt Feb 17, 2021
7b99a1c
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 17, 2021
de88b25
Merge branch 'keyboard-win' of https://github.com/dkwingsmt/engine in…
dkwingsmt Feb 17, 2021
9b698b1
Tests for modifiers
dkwingsmt Feb 17, 2021
b5f82a6
Key event irregularity
dkwingsmt Feb 17, 2021
64f61a6
Some comments
dkwingsmt Feb 17, 2021
4e759d0
Comments
dkwingsmt Feb 17, 2021
9156bac
Privatize string convertsion
dkwingsmt Feb 17, 2021
aca9f8f
Impl check keys
dkwingsmt Feb 17, 2021
108f56c
Adapt unittests
dkwingsmt Feb 17, 2021
c239f83
More tests
dkwingsmt Feb 17, 2021
cc21634
Fix tests
dkwingsmt Feb 17, 2021
4b0d841
format
dkwingsmt Feb 17, 2021
d6b6920
Fix move and test
dkwingsmt Feb 18, 2021
e90a976
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 18, 2021
0331bf5
format
dkwingsmt Feb 18, 2021
e5aecc4
Renames and docs
dkwingsmt Feb 18, 2021
d4457f2
Test initial state
dkwingsmt Feb 18, 2021
5eca1ba
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 22, 2021
4481be6
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 24, 2021
2e962b4
Fix comments
dkwingsmt Feb 25, 2021
c89e3b1
Merge remote-tracking branch 'upstream/master' into keyboard-win
dkwingsmt Feb 26, 2021
01223a3
Fix arg name
dkwingsmt Feb 26, 2021
c7c8fca
Fix compile
dkwingsmt Feb 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ci/licenses_golden/licenses_flutter
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -1487,6 +1487,7 @@ FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
FILE: ../../../flutter/shell/platform/windows/external_texture_gl.cc
FILE: ../../../flutter/shell/platform/windows/external_texture_gl.h
FILE: ../../../flutter/shell/platform/windows/flutter_key_map.cc
FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.cc
FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.h
FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
Expand All @@ -1503,10 +1504,16 @@ FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.cc
FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.h
FILE: ../../../flutter/shell/platform/windows/flutter_windows_win32.cc
FILE: ../../../flutter/shell/platform/windows/flutter_windows_winuwp.cc
FILE: ../../../flutter/shell/platform/windows/key_event_handler.cc
FILE: ../../../flutter/shell/platform/windows/key_event_handler.h
FILE: ../../../flutter/shell/platform/windows/key_event_handler_unittests.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_hook_handler.h
FILE: ../../../flutter/shell/platform/windows/keyboard_handler_base.h
FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.h
FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler_unittests.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.h
FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.cc
FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.h
FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler_unittests.cc
FILE: ../../../flutter/shell/platform/windows/platform_handler.cc
FILE: ../../../flutter/shell/platform/windows/platform_handler.h
FILE: ../../../flutter/shell/platform/windows/platform_handler_unittests.cc
Expand Down
15 changes: 11 additions & 4 deletions shell/platform/windows/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ source_set("flutter_windows_source") {
"cursor_handler.h",
"external_texture_gl.cc",
"external_texture_gl.h",
"flutter_key_map.cc",
"flutter_project_bundle.cc",
"flutter_project_bundle.h",
"flutter_windows.cc",
Expand All @@ -58,9 +59,13 @@ source_set("flutter_windows_source") {
"flutter_windows_texture_registrar.h",
"flutter_windows_view.cc",
"flutter_windows_view.h",
"key_event_handler.cc",
"key_event_handler.h",
"keyboard_hook_handler.h",
"keyboard_handler_base.h",
"keyboard_key_channel_handler.cc",
"keyboard_key_channel_handler.h",
"keyboard_key_embedder_handler.cc",
"keyboard_key_embedder_handler.h",
"keyboard_key_handler.cc",
"keyboard_key_handler.h",
"platform_handler.cc",
"platform_handler.h",
"string_conversion.cc",
Expand Down Expand Up @@ -195,7 +200,9 @@ executable("flutter_windows_unittests") {
"flutter_project_bundle_unittests.cc",
"flutter_windows_engine_unittests.cc",
"flutter_windows_texture_registrar_unittests.cc",
"key_event_handler_unittests.cc",
"keyboard_key_channel_handler_unittests.cc",
"keyboard_key_embedder_handler_unittests.cc",
"keyboard_key_handler_unittests.cc",
"testing/mock_win32_window.cc",
"testing/mock_win32_window.h",
"testing/mock_window_binding_handler.cc",
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/windows/client_wrapper/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _wrapper_sources = [
"flutter_view_controller.cc",
]

# This code will be merged into .../common/cpp/client_wrapper for client use,
# This code will be merged into .../common/client_wrapper for client use,
# so uses header paths that assume the merged state. Include the header
# directories of the core wrapper files so these includes will work.
config("relative_core_wrapper_headers") {
Expand Down
Loading