diff options
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index 0e36a0d..e0ca810 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -314,11 +314,6 @@ CppVariant* CppBoundClass::GetAsCppVariant() { void CppBoundClass::BindToJavascript(WebFrame* frame, const std::string& classname) { -#if WEBKIT_USING_JSC -#error "This is not going to work anymore...but it's not clear what the solution is...or if it's still necessary." - JSC::JSLock lock(false); -#endif - // BindToWindowObject will take its own reference to the NPObject, and clean // up after itself. It will also (indirectly) register the object with V8, // so we must remember this so we can unregister it when we're destroyed. diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index b1904cd..e8c4060 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -89,9 +89,7 @@ namespace webkit_glue { bool g_forcefully_terminate_plugin_process = false; void SetJavaScriptFlags(const std::string& str) { -#if WEBKIT_USING_V8 v8::V8::SetFlagsFromString(str.data(), static_cast<int>(str.size())); -#endif } void EnableWebCoreLogChannels(const std::string& channels) { |