[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit b0f26e200b9c937251fdff9516eda8380866ed5a
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 15:33:21 2010 +0000

    2010-11-23  Laszlo Gombos  <laszlo.1.gombos at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72606 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3196af0..b7578f1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-23  Laszlo Gombos  <laszlo.1.gombos at 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 at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index e596870..1b06e2e 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -125,6 +125,7 @@ InspectorClientQt::InspectorClientQt(QWebPage* page)
 
 void InspectorClientQt::inspectorDestroyed()
 {
+#if ENABLE(INSPECTOR)
     if (m_frontendClient)
         m_frontendClient->inspectorClientDestroyed();
 
@@ -133,11 +134,13 @@ void InspectorClientQt::inspectorDestroyed()
         webInspectorServer->unregisterClient(this);
 
     delete this;
+#endif
 }
 
     
 void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController)
 {
+#if ENABLE(INSPECTOR)
 #if USE(V8)
     ensureDebuggerScriptLoaded();
 #endif
@@ -174,6 +177,7 @@ void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* insp
     m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this);
     inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient);
     m_frontendWebPage = inspectorPage;
+#endif
 }
 
 void InspectorClientQt::releaseFrontendPage()
@@ -255,6 +259,7 @@ void InspectorClientQt::storeSetting(const String& key, const String& setting)
 
 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)
@@ -266,6 +271,9 @@ bool InspectorClientQt::sendMessageToFrontend(const String& message)
 
     Page* frontendPage = QWebPagePrivate::core(m_frontendWebPage);
     return doDispatchMessageOnFrontendPage(frontendPage, message);
+#else
+    return false;
+#endif
 }
 
 static String variantToSetting(const QVariant& qvariant)
@@ -291,6 +299,7 @@ static QVariant settingToVariant(const String& setting)
     return retVal;
 }
 
+#if ENABLE(INSPECTOR)
 InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView, InspectorClientQt* inspectorClient)
     : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page) 
     , m_inspectedWebPage(inspectedWebPage)
@@ -397,7 +406,7 @@ void InspectorFrontendClientQt::inspectorClientDestroyed()
     m_inspectorClient = 0;
     m_inspectedWebPage = 0;
 }
-
+#endif
 }
 
 #include "InspectorClientQt.moc"
diff --git a/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp b/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp
index a6dda58..7002dce 100644
--- a/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp
@@ -360,10 +360,12 @@ void InspectorServerRequestHandlerQt::webSocketReadyRead()
 
         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).
         m_data = m_data.mid(length + 2);

-- 
WebKit Debian packaging