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

Get rid of WebView.cur_url attribute

Browse Source 
The only thing which differs from url() is that it got set immediately
after openurl() was called, which might or might not have improved
something.

Let's see if things still work the same without it.
This commit is contained in:
Florian Bruhin 2016-07-11 14:20:46 +02:00
parent 7e36884cbd
commit 5cbd540e15
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/webkit/webkittab.py
View File

@ -470,7 +470,7 @@ class WebKitTab(browsertab.AbstractTab):
self._widget.openurl(url) self._widget.openurl(url)
def url(self): def url(self):
return self._widget.cur_url return self._widget.url()
def dump_async(self, callback, *, plain=False): def dump_async(self, callback, *, plain=False):
frame = self._widget.page().mainFrame() frame = self._widget.page().mainFrame()

9
qutebrowser/browser/webkit/webview.py
View File

@ -83,7 +83,6 @@ class WebView(QWebView):
self._old_scroll_pos = (-1, -1) self._old_scroll_pos = (-1, -1)
self._ignore_wheel_event = False self._ignore_wheel_event = False
self._set_bg_color() self._set_bg_color()
self.cur_url = QUrl()
self._tab_id = tab_id self._tab_id = tab_id
page = self._init_page() page = self._init_page()
@ -109,11 +108,11 @@ class WebView(QWebView):
no_formatting = QUrl.UrlFormattingOption(0) no_formatting = QUrl.UrlFormattingOption(0)
orig_url = self.page().mainFrame().requestedUrl() orig_url = self.page().mainFrame().requestedUrl()
if (orig_url.isValid() and if (orig_url.isValid() and
not orig_url.matches(self.cur_url, no_formatting)): not orig_url.matches(self.url(), no_formatting)):
# If the url of the page is different than the url of the link # If the url of the page is different than the url of the link
# originally clicked, save them both. # originally clicked, save them both.
history.add_url(orig_url, self.title(), redirect=True) history.add_url(orig_url, self.title(), redirect=True)
history.add_url(self.cur_url, self.title()) history.add_url(self.url(), self.title())
def _init_page(self): def _init_page(self):
"""Initialize the QWebPage used by this view.""" """Initialize the QWebPage used by this view."""
@ -293,7 +292,6 @@ class WebView(QWebView):
urlstr = url.toDisplayString() urlstr = url.toDisplayString()
log.webview.debug("New title: {}".format(urlstr)) log.webview.debug("New title: {}".format(urlstr))
self.titleChanged.emit(urlstr) self.titleChanged.emit(urlstr)
self.cur_url = url
self.url_text_changed.emit(url.toDisplayString()) self.url_text_changed.emit(url.toDisplayString())
self.load(url) self.load(url)
if url.scheme() == 'qute': if url.scheme() == 'qute':
@ -315,12 +313,11 @@ class WebView(QWebView):
@pyqtSlot('QUrl') @pyqtSlot('QUrl')
def on_url_changed(self, url): def on_url_changed(self, url):
"""Update cur_url when URL has changed. """Update title when URL has changed.
If the URL is invalid, we just ignore it here. If the URL is invalid, we just ignore it here.
""" """
if url.isValid(): if url.isValid():
self.cur_url = url
self.url_text_changed.emit(url.toDisplayString()) self.url_text_changed.emit(url.toDisplayString())
if not self.title(): if not self.title():
self.titleChanged.emit(self.url().toDisplayString()) self.titleChanged.emit(self.url().toDisplayString())