projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Purge underscored header file barriers
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
actors
/
actor-wrapper.h
diff --git
a/plugins/dali-script-v8/src/actors/actor-wrapper.h
b/plugins/dali-script-v8/src/actors/actor-wrapper.h
index
06b2e06
..
f7a48b3
100644
(file)
--- a/
plugins/dali-script-v8/src/actors/actor-wrapper.h
+++ b/
plugins/dali-script-v8/src/actors/actor-wrapper.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_V8PLUGIN_ACTOR_WRAPPER_H__
-#define
__DALI_V8PLUGIN_ACTOR_WRAPPER_H__
+#ifndef
DALI_V8PLUGIN_ACTOR_WRAPPER_H
+#define
DALI_V8PLUGIN_ACTOR_WRAPPER_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-41,17
+41,16
@@
class ActorWrapper : public HandleWrapper
public:
/**
public:
/**
- * Actor type used an index
+ * Actor type used an index.
+ * These enums are used to index the ActorApiLookup table in actor-wrapper.cpp.
+ * Any changes made must be reflected in the ActorApiLookup otherwise it may segfault when creating an actor
*/
enum ActorType
{
UNKNOWN_ACTOR = -1,
*/
enum ActorType
{
UNKNOWN_ACTOR = -1,
- ACTOR = 0,
- IMAGE_ACTOR =1,
- MESH_ACTOR =2,
- LAYER_ACTOR =3,
- CAMERA_ACTOR =4,
- TEXT_LABEL =5
+ ACTOR = 0,
+ LAYER_ACTOR = 1,
+ CAMERA_ACTOR = 2
};
/**
};
/**
@@
-71,7
+70,7
@@
public:
/**
* @brief Creates a new Actor wrapped inside a Javascript Object.
/**
* @brief Creates a new Actor wrapped inside a Javascript Object.
- * @note: the actor type ie '
Image
Actor' is expected to be the name of the callee function.
+ * @note: the actor type ie '
Camera
Actor' is expected to be the name of the callee function.
* @param[in] args v8 function call arguments interpreted
*/
static void NewActor( const v8::FunctionCallbackInfo< v8::Value >& args);
* @param[in] args v8 function call arguments interpreted
*/
static void NewActor( const v8::FunctionCallbackInfo< v8::Value >& args);
@@
-88,11
+87,8
@@
public:
// The Actor ObjectTemplates.
static v8::Persistent<v8::ObjectTemplate> mActorTemplate;
// The Actor ObjectTemplates.
static v8::Persistent<v8::ObjectTemplate> mActorTemplate;
- static v8::Persistent<v8::ObjectTemplate> mImageActorTemplate;
- static v8::Persistent<v8::ObjectTemplate> mMeshActorTemplate;
static v8::Persistent<v8::ObjectTemplate> mCameraActorTemplate;
static v8::Persistent<v8::ObjectTemplate> mLayerActorTemplate;
static v8::Persistent<v8::ObjectTemplate> mCameraActorTemplate;
static v8::Persistent<v8::ObjectTemplate> mLayerActorTemplate;
- static v8::Persistent<v8::ObjectTemplate> mTextLabelTemplate;
/**
* @return the wrapped actor
/**
* @return the wrapped actor
@@
-104,14
+100,16
@@
public:
*/
static ActorWrapper::ActorType GetActorType( const std::string& name );
*/
static ActorWrapper::ActorType GetActorType( const std::string& name );
-pr
ivate
:
+pr
otected
:
/**
/**
- * Helper to make the actor template
+ *
@brief
Helper to make the actor template
*
*/
static v8::Handle<v8::ObjectTemplate> MakeDaliActorTemplate( v8::Isolate* isolate, ActorType actorType );
*
*/
static v8::Handle<v8::ObjectTemplate> MakeDaliActorTemplate( v8::Isolate* isolate, ActorType actorType );
+private:
+
/**
* Helper, get an actor template given an actor type
*/
/**
* Helper, get an actor template given an actor type
*/
@@
-125,4
+123,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
header
+#endif //
DALI_V8PLUGIN_ACTOR_WRAPPER_H