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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6b44cf8b8088699654df957fd9a245c82eceaf54
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 24 23:33:20 2010 +0000

    2010-07-24  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Darin Adler.
    
            Buildfix for !ENABLE(INSPECTOR) after r63891.
            https://bugs.webkit.org/show_bug.cgi?id=42925
    
            * bindings/js/ScriptValue.cpp: Added property svn:eol-style.
            * bindings/js/ScriptValue.h: Added property svn:eol-style.
            * inspector/ConsoleMessage.cpp: Added property svn:eol-style.
            * inspector/ConsoleMessage.h: Added property svn:eol-style.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03be1f2..406df73 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-24  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Darin Adler.
+
+        Buildfix for !ENABLE(INSPECTOR) after r63891.
+        https://bugs.webkit.org/show_bug.cgi?id=42925
+
+        * bindings/js/ScriptValue.cpp: Added property svn:eol-style.
+        * bindings/js/ScriptValue.h: Added property svn:eol-style.
+        * inspector/ConsoleMessage.cpp: Added property svn:eol-style.
+        * inspector/ConsoleMessage.h: Added property svn:eol-style.
+
 2010-07-24  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/bindings/js/ScriptValue.cpp b/WebCore/bindings/js/ScriptValue.cpp
index 44c6828..abc31e2 100644
--- a/WebCore/bindings/js/ScriptValue.cpp
+++ b/WebCore/bindings/js/ScriptValue.cpp
@@ -94,6 +94,7 @@ ScriptValue ScriptValue::deserialize(ScriptState* scriptState, SerializedScriptV
     return ScriptValue(value->deserialize(scriptState, scriptState->lexicalGlobalObject()));
 }
 
+#if ENABLE(INSPECTOR)
 static PassRefPtr<InspectorValue> jsToInspectorValue(ScriptState* scriptState, JSValue value)
 {
     if (!value) {
@@ -149,5 +150,6 @@ PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ScriptState* scriptStat
 {
     return jsToInspectorValue(scriptState, m_value.get());
 }
+#endif // ENABLE(INSPECTOR)
 
 } // namespace WebCore
diff --git a/WebCore/bindings/js/ScriptValue.h b/WebCore/bindings/js/ScriptValue.h
index 21ad01c..b170fcf 100644
--- a/WebCore/bindings/js/ScriptValue.h
+++ b/WebCore/bindings/js/ScriptValue.h
@@ -62,7 +62,9 @@ public:
 
     static ScriptValue undefined() { return ScriptValue(JSC::jsUndefined()); }
 
+#if ENABLE(INSPECTOR)
     PassRefPtr<InspectorValue> toInspectorValue(ScriptState*) const;
+#endif
 
 private:
     JSC::ProtectedJSValue m_value;
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index aa0b1c0..9c0b783 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -35,10 +35,13 @@
 #include "InjectedScriptHost.h"
 #include "InspectorFrontend.h"
 #include "InspectorValues.h"
-#include "RemoteInspectorFrontend.h"
 #include "ScriptCallStack.h"
 #include "ScriptObject.h"
 
+#if ENABLE(INSPECTOR)
+#include "RemoteInspectorFrontend.h"
+#endif
+
 namespace WebCore {
 
 ConsoleMessage::CallFrame::CallFrame(const ScriptCallFrame& frame)
@@ -60,6 +63,7 @@ bool ConsoleMessage::CallFrame::isEqual(const ConsoleMessage::CallFrame& o) cons
         && m_lineNumber == o.m_lineNumber;
 }
 
+#if ENABLE(INSPECTOR)
 PassRefPtr<InspectorObject> ConsoleMessage::CallFrame::buildInspectorObject() const
 {
     RefPtr<InspectorObject> frame = InspectorObject::create();
@@ -68,6 +72,7 @@ PassRefPtr<InspectorObject> ConsoleMessage::CallFrame::buildInspectorObject() co
     frame->setNumber("lineNumber", m_lineNumber);
     return frame;
 }
+#endif
 
 ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, unsigned li, const String& u, unsigned g)
     : m_source(s)
diff --git a/WebCore/inspector/ConsoleMessage.h b/WebCore/inspector/ConsoleMessage.h
index 81d32b9..cb5e6f0 100644
--- a/WebCore/inspector/ConsoleMessage.h
+++ b/WebCore/inspector/ConsoleMessage.h
@@ -67,7 +67,9 @@ private:
         explicit CallFrame(const ScriptCallFrame& frame);
         CallFrame();
         bool isEqual(const CallFrame& o) const;
+#if ENABLE(INSPECTOR)
         PassRefPtr<InspectorObject> buildInspectorObject() const;
+#endif
 
     private:
         String m_functionName;

-- 
WebKit Debian packaging