Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

browser(webkit): fix mac compilation errors #4139

Merged
merged 1 commit into from
Oct 14, 2020
Merged

browser(webkit): fix mac compilation errors #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions browser_patches/webkit/BUILD_NUMBER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1355
Changed: [email protected] Wed 14 Oct 2020 05:37:36 AM PDT
1356
Changed: [email protected] Wed 14 Oct 2020 08:57:55 AM PDT
6 changes: 3 additions & 3 deletions browser_patches/webkit/patches/bootstrap.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ index c8a849d98d04e3d23d349ede31dad76c20fb17f8..b5dcc6f0cd2a0785ad050e3d8e6ff267
return false;

diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
index 3cc7f016fb8414d7385c1189a7595940d1972a4b..e24c885701d593c9f07a966766064f58adba479b 100644
index 3cc7f016fb8414d7385c1189a7595940d1972a4b..5a7fc02255900a9f9705567e79ee43718436cf2d 100644
--- a/Source/WebCore/dom/PointerEvent.cpp
+++ b/Source/WebCore/dom/PointerEvent.cpp
@@ -129,4 +129,61 @@ EventInterface PointerEvent::eventInterface() const
Expand All @@ -2017,6 +2017,8 @@ index 3cc7f016fb8414d7385c1189a7595940d1972a4b..e24c885701d593c9f07a966766064f58
+ return eventNames().pointerupEvent;
+ case PlatformTouchPoint::State::TouchCancelled:
+ return eventNames().pointercancelEvent;
+ case PlatformTouchPoint::State::TouchStateEnd:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return nullAtom();
Expand Down Expand Up @@ -2052,8 +2054,6 @@ index 3cc7f016fb8414d7385c1189a7595940d1972a4b..e24c885701d593c9f07a966766064f58
+ , m_pressure(event.touchPoints().at(index).force())
+ , m_pointerType(PointerEvent::touchPointerType())
+ , m_isPrimary(isPrimary)
+ , m_tiltX(0)
+ , m_tiltY(0)
+{
+}
+
Expand Down