diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-03 11:40:17 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | 6519a198e60c7ce0b9e38db00b3a1d1ef3338bd6 (patch) | |
| tree | 9db2c666bbe0cd11d0e92d7ca5313b3742a3dad5 /WebCore | |
| parent | 3882ca86c53f9b27a768fd8e6dd926de341d31f9 (diff) | |
| download | external_webkit-6519a198e60c7ce0b9e38db00b3a1d1ef3338bd6.zip external_webkit-6519a198e60c7ce0b9e38db00b3a1d1ef3338bd6.tar.gz external_webkit-6519a198e60c7ce0b9e38db00b3a1d1ef3338bd6.tar.bz2 | |
Merge WebKit at r64264 : Compile fix: Inspector guards in V8
Introduced here: http://trac.webkit.org/changeset/63891/trunk/WebCore/bindings/v8/ScriptValue.cpp
The JSC version is guarded.
This change has been upstreamed, and this is the bug:
https://bugs.webkit.org/show_bug.cgi?id=43345
And the webkit CL:
http://trac.webkit.org/changeset/64464/trunk/WebCore/bindings/v8/ScriptValue.cpp
Change-Id: Ic1e5b7a7352a9f290210776f2f1ce220952c6725
Diffstat (limited to 'WebCore')
| -rwxr-xr-x | WebCore/bindings/v8/ScriptValue.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 |