[events] Rework the logic of dispatchEvent since clone is always defined

src/scripting/flash/events/flashevents.cpp

@@ -524,27 +524,20 @@ ASFUNCTIONBODY(EventDispatcher,dispatchEvent)
 		cloneName.ns.push_back(nsNameAndKind("",PACKAGE_NAMESPACE));
 
 		_NR<ASObject> clone=e->getVariableByMultiname(cloneName);
-		if(!clone.isNull() && clone->getObjectType()==T_FUNCTION)
-		{
-			IFunction* f = static_cast<IFunction*>(clone.getPtr());
-			e->incRef();
-			ASObject* funcRet=f->call(e.getPtr(),NULL,0);
-			//Verify that the returned object is actually an event
-			Event* newEvent=dynamic_cast<Event*>(funcRet);
-			if(newEvent==NULL)
-			{
-				if(funcRet)
-					funcRet->decRef();
-				return abstract_b(false);
-			}
-			e=_MR(newEvent);
-		}
-		else
+		//Clone always exists since it's implemented in Event itself
+		assert(!clone.isNull());
+		IFunction* f = static_cast<IFunction*>(clone.getPtr());
+		e->incRef();
+		ASObject* funcRet=f->call(e.getPtr(),NULL,0);
+		//Verify that the returned object is actually an event
+		Event* newEvent=dynamic_cast<Event*>(funcRet);
+		if(newEvent==NULL)
 		{
-			//TODO: support cloning of actual type
-			LOG(LOG_NOT_IMPLEMENTED,"Event cloning not supported!");
-			e=_MR(Class<Event>::getInstanceS(e->type,e->bubbles, e->cancelable));
+			if(funcRet)
+				funcRet->decRef();
+			return abstract_b(false);
 		}
+		e=_MR(newEvent);
 	}
 	th->incRef();
 	ABCVm::publicHandleEvent(_MR(th), e);