Packman Build Service PMBS

lightspark.spec Changed

lightspark.tar.xz/ChangeLog Changed

lightspark.tar.xz/src/backends/graphics.cpp Changed

lightspark.tar.xz/src/backends/graphics.h Changed

@@ -302,12 +302,12 @@
 {
 private:
 	static cairo_pattern_t* FILLSTYLEToCairo(const FILLSTYLE& style, double scaleCorrection);
-	static bool cairoPathFromTokens(cairo_t* cr, const std::vector<GeomToken>& tokens, double scaleCorrection, bool skipFill);
+	static bool cairoPathFromTokens(cairo_t* cr, const tokensVector &tokens, double scaleCorrection, bool skipFill);
 	static void quadraticBezier(cairo_t* cr, double control_x, double control_y, double end_x, double end_y);
 	/*
 	   The tokens to be drawn
 	*/
-	const std::vector<GeomToken> tokens;
+	const tokensVector tokens;
 	/*
 	 * This is run by CairoRenderer::execute()
 	 */
@@ -325,7 +325,7 @@
 	   @param _a The alpha factor to be applied
 	   @param _ms The masks that must be applied
 	*/
-	CairoTokenRenderer(const std::vector<GeomToken>& _g, const MATRIX& _m,
+	CairoTokenRenderer(const tokensVector& _g, const MATRIX& _m,
 			int32_t _x, int32_t _y, int32_t _w, int32_t _h,
 		    float _s, float _a, const std::vector<MaskData>& _ms)
 		: CairoRenderer(_m,_x,_y,_w,_h,_s,_a,_ms),tokens(_g){}
@@ -337,7 +337,7 @@
 	   @param x The X in local coordinates
 	   @param y The Y in local coordinates
 	*/
-	static bool hitTest(const std::vector<GeomToken>& tokens, float scaleFactor, number_t x, number_t y);
+	static bool hitTest(const tokensVector& tokens, float scaleFactor, number_t x, number_t y);
 };
 
 class TextData

lightspark.tar.xz/src/parsing/amf3_generator.cpp Changed

lightspark.tar.xz/src/parsing/tags.cpp Changed

@@ -307,6 +307,9 @@
 	if(HasFont)
 	{
 		in >> FontID;
+		DefineFont3Tag* fonttag =  dynamic_cast<DefineFont3Tag*>(root->dictionaryLookup(FontID));
+		if (fonttag)
+			textData.font = fonttag->getFontname();
 		if(HasFontClass)
 			in >> FontClass;
 		in >> FontHeight;
@@ -706,6 +709,8 @@
 	}
 	//TODO: implment Kerning support
 	ignore(in,KerningCount*4);
+	root->registerEmbeddedFont(getFontname(),this);
+
 }
 ASObject* DefineFont3Tag::instance(Class_base* c) const
 { 
@@ -724,6 +729,57 @@
 	return ret;
 }
 
+const tiny_string DefineFont3Tag::getFontname() const
+{
+	return tiny_string((const char*)FontName.data(),true);
+}
+
+void DefineFont3Tag::fillTextTokens(tokensVector &tokens, const tiny_string text, int fontpixelsize,RGB textColor) const
+{
+	std::list<FILLSTYLE> fillStyles;
+	Vector2 curPos;
+	FILLSTYLE fs(1);
+	fs.FillStyleType = SOLID_FILL;
+	fs.Color = RGBA(textColor.Red,textColor.Green,textColor.Blue,255);
+	fillStyles.push_back(fs);
+
+	number_t tokenscaling = fontpixelsize * this->scaling;
+	curPos.y = 20*1024 * this->scaling;
+
+	for (CharIterator it = text.begin(); it != text.end(); it++)
+	{
+		if (*it == 13) 
+		{
+			curPos.x = 0;
+			curPos.y += 20*1024 * this->scaling;
+		}
+		else
+		{
+			bool found = false;
+			for (uint i = 0; i < CodeTable.size(); i++)
+			{
+				if (CodeTable[i] == *it)
+				{
+					const std::vector<SHAPERECORD>& sr = getGlyphShapes().at(i).ShapeRecords;
+					Vector2 glyphPos = curPos*tokenscaling;
+	
+					MATRIX glyphMatrix(tokenscaling, tokenscaling, 0, 0,
+							   glyphPos.x,
+							   glyphPos.y);
+	
+					TokenContainer::FromShaperecordListToShapeVector(sr,tokens,fillStyles,glyphMatrix);
+	
+					curPos.x += FontAdvanceTable[i];
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+				LOG(LOG_INFO,"DefineFont3Tag:Character not found:"<<(int)*it<<" "<<text);
+		}
+	}
+}
+
 DefineFont4Tag::DefineFont4Tag(RECORDHEADER h, std::istream& in, RootMovieClip* root):DictionaryTag(h,root)
 {
 	LOG(LOG_TRACE,_("DefineFont4"));

lightspark.tar.xz/src/parsing/tags.h Changed

lightspark.tar.xz/src/scripting/abc.cpp Changed

@@ -2104,6 +2104,10 @@
 	{
 		case traits_info::Class:
 		{
+			// check if class is alreadey defined in this context
+			if (root->applicationDomain->getVariableByMultinameOpportunistic(*mname))
+				return;
+			
 			//Check if this already defined in upper levels
 			_NR<ASObject> tmpo=obj->getVariableByMultiname(*mname,ASObject::SKIP_IMPL);
 			if(!tmpo.isNull())
@@ -2171,13 +2175,14 @@
 			{
 				MemoryAccount* memoryAccount = getSys()->allocateMemoryAccount(className.name);
 				Class_inherit* c=new (getSys()->unaccountedMemory) Class_inherit(className, memoryAccount);
+				c->context = this;
 
 				if(instances[t->classi].supername)
 				{
 					// set superclass for classes that are not instantiated by newClass opcode (e.g. buttons)
 					multiname mnsuper = *getMultiname(instances[t->classi].supername,NULL);
 					ASObject* superclass=root->applicationDomain->getVariableByMultinameOpportunistic(mnsuper);
-					if(superclass && superclass->is<Class_base>())
+					if(superclass && superclass->is<Class_base>() && !superclass->is<Class_inherit>())
 					{
 						superclass->incRef();
 						c->setSuper(_MR(superclass->as<Class_base>()));

lightspark.tar.xz/src/scripting/abc_opcodes.cpp Changed

lightspark.tar.xz/src/scripting/class.h Changed

@@ -22,6 +22,7 @@
 #include "scripting/toplevel/Integer.h"
 #include "scripting/toplevel/UInteger.h"
 #include "scripting/toplevel/Vector.h"
+#include "scripting/flash/system/flashsystem.h"
 #include "compat.h"
 #include "asobject.h"
 #include "swf.h"
@@ -418,17 +419,22 @@
 		return ret;
 	}
 
-	Class_base* applyType(const std::vector<const Type*>& types)
+	Class_base* applyType(const std::vector<const Type*>& types,_NR<ApplicationDomain> applicationDomain)
 	{
 		QName instantiatedQName = getQName(types);
+		_NR<ApplicationDomain> appdomain = applicationDomain;
+		
+		// if type is a builtin class, it is handled in the systemDomain
+		if (appdomain.isNull() || (types.size() > 0 && !dynamic_cast<const Class_inherit*>(types[0])))
+			appdomain = getSys()->systemDomain;
 
-		std::map<QName, Class_base*>::iterator it=getSys()->instantiatedTemplates.find(instantiatedQName);
+		std::map<QName, Class_base*>::iterator it=appdomain->instantiatedTemplates.find(instantiatedQName);
 		Class<T>* ret=NULL;
-		if(it==getSys()->instantiatedTemplates.end()) //This class is not yet in the map, create it
+		if(it==appdomain->instantiatedTemplates.end()) //This class is not yet in the map, create it
 		{
 			MemoryAccount* memoryAccount = getSys()->allocateMemoryAccount(instantiatedQName.name);
 			ret=new (getSys()->unaccountedMemory) TemplatedClass<T>(instantiatedQName,types,this,memoryAccount);
-			getSys()->instantiatedTemplates.insert(std::make_pair(instantiatedQName,ret));
+			appdomain->instantiatedTemplates.insert(std::make_pair(instantiatedQName,ret));
 			ret->prototype = _MNR(new_objectPrototype());
 			T::sinit(ret);
 			if(ret->super)
@@ -446,16 +452,17 @@
 		ret->incRef();
 		return ret;
 	}
-	Class_base* applyTypeByQName(const QName& qname)
+	Class_base* applyTypeByQName(const QName& qname,_NR<ApplicationDomain> applicationDomain)
 	{
 		const std::vector<const Type*> types;
-		std::map<QName, Class_base*>::iterator it=getSys()->instantiatedTemplates.find(qname);
+		_NR<ApplicationDomain> appdomain = applicationDomain;
+		std::map<QName, Class_base*>::iterator it=appdomain->instantiatedTemplates.find(qname);
 		Class<T>* ret=NULL;
-		if(it==getSys()->instantiatedTemplates.end()) //This class is not yet in the map, create it
+		if(it==appdomain->instantiatedTemplates.end()) //This class is not yet in the map, create it
 		{
 			MemoryAccount* memoryAccount = getSys()->allocateMemoryAccount(qname.name);
 			ret=new (getSys()->unaccountedMemory) TemplatedClass<T>(qname,types,this,memoryAccount);
-			getSys()->instantiatedTemplates.insert(std::make_pair(qname,ret));
+			appdomain->instantiatedTemplates.insert(std::make_pair(qname,ret));
 			ret->prototype = _MNR(new_objectPrototype());
 			T::sinit(ret);
 			if(ret->super)
@@ -469,26 +476,26 @@
 		return ret;
 	}
 
-	static Ref<Class_base> getTemplateInstance(const Type* type)
+	static Ref<Class_base> getTemplateInstance(const Type* type,_NR<ApplicationDomain> appdomain)
 	{
 		std::vector<const Type*> t(1,type);
 		Template<T>* templ=getTemplate();
-		Ref<Class_base> ret=_MR(templ->applyType(t));
+		Ref<Class_base> ret=_MR(templ->applyType(t, appdomain));
 		templ->decRef();
 		return ret;
 	}
 
-	static Ref<Class_base> getTemplateInstance(const QName& qname, ABCContext* context)
+	static Ref<Class_base> getTemplateInstance(const QName& qname, ABCContext* context,_NR<ApplicationDomain> appdomain)
 	{
 		Template<T>* templ=getTemplate();
-		Ref<Class_base> ret=_MR(templ->applyTypeByQName(qname));
+		Ref<Class_base> ret=_MR(templ->applyTypeByQName(qname,appdomain));
 		ret->context = context;
 		templ->decRef();
 		return ret;
 	}
-	static T* getInstanceS(const Type* type)
+	static T* getInstanceS(const Type* type,_NR<ApplicationDomain> appdomain)
 	{
-		return static_cast<T*>(getTemplateInstance(type).getPtr()->getInstance(true,NULL,0));
+		return static_cast<T*>(getTemplateInstance(type,appdomain).getPtr()->getInstance(true,NULL,0));
 	}
 
 	static Template<T>* getTemplate(const QName& name)

lightspark.tar.xz/src/scripting/flash/display/BitmapData.cpp Changed

@@ -570,11 +570,11 @@
 		}
 	}
 
-	Vector *result = Template<Vector>::getInstanceS(Template<Vector>::getTemplateInstance(Class<Number>::getClass()).getPtr());
+	Vector *result = Template<Vector>::getInstanceS(Template<Vector>::getTemplateInstance(Class<Number>::getClass(),NullRef).getPtr(),NullRef);
 	int channelOrder[4] = {2, 1, 0, 3}; // red, green, blue, alpha
 	for (int j=0; j<4; j++)
 	{
-		Vector *histogram = Template<Vector>::getInstanceS(Class<Number>::getClass());
+		Vector *histogram = Template<Vector>::getInstanceS(Class<Number>::getClass(),NullRef);
 		for (int level=0; level<256; level++)
 		{
 			histogram->append(abstract_d(counts[channelOrder[j]][level]));
@@ -663,7 +663,7 @@
 	if (rect.isNull())
 		throwError<TypeError>(kNullPointerError, "rect");
 
-	Vector *result = Template<Vector>::getInstanceS(Class<UInteger>::getClass());
+	Vector *result = Template<Vector>::getInstanceS(Class<UInteger>::getClass(),NullRef);
 	vector<uint32_t> pixelvec = th->pixels->getPixelVector(rect->getRect());
 	vector<uint32_t>::const_iterator it;
 	for (it=pixelvec.begin(); it!=pixelvec.end(); ++it)

lightspark.tar.xz/src/scripting/flash/display/Graphics.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/Graphics.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsBitmapFill.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsBitmapFill.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsEndFill.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsEndFill.h Changed

@@ -1,20 +1,20 @@
 /**************************************************************************
-    Lightspark, a free flash player implementation
+	Lightspark, a free flash player implementation
 
-    Copyright (C) 2013  Antti Ajanki (antti.ajanki@iki.fi)
+	Copyright (C) 2013  Antti Ajanki (antti.ajanki@iki.fi)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **************************************************************************/
 
 #ifndef SCRIPTING_FLASH_DISPLAY_GRAPHICSENDFILL_H
@@ -32,8 +32,8 @@
 public:
 	GraphicsEndFill(Class_base* c);
 	static void sinit(Class_base* c);
-        FILLSTYLE toFillStyle();
-        void appendToTokens(std::vector<GeomToken>& tokens);
+		FILLSTYLE toFillStyle();
+		void appendToTokens(tokensVector& tokens);
 };
 
 };

lightspark.tar.xz/src/scripting/flash/display/GraphicsGradientFill.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsGradientFill.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsPath.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsPath.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsShaderFill.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsShaderFill.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsSolidFill.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsSolidFill.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsStroke.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsStroke.h Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsTrianglePath.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/GraphicsTrianglePath.h Changed

lightspark.tar.xz/src/scripting/flash/display/IGraphicsData.h Changed

lightspark.tar.xz/src/scripting/flash/display/TokenContainer.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/TokenContainer.h Changed

lightspark.tar.xz/src/scripting/flash/display/flashdisplay.cpp Changed

lightspark.tar.xz/src/scripting/flash/system/flashsystem.cpp Changed

lightspark.tar.xz/src/scripting/flash/system/flashsystem.h Changed

lightspark.tar.xz/src/scripting/flash/text/flashtext.cpp Changed

@@ -17,6 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **************************************************************************/
 
+#include "scripting/abc.h"
 #include "scripting/flash/text/flashtext.h"
 #include "scripting/class.h"
 #include "compat.h"
@@ -89,7 +90,7 @@
 }
 
 TextField::TextField(Class_base* c, const TextData& textData, bool _selectable, bool readOnly)
-	: InteractiveObject(c), TextData(textData), type(ET_READ_ONLY), 
+	: InteractiveObject(c), TextData(textData), TokenContainer(this), type(ET_READ_ONLY),
 	  antiAliasType(AA_NORMAL), gridFitType(GF_PIXEL),
 	  textInteractionMode(TI_NORMAL), alwaysShowSelection(false),
 	  caretIndex(0), condenseWhite(false), displayAsPassword(false),
@@ -962,9 +963,14 @@
 
 void TextField::requestInvalidation(InvalidateQueue* q)
 {
-	incRef();
-	updateSizes();
-	q->addToInvalidateQueue(_MR(this));
+	if (!tokensEmpty())
+		TokenContainer::requestInvalidation(q);
+	else
+	{
+		incRef();
+		updateSizes();
+		q->addToInvalidateQueue(_MR(this));
+	}
 }
 
 IDrawable* TextField::invalidate(DisplayObject* target, const MATRIX& initialMatrix)
@@ -978,6 +984,17 @@
 		return NULL;
 	}
 
+	RootMovieClip* currentRoot=getSys()->mainClip;
+	DefineFont3Tag* embeddedfont = currentRoot->getEmbeddedFont(font);
+	tokens.clear();
+	if (embeddedfont)
+	{
+		scaling = 1.0f/1024.0f/20.0f;
+		embeddedfont->fillTextTokens(tokens,text,fontSize,textColor);
+	}
+	if (!tokensEmpty())
+		return TokenContainer::invalidate(target, initialMatrix);
+	
 	MATRIX totalMatrix;
 	std::vector<IDrawable::MaskData> masks;
 	computeMasksAndMatrix(target, masks, totalMatrix);

lightspark.tar.xz/src/scripting/flash/text/flashtext.h Changed

lightspark.tar.xz/src/scripting/toplevel/toplevel.cpp Changed

@@ -437,7 +437,10 @@
 		rest->resize(passedToRest);
 		//Give the reference of the other args to an array
 		for(uint32_t j=0;j<passedToRest;j++)
+		{
+			args[passedToLocals+j]->incRef();
 			rest->set(j,_MR(args[passedToLocals+j]));
+		}
 
 		assert_and_throw(cc.locals_size>args_len+1);
 		cc.locals[args_len+1]=rest;
@@ -756,7 +759,7 @@
 		if (mn->ns.size() >= 1 && mn->ns[0].getImpl().name == "__AS3__.vec")
 		{
 			QName qname(getSys()->getStringFromUniqueId(mn->name_s_id),mn->ns[0].getImpl().name);
-			typeObject = Template<Vector>::getTemplateInstance(qname,context).getPtr();
+			typeObject = Template<Vector>::getTemplateInstance(qname,context,context->root->applicationDomain).getPtr();
 		}
 	}
 	return typeObject->as<Type>();
@@ -1168,11 +1171,6 @@
 	if(cls==this || cls==Class<ASObject>::getClass())
 		return true;
 
-	// it seems that classes with the same name from different applicationDomains 
-	// are treated as equal, so we test for same names
-	//if (this->getQualifiedClassName() == cls->getQualifiedClassName())
-	//	return true;
-
 	//Now check the interfaces
 	if (considerInterfaces)
 	{

lightspark.tar.xz/src/scripting/toplevel/toplevel.h Changed

lightspark.tar.xz/src/swf.cpp Changed

@@ -587,8 +587,6 @@
 	}
 	for(auto it = customClasses.begin(); it != customClasses.end(); ++it)
 		(*it)->finalize();
-	for(auto it = instantiatedTemplates.begin(); it != instantiatedTemplates.end(); ++it)
-		it->second->finalize();
 	for(auto it = templates.begin(); it != templates.end(); ++it)
 		it->second->finalize();
 
@@ -605,10 +603,6 @@
 	for(auto i = customClasses.begin(); i != customClasses.end(); ++i)
 		(*i)->decRef();
 
-	//Free template instantations by decRef'ing them
-	for(auto i = instantiatedTemplates.begin(); i != instantiatedTemplates.end(); ++i)
-		i->second->decRef();
-
 	//Free templates by decRef'ing them
 	for(auto i = templates.begin(); i != templates.end(); ++i)
 		i->second->decRef();
@@ -1339,6 +1333,7 @@
 	if (loader && !loader->allowLoadingSWF())
 	{
 		_NR<LoaderInfo> li=loader->getContentLoaderInfo();
+		li->incRef();
 		getVm()->addEvent(li,_MR(Class<SecurityErrorEvent>::getInstanceS(
 			"Cannot import a SWF file when LoaderContext.allowCodeImport is false."))); // 3226
 		return;
@@ -1609,7 +1604,7 @@
 		if(this==sys->mainClip)
 		{
 			/* now the frameRate is available and all SymbolClass tags have created their classes */
-			sys->addFrameTick(1000/frameRate,sys);
+			sys->addTick(1000/frameRate,sys);
 		}
 		else
 		{
@@ -2104,3 +2099,16 @@
 		}
 	}
 }
+
+void RootMovieClip::registerEmbeddedFont(const tiny_string fontname, DefineFont3Tag *tag)
+{
+	embeddedfonts[fontname] = tag;
+}
+
+DefineFont3Tag *RootMovieClip::getEmbeddedFont(const tiny_string fontname) const
+{
+	auto it = embeddedfonts.find(fontname);
+	if (it != embeddedfonts.end())
+		return it->second;
+	return NULL;
+}

lightspark.tar.xz/src/swf.h Changed

@@ -57,6 +57,7 @@
 class ApplicationDomain;
 class SecurityDomain;
 class Class_inherit;
+class DefineFont3Tag;
 
 class RootMovieClip: public MovieClip
 {
@@ -69,6 +70,7 @@
 	Spinlock dictSpinlock;
 	std::list < DictionaryTag* > dictionary;
 	std::list< std::pair<tiny_string, DictionaryTag*> > classesToBeBound;
+	std::map < tiny_string,DefineFont3Tag* > embeddedfonts;
 
 	//frameSize and frameRate are valid only after the header has been parsed
 	RECT frameSize;
@@ -122,6 +124,8 @@
 	void addBinding(const tiny_string& name, DictionaryTag *tag);
 	void bindClass(const QName &classname, Class_inherit* cls);
 	void checkBinding(DictionaryTag* tag);
+	void registerEmbeddedFont(const tiny_string fontname,DefineFont3Tag* tag);
+	DefineFont3Tag* getEmbeddedFont(const tiny_string fontname) const;
 };
 
 class ThreadProfile
@@ -332,7 +336,6 @@
 	//This is an array of fixed size, we can avoid using std::vector
 	Class_base** builtinClasses;
 	std::map<QName, Template_base*> templates;
-	std::map<QName, Class_base*> instantiatedTemplates;
 
 	//Flags for command line options
 	bool useInterpreter;

Changes of Revision 93