summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2010-11-16 14:07:38 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2010-11-17 13:36:01 -0800
commit889949bf5cd798b513b2277b49c752d8eab67ba7 (patch)
tree3ccd867c9807d7cca298cc5bfa2dd2a5cbf1de37
parente8e7e7f47930d953f99108f9a82214f2f2a5a7bc (diff)
downloadexternal_webkit-889949bf5cd798b513b2277b49c752d8eab67ba7.zip
external_webkit-889949bf5cd798b513b2277b49c752d8eab67ba7.tar.gz
external_webkit-889949bf5cd798b513b2277b49c752d8eab67ba7.tar.bz2
Merge Webkit at r71558: Functions generated from .idl file should be guarded.
This is a cherry pick from the webkit fix. http://trac.webkit.org/changeset/72216 The change cause this compile error is http://trac.webkit.org/changeset/71515 Change-Id: Ibf7f689b1463116bb856739af7bbab8457498d05
-rw-r--r--WebCore/bindings/v8/custom/V8ConsoleCustom.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
index b17b8e9..9142ad7 100644
--- a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
@@ -82,6 +82,7 @@ v8::Handle<v8::Value> V8Console::assertCallback(const v8::Arguments& args)
return v8::Handle<v8::Value>();
}
+#if ENABLE(JAVASCRIPT_DEBUGGER)
v8::Handle<v8::Value> V8Console::profileCallback(const v8::Arguments& args)
{
INC_STATS("DOM.Console.profile");
@@ -105,5 +106,6 @@ v8::Handle<v8::Value> V8Console::profileEndCallback(const v8::Arguments& args)
imp->profileEnd(title, ScriptState::current(), callStack.release());
return v8::Handle<v8::Value>();
}
+#endif
} // namespace WebCore