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

Commit 6be792a

Browse files
cbrackenharryterkelsen
cbracken
authored and
harryterkelsen
committed
Revert "[Windows] Update vsync on raster thread (#45310)" (#46000)
This also reverts the ANGLE roll (for which the original fix was landed) to 48e2c605adcd5bcc1622b18f357c7a73ebfb3543. fixes: flutter/flutter#134262 This reverts commit 708d82d. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 3066d43 commit 6be792a

7 files changed

Lines changed: 18 additions & 57 deletions

File tree

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ deps = {
631631
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5f9ed9b16931c7155171d31f75004f73f0a3abc8',
632632

633633
'src/third_party/angle':
634-
Var('chromium_git') + '/angle/angle.git' + '@' + '48e2c605adcd5bcc1622b18f357c7a73ebfb3543',
634+
Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
635635

636636
'src/third_party/vulkan_memory_allocator':
637637
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',

‎ci/licenses_golden/excluded_files‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,6 @@
991991
../../../third_party/angle/.git
992992
../../../third_party/angle/.gitattributes
993993
../../../third_party/angle/.gitignore
994-
../../../third_party/angle/.gitmodules
995994
../../../third_party/angle/.gn
996995
../../../third_party/angle/.style.yapf
997996
../../../third_party/angle/.vpython
@@ -1130,7 +1129,6 @@
11301129
../../../third_party/angle/src/third_party/ceval/package.json
11311130
../../../third_party/angle/src/third_party/libXNVCtrl/README.chromium
11321131
../../../third_party/angle/src/third_party/volk
1133-
../../../third_party/angle/testing
11341132
../../../third_party/angle/third_party
11351133
../../../third_party/angle/tools
11361134
../../../third_party/angle/util

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d18c418247db94f3fad4810fc4ab16af
1+
Signature: 0e74d276e12eb0bcc1bfbdbbfabc2574
22

33
====================================================================================================
44
LIBRARY: angle
@@ -42632,8 +42632,12 @@ ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp +
4263242632
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.h + ../../../third_party/angle/LICENSE
4263342633
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp + ../../../third_party/angle/LICENSE
4263442634
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.h + ../../../third_party/angle/LICENSE
42635+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp + ../../../third_party/angle/LICENSE
42636+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.h + ../../../third_party/angle/LICENSE
4263542637
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.cpp + ../../../third_party/angle/LICENSE
4263642638
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.h + ../../../third_party/angle/LICENSE
42639+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.cpp + ../../../third_party/angle/LICENSE
42640+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.h + ../../../third_party/angle/LICENSE
4263742641
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.h + ../../../third_party/angle/LICENSE
4263842642
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.mm + ../../../third_party/angle/LICENSE
4263942643
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.h + ../../../third_party/angle/LICENSE
@@ -42819,8 +42823,12 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
4281942823
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.h
4282042824
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp
4282142825
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.h
42826+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp
42827+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.h
4282242828
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.cpp
4282342829
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.h
42830+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.cpp
42831+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.h
4282442832
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.h
4282542833
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.mm
4282642834
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.h
@@ -43218,6 +43226,8 @@ ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfac
4321843226
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm + ../../../third_party/angle/LICENSE
4321943227
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp + ../../../third_party/angle/LICENSE
4322043228
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h + ../../../third_party/angle/LICENSE
43229+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp + ../../../third_party/angle/LICENSE
43230+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h + ../../../third_party/angle/LICENSE
4322143231
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h + ../../../third_party/angle/LICENSE
4322243232
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm + ../../../third_party/angle/LICENSE
4322343233
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp + ../../../third_party/angle/LICENSE
@@ -43232,7 +43242,6 @@ ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedback
4323243242
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm + ../../../third_party/angle/LICENSE
4323343243
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/file_hooking/shader_cache_file_hooking.cpp + ../../../third_party/angle/LICENSE
4323443244
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm + ../../../third_party/angle/LICENSE
43235-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_autogen.metal + ../../../third_party/angle/LICENSE
4323643245
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_ios_autogen.h + ../../../third_party/angle/LICENSE
4323743246
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_macos_autogen.h + ../../../third_party/angle/LICENSE
4323843247
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_src_autogen.h + ../../../third_party/angle/LICENSE
@@ -43492,6 +43501,8 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceE
4349243501
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm
4349343502
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp
4349443503
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h
43504+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp
43505+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h
4349543506
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
4349643507
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
4349743508
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp
@@ -43506,7 +43517,6 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMt
4350643517
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm
4350743518
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/file_hooking/shader_cache_file_hooking.cpp
4350843519
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
43509-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_autogen.metal
4351043520
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_ios_autogen.h
4351143521
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_macos_autogen.h
4351243522
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_src_autogen.h
@@ -44468,8 +44478,6 @@ LIBRARY: angle
4446844478
ORIGIN: ../../../third_party/angle/src/common/FixedQueue.h + ../../../third_party/angle/LICENSE
4446944479
ORIGIN: ../../../third_party/angle/src/common/platform_helpers.cpp + ../../../third_party/angle/LICENSE
4447044480
ORIGIN: ../../../third_party/angle/src/common/platform_helpers.h + ../../../third_party/angle/LICENSE
44471-
ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/RescopeGlobalVariables.cpp + ../../../third_party/angle/LICENSE
44472-
ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/RescopeGlobalVariables.h + ../../../third_party/angle/LICENSE
4447344481
ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp + ../../../third_party/angle/LICENSE
4447444482
ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.h + ../../../third_party/angle/LICENSE
4447544483
ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.cpp + ../../../third_party/angle/LICENSE
@@ -44484,13 +44492,6 @@ ORIGIN: ../../../third_party/angle/src/libANGLE/context_private_call_gl.cpp + ..
4448444492
ORIGIN: ../../../third_party/angle/src/libANGLE/context_private_call_gl_autogen.h + ../../../third_party/angle/LICENSE
4448544493
ORIGIN: ../../../third_party/angle/src/libANGLE/context_private_call_gles.cpp + ../../../third_party/angle/LICENSE
4448644494
ORIGIN: ../../../third_party/angle/src/libANGLE/context_private_call_gles_autogen.h + ../../../third_party/angle/LICENSE
44487-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/ProgramExecutableImpl.h + ../../../third_party/angle/LICENSE
44488-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramExecutableD3D.cpp + ../../../third_party/angle/LICENSE
44489-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramExecutableD3D.h + ../../../third_party/angle/LICENSE
44490-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramExecutableGL.cpp + ../../../third_party/angle/LICENSE
44491-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramExecutableGL.h + ../../../third_party/angle/LICENSE
44492-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramExecutableMtl.h + ../../../third_party/angle/LICENSE
44493-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramExecutableMtl.mm + ../../../third_party/angle/LICENSE
4449444495
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.cpp + ../../../third_party/angle/LICENSE
4449544496
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.h + ../../../third_party/angle/LICENSE
4449644497
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.h + ../../../third_party/angle/LICENSE
@@ -44501,17 +44502,12 @@ ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/process.cpp + ../
4450144502
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/process.h + ../../../third_party/angle/LICENSE
4450244503
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.cpp + ../../../third_party/angle/LICENSE
4450344504
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.h + ../../../third_party/angle/LICENSE
44504-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_metallib.h + ../../../third_party/angle/LICENSE
44505-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramExecutableNULL.cpp + ../../../third_party/angle/LICENSE
44506-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramExecutableNULL.h + ../../../third_party/angle/LICENSE
4450744505
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.cpp + ../../../third_party/angle/LICENSE
4450844506
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.h + ../../../third_party/angle/LICENSE
4450944507
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.cpp + ../../../third_party/angle/LICENSE
4451044508
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.h + ../../../third_party/angle/LICENSE
4451144509
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.cpp + ../../../third_party/angle/LICENSE
4451244510
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.h + ../../../third_party/angle/LICENSE
44513-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkOffscreen.cpp + ../../../third_party/angle/LICENSE
44514-
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkOffscreen.h + ../../../third_party/angle/LICENSE
4451544511
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp + ../../../third_party/angle/LICENSE
4451644512
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp.json + ../../../third_party/angle/LICENSE
4451744513
ORIGIN: ../../../third_party/angle/src/libGLESv2/egl_context_lock_autogen.h + ../../../third_party/angle/LICENSE
@@ -44520,8 +44516,6 @@ TYPE: LicenseType.bsd
4452044516
FILE: ../../../third_party/angle/src/common/FixedQueue.h
4452144517
FILE: ../../../third_party/angle/src/common/platform_helpers.cpp
4452244518
FILE: ../../../third_party/angle/src/common/platform_helpers.h
44523-
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RescopeGlobalVariables.cpp
44524-
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RescopeGlobalVariables.h
4452544519
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp
4452644520
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.h
4452744521
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.cpp
@@ -44536,13 +44530,6 @@ FILE: ../../../third_party/angle/src/libANGLE/context_private_call_gl.cpp
4453644530
FILE: ../../../third_party/angle/src/libANGLE/context_private_call_gl_autogen.h
4453744531
FILE: ../../../third_party/angle/src/libANGLE/context_private_call_gles.cpp
4453844532
FILE: ../../../third_party/angle/src/libANGLE/context_private_call_gles_autogen.h
44539-
FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramExecutableImpl.h
44540-
FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramExecutableD3D.cpp
44541-
FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramExecutableD3D.h
44542-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramExecutableGL.cpp
44543-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramExecutableGL.h
44544-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramExecutableMtl.h
44545-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramExecutableMtl.mm
4454644533
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.cpp
4454744534
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.h
4454844535
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.h
@@ -44553,17 +44540,12 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/process.cpp
4455344540
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/process.h
4455444541
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.cpp
4455544542
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.h
44556-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_metallib.h
44557-
FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramExecutableNULL.cpp
44558-
FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramExecutableNULL.h
4455944543
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.cpp
4456044544
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.h
4456144545
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.cpp
4456244546
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.h
4456344547
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.cpp
4456444548
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.h
44565-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkOffscreen.cpp
44566-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkOffscreen.h
4456744549
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp
4456844550
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp.json
4456944551
FILE: ../../../third_party/angle/src/libGLESv2/egl_context_lock_autogen.h

‎shell/platform/windows/angle_surface_manager.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -343,13 +343,6 @@ void AngleSurfaceManager::SetVSyncEnabled(bool enabled) {
343343
LogEglError("Unable to update the swap interval");
344344
return;
345345
}
346-
347-
if (eglMakeCurrent(egl_display_, EGL_NO_SURFACE, EGL_NO_SURFACE,
348-
EGL_NO_CONTEXT) != EGL_TRUE) {
349-
LogEglError(
350-
"Unable to release the context after updating the swap interval");
351-
return;
352-
}
353346
}
354347

355348
bool AngleSurfaceManager::GetDevice(ID3D11Device** device) {

‎shell/platform/windows/flutter_windows_engine.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class FlutterWindowsEngine {
199199
bool MarkExternalTextureFrameAvailable(int64_t texture_id);
200200

201201
// Posts the given callback onto the raster thread.
202-
virtual bool PostRasterThreadTask(fml::closure callback);
202+
bool PostRasterThreadTask(fml::closure callback);
203203

204204
// Invoke on the embedder's vsync callback to schedule a frame.
205205
void OnVsync(intptr_t baton);

‎shell/platform/windows/flutter_windows_view.cc‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -669,12 +669,7 @@ void FlutterWindowsView::UpdateSemanticsEnabled(bool enabled) {
669669

670670
void FlutterWindowsView::OnDwmCompositionChanged() {
671671
if (engine_->surface_manager()) {
672-
// Update the surface with the new composition state.
673-
// Switch to the raster thread as this requires making the context current.
674-
auto needs_vsync = binding_handler_->NeedsVSync();
675-
engine_->PostRasterThreadTask([this, needs_vsync]() {
676-
engine_->surface_manager()->SetVSyncEnabled(needs_vsync);
677-
});
672+
engine_->surface_manager()->SetVSyncEnabled(binding_handler_->NeedsVSync());
678673
}
679674
}
680675

‎shell/platform/windows/flutter_windows_view_unittests.cc‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ class MockFlutterWindowsEngine : public FlutterWindowsEngine {
110110
public:
111111
MockFlutterWindowsEngine() : FlutterWindowsEngine(GetTestProject()) {}
112112

113-
MOCK_METHOD(bool, Stop, (), (override));
114-
MOCK_METHOD(bool, PostRasterThreadTask, (fml::closure), (override));
113+
MOCK_METHOD(bool, Stop, (), ());
114+
MOCK_METHOD(bool, PostRasterThreadTask, (fml::closure), ());
115115

116116
private:
117117
FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsEngine);
@@ -1287,13 +1287,6 @@ TEST(FlutterWindowsViewTest, UpdatesVSyncOnDwmUpdates) {
12871287
std::unique_ptr<MockAngleSurfaceManager> surface_manager =
12881288
std::make_unique<MockAngleSurfaceManager>();
12891289

1290-
EXPECT_CALL(*engine.get(), PostRasterThreadTask)
1291-
.Times(2)
1292-
.WillRepeatedly([](fml::closure callback) {
1293-
callback();
1294-
return true;
1295-
});
1296-
12971290
EXPECT_CALL(*window_binding_handler.get(), NeedsVSync)
12981291
.WillOnce(Return(true))
12991292
.WillOnce(Return(false));

0 commit comments

Comments
 (0)