Skip to content

Commit

Permalink
Attempt flutter#2 to fix CI failures
Browse files Browse the repository at this point in the history
  • Loading branch information
moffatman committed Nov 30, 2021
1 parent 6e49bad commit 2595817
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
9 changes: 4 additions & 5 deletions shell/platform/windows/direct_manipulation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ DirectManipulationOwner::DirectManipulationOwner(WindowWin32* window)
: window_(window) {}

int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
HRESULT hr = CoCreateInstance(
CLSID_DirectManipulationManager, nullptr, CLSCTX_INPROC_SERVER,
IID_IDirectManipulationManager, &manager_);
HRESULT hr = CoCreateInstance(CLSID_DirectManipulationManager, nullptr,
CLSCTX_INPROC_SERVER,
IID_IDirectManipulationManager, &manager_);
if (FAILED(hr)) {
FML_LOG(ERROR)
<< "CoCreateInstance(CLSID_DirectManipulationManager) failed";
Expand All @@ -137,8 +137,7 @@ int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
}

hr = manager_->CreateViewport(nullptr, window_->GetWindowHandle(),
IID_IDirectManipulationViewport,
&viewport_);
IID_IDirectManipulationViewport, &viewport_);
if (FAILED(hr)) {
FML_LOG(ERROR) << "CreateViewport failed";
manager_ = nullptr;
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/windows/flutter_window_winuwp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ bool FlutterWindowWinUWP::OnBitmapSurfaceUpdated(const void* allocation,
PointerLocation FlutterWindowWinUWP::GetPrimaryPointerLocation() {
auto point = window_.PointerPosition();
auto bounds = window_.Bounds();
return {static_cast<size_t>(point.X - bounds.X), static_cast<size_t>(point.Y - bounds.Y)};
return {static_cast<size_t>(point.X - bounds.X),
static_cast<size_t>(point.Y - bounds.Y)};
}

} // namespace flutter
2 changes: 1 addition & 1 deletion shell/platform/windows/window_binding_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class WindowBindingHandler {
virtual void OnResetImeComposing() = 0;

// Returns the last known position of the primary pointer
virtual PointerLocation GetPrimaryPointerLocation() = 0;
virtual PointerLocation GetPrimaryPointerLocation() = 0;
};

} // namespace flutter
Expand Down

0 comments on commit 2595817

Please sign in to comment.