diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index d92c20de4f3fba..208fa0dce5d871 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1361 -Changed: joel.einbinde@gmail.com Mon Oct 19 02:27:36 PDT 2020 +1362 +Changed: einbinder@chromium.org Mon 19 Oct 2020 06:14:17 AM PDT diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index c1913df41185d5..1f4a1ac28529d7 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -16364,6 +16364,56 @@ index a1729f5c6205d16d7fa998a6536a84c8fa480454..a23b742a0f5ef084f116b2e2c61e8460 return PointerCharacteristics::Fine; } +diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +index fbfc1fd3ece09dc3dfd9300dc1d67f045942053b..08a671959b8483760771a790ad6793eb124a9495 100644 +--- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp ++++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -118,21 +119,37 @@ String WebPage::platformUserAgent(const URL&) const + + bool WebPage::hoverSupportedByPrimaryPointingDevice() const + { ++#if ENABLE(TOUCH_EVENTS) ++ return !screenIsTouchPrimaryInputDevice(); ++#else + return true; ++#endif + } + + bool WebPage::hoverSupportedByAnyAvailablePointingDevice() const + { ++#if ENABLE(TOUCH_EVENTS) ++ return !screenHasTouchDevice(); ++#else + return true; ++#endif + } + + Optional WebPage::pointerCharacteristicsOfPrimaryPointingDevice() const + { ++#if ENABLE(TOUCH_EVENTS) ++ if (screenIsTouchPrimaryInputDevice()) ++ return PointerCharacteristics::Coarse; ++#endif + return PointerCharacteristics::Fine; + } + + OptionSet WebPage::pointerCharacteristicsOfAllAvailablePointingDevices() const + { ++#if ENABLE(TOUCH_EVENTS) ++ if (screenHasTouchDevice()) ++ return PointerCharacteristics::Coarse; ++#endif + return PointerCharacteristics::Fine; + } + diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp index c0832f328dc51c50d3bc8bb245d6f75f0dc6f89f..422086a4b470b246cb1e169d8c96aabfbc4159ed 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp