Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2ca19a3a2d7
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32e30809ca42
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 21, 2021

  1. haikuwebkit-1.8.2: Last minute font hack fix, and other fixes 

    * Thanks madmax for discovering a workaround!!
* This patch should *NOT* be merged into haikuwebkit.. it
  is a temporary fix until a better one becomes available.
    @kallisti5
    kallisti5 committed Jul 21, 2021
    11
    Copy the full SHA
    32e3080 View commit details
Showing with 140 additions and 1 deletion.
  1. +2 −1 haiku-libs/haikuwebkit/haikuwebkit-1.8.2.recipe
  2. +138 −0 haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset
3 changes: 2 additions & 1 deletion haiku-libs/haikuwebkit/haikuwebkit-1.8.2.recipe
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,12 @@ COPYRIGHT="1998-2021 Apple Inc., Google Inc., et al"
LICENSE="GNU LGPL v2
GNU LGPL v2.1
MIT"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/haiku/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz"
SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
SOURCE_DIR="haikuwebkit-HaikuWebKit-$portVersion"
CHECKSUM_SHA256="d21f4f6c34862ee25ccdf8f75a66304453a24689c59a9e4ab56cb201dc24f3ec"
PATCHES="haikuwebkit-1.8.2.patchset"

ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
138 changes: 138 additions & 0 deletions haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
From 6697a67df8732d632161fefdab4ba1523c7d567e Mon Sep 17 00:00:00 2001
From: madmax <nobody@haiku-os.org>
Date: Wed, 21 Jul 2021 20:22:05 +0000
Subject: [PATCH 3/3] haikuwebkit: Fix font disappearing issue

---
Source/WebCore/rendering/TextPainter.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/WebCore/rendering/TextPainter.h b/Source/WebCore/rendering/TextPainter.h
index e4534cbfbf..155cc8ad97 100644
--- a/Source/WebCore/rendering/TextPainter.h
+++ b/Source/WebCore/rendering/TextPainter.h
@@ -64,10 +64,10 @@ public:
template<typename LayoutRun>
void setGlyphDisplayListIfNeeded(const LayoutRun& run, const PaintInfo& paintInfo, const FontCascade& font, GraphicsContext& context, const TextRun& textRun)
{
- if (!TextPainter::shouldUseGlyphDisplayList(paintInfo))
+ //if (!TextPainter::shouldUseGlyphDisplayList(paintInfo))
TextPainter::removeGlyphDisplayList(run);
- else
- m_glyphDisplayList = GlyphDisplayListCache<LayoutRun>::singleton().get(run, font, context, textRun);
+ //else
+ // m_glyphDisplayList = GlyphDisplayListCache<LayoutRun>::singleton().get(run, font, context, textRun);
}

template<typename LayoutRun>
--
2.30.2

From cdc3353930344f26b6c356d749011d884d5255c9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 20 Jul 2021 21:55:51 +0200
Subject: [PATCH] Fix downloads not ending.

Fixes #17087.
---
Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp | 5 +++++
Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h | 1 +
2 files changed, 6 insertions(+)

diff --git a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp
index 84af616428..6624918f75 100644
--- a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp
+++ b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp
@@ -134,6 +134,11 @@ void WebDownloadPrivate::didReceiveData(ResourceHandle*, const uint8_t* data, un
m_progressListener.SendMessage(&message);
}

+void WebDownloadPrivate::didFinishLoading(ResourceHandle* handle, const WebCore::NetworkLoadMetrics&)
+{
+ handleFinished(handle, B_DOWNLOAD_FINISHED);
+}
+
void WebDownloadPrivate::didFail(ResourceHandle* handle, const ResourceError& /*error*/)
{
handleFinished(handle, B_DOWNLOAD_FAILED);
diff --git a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h
index bc130966d3..ce881dcbf2 100644
--- a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h
+++ b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h
@@ -62,6 +62,7 @@ public:
// ResourceHandleClient implementation
virtual void didReceiveResponseAsync(ResourceHandle*, ResourceResponse&&, WTF::CompletionHandler<void()>&&) override;
virtual void didReceiveData(ResourceHandle*, const uint8_t*, unsigned, int) override;
+ virtual void didFinishLoading(ResourceHandle*, const WebCore::NetworkLoadMetrics&) override;
virtual void didFail(ResourceHandle*, const ResourceError&) override;
virtual void wasBlocked(ResourceHandle*) override;
virtual void cannotShowURL(ResourceHandle*) override;
--
2.30.2

From 2aea0ad0c51a4c8dd3234c614d66b7392fd80fec Mon Sep 17 00:00:00 2001
From: Pascal Abresch <nep@packageloss.eu>
Date: Mon, 19 Jul 2021 16:05:53 +0200
Subject: [PATCH] Add dark mode support to directoy view template

---
.../resources/Directory Listing Template.html | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Source/WebCore/platform/haiku/resources/Directory Listing Template.html b/Source/WebCore/platform/haiku/resources/Directory Listing Template.html
index e77fcb000d19..b93cdeb2c592 100644
--- a/Source/WebCore/platform/haiku/resources/Directory Listing Template.html
+++ b/Source/WebCore/platform/haiku/resources/Directory Listing Template.html
@@ -1,8 +1,20 @@
<html>
<head>
<style>
+ @media (prefers-color-scheme: dark) {
+ :root {
+ background-color: #121212;
+ }
+ body {
+ color: #CCC
+ }
+ }
+ @media (prefers-color-scheme: light) {
+ body {
+ color: #333333
+ }
+ }
body {
- color: #333333;
line-height: 1.5;
margin: 0;
padding: 0;
--
2.32.0

From 0f1e3574c41b3f2945817b26fdcd245468d7dd98 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 15 Jul 2021 19:57:28 +0200
Subject: [PATCH] Fix missing check of statement validity.

Fixes #17082
---
Source/WebKitLegacy/haiku/WebCoreSupport/IconDatabase.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/WebKitLegacy/haiku/WebCoreSupport/IconDatabase.cpp b/Source/WebKitLegacy/haiku/WebCoreSupport/IconDatabase.cpp
index eef3230c4503..14eef5f5c65b 100644
--- a/Source/WebKitLegacy/haiku/WebCoreSupport/IconDatabase.cpp
+++ b/Source/WebKitLegacy/haiku/WebCoreSupport/IconDatabase.cpp
@@ -1090,8 +1090,8 @@ void IconDatabase::performURLImport()
// we use it or not). This code works anyway because the IconDatabase downloads icons again if they are older than 4 days,
// so if the timestamp goes back in time more than those 30 days we can be sure that the icon was not used at all.
auto query = m_syncDB.prepareStatement("SELECT PageURL.url, IconInfo.url, IconInfo.stamp FROM PageURL INNER JOIN IconInfo ON PageURL.iconID=IconInfo.iconID WHERE IconInfo.stamp > (?) ;"_s);
- query->bindInt(1, floor((WallTime::now() - notUsedIconExpirationTime).secondsSinceEpoch().seconds()));
- if (!query) {
+ if (!query || query->bindInt(1, floor((WallTime::now() - notUsedIconExpirationTime).secondsSinceEpoch().seconds())) != SQLITE_OK)
+ {
LOG_ERROR("Unable to prepare icon url import query");
return;
}
--
2.32.0