Commit 36cd561e authored by Alexander Mikhaylenko's avatar Alexander Mikhaylenko
Browse files

Drop upstream patches

parent df0434af
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Wed, 30 Sep 2020 17:22:42 +0500
Subject: Chassis type check fails if the value is quoted
https://bugs.webkit.org/show_bug.cgi?id=217123
Reviewed by NOBODY (OOPS!).
Sometimes the chassis type can be quoted, in this case we'll fail to
parse it and fall back to desktop type. Unquote the string before
attempting to parse it.
* wtf/glib/ChassisType.cpp:
(WTF::readMachineInfoChassisType):
---
Source/WTF/wtf/glib/ChassisType.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Source/WTF/wtf/glib/ChassisType.cpp b/Source/WTF/wtf/glib/ChassisType.cpp
index 3fc326e..b8269de 100644
--- a/Source/WTF/wtf/glib/ChassisType.cpp
+++ b/Source/WTF/wtf/glib/ChassisType.cpp
@@ -46,7 +46,12 @@ static Optional<ChassisType> readMachineInfoChassisType()
for (int i = 0; split.get()[i]; ++i) {
if (g_str_has_prefix(split.get()[i], "CHASSIS=")) {
char* chassis = split.get()[i] + 8;
- if (!strcmp(chassis, "tablet") || !strcmp(chassis, "handset"))
+
+ GUniquePtr<char> unquoted(g_shell_unquote(chassis, &error.outPtr()));
+ if (error.get() != nullptr)
+ g_warning("Could not unquote chassis type %s: %s", chassis, error->message);
+
+ if (!strcmp(unquoted.get(), "tablet") || !strcmp(unquoted.get(), "handset"))
return ChassisType::Mobile;
return ChassisType::Desktop;
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Wed, 7 Oct 2020 15:30:23 +0500
Subject: librem5: Disable smooth scrolling for Nicosia async scrolling
See https://bugs.webkit.org/show_bug.cgi?id=210382#c22
---
.../scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp | 5 -----
.../scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp | 5 -----
2 files changed, 10 deletions(-)
diff --git a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
index 08b5e5e..d2c64de 100644
--- a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
+++ b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
@@ -188,17 +188,12 @@ WheelEventHandlingResult ScrollingTreeFrameScrollingNodeNicosia::handleWheelEven
}
}
-#if ENABLE(SMOOTH_SCROLLING)
- m_smoothAnimation->scroll(HorizontalScrollbar, ScrollByPixel, 1, -deltaX);
- m_smoothAnimation->scroll(VerticalScrollbar, ScrollByPixel, 1, -deltaY);
-#else
auto* scrollLayer = static_cast<Nicosia::PlatformLayer*>(scrolledContentsLayer());
ASSERT(scrollLayer);
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
scrollBy({ -deltaX, -deltaY });
-#endif
return WheelEventHandlingResult::handled();
}
diff --git a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
index 069ad4f..04dba6f 100644
--- a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
+++ b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
@@ -173,17 +173,12 @@ WheelEventHandlingResult ScrollingTreeOverflowScrollingNodeNicosia::handleWheelE
}
}
-#if ENABLE(SMOOTH_SCROLLING)
- m_smoothAnimation->scroll(HorizontalScrollbar, ScrollByPixel, 1, -deltaX);
- m_smoothAnimation->scroll(VerticalScrollbar, ScrollByPixel, 1, -deltaY);
-#else
auto* scrollLayer = static_cast<Nicosia::PlatformLayer*>(scrollContainerLayer());
ASSERT(scrollLayer);
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
scrollBy({ -deltaX, -deltaY });
-#endif
return WheelEventHandlingResult::handled();
}
......@@ -7,6 +7,3 @@ dont-detect-sse2.patch
reduce-memory-overheads.patch
force-single-process.patch
0009-ScrollAnimationKinetic-Drop-the-deceleration-frictio.patch
0010-Chassis-type-check-fails-if-the-value-is-quoted-http.patch
0011-Add-support-for-smooth-scrolling-animation-with-asyn.patch
0012-librem5-Disable-smooth-scrolling-for-Nicosia-async-s.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment