Add Sprite::constructed flag

lightspark · Mar 29, 2011 · 729a9b0 · 729a9b0
1 parent b5dfa54
commit 729a9b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/scripting/flashdisplay.cpp b/scripting/flashdisplay.cpp
@@ -365,10 +365,15 @@ bool Loader::getBounds(number_t& xmin, number_t& xmax, number_t& ymin, number_t&
 		return false;
 }
 
-Sprite::Sprite():GraphicsContainer(this)
+Sprite::Sprite():GraphicsContainer(this),constructed(false)
 {
 }
 
+Sprite::Sprite(const Sprite& r):GraphicsContainer(this),constructed(false)
+{
+	assert(!r.isConstructed());
+}
+
 void Sprite::sinit(Class_base* c)
 {
 	c->setConstructor(Class<IFunction>::getFunction(_constructor));

diff --git a/scripting/flashdisplay.h b/scripting/flashdisplay.h
@@ -384,12 +384,16 @@ class Loader: public IThreadJob, public DisplayObjectContainer
 class Sprite: public DisplayObjectContainer, public GraphicsContainer
 {
 friend class DisplayObject;
+private:
+	ACQUIRE_RELEASE_FLAG(constructed);
 protected:
 	bool boundsRect(number_t& xmin, number_t& xmax, number_t& ymin, number_t& ymax) const;
 	void renderImpl(bool maskEnabled, number_t t1,number_t t2,number_t t3,number_t t4) const;
 	InteractiveObject* hitTestImpl(number_t x, number_t y);
+	void setConstructed() { RELEASE_WRITE(constructed,true); }
 public:
 	Sprite();
+	Sprite(const Sprite& r);
 	static void sinit(Class_base* c);
 	static void buildTraits(ASObject* o);
 	ASFUNCTION(_constructor);
@@ -403,6 +407,7 @@ friend class DisplayObject;
 	InteractiveObject* hitTest(InteractiveObject* last, number_t x, number_t y);
 	void invalidate();
 	void requestInvalidation();
+	bool isConstructed() const { return ACQUIRE_READ(constructed); }
 };
 
 class MovieClip: public Sprite