Restore ability to view help pages from Konqueror
ClosedPublic
Actions

Authored by stefanocrocco on Jul 19 2018, 1:08 PM.

Details

Reviewers

Commits

R226:51449ce98a86: Restore ability to view help pages from Konqueror

Summary

A generic QWebEngineUrlSchemeHandler which takes data from KIO::storedGet has been added and is now used also for man and info URLs. The old WebEnginePartHtmlMimetypeHandler has been changed into a class which only embeds the content of file URLs in the HTML code.

I found out that several calls to QWebEngineUrlSchemeHandler::requestStarted may happen before the previous one has replied (it happened for the help protocol where the HTML code produced by KIO in turn contained help URLs). Because of this, I needed to implement a queuing mechanism in the new handler.

The new handler can be used as a base class if special processing of data produced by KIO is needed

Test Plan

check that man pages displayed with WebEnginePart look as when displayed by KHTML (es: man:/cp)
check that help pages displayed with WebEnginePart look as when displayed by KHTML (es help:/kate)

Diff Detail

Repository

R226 Konqueror

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

stefanocrocco requested review of this revision.Jul 19 2018, 1:08 PM

stefanocrocco created this revision.

Harbormaster completed remote builds in B1011: Diff 38091.Jul 19 2018, 1:08 PM

stefanocrocco mentioned this in D13924: Restore the ability to view man and info pages from Konqueror.Jul 20 2018, 3:51 PM

Any news about this?

dfaure requested changes to this revision.Aug 2 2018, 8:20 AM

This revision now requires changes to proceed.Aug 2 2018, 8:20 AM

I see that you requested changes, but I can't see which changes

dfaure added inline comments.Aug 2 2018, 10:08 AM

webenginepart/src/webengineparthtmlembedder.cpp
131	Strange, this comment got lost. I think QEventLoop is very dangerous. A HTML redirection timer could fire while in that loop, destroying the page/view/whatever, and if that deletes the HtmlEmbedded as well, this will crash. Any chance to make this asynchronous instead?

stefanocrocco added inline comments.Aug 2 2018, 10:15 AM

webenginepart/src/webengineparthtmlembedder.cpp
131	Yes, it can be done. I'll look into it later today

Don't use an inner event loop

Harbormaster completed remote builds in B1459: Diff 38962.Aug 2 2018, 2:22 PM

Very nice.

webenginepart/src/webengineparthtmlembedder.cpp
36	remove
webenginepart/src/webenginepartkiohandler.cpp
72	Minor: this if() is in fact redundant, the while+if that follow take care of this case already.
98	coding style: join with previous line?

This revision is now accepted and ready to land.Aug 4 2018, 8:54 AM

Closed by commit R226:51449ce98a86: Restore ability to view help pages from Konqueror (authored by stefanocrocco). · Explain WhyAug 4 2018, 1:15 PM

This revision was automatically updated to reflect the committed changes.

Hi @stefanocrocco. I just came across your nice fixes for webenginepart to improve kio support, Thanks for those.

But sadly there there is some glitch here in the license headers for the new files you added:

broken mix of text for GPL & LGPL
inconsistency in license with rest of source files

Could you help everyone in fixing this up by changing this license header to match the rest of webenginepart sources? Same for some other files you added in other commits. You can grep for "GNU General Public License" to find all of them.

I just submitted review D18227 with the license fixes. I believe I copied the license from some other Konqueror source file which uses GPL and didn't notice that WebEnginePart files use LGPL instead.

In D14233#392491, @stefanocrocco wrote:

I just submitted review D18227 with the license fixes. I believe I copied the license from some other Konqueror source file which uses GPL and didn't notice that WebEnginePart files use LGPL instead.

Thanks for fixing :)

Revision Contents
Changeset List

		Path
M		webenginepart/src/CMakeLists.txt (3 lines)
M		webenginepart/src/webenginepart.cpp (5 lines)
V		webenginepart/src/{webengineparthtmlembedder.h ← webengineparthtmlmimetypehandler.h} (75 lines)
V		webenginepart/src/{webengineparthtmlembedder.cpp ← webengineparthtmlmimetypehandler.cpp} (49 lines)
V		webenginepart/src/{webengineparthtmlmimetypehandler.h → webengineparthtmlembedder.h}
V		webenginepart/src/{webengineparthtmlmimetypehandler.cpp → webengineparthtmlembedder.cpp}
A	M	webenginepart/src/webenginepartkiohandler.h (317 lines)
A	M	webenginepart/src/webenginepartkiohandler.cpp (114 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	38091	d0842c8		Jul 19 2018, 1:08 PM	★	★
Diff 2	38962	d0842c8	Don't use an inner event loop	Aug 2 2018, 2:22 PM	★	★
Diff 3	39063	f8e4e54	R226:51449ce98a86e604d3ea9806f6e4339895b96b2b	Aug 4 2018, 12:45 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
c6522aa2b018	7f9fbaea579b	0bb4776f08f1	Stefano Crocco	Remove sync API from WebEnginePartHtmlEmbedder	Aug 2 2018, 2:24 PM
0bb4776f08f1	bc1daf01d8a6	61686d5a1daa	Stefano Crocco	Avoid using an event loop	Aug 2 2018, 2:10 PM
61686d5a1daa	64bb2e3c7d29	eb0fe337e2b2	Stefano Crocco	Restore ability to view help pages from Konqueror (Show More…)	Jul 19 2018, 12:59 PM
eb0fe337e2b2	bc81445b38c8	62846cc23373	Stefano Crocco	Add API for embedding HTML	Jul 19 2018, 10:10 AM
62846cc23373	fe289239ecaa	f6cc97a47549	Stefano Crocco	Use the synchronous API of WebEnginePartHtmlEmbedder	Jul 19 2018, 10:04 AM
f6cc97a47549	3bc56fd5c2c3	0747a421a528	Stefano Crocco	Add synchronous API (Show More…)	Jul 19 2018, 10:04 AM
0747a421a528	588fad04b6a0	5fe180fabae8	Stefano Crocco	Add setters for data, error and error message and change sendReply signature	Jul 19 2018, 9:26 AM
5fe180fabae8	84c5ffcfe473	8e58f3772876	Stefano Crocco	Update documentation	Jul 19 2018, 9:10 AM
8e58f3772876	64f85bf26e65	9aea8d457f46	Stefano Crocco	Embed local files content in all html output from KIO	Jul 19 2018, 8:58 AM
9aea8d457f46	d7c8601bd6ef	ef777b6ad201	Stefano Crocco	Add startEmbedding function	Jul 19 2018, 8:01 AM
ef777b6ad201	5fcc3839aae7	34c0857de5d0	Stefano Crocco	Remove debug statements	Jul 19 2018, 7:49 AM
34c0857de5d0	f2224e408b79	bea4800c7100	Stefano Crocco	Transform the WebEnginePartHtmlMimetypeHandler into a stand-alone embeddder	Jul 19 2018, 7:46 AM
bea4800c7100	ce96e1b8baa3	a53955bfe9a7	Stefano Crocco	Derive the HTML mimetype handler from the KIO one	Jul 19 2018, 7:17 AM
a53955bfe9a7	f2e107da2839	3dfb83961358	Stefano Crocco	Don't store the KIO job	Jul 19 2018, 7:17 AM
3dfb83961358	05d6c83fba25	48c842e7b6b8	Stefano Crocco	Replace help handler with generic KIO handler	Jul 18 2018, 4:53 PM
48c842e7b6b8	ad76b6fa1243	d0842c88fc5a	Stefano Crocco	Add support for help URLs	Jul 18 2018, 4:30 PM