[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 54abffc62ca6e6a31f0448416d308c48543c3e4e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 17:17:42 2009 +0000

    2009-11-30  Steve Block  <steveblock at google.com>
    
            Reviewed by Eric Seidel.
    
            Adds ENABLE(INSPECTOR) guards around DOMWindow::inspectorTimelineAgent.
            https://bugs.webkit.org/show_bug.cgi?id=31928
    
            Build fix only, no new tests.
    
            * page/DOMWindow.cpp: Modified. Adds ENABLE(INSPECTOR) guards around DOMWindow::inspectorTimelineAgent.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0e6e131..b5efbbd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Eric Seidel.
 
+        Adds ENABLE(INSPECTOR) guards around DOMWindow::inspectorTimelineAgent.
+        https://bugs.webkit.org/show_bug.cgi?id=31928
+
+        Build fix only, no new tests.
+
+        * page/DOMWindow.cpp: Modified. Adds ENABLE(INSPECTOR) guards around DOMWindow::inspectorTimelineAgent.
+
+2009-11-30  Steve Block  <steveblock at google.com>
+
+        Reviewed by Eric Seidel.
+
         Adds SHARED_WORKERS guards to V8 WorkerContextExecutionProxy.
         https://bugs.webkit.org/show_bug.cgi?id=31926
 
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 08b24a6..58f54bd 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1299,12 +1299,14 @@ void DOMWindow::dispatchLoadEvent()
 #endif
 }
 
+#if ENABLE(INSPECTOR)
 InspectorTimelineAgent* DOMWindow::inspectorTimelineAgent() 
 {
     if (frame() && frame()->page())
         return frame()->page()->inspectorTimelineAgent();
     return 0;
 }
+#endif
 
 bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget)
 {

-- 
WebKit Debian packaging