diff options
| author | Steve Block <steveblock@google.com> | 2010-02-10 18:55:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:54:06 +0000 |
| commit | db6ec27680d00cea5ecd0c192eab2767cd6a9cf8 (patch) | |
| tree | c1f2f41f1fd1a2cb47e2b17ae5fdc0dced13890b | |
| parent | e6dc63f936f844a7d0345323c19b11349214737e (diff) | |
| download | external_webkit-db6ec27680d00cea5ecd0c192eab2767cd6a9cf8.zip external_webkit-db6ec27680d00cea5ecd0c192eab2767cd6a9cf8.tar.gz external_webkit-db6ec27680d00cea5ecd0c192eab2767cd6a9cf8.tar.bz2 | |
Merge webkit.org at r54340 : Cherry-pick WebKit change 54417 to fix ENABLE_DEBUGGER guards for V8
See http://trac.webkit.org/changeset/54417
Change-Id: I03e7f8f1ddb9af92e5ce7494136ea2d2a6de6800
| -rw-r--r-- | WebCore/page/Console.cpp | 4 | ||||
| -rw-r--r-- | WebCore/page/Console.h | 8 | ||||
| -rw-r--r-- | WebCore/page/Console.idl | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp index 8f55c78..13595a1 100644 --- a/WebCore/page/Console.cpp +++ b/WebCore/page/Console.cpp @@ -312,9 +312,7 @@ String Console::lastWMLErrorMessage() const } #endif -// FIXME: "USE(V8)" and "USE(JSC)" below are temporary measures until JAVASCRIPT_DEBUGGER is -// enabled when building Chromium. -#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8) +#if ENABLE(JAVASCRIPT_DEBUGGER) void Console::profile(const String& title, ScriptCallStack* callStack) { diff --git a/WebCore/page/Console.h b/WebCore/page/Console.h index bbf2ac7..9a6d88c 100644 --- a/WebCore/page/Console.h +++ b/WebCore/page/Console.h @@ -38,9 +38,7 @@ namespace WebCore { -// FIXME: "USE(V8)" and "USE(JSC)" below are temporary measures until JAVASCRIPT_DEBUGGER is -// enabled when building Chromium. -#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8) +#if ENABLE(JAVASCRIPT_DEBUGGER) typedef Vector<RefPtr<ScriptProfile> > ProfilesArray; #endif @@ -99,7 +97,7 @@ public: #if ENABLE(WML) String lastWMLErrorMessage() const; #endif -#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8) +#if ENABLE(JAVASCRIPT_DEBUGGER) void profile(const String&, ScriptCallStack*); void profileEnd(const String&, ScriptCallStack*); #endif @@ -122,7 +120,7 @@ private: Console(Frame*); Frame* m_frame; -#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8) +#if ENABLE(JAVASCRIPT_DEBUGGER) ProfilesArray m_profiles; #endif }; diff --git a/WebCore/page/Console.idl b/WebCore/page/Console.idl index 290235b..b3c0c24 100644 --- a/WebCore/page/Console.idl +++ b/WebCore/page/Console.idl @@ -50,7 +50,7 @@ module window { [DontEnum] DOMString lastWMLErrorMessage(); #endif -#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER || defined(V8_BINDING) && V8_BINDING +#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER [CustomArgumentHandling] void profile(in [ConvertUndefinedOrNullToNullString] DOMString title); [CustomArgumentHandling] void profileEnd(in [ConvertUndefinedOrNullToNullString] DOMString title); #endif |