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
Merge "Fix for the cursor position with the arabic script." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
rendering
/
geometry-wrapper.cpp
diff --git
a/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
b/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
index
d9ea511
..
e4f6498
100644
(file)
--- a/
plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
+++ b/
plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-58,7
+58,7
@@
const unsigned int GeometryFunctionTableCount = sizeof(GeometryFunctionTable)/si
GeometryWrapper::GeometryWrapper( const Dali::Geometry& geometry, GarbageCollectorInterface& gc )
GeometryWrapper::GeometryWrapper( const Dali::Geometry& geometry, GarbageCollectorInterface& gc )
-:
HandleWrapper( BaseWrappedObject::GEOMETRY , geometry
, gc )
+:
BaseWrappedObject( BaseWrappedObject::GEOMETRY
, gc )
{
mGeometry = geometry;
}
{
mGeometry = geometry;
}
@@
-106,9
+106,6
@@
v8::Handle<v8::ObjectTemplate> GeometryWrapper::MakeGeometryTemplate( v8::Isolat
v8::Local<v8::ObjectTemplate> objTemplate = v8::ObjectTemplate::New();
v8::Local<v8::ObjectTemplate> objTemplate = v8::ObjectTemplate::New();
- // property handle intercepts property getters and setters and signals
- HandleWrapper::AddInterceptsToTemplate( isolate, objTemplate );
-
objTemplate->SetInternalFieldCount( BaseWrappedObject::FIELD_COUNT );
// add our function properties
objTemplate->SetInternalFieldCount( BaseWrappedObject::FIELD_COUNT );
// add our function properties