[Qt][WK2] Remove QWKContext class and make sure the WebProcessProxy life is correctly...
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Aug 2011 15:13:39 +0000 (15:13 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Aug 2011 15:13:39 +0000 (15:13 +0000)
commite8cb05cd102192ceea6c63cf61ab4d69e0533401
treeb6db1a2f3653ef47a26f46a98bb1ea85a6af1884
parentab9a7bb51c138ac589a30c05658a220a003157ee
[Qt][WK2] Remove QWKContext class and make sure the WebProcessProxy life is correctly managed.
https://bugs.webkit.org/show_bug.cgi?id=66886

Reviewed by Benjamin Poulain.

Remove QWKContext class from Qt APIs as it is too low level for the vision
of the Qt5 API. QtWebPageProxy now holds directly a WebContext which can be a custom one
or default created one. This patch also ensure that the WebProcessProxy is correctly
destroyed at application exit by removing the circular references between the WebContext,
WebProcessProxy, and WebPageProxy.

* UIProcess/API/qt/qdesktopwebview.cpp:
(QDesktopWebViewPrivate::QDesktopWebViewPrivate):
* UIProcess/API/qt/qtouchwebview.cpp:
(QTouchWebViewPrivate::QTouchWebViewPrivate):
* UIProcess/qt/ClientImpl.cpp:
(qt_wk_setStatusText):
* UIProcess/qt/ClientImpl.h:
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::defaultWKContext):
(QtWebPageProxy::QtWebPageProxy):
(QtWebPageProxy::~QtWebPageProxy):
* UIProcess/qt/QtWebPageProxy.h:
* UIProcess/qt/qdesktopwebpageproxy.cpp:
(QDesktopWebPageProxy::QDesktopWebPageProxy):
* UIProcess/qt/qdesktopwebpageproxy.h:
* UIProcess/qt/qtouchwebpageproxy.cpp:
(QTouchWebPageProxy::QTouchWebPageProxy):
* UIProcess/qt/qtouchwebpageproxy.h:
* UIProcess/qt/qwkcontext.cpp: Removed.
* UIProcess/qt/qwkcontext.h: Removed.
* UIProcess/qt/qwkcontext_p.h: Removed.
* WebKit2.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@93784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp
Source/WebKit2/UIProcess/qt/ClientImpl.cpp
Source/WebKit2/UIProcess/qt/ClientImpl.h
Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp
Source/WebKit2/UIProcess/qt/QtWebPageProxy.h
Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp
Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h
Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp
Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h
Source/WebKit2/UIProcess/qt/qwkcontext.cpp [deleted file]
Source/WebKit2/UIProcess/qt/qwkcontext.h [deleted file]
Source/WebKit2/UIProcess/qt/qwkcontext_p.h [deleted file]
Source/WebKit2/WebKit2.pro