diff options
| author | Steve Block <steveblock@google.com> | 2011-01-04 11:51:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-04 11:51:48 -0800 |
| commit | 29f7b6285a17b04529f2284d01450111aa82fb07 (patch) | |
| tree | c37e2e746626787a676ae65c9153339a3304984e | |
| parent | c4b05dc669ff21d9f44a638c7784f8ad79b68bf8 (diff) | |
| parent | c57ce97d4a72c3788c8055c731cc90241e9dab76 (diff) | |
| download | external_webkit-29f7b6285a17b04529f2284d01450111aa82fb07.zip external_webkit-29f7b6285a17b04529f2284d01450111aa82fb07.tar.gz external_webkit-29f7b6285a17b04529f2284d01450111aa82fb07.tar.bz2 | |
Merge "Update JSDOMWindowBase to reflect recent upstreaming"
| -rw-r--r-- | WebCore/bindings/js/JSDOMWindowBase.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/bindings/js/JSDOMWindowBase.cpp b/WebCore/bindings/js/JSDOMWindowBase.cpp index 7e09f51..686326f 100644 --- a/WebCore/bindings/js/JSDOMWindowBase.cpp +++ b/WebCore/bindings/js/JSDOMWindowBase.cpp @@ -121,12 +121,8 @@ bool JSDOMWindowBase::supportsProfiling() const bool JSDOMWindowBase::supportsRichSourceInfo() const { #if PLATFORM(ANDROID) - // TODO: better to get upstream to fix the line info without enabling - // DEBUGGER or INSPECTOR. - // See webkit change: http://trac.webkit.org/changeset/72360 return true; -#endif -#if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR) +#elif !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR) return false; #else Frame* frame = impl()->frame(); |