Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "core/css/MediaQueryListListener.h" | 21 #include "core/css/MediaQueryListListener.h" |
| 22 | 22 |
| 23 #include "bindings/core/v8/V8MediaQueryList.h" | 23 #include "bindings/core/v8/V8MediaQueryList.h" |
| 24 #include "bindings/v8/V8Binding.h" | 24 #include "bindings/v8/ScriptController.h" |
| 25 #include <v8.h> | 25 #include <v8.h> |
| 26 | 26 |
| 27 namespace WebCore { | 27 namespace WebCore { |
| 28 | 28 |
| 29 MediaQueryListListener::MediaQueryListListener(ScriptState* scriptState, const S criptValue& function) | 29 MediaQueryListListener::MediaQueryListListener(ScriptState* scriptState, const S criptValue& function) |
| 30 : m_scriptState(scriptState) | 30 : m_scriptState(scriptState) |
| 31 , m_function(function) | 31 , m_function(function) |
| 32 { | 32 { |
| 33 ASSERT(m_function.isFunction()); | 33 ASSERT(m_function.isFunction()); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void MediaQueryListListener::queryChanged(MediaQueryList* query) | 36 void MediaQueryListListener::queryChanged(MediaQueryList* query) |
| 37 { | 37 { |
| 38 if (m_scriptState->contextIsEmpty()) | 38 if (m_scriptState->contextIsEmpty()) |
| 39 return; | 39 return; |
| 40 ScriptState::Scope scope(m_scriptState.get()); | 40 ScriptState::Scope scope(m_scriptState.get()); |
| 41 v8::Handle<v8::Value> args[] = { toV8(query, m_scriptState->context()->Globa l(), m_scriptState->isolate()) }; | 41 v8::Handle<v8::Value> args[] = { toV8(query, m_scriptState->context()->Globa l(), m_scriptState->isolate()) }; |
| 42 invokeCallback(m_scriptState.get(), v8::Handle<v8::Function>::Cast(m_functio n.v8Value()), WTF_ARRAY_LENGTH(args), args); | 42 ScriptController::callFunction(m_scriptState.get()->executionContext(), v8:: Handle<v8::Function>::Cast(m_function.v8Value()), m_scriptState.get()->context() ->Global(), WTF_ARRAY_LENGTH(args), args, m_scriptState.get()->isolate()); |
|
haraken
2014/06/24 03:58:51
m_scriptState->context()->Global() will work.
m_s
| |
| 43 } | 43 } |
| 44 | 44 |
| 45 } | 45 } |
| OLD | NEW |