Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Merge Window into FlutterWindow #45542

Merged
merged 14 commits into from
Sep 11, 2023
Merged

Merge Window into FlutterWindow #45542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2983953
Add members to FlutterWindow
yaakovschectman Sep 1, 2023
947d820
Remove Window parent
yaakovschectman Sep 1, 2023
a6b3947
Compiles
yaakovschectman Sep 5, 2023
b8fadb8
Passes unit tests
yaakovschectman Sep 5, 2023
56273df
Cull includes
yaakovschectman Sep 6, 2023
4823a50
Remove old window from BUILD
yaakovschectman Sep 6, 2023
a0cee80
Delete old window files
yaakovschectman Sep 6, 2023
4ef1f23
Formatting
yaakovschectman Sep 7, 2023
9d5e0a8
Licenses
yaakovschectman Sep 7, 2023
a2237e3
Reorganize members
yaakovschectman Sep 7, 2023
26db6f5
PR Feedback
yaakovschectman Sep 7, 2023
1b9ab60
Update shell/platform/windows/testing/mock_window.h
yaakovschectman Sep 8, 2023
de053cb
Privatize
yaakovschectman Sep 11, 2023
dbbc749
Merge branch 'main' into merge_windows
yaakovschectman Sep 11, 2023
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
4 changes: 0 additions & 4 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3288,8 +3288,6 @@ ORIGIN: ../../../flutter/shell/platform/windows/text_input_manager.h + ../../../
ORIGIN: ../../../flutter/shell/platform/windows/text_input_plugin.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/text_input_plugin.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/text_input_plugin_delegate.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/window.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/window.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/window_binding_handler.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/window_binding_handler_delegate.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -6060,8 +6058,6 @@ FILE: ../../../flutter/shell/platform/windows/text_input_manager.h
FILE: ../../../flutter/shell/platform/windows/text_input_plugin.cc
FILE: ../../../flutter/shell/platform/windows/text_input_plugin.h
FILE: ../../../flutter/shell/platform/windows/text_input_plugin_delegate.h
FILE: ../../../flutter/shell/platform/windows/window.cc
FILE: ../../../flutter/shell/platform/windows/window.h
FILE: ../../../flutter/shell/platform/windows/window_binding_handler.h
FILE: ../../../flutter/shell/platform/windows/window_binding_handler_delegate.h
FILE: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.cc
Expand Down
2 changes: 0 additions & 2 deletions shell/platform/windows/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ source_set("flutter_windows_source") {
"text_input_manager.h",
"text_input_plugin.cc",
"text_input_plugin.h",
"window.cc",
"window.h",
"window_binding_handler.h",
"window_binding_handler_delegate.h",
"window_proc_delegate_manager.cc",
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/windows/direct_manipulation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <algorithm>

#include "flutter/shell/platform/windows/direct_manipulation.h"
#include "flutter/shell/platform/windows/window.h"
#include "flutter/shell/platform/windows/flutter_window.h"
#include "flutter/shell/platform/windows/window_binding_handler_delegate.h"

#define RETURN_IF_FAILED(operation) \
Expand Down Expand Up @@ -172,7 +172,7 @@ ULONG STDMETHODCALLTYPE DirectManipulationEventHandler::Release() {
return 0;
}

DirectManipulationOwner::DirectManipulationOwner(Window* window)
DirectManipulationOwner::DirectManipulationOwner(FlutterWindow* window)
: window_(window) {}

int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/windows/direct_manipulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace flutter {

class Window;
class FlutterWindow;
class WindowBindingHandlerDelegate;

class DirectManipulationEventHandler;
Expand All @@ -21,7 +21,7 @@ class DirectManipulationEventHandler;
// DirectManipulation and WindowBindingHandlerDelegate.
class DirectManipulationOwner {
public:
explicit DirectManipulationOwner(Window* window);
explicit DirectManipulationOwner(FlutterWindow* window);
virtual ~DirectManipulationOwner() = default;
// Initialize a DirectManipulation viewport with specified width and height.
// These should match the width and height of the application window.
Expand All @@ -47,7 +47,7 @@ class DirectManipulationOwner {

private:
// The window gesture input is occuring on.
Window* window_;
FlutterWindow* window_;
// Cookie needed to register child event handler with viewport.
DWORD viewportHandlerCookie_;
// Object needed for operation of the DirectManipulation API.
Expand Down
Loading