From 18d8da9ccbfe6e9758a9e7f8fe47f1595c8fba46 Mon Sep 17 00:00:00 2001 From: Alessandro Pignotti Date: Fri, 15 Oct 2010 15:31:24 +0200 Subject: [PATCH] Introduce the getTokens API --- parsing/tags.cpp | 2 +- parsing/tags.h | 3 ++- scripting/flashdisplay.h | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/parsing/tags.cpp b/parsing/tags.cpp index fb3737bd86..8507fb7d8e 100644 --- a/parsing/tags.cpp +++ b/parsing/tags.cpp @@ -1096,7 +1096,7 @@ Vector2 DefineShape3Tag::debugRender(FTFont* font, bool deep) * * \param cur SHAPERECORD list head * * \param shapes a vector to be populated with the shapes */ -void lightspark::FromShaperecordListToShapeVector(const std::vector& shapeRecords, std::vector& tokens, +void DefineShapeTag::FromShaperecordListToShapeVector(const std::vector& shapeRecords, std::vector& tokens, const std::list& fillStyles) { int startX=0; diff --git a/parsing/tags.h b/parsing/tags.h index cc0f50ba0d..7542b561c9 100644 --- a/parsing/tags.h +++ b/parsing/tags.h @@ -39,7 +39,6 @@ namespace lightspark enum TAGTYPE {TAG=0,DISPLAY_LIST_TAG,SHOW_TAG,CONTROL_TAG,DICT_TAG,FRAMELABEL_TAG,END_TAG}; void ignore(std::istream& i, int count); -void FromShaperecordListToShapeVector(const std::vector& shapeRecords, std::vector& tokens, const std::list& fillStyles); class Tag { @@ -99,6 +98,8 @@ class DefineShapeTag: public DictionaryTag, public DisplayObject private: void computeCached(); void invalidate(); + void FromShaperecordListToShapeVector(const std::vector& shapeRecords, + std::vector& tokens, const std::list& fillStyles); protected: UI16 ShapeId; RECT ShapeBounds; diff --git a/scripting/flashdisplay.h b/scripting/flashdisplay.h index bb2bab7123..fbfa2fdaaf 100644 --- a/scripting/flashdisplay.h +++ b/scripting/flashdisplay.h @@ -60,6 +60,10 @@ friend class GraphicsContainer; void localToGlobal(number_t xin, number_t yin, number_t& xout, number_t& yout) const; void becomeMaskOf(DisplayObject* m); void setMask(DisplayObject* m); + virtual const std::vector& getTokens() + { + throw RunTimeException("DisplayObject::getTokens"); + } protected: void computeDeviceBoundsForRect(number_t xmin, number_t xmax, number_t ymin, number_t ymax, uint32_t& outXMin, uint32_t& outYMin, uint32_t& outWidth, uint32_t& outHeight) const;