[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 24458681b5b08a0041dd34ae9b51ac9aa5f234cf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 11:10:14 2010 +0000

    2010-02-16  Ismail Donmez  <ismail at namtrac.org>
    
            Reviewed by Pavel Feldman.
    
            Fix compilation with inspector disabled.
            https://bugs.webkit.org/show_bug.cgi?id=32724
    
            * rendering/RenderLayerBacking.cpp:
            (WebCore::inspectorTimelineAgent):
    2010-02-16  Ismail Donmez  <ismail at namtrac.org>
    
            Reviewed by Pavel Feldman.
    
            Fix compilation with inspector disabled.
            https://bugs.webkit.org/show_bug.cgi?id=32724
    
            * Api/qwebpage.cpp:
            (qt_drt_webinspector_executeScript):
            (qt_drt_webinspector_close):
            (qt_drt_webinspector_show):
            (qt_drt_setTimelineProfilingEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54815 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 147ca76..37097f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16  Ismail Donmez  <ismail at namtrac.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix compilation with inspector disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=32724
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::inspectorTimelineAgent):
+
 2010-02-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index 5435bf1..3f60557 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -1017,6 +1017,7 @@ void RenderLayerBacking::paintIntoLayer(RenderLayer* rootLayer, GraphicsContext*
     ASSERT(!m_owningLayer->m_usedTransparency);
 }
 
+#if ENABLE(INSPECTOR)
 static InspectorTimelineAgent* inspectorTimelineAgent(RenderObject* renderer)
 {
     Frame* frame = renderer->document()->frame();
@@ -1027,6 +1028,7 @@ static InspectorTimelineAgent* inspectorTimelineAgent(RenderObject* renderer)
         return 0;
     return page->inspectorTimelineAgent();
 }
+#endif
 
 // Up-call from compositing layer drawing callback.
 void RenderLayerBacking::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect& clip)
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 185a2ee..2a8aced 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -161,6 +161,7 @@ QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page)
     return page->handle()->page->groupName();
 }
 
+#if ENABLE(INSPECTOR)
 void QWEBKIT_EXPORT qt_drt_webinspector_executeScript(QWebPage* page, long callId, const QString& script)
 {
     if (!page->handle()->page->inspectorController())
@@ -192,6 +193,7 @@ void QWEBKIT_EXPORT qt_drt_setTimelineProfilingEnabled(QWebPage* page, bool enab
     else
         controller->stopTimelineProfiler();
 }
+#endif
 
 class QWebPageWidgetClient : public QWebPageClient {
 public:
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 29e89eb..06df5a3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-16  Ismail Donmez  <ismail at namtrac.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix compilation with inspector disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=32724
+
+        * Api/qwebpage.cpp:
+        (qt_drt_webinspector_executeScript):
+        (qt_drt_webinspector_close):
+        (qt_drt_webinspector_show):
+        (qt_drt_setTimelineProfilingEnabled):
+
 2010-02-16  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Simon Hausman.

-- 
WebKit Debian packaging