diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-21 14:43:21 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 16:43:59 +0200 |
commit | e9575322f8068b2dd2bc0b30a0f444f769a861b9 (patch) | |
tree | 1a6fbc4a8cb71d10f436265d20bcb1538e836220 /src/core/web_contents_adapter.h | |
parent | 3f69bf43c45e54789ce6cdc4a2f01ea129e6287c (diff) |
Implement QWebEngineHistory serialization
This does uses logic taken from Chromium's state save and restore
code. The history version is incremented from the same method in
QtWebKit in cases where the application would try loading a stream
from a previous version using QtWebKit.
In all cases where Chromium does a restore of a serialized history,
it does so on a fresh WebContents instance, thus we must do the same
and some of the initialization code has to be updated.
Change-Id: I45abb052073bd44c9cb47bc2abcf4b558fe3dbbd
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/core/web_contents_adapter.h')
-rw-r--r-- | src/core/web_contents_adapter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 3e5a0e24b..ba59252bf 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -56,6 +56,7 @@ class WebContentsAdapterPrivate; class QWEBENGINE_EXPORT WebContentsAdapter : public QSharedData { public: + static QExplicitlySharedDataPointer<WebContentsAdapter> createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient, WebContentsAdapterClient::RenderingMode renderingMode); // Takes ownership of the WebContents. WebContentsAdapter(WebContentsAdapterClient::RenderingMode renderingMode, content::WebContents *webContents = 0); ~WebContentsAdapter(); @@ -89,6 +90,7 @@ public: QUrl getNavigationEntryUrl(int index); QString getNavigationEntryTitle(int index); void clearNavigationHistory(); + void serializeNavigationHistory(QDataStream &output); void setZoomFactor(qreal); qreal currentZoomFactor() const; void enableInspector(bool); |