rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't tell PDF.js to disable createObjectURL on Qt 5.7.1

Browse Source 
Looks like things actually work fine there...
This commit is contained in:
Florian Bruhin 2018-09-10 13:01:01 +02:00
parent 3138c1f488
commit 02641b86fc
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/browser/pdfjs.py
View File

@ -89,6 +89,7 @@ def _generate_pdfjs_script(filename):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-70420 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-70420
disable_create_object_url=( disable_create_object_url=(
not qtutils.version_check('5.12') and not qtutils.version_check('5.12') and
not qtutils.version_check('5.7.1', exact=True, compiled=False) and
objects.backend == usertypes.Backend.QtWebEngine)) objects.backend == usertypes.Backend.QtWebEngine))

31
tests/unit/browser/test_pdfjs.py
View File

@ -21,7 +21,7 @@ import pytest
from PyQt5.QtCore import QUrl from PyQt5.QtCore import QUrl
from qutebrowser.browser import pdfjs from qutebrowser.browser import pdfjs
from qutebrowser.utils import usertypes from qutebrowser.utils import usertypes, utils
@pytest.mark.parametrize('available, snippet', [ @pytest.mark.parametrize('available, snippet', [
@ -61,15 +61,30 @@ def test_generate_pdfjs_script(filename, expected):
assert 'PDFView' in actual assert 'PDFView' in actual
@pytest.mark.parametrize('new_qt, backend, expected', [ @pytest.mark.parametrize('qt, backend, expected', [
(True, usertypes.Backend.QtWebEngine, False), ('new', usertypes.Backend.QtWebEngine, False),
(True, usertypes.Backend.QtWebKit, False), ('new', usertypes.Backend.QtWebKit, False),
(False, usertypes.Backend.QtWebEngine, True), ('old', usertypes.Backend.QtWebEngine, True),
(False, usertypes.Backend.QtWebKit, False), ('old', usertypes.Backend.QtWebKit, False),
('5.7', usertypes.Backend.QtWebEngine, False),
('5.7', usertypes.Backend.QtWebKit, False),
]) ])
def test_generate_pdfjs_script_disable_object_url(monkeypatch, def test_generate_pdfjs_script_disable_object_url(monkeypatch,
new_qt, backend, expected): qt, backend, expected):
monkeypatch.setattr(pdfjs.qtutils, 'version_check', lambda _v: new_qt) if qt == 'new':
monkeypatch.setattr(pdfjs.qtutils, 'version_check',
lambda version, exact=False, compiled=True:
False if version == '5.7.1' else True)
elif qt == 'old':
monkeypatch.setattr(pdfjs.qtutils, 'version_check',
lambda version, exact=False, compiled=True: False)
elif qt == '5.7':
monkeypatch.setattr(pdfjs.qtutils, 'version_check',
lambda version, exact=False, compiled=True:
True if version == '5.7.1' else False)
else:
raise utils.Unreachable
monkeypatch.setattr(pdfjs.objects, 'backend', backend) monkeypatch.setattr(pdfjs.objects, 'backend', backend)
script = pdfjs._generate_pdfjs_script('testfile') script = pdfjs._generate_pdfjs_script('testfile')