summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/Api/qgraphicswebview.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-23 15:08:59 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-23 15:09:20 +0100
commit061d58bc0fa016cfeed744fd3e4663460635d69b (patch)
treead9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit/qt/Api/qgraphicswebview.cpp
parent470286ecfe79d59df14944e5b5d34630fc739391 (diff)
downloadqtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qgraphicswebview.cpp')
-rw-r--r--Source/WebKit/qt/Api/qgraphicswebview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/Api/qgraphicswebview.cpp b/Source/WebKit/qt/Api/qgraphicswebview.cpp
index ef42c9518..84b4e801b 100644
--- a/Source/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/Source/WebKit/qt/Api/qgraphicswebview.cpp
@@ -88,7 +88,7 @@ public:
PageClientQGraphicsWidget* pageClient() const
{
- return static_cast<WebCore::PageClientQGraphicsWidget*> (page->d->client.get());
+ return static_cast<WebCore::PageClientQGraphicsWidget*> (page->d->client.data());
}
};
@@ -468,7 +468,7 @@ void QGraphicsWebViewPrivate::detachCurrentPage()
return;
page->d->view = 0;
- page->d->client = nullptr;
+ page->d->client.reset();
// if the page was created by us, we own it and need to
// destroy it as well.
@@ -501,7 +501,7 @@ void QGraphicsWebView::setPage(QWebPage* page)
if (!d->page)
return;
- d->page->d->client = adoptPtr(new PageClientQGraphicsWidget(this, page));
+ d->page->d->client.reset(new PageClientQGraphicsWidget(this, page));
if (d->overlay())
d->overlay()->prepareGraphicsItemGeometryChange();