Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

fix: backport patch to fix scrolling problem (2-0-x) #707

Merged
merged 2 commits into from Dec 4, 2018

Conversation

zcbenz
Copy link
Member

@zcbenz zcbenz commented Nov 26, 2018

Backport electron/electron#15830 to 2-0-x.

Refs electron/electron#8960.

Notes: Fix support for precision trackpad/mouse scrolling on Windows.

@bpasero
Copy link

bpasero commented Nov 26, 2018

Awesome 👍

@ckerr
Copy link
Member

ckerr commented Nov 26, 2018

@zcbenz any idea about this?

[12353/18056] CXX obj/media/capture/capture_base/video_capture_types.obj
[12354/18056] CXX obj/gpu/ipc/service/ipc_service_sources/child_window_surface_win.obj
FAILED: obj/gpu/ipc/service/ipc_service_sources/child_window_surface_win.obj 
C:/Python27/python.exe ../../build/toolchain/win/tool_wrapper.py cl-wrapper ninja -t msvc -e environment.x86 -- "c:\program files (x86)\microsoft visual studio 14.0\vc\bin\amd64_x86/cl.exe" /nologo /showIncludes  @obj/gpu/ipc/ser
vice/ipc_service_sources/child_window_surface_win.obj.rsp /c ../../gpu/ipc/service/child_window_surface_win.cc /Foobj/gpu/ipc/service/ipc_service_sources/child_window_surface_win.obj obj/gpu/ipc/service "ipc_service_sources_cc.pd
b"
../../gpu/ipc/service/child_window_surface_win.cc(154): error C2039: 'ClearInvalidContents': is not a member of 'gpu::ChildWindowWin'
C:\projects\libchromiumcontent-wqq1s\src\gpu/ipc/service/child_window_win.h(20): note: see declaration of 'gpu::ChildWindowWin'
../../gpu/ipc/service/child_window_surface_win.cc(164): error C2039: 'ClearInvalidContents': is not a member of 'gpu::ChildWindowWin'
C:\projects\libchromiumcontent-wqq1s\src\gpu/ipc/service/child_window_win.h(20): note: see declaration of 'gpu::ChildWindowWin'

@zcbenz zcbenz force-pushed the fix-trackpad-scrolling-2-0-x branch from 79d459d to 3c6f864 Compare November 27, 2018 00:38
@zcbenz
Copy link
Member Author

zcbenz commented Nov 27, 2018

I have fixed the compilation error, but it seems that the mac CI machines are failing because of S3 errors:

Job Build_libchromiumcontent: Step references task 'AmazonWebServices.aws-vsts-tools.S3Upload.S3Upload' at version '1' which does not exist.

/cc @jkleinsc

@zcbenz zcbenz merged commit ebe1313 into electron-2-0-x Dec 4, 2018
@zcbenz zcbenz deleted the fix-trackpad-scrolling-2-0-x branch December 4, 2018 11:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants