diff -r 960e5e18894b -r a1a8eac81b54 WebBrowser/WebBrowserPage.py
--- a/WebBrowser/WebBrowserPage.py Sat Mar 12 17:02:04 2016 +0100
+++ b/WebBrowser/WebBrowserPage.py Sat Mar 12 20:05:01 2016 +0100
@@ -152,13 +152,8 @@
self.__sslConfiguration = None
## self.__proxy.finished.connect(self.__managerFinished)
##
- self.__adBlockedEntries = []
- self.loadStarted.connect(self.__loadStarted)
-##
-## self.saveFrameStateRequested.connect(
-## self.__saveFrameStateRequested)
-## self.restoreFrameStateRequested.connect(
-## self.__restoreFrameStateRequested)
+## self.__adBlockedEntries = []
+## self.loadStarted.connect(self.__loadStarted)
self.featurePermissionRequested.connect(
self.__featurePermissionRequested)
@@ -397,12 +392,12 @@
## return True
##
## return QWebPage.extension(self, extension, option, output)
-
- def __loadStarted(self):
- """
- Private slot to handle the loadStarted signal.
- """
- self.__adBlockedEntries = []
+##
+## def __loadStarted(self):
+## """
+## Private slot to handle the loadStarted signal.
+## """
+## self.__adBlockedEntries = []
##
## def addAdBlockRule(self, rule, url):
## """
@@ -609,58 +604,6 @@
## return super(HelpWebPage, self).event(fakeEvent)
##
## return super(HelpWebPage, self).event(evt)
-##
-## def __saveFrameStateRequested(self, frame, itm):
-## """
-## Private slot to save the page state (i.e. zoom level and scroll
-## position).
-##
-## Note: Code is based on qutebrowser.
-##
-## @param frame frame to be saved
-## @type QWebFrame
-## @param itm web history item to be saved
-## @type QWebHistoryItem
-## """
-## try:
-## if frame != self.mainFrame():
-## return
-## except RuntimeError:
-## # With Qt 5.2.1 (Ubuntu Trusty) we get this when closing a tab:
-## # RuntimeError: wrapped C/C++ object of type BrowserPage has
-## # been deleted
-## # Since the information here isn't that important for closing web
-## # views anyways, we ignore this error.
-## return
-## data = {
-## 'zoom': frame.zoomFactor(),
-## 'scrollPos': frame.scrollPosition(),
-## }
-## itm.setUserData(data)
-##
-## def __restoreFrameStateRequested(self, frame):
-## """
-## Private slot to restore scroll position and zoom level from
-## history.
-##
-## Note: Code is based on qutebrowser.
-##
-## @param frame frame to be restored
-## @type QWebFrame
-## """
-## if frame != self.mainFrame():
-## return
-##
-## data = self.history().currentItem().userData()
-## if data is None:
-## return
-##
-## if 'zoom' in data:
-## frame.page().view().setZoomValue(int(data['zoom'] * 100),
-## saveValue=False)
-##
-## if 'scrollPos' in data and frame.scrollPosition() == QPoint(0, 0):
-## frame.setScrollPosition(data['scrollPos'])
def __featurePermissionRequested(self, url, feature):
"""
