diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-13 15:30:18 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-13 16:16:20 +0100 |
| commit | 98c4643ae0de69563228a5c4981f9efeacd27099 (patch) | |
| tree | 5e21ec28120fffc063dd6b787a772eee5fd5ce32 /WebCore/bindings | |
| parent | 7bb28f8ec202edb789a7fa94ed0496b92d7ea491 (diff) | |
| download | external_webkit-98c4643ae0de69563228a5c4981f9efeacd27099.zip external_webkit-98c4643ae0de69563228a5c4981f9efeacd27099.tar.gz external_webkit-98c4643ae0de69563228a5c4981f9efeacd27099.tar.bz2 | |
Fix left over maunal merges
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index ea4363e..beadc4a 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -129,7 +129,6 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S #if ENABLE(JAVASCRIPT_DEBUGGER) bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) -#endif { JSLock lock(SilenceAssertionsOnly); JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject()); |