Changeset 72606 in webkit

Timestamp:

Nov 23, 2010 7:33:21 AM (13 years ago)

Author:

Laszlo Gombos

Message:

2010-11-23 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix compilation with !ENABLE(INSPECTOR)
​https://bugs.webkit.org/show_bug.cgi?id=49942

Add ENABLE(INSPECTOR) to the Qt specific files following r71981.

• WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::inspectorDestroyed): (WebCore::InspectorClientQt::openInspectorFrontend): (WebCore::InspectorClientQt::sendMessageToFrontend):
• WebCoreSupport/InspectorServerQt.cpp: (WebCore::InspectorServerRequestHandlerQt::webSocketReadyRead):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/InspectorClientQt.cpp (modified) (8 diffs)
• WebCoreSupport/InspectorServerQt.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-11-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix compilation with !ENABLE(INSPECTOR)
+        https://bugs.webkit.org/show_bug.cgi?id=49942
+
+        Add ENABLE(INSPECTOR) to the Qt specific files following r71981.
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::inspectorDestroyed):
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        (WebCore::InspectorClientQt::sendMessageToFrontend):
+        * WebCoreSupport/InspectorServerQt.cpp:
+        (WebCore::InspectorServerRequestHandlerQt::webSocketReadyRead):
+
 2010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

@@ -126 +126 @@
 void InspectorClientQt::inspectorDestroyed()
 {
+#if ENABLE(INSPECTOR)
     if (m_frontendClient)
         m_frontendClient->inspectorClientDestroyed();
@@ -134 +135 @@
 
     delete this;
+#endif
 }
 
@@ -139 +141 @@
 void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController)
 {
+#if ENABLE(INSPECTOR)
 #if USE(V8)
     ensureDebuggerScriptLoaded();
@@ -175 +178 @@
     inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient);
     m_frontendWebPage = inspectorPage;
+#endif
 }
 
@@ -256 +260 @@
 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);
@@ -267 +272 @@
     Page* frontendPage = QWebPagePrivate::core(m_frontendWebPage);
     return doDispatchMessageOnFrontendPage(frontendPage, message);
+#else
+    return false;
+#endif
 }
 
@@ -292 +300 @@
 }
 
+#if ENABLE(INSPECTOR)
 InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView, InspectorClientQt* inspectorClient)
     : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page) 
@@ -398 +407 @@
     m_inspectedWebPage = 0;
 }
-
+#endif
 }
 

trunk/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp

@@ -361 +361 @@
         QByteArray payload = m_data.mid(1, length);
 
+#if ENABLE(INSPECTOR)
         if (m_inspectorClient) {
           InspectorController* inspectorController = m_inspectorClient->m_inspectedWebPage->d->page->inspectorController();
           inspectorController->inspectorBackendDispatcher()->dispatch(QString::fromUtf8(payload));
         }
+#endif
 
         // Remove this WebSocket message from m_data (payload, start-of-frame byte, end-of-frame byte).