From cc3a3a68d86a950ce06c08ff210ebe1d1c9970e0 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 22 Dec 2011 17:08:35 +0000 Subject: [PATCH] Remove CefV8Value::CreateObject variant that accepts only one argument (issue #449). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@440 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- include/cef.h | 17 +++++------------ include/cef_capi.h | 12 ++---------- libcef/v8_impl.cc | 7 ------- libcef_dll/cpptoc/v8value_cpptoc.cc | 15 --------------- libcef_dll/ctocpp/v8value_ctocpp.cc | 15 --------------- tests/cefclient/binding_test.cpp | 2 +- tests/cefclient/extension_test.cpp | 2 +- tests/unittests/v8_unittest.cc | 4 ++-- 8 files changed, 11 insertions(+), 63 deletions(-) diff --git a/include/cef.h b/include/cef.h index a3a24bafe..623c0f189 100644 --- a/include/cef.h +++ b/include/cef.h @@ -2562,18 +2562,11 @@ public: /*--cef(optional_param=value)--*/ static CefRefPtr CreateString(const CefString& value); /// - // Create a new CefV8Value object of type object. This method should only be - // called from within the scope of a CefV8ContextHandler, CefV8Handler or - // CefV8Accessor callback, or in combination with calling Enter() and Exit() - // on a stored CefV8Context reference. - /// - /*--cef(optional_param=user_data)--*/ - static CefRefPtr CreateObject(CefRefPtr user_data); - /// - // Create a new CefV8Value object of type object with accessors. This method - // should only be called from within the scope of a CefV8ContextHandler, - // CefV8Handler or CefV8Accessor callback, or in combination with calling - // Enter() and Exit() on a stored CefV8Context reference. + // Create a new CefV8Value object of type object with optional user data and + // accessor. This method should only be called from within the scope of a + // CefV8ContextHandler, CefV8Handler or CefV8Accessor callback, or in + // combination with calling Enter() and Exit() on a stored CefV8Context + // reference. /// /*--cef(capi_name=cef_v8value_create_object_with_accessor, optional_param=user_data,optional_param=accessor)--*/ diff --git a/include/cef_capi.h b/include/cef_capi.h index 9ac4e0272..ce966dced 100644 --- a/include/cef_capi.h +++ b/include/cef_capi.h @@ -2563,16 +2563,8 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_date(const cef_time_t* date); CEF_EXPORT cef_v8value_t* cef_v8value_create_string(const cef_string_t* value); /// -// Create a new cef_v8value_t object of type object. This function should only -// be called from within the scope of a cef_v8context_tHandler, cef_v8handler_t -// or cef_v8accessor_t callback, or in combination with calling enter() and -// exit() on a stored cef_v8context_t reference. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_object(cef_base_t* user_data); - -/// -// Create a new cef_v8value_t object of type object with accessors. This -// function should only be called from within the scope of a +// Create a new cef_v8value_t object of type object with optional user data and +// accessor. This function should only be called from within the scope of a // cef_v8context_tHandler, cef_v8handler_t or cef_v8accessor_t callback, or in // combination with calling enter() and exit() on a stored cef_v8context_t // reference. diff --git a/libcef/v8_impl.cc b/libcef/v8_impl.cc index fc7ec8280..8aceb8441 100644 --- a/libcef/v8_impl.cc +++ b/libcef/v8_impl.cc @@ -583,13 +583,6 @@ CefRefPtr CefV8Value::CreateString(const CefString& value) return new CefV8ValueImpl(GetV8String(value)); } -// static -CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data) -{ - CefRefPtr no_accessor; - return CreateObject(user_data, no_accessor); -} - // static CefRefPtr CefV8Value::CreateObject( CefRefPtr user_data, CefRefPtr accessor) diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/libcef_dll/cpptoc/v8value_cpptoc.cc index 057ca58e4..5f81f636d 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.cc +++ b/libcef_dll/cpptoc/v8value_cpptoc.cc @@ -120,21 +120,6 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_string(const cef_string_t* value) } -CEF_EXPORT cef_v8value_t* cef_v8value_create_object(cef_base_t* user_data) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Unverified params: user_data - - // Execute - CefRefPtr _retval = CefV8Value::CreateObject( - CefBaseCToCpp::Wrap(user_data)); - - // Return type: refptr_same - return CefV8ValueCppToC::Wrap(_retval); -} - - CEF_EXPORT cef_v8value_t* cef_v8value_create_object_with_accessor( cef_base_t* user_data, cef_v8accessor_t* accessor) { diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/libcef_dll/ctocpp/v8value_ctocpp.cc index 78adb9d9e..b79c53e3e 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -112,21 +112,6 @@ CefRefPtr CefV8Value::CreateString(const CefString& value) } -CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Unverified params: user_data - - // Execute - cef_v8value_t* _retval = cef_v8value_create_object( - CefBaseCppToC::Wrap(user_data)); - - // Return type: refptr_same - return CefV8ValueCToCpp::Wrap(_retval); -} - - CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data, CefRefPtr accessor) { diff --git a/tests/cefclient/binding_test.cpp b/tests/cefclient/binding_test.cpp index 6bd5d9750..f6545f70c 100644 --- a/tests/cefclient/binding_test.cpp +++ b/tests/cefclient/binding_test.cpp @@ -143,7 +143,7 @@ void InitBindingTest(CefRefPtr browser, CefRefPtr object) { // Create the new V8 object. - CefRefPtr testObjPtr = CefV8Value::CreateObject(NULL); + CefRefPtr testObjPtr = CefV8Value::CreateObject(NULL, NULL); // Add the new V8 object to the global window object with the name // "cef_test". object->SetValue("cef_test", testObjPtr, V8_PROPERTY_ATTRIBUTE_NONE); diff --git a/tests/cefclient/extension_test.cpp b/tests/cefclient/extension_test.cpp index 9fe4e1382..485358e6d 100644 --- a/tests/cefclient/extension_test.cpp +++ b/tests/cefclient/extension_test.cpp @@ -46,7 +46,7 @@ public: { // Handle the GetTestObject native function by creating and returning a // new V8 object. - retval = CefV8Value::CreateObject(NULL); + retval = CefV8Value::CreateObject(NULL, NULL); // Add a string parameter to the new V8 object. retval->SetValue("param", CefV8Value::CreateString( "Retrieving a parameter on a native object succeeded."), diff --git a/tests/unittests/v8_unittest.cc b/tests/unittests/v8_unittest.cc index 4624347e2..efe1ddc9e 100644 --- a/tests/unittests/v8_unittest.cc +++ b/tests/unittests/v8_unittest.cc @@ -299,7 +299,7 @@ public: CefRefPtr object) { // Create the new V8 object - CefRefPtr testObj = CefV8Value::CreateObject(NULL); + CefRefPtr testObj = CefV8Value::CreateObject(NULL, NULL); ASSERT_TRUE(testObj.get() != NULL); ASSERT_TRUE(object->SetValue("test", testObj, V8_PROPERTY_ATTRIBUTE_NONE)); @@ -828,7 +828,7 @@ public: CefRefPtr foobarFunc = CefV8Value::CreateFunction("foobar", funcHandler); - obj = CefV8Value::CreateObject(NULL); + obj = CefV8Value::CreateObject(NULL, NULL); url = CefV8Value::CreateString("http://tests/end.html"); obj->SetValue("url", url, V8_PROPERTY_ATTRIBUTE_NONE);