[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 f2480cd35bef21b8928f9e29b3acb0d416e2bdb8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 00:39:29 2009 +0000

    2009-11-11  Ben Murdoch  <benm at google.com>
    
            Reviewed by Darin Adler.
    
            bindings/js/ScriptObject.cpp is missing and ENABLE(INSPECTOR) guard.
            https://bugs.webkit.org/show_bug.cgi?id=31384
    
            No functionality change so no tests required.
    
            * bindings/js/ScriptObject.cpp: Add ENABLE(INSPECTOR) guard around the JSInspectorBackend.h include.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a78fe0..c4f0c3a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-11  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Darin Adler.
+
+        bindings/js/ScriptObject.cpp is missing and ENABLE(INSPECTOR) guard.
+        https://bugs.webkit.org/show_bug.cgi?id=31384
+
+        No functionality change so no tests required.
+
+        * bindings/js/ScriptObject.cpp: Add ENABLE(INSPECTOR) guard around the JSInspectorBackend.h include.
+
 2009-11-11  Jens Alfke  <snej at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp
index 1172e8e..f14145e 100644
--- a/WebCore/bindings/js/ScriptObject.cpp
+++ b/WebCore/bindings/js/ScriptObject.cpp
@@ -32,10 +32,13 @@
 #include "ScriptObject.h"
 
 #include "JSDOMBinding.h"
-#include "JSInspectorBackend.h"
 
 #include <runtime/JSLock.h>
 
+#if ENABLE(INSPECTOR)
+#include "JSInspectorBackend.h"
+#endif
+
 using namespace JSC;
 
 namespace WebCore {

-- 
WebKit Debian packaging