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 resource leaks in layouting." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
layout-item-data-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/layout-item-data-impl.cpp
b/dali-toolkit/internal/layouting/layout-item-data-impl.cpp
index
0833b3b
..
e6e41b6
100644
(file)
--- a/
dali-toolkit/internal/layouting/layout-item-data-impl.cpp
+++ b/
dali-toolkit/internal/layouting/layout-item-data-impl.cpp
@@
-24,11
+24,13
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-
bool LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec = false
;
+
class LayoutData
;
+bool LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec = false;
+LayoutData* LayoutItem::Impl::sLayoutData = nullptr;
LayoutItem::Impl::Impl()
LayoutItem::Impl::Impl()
-: mOwner(
nullptr
),
+: mOwner(),
mLayoutParent( nullptr ),
mOldWidthMeasureSpec( 0 ),
mOldHeightMeasureSpec( 0 ),
mLayoutParent( nullptr ),
mOldWidthMeasureSpec( 0 ),
mOldHeightMeasureSpec( 0 ),