diff options
| author | Steve Block <steveblock@google.com> | 2010-12-31 13:19:41 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-12-31 13:19:41 +0000 |
| commit | c57ce97d4a72c3788c8055c731cc90241e9dab76 (patch) | |
| tree | 303b9196b733b4942e74960ef2a9ff2bcb91dac1 /WebCore/bindings/js | |
| parent | 0cbc4f2c016ebe2b600784ac016f35c83b5f5b50 (diff) | |
| download | external_webkit-c57ce97d4a72c3788c8055c731cc90241e9dab76.zip external_webkit-c57ce97d4a72c3788c8055c731cc90241e9dab76.tar.gz external_webkit-c57ce97d4a72c3788c8055c731cc90241e9dab76.tar.bz2 | |
Update JSDOMWindowBase to reflect recent upstreaming
An Android-specific modification was upstreamed in
http://trac.webkit.org/changeset/74806
Bug: 3305994
Change-Id: Ie43475aa611259d2d2de39397e167e42b24434f3
Diffstat (limited to 'WebCore/bindings/js')
| -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(); |