Diff
Modified: trunk/Source/WebKit/qt/Api/qwebinspector.cpp (98161 => 98162)
--- trunk/Source/WebKit/qt/Api/qwebinspector.cpp 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/Api/qwebinspector.cpp 2011-10-21 22:33:35 UTC (rev 98162)
@@ -198,31 +198,6 @@
}
}
-/*!
- * \internal
- */
-void QWebInspectorPrivate::attachAndReplaceRemoteFrontend(QObject* newRemoteFrontend)
-{
- if (remoteFrontend)
- remoteFrontend->setParent(0);
-
- remoteFrontend = newRemoteFrontend;
-
- if (remoteFrontend)
- remoteFrontend->setParent(q);
-}
-
-/*!
- * \internal
- */
-void QWebInspectorPrivate::detachRemoteFrontend()
-{
- if (remoteFrontend) {
- remoteFrontend->deleteLater();
- remoteFrontend = 0;
- }
-}
-
void QWebInspectorPrivate::adjustFrontendSize(const QSize& size)
{
if (frontend)
Modified: trunk/Source/WebKit/qt/Api/qwebinspector_p.h (98161 => 98162)
--- trunk/Source/WebKit/qt/Api/qwebinspector_p.h 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/Api/qwebinspector_p.h 2011-10-21 22:33:35 UTC (rev 98162)
@@ -33,18 +33,14 @@
: q(qq)
, page(0)
, frontend(0)
- , remoteFrontend(0)
{}
void setFrontend(QWidget* newFrontend);
- void attachAndReplaceRemoteFrontend(QObject* newRemoteFrontend);
- void detachRemoteFrontend();
void adjustFrontendSize(const QSize& size);
QWebInspector* q;
QWebPage* page;
QWidget* frontend;
- QObject* remoteFrontend;
};
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (98161 => 98162)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 22:33:35 UTC (rev 98162)
@@ -1,5 +1,28 @@
2011-10-21 Luiz Agostini <luiz.agost...@palm.com>
+ [Qt] Remote debugging needs QWebInspector to work
+ https://bugs.webkit.org/show_bug.cgi?id=70651
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Removing QWebInspector dependency from remote inspector.
+
+ * Api/qwebinspector.cpp:
+ * Api/qwebinspector_p.h:
+ (QWebInspectorPrivate::QWebInspectorPrivate):
+ * WebCoreSupport/InspectorClientQt.cpp:
+ (WebCore::InspectorClientQt::InspectorClientQt):
+ (WebCore::InspectorClientQt::openInspectorFrontend):
+ (WebCore::InspectorClientQt::attachAndReplaceRemoteFrontend):
+ (WebCore::InspectorClientQt::detachRemoteFrontend):
+ (WebCore::InspectorClientQt::sendMessageToFrontend):
+ * WebCoreSupport/InspectorClientQt.h:
+ * WebCoreSupport/InspectorServerQt.cpp:
+ (WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):
+ * WebCoreSupport/InspectorServerQt.h:
+
+2011-10-21 Luiz Agostini <luiz.agost...@palm.com>
+
[Qt] Wrong type conversion in InspectorServerQt.cpp
https://bugs.webkit.org/show_bug.cgi?id=70639
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (98161 => 98162)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2011-10-21 22:33:35 UTC (rev 98162)
@@ -179,6 +179,7 @@
: m_inspectedWebPage(page)
, m_frontendWebPage(0)
, m_frontendClient(0)
+ , m_remoteFrontEndChannel(0)
{
InspectorServerQt* webInspectorServer = InspectorServerQt::server();
if (webInspectorServer)
@@ -210,7 +211,7 @@
QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
// Remote frontend was attached.
- if (m_inspectedWebPage->d->inspector->d->remoteFrontend)
+ if (m_remoteFrontEndChannel)
return;
// This is a known hook that allows changing the default URL for the
@@ -248,11 +249,10 @@
m_frontendClient = 0;
}
-void InspectorClientQt::attachAndReplaceRemoteFrontend(RemoteFrontendChannel* channel)
+void InspectorClientQt::attachAndReplaceRemoteFrontend(InspectorServerRequestHandlerQt* channel)
{
#if ENABLE(INSPECTOR)
- // Channel was allocated by InspectorServerQt. Here we transfer ownership to inspector.
- m_inspectedWebPage->d->inspector->d->attachAndReplaceRemoteFrontend(channel);
+ m_remoteFrontEndChannel = channel;
m_inspectedWebPage->d->inspectorController()->connectFrontend();
#endif
}
@@ -260,7 +260,7 @@
void InspectorClientQt::detachRemoteFrontend()
{
#if ENABLE(INSPECTOR)
- m_inspectedWebPage->d->inspector->d->detachRemoteFrontend();
+ m_remoteFrontEndChannel = 0;
m_inspectedWebPage->d->inspectorController()->disconnectFrontend();
#endif
}
@@ -283,10 +283,9 @@
bool InspectorClientQt::sendMessageToFrontend(const String& message)
{
#if ENABLE(INSPECTOR)
- if (m_inspectedWebPage->d->inspector->d->remoteFrontend) {
- RemoteFrontendChannel* session = qobject_cast<RemoteFrontendChannel*>(m_inspectedWebPage->d->inspector->d->remoteFrontend);
- if (session)
- session->sendMessageToFrontend(message);
+ if (m_remoteFrontEndChannel) {
+ WTF::CString msg = message.utf8();
+ m_remoteFrontEndChannel->webSocketSend(msg.data(), msg.length());
return true;
}
if (!m_frontendWebPage)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h (98161 => 98162)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h 2011-10-21 22:33:35 UTC (rev 98162)
@@ -44,7 +44,6 @@
class InspectorFrontendClientQt;
class InspectorServerRequestHandlerQt;
class Page;
-class RemoteFrontendChannel;
class InspectorClientQt : public InspectorClient {
public:
@@ -61,7 +60,7 @@
void releaseFrontendPage();
- void attachAndReplaceRemoteFrontend(RemoteFrontendChannel *channel);
+ void attachAndReplaceRemoteFrontend(InspectorServerRequestHandlerQt *channel);
void detachRemoteFrontend();
private:
@@ -69,6 +68,7 @@
QWebPage* m_frontendWebPage;
InspectorFrontendClientQt* m_frontendClient;
bool m_remoteInspector;
+ InspectorServerRequestHandlerQt* m_remoteFrontEndChannel;
friend class InspectorServerRequestHandlerQt;
};
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp (98161 => 98162)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2011-10-21 22:33:35 UTC (rev 98162)
@@ -240,7 +240,7 @@
m_inspectorClient = m_server->inspectorClientForPage(pageNum);
// Attach remoteFrontendChannel to inspector, also transferring ownership.
if (m_inspectorClient)
- m_inspectorClient->attachAndReplaceRemoteFrontend(new RemoteFrontendChannel(this));
+ m_inspectorClient->attachAndReplaceRemoteFrontend(this);
}
}
@@ -371,18 +371,4 @@
}
}
-RemoteFrontendChannel::RemoteFrontendChannel(InspectorServerRequestHandlerQt* requestHandler)
- : QObject(requestHandler)
- , m_requestHandler(requestHandler)
-{
}
-
-bool RemoteFrontendChannel::sendMessageToFrontend(const String& message)
-{
- if (!m_requestHandler)
- return false;
- CString cstr = message.utf8();
- return m_requestHandler->webSocketSend(cstr.data(), cstr.length());
-}
-
-}
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h (98161 => 98162)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h 2011-10-21 22:33:35 UTC (rev 98162)
@@ -66,17 +66,6 @@
friend class InspectorServerRequestHandlerQt;
};
-class RemoteFrontendChannel : public QObject {
- Q_OBJECT
-public:
-
- RemoteFrontendChannel(InspectorServerRequestHandlerQt* requestHandler);
- bool sendMessageToFrontend(const String& message);
-
-private:
- InspectorServerRequestHandlerQt* m_requestHandler;
-};
-
class InspectorServerRequestHandlerQt : public QObject {
Q_OBJECT
public:
