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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:38:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b645c68fc16f4da81ade3dc08c0cb92152d0c28a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 16:05:17 2010 +0000

    2010-08-02  Kristian Monsen  <kristianm at google.com>
    
            Reviewed by Steve Block.
    
            Compile fix for Android, guard inspector code with ENABLE(INSPECTOR).
            https://bugs.webkit.org/show_bug.cgi?id=43345
            Code introduced in this CL:
            http://trac.webkit.org/changeset/63891
    
            No new tests, just a compile fix.
    
            * bindings/v8/ScriptValue.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ff632a..0958314 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-02  Kristian Monsen  <kristianm at google.com>
+
+        Reviewed by Steve Block.
+
+        Compile fix for Android, guard inspector code with ENABLE(INSPECTOR).
+        https://bugs.webkit.org/show_bug.cgi?id=43345
+        Code introduced in this CL:
+        http://trac.webkit.org/changeset/63891
+
+        No new tests, just a compile fix.
+
+        * bindings/v8/ScriptValue.cpp:
+
 2010-08-02  Jeremy Orlow  <jorlow at chromium.org>
 
         Speculative revert of 64425 due to Chromium instability
diff --git a/WebCore/bindings/v8/ScriptValue.cpp b/WebCore/bindings/v8/ScriptValue.cpp
index 4ae532d..54f3860 100755
--- a/WebCore/bindings/v8/ScriptValue.cpp
+++ b/WebCore/bindings/v8/ScriptValue.cpp
@@ -67,6 +67,7 @@ String ScriptValue::toString(ScriptState*) const
     return toWebCoreString(m_value);
 }
 
+#if ENABLE(INSPECTOR)
 static PassRefPtr<InspectorValue> v8ToInspectorValue(v8::Handle<v8::Value> value)
 {
     if (value.IsEmpty()) {
@@ -122,5 +123,6 @@ PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ScriptState* scriptStat
     v8::Context::Scope contextScope(scriptState->context());
     return v8ToInspectorValue(m_value);
 }
+#endif
 
 } // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list