mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-24 07:58:11 +01:00
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
This commit is contained in:
parent
7b24eeeeb0
commit
cc3a3a68d8
@ -2562,18 +2562,11 @@ public:
|
|||||||
/*--cef(optional_param=value)--*/
|
/*--cef(optional_param=value)--*/
|
||||||
static CefRefPtr<CefV8Value> CreateString(const CefString& value);
|
static CefRefPtr<CefV8Value> CreateString(const CefString& value);
|
||||||
///
|
///
|
||||||
// Create a new CefV8Value object of type object. This method should only be
|
// Create a new CefV8Value object of type object with optional user data and
|
||||||
// called from within the scope of a CefV8ContextHandler, CefV8Handler or
|
// accessor. This method should only be called from within the scope of a
|
||||||
// CefV8Accessor callback, or in combination with calling Enter() and Exit()
|
// CefV8ContextHandler, CefV8Handler or CefV8Accessor callback, or in
|
||||||
// on a stored CefV8Context reference.
|
// combination with calling Enter() and Exit() on a stored CefV8Context
|
||||||
///
|
// reference.
|
||||||
/*--cef(optional_param=user_data)--*/
|
|
||||||
static CefRefPtr<CefV8Value> CreateObject(CefRefPtr<CefBase> 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.
|
|
||||||
///
|
///
|
||||||
/*--cef(capi_name=cef_v8value_create_object_with_accessor,
|
/*--cef(capi_name=cef_v8value_create_object_with_accessor,
|
||||||
optional_param=user_data,optional_param=accessor)--*/
|
optional_param=user_data,optional_param=accessor)--*/
|
||||||
|
@ -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);
|
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
|
// Create a new cef_v8value_t object of type object with optional user data and
|
||||||
// be called from within the scope of a cef_v8context_tHandler, cef_v8handler_t
|
// accessor. This function should only be called from within the scope of a
|
||||||
// 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
|
|
||||||
// cef_v8context_tHandler, cef_v8handler_t or cef_v8accessor_t callback, or in
|
// 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
|
// combination with calling enter() and exit() on a stored cef_v8context_t
|
||||||
// reference.
|
// reference.
|
||||||
|
@ -583,13 +583,6 @@ CefRefPtr<CefV8Value> CefV8Value::CreateString(const CefString& value)
|
|||||||
return new CefV8ValueImpl(GetV8String(value));
|
return new CefV8ValueImpl(GetV8String(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
|
||||||
CefRefPtr<CefV8Value> CefV8Value::CreateObject(CefRefPtr<CefBase> user_data)
|
|
||||||
{
|
|
||||||
CefRefPtr<CefV8Accessor> no_accessor;
|
|
||||||
return CreateObject(user_data, no_accessor);
|
|
||||||
}
|
|
||||||
|
|
||||||
// static
|
// static
|
||||||
CefRefPtr<CefV8Value> CefV8Value::CreateObject(
|
CefRefPtr<CefV8Value> CefV8Value::CreateObject(
|
||||||
CefRefPtr<CefBase> user_data, CefRefPtr<CefV8Accessor> accessor)
|
CefRefPtr<CefBase> user_data, CefRefPtr<CefV8Accessor> accessor)
|
||||||
|
@ -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<CefV8Value> _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_EXPORT cef_v8value_t* cef_v8value_create_object_with_accessor(
|
||||||
cef_base_t* user_data, cef_v8accessor_t* accessor)
|
cef_base_t* user_data, cef_v8accessor_t* accessor)
|
||||||
{
|
{
|
||||||
|
@ -112,21 +112,6 @@ CefRefPtr<CefV8Value> CefV8Value::CreateString(const CefString& value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CefRefPtr<CefV8Value> CefV8Value::CreateObject(CefRefPtr<CefBase> 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> CefV8Value::CreateObject(CefRefPtr<CefBase> user_data,
|
CefRefPtr<CefV8Value> CefV8Value::CreateObject(CefRefPtr<CefBase> user_data,
|
||||||
CefRefPtr<CefV8Accessor> accessor)
|
CefRefPtr<CefV8Accessor> accessor)
|
||||||
{
|
{
|
||||||
|
@ -143,7 +143,7 @@ void InitBindingTest(CefRefPtr<CefBrowser> browser,
|
|||||||
CefRefPtr<CefV8Value> object)
|
CefRefPtr<CefV8Value> object)
|
||||||
{
|
{
|
||||||
// Create the new V8 object.
|
// Create the new V8 object.
|
||||||
CefRefPtr<CefV8Value> testObjPtr = CefV8Value::CreateObject(NULL);
|
CefRefPtr<CefV8Value> testObjPtr = CefV8Value::CreateObject(NULL, NULL);
|
||||||
// Add the new V8 object to the global window object with the name
|
// Add the new V8 object to the global window object with the name
|
||||||
// "cef_test".
|
// "cef_test".
|
||||||
object->SetValue("cef_test", testObjPtr, V8_PROPERTY_ATTRIBUTE_NONE);
|
object->SetValue("cef_test", testObjPtr, V8_PROPERTY_ATTRIBUTE_NONE);
|
||||||
|
@ -46,7 +46,7 @@ public:
|
|||||||
{
|
{
|
||||||
// Handle the GetTestObject native function by creating and returning a
|
// Handle the GetTestObject native function by creating and returning a
|
||||||
// new V8 object.
|
// new V8 object.
|
||||||
retval = CefV8Value::CreateObject(NULL);
|
retval = CefV8Value::CreateObject(NULL, NULL);
|
||||||
// Add a string parameter to the new V8 object.
|
// Add a string parameter to the new V8 object.
|
||||||
retval->SetValue("param", CefV8Value::CreateString(
|
retval->SetValue("param", CefV8Value::CreateString(
|
||||||
"Retrieving a parameter on a native object succeeded."),
|
"Retrieving a parameter on a native object succeeded."),
|
||||||
|
@ -299,7 +299,7 @@ public:
|
|||||||
CefRefPtr<CefV8Value> object)
|
CefRefPtr<CefV8Value> object)
|
||||||
{
|
{
|
||||||
// Create the new V8 object
|
// Create the new V8 object
|
||||||
CefRefPtr<CefV8Value> testObj = CefV8Value::CreateObject(NULL);
|
CefRefPtr<CefV8Value> testObj = CefV8Value::CreateObject(NULL, NULL);
|
||||||
ASSERT_TRUE(testObj.get() != NULL);
|
ASSERT_TRUE(testObj.get() != NULL);
|
||||||
ASSERT_TRUE(object->SetValue("test", testObj, V8_PROPERTY_ATTRIBUTE_NONE));
|
ASSERT_TRUE(object->SetValue("test", testObj, V8_PROPERTY_ATTRIBUTE_NONE));
|
||||||
|
|
||||||
@ -828,7 +828,7 @@ public:
|
|||||||
CefRefPtr<CefV8Value> foobarFunc =
|
CefRefPtr<CefV8Value> foobarFunc =
|
||||||
CefV8Value::CreateFunction("foobar", funcHandler);
|
CefV8Value::CreateFunction("foobar", funcHandler);
|
||||||
|
|
||||||
obj = CefV8Value::CreateObject(NULL);
|
obj = CefV8Value::CreateObject(NULL, NULL);
|
||||||
url = CefV8Value::CreateString("http://tests/end.html");
|
url = CefV8Value::CreateString("http://tests/end.html");
|
||||||
|
|
||||||
obj->SetValue("url", url, V8_PROPERTY_ATTRIBUTE_NONE);
|
obj->SetValue("url", url, V8_PROPERTY_ATTRIBUTE_NONE);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user