[Gnash-commit] /srv/bzr/gnash/trunk r11719: Drop GC stuff from some of the non-GC-managed resources

[Sandro Santilli]

------------------------------------------------------------
revno: 11719
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2009-12-19 20:03:28 +0100
message:
  Drop GC stuff from some of the non-GC-managed resources
modified:
  libcore/Font.cpp
  libcore/Font.h
  libcore/fill_style.cpp
  libcore/fill_style.h
  libcore/swf/DefineButtonSoundTag.h
  libcore/swf/DefineButtonTag.h
  libcore/swf/DefineEditTextTag.h
  libcore/swf/DefineFontTag.cpp
  libcore/swf/DefineFontTag.h
  libcore/swf/DefineShapeTag.cpp
  libcore/swf/DefineShapeTag.h

=== modified file 'libcore/Font.cpp'
--- a/libcore/Font.cpp  2009-04-08 11:48:21 +0000
+++ b/libcore/Font.cpp  2009-12-19 19:03:28 +0000
@@ -72,13 +72,6 @@
 {}
 
 
-#ifdef GNASH_USE_GC
-void
-Font::GlyphInfo::markReachableResources() const
-{
-}
-#endif
-
 Font::Font(std::auto_ptr<SWF::DefineFontTag> ft)
     :
     _fontTag(ft.release()),
@@ -366,22 +359,6 @@
     return _fontTag ? _fontTag->subpixelFont() : false;
 }
 
-#ifdef GNASH_USE_GC
-/// Mark reachable resources (for the GC)
-//
-/// Reachable resources are:
-void
-Font::markReachableResources() const
-{
-       // Mark device glyphs (textured and vector)
-       for (GlyphInfoRecords::const_iterator i = _deviceGlyphTable.begin(),
-            e=_deviceGlyphTable.end(); i != e; ++i) {
-               i->markReachableResources();
-       }
-
-}
-#endif // GNASH_USE_GC
-
 
 }      // end namespace gnash
 

=== modified file 'libcore/Font.h'
--- a/libcore/Font.h    2009-04-08 11:48:21 +0000
+++ b/libcore/Font.h    2009-12-19 19:03:28 +0000
@@ -220,11 +220,6 @@
 
         GlyphInfo(const GlyphInfo& o);
 
-#ifdef GNASH_USE_GC
-        /// Mark any glyph and texture glyph resources as reachable
-        void markReachableResources() const;
-#endif
-
         boost::shared_ptr<SWF::ShapeRecord> glyph;
 
         float advance;
@@ -315,16 +310,6 @@
 
        mutable std::auto_ptr<FreetypeGlyphsProvider> _ftProvider;
 
-protected:
-
-#ifdef GNASH_USE_GC
-       /// Mark reachable resources (for the GC)
-       //
-       /// Reachable resources are:
-       ///     - DefineShapeTags (vector glyphs)
-       ///
-       void markReachableResources() const;
-#endif // GNASH_USE_GC
 };
 
 

=== modified file 'libcore/fill_style.cpp'
--- a/libcore/fill_style.cpp    2009-07-13 08:06:09 +0000
+++ b/libcore/fill_style.cpp    2009-12-19 19:03:28 +0000
@@ -19,7 +19,6 @@
 
 // Based on work of Thatcher Ulrich <address@hidden> 2003
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "fill_style.h"
 #include "log.h"
 #include "SWFStream.h"
@@ -655,15 +654,6 @@
     return os;
 }
 
-
-#ifdef GNASH_USE_GC
-void
-fill_style::markReachableResources() const
-{
-    if ( _bitmapInfo ) _bitmapInfo->setReachable();
-}
-#endif // GNASH_USE_GC
-
 } // end of namespace
 
 

=== modified file 'libcore/fill_style.h'
--- a/libcore/fill_style.h      2009-07-13 08:06:09 +0000
+++ b/libcore/fill_style.h      2009-12-19 19:03:28 +0000
@@ -21,11 +21,11 @@
 #ifndef GNASH_FILL_STYLE_H
 #define GNASH_FILL_STYLE_H
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "SWFMatrix.h"
 #include "BitmapInfo.h"
 #include "SWF.h"
 #include "RGBA.h" // for rgba type
+#include "smart_ptr.h" // for BitmapInfo (shared)
 
 #include <vector> // for composition
 #include <iosfwd> // for output operator forward declarations
@@ -231,17 +231,6 @@
        float get_focal_point() const { return m_focal_point; }
        void set_focal_point(float f) { m_focal_point = f; }
 
-#ifdef GNASH_USE_GC
-       /// Mark reachable resources (for the GC)
-       //
-       /// fill_style specific reachable resources are:
-       ///
-       ///     - gradient bitmap info (_gradientBitmapInfo)
-       ///     - bitmap DisplayObject (_bitmap)
-       ///
-       void markReachableResources() const;
-#endif // GNASH_USE_GC
-
 private:
 
        /// Return the color at the specified ratio into our gradient.

=== modified file 'libcore/swf/DefineButtonSoundTag.h'
--- a/libcore/swf/DefineButtonSoundTag.h        2009-07-13 08:06:09 +0000
+++ b/libcore/swf/DefineButtonSoundTag.h        2009-12-19 19:03:28 +0000
@@ -49,21 +49,10 @@
 
                ButtonSound()
                        :
-            soundID(0),
+                       soundID(0),
                        sample(0)
                {}
 
-#ifdef GNASH_USE_GC
-               /// Mark all reachable resources (for GC)
-               //
-               /// Reachable resources are:
-               ///  - sound sample (sample)
-               ///
-               void markReachableResources() const
-        {
-            if (sample) sample->setReachable();
-        }
-#endif // GNASH_USE_GC
        };
 
     typedef std::vector<ButtonSound> Sounds;
@@ -77,21 +66,6 @@
         assert (index < 4);
         return _sounds[index];
     }
-#ifdef GNASH_USE_GC
-    /// Mark all reachable resources (for GC)
-    //
-    /// Reachable resources are:
-    ///  - button sound infos (_sounds)
-    ///
-    void markReachableResources() const
-    {
-        for (Sounds::const_iterator i=_sounds.begin(), e = _sounds.end();
-                i != e; ++i)
-        {
-            i->markReachableResources();
-        }
-    }
-#endif // GNASH_USE_GC
 
 private:
 

=== modified file 'libcore/swf/DefineButtonTag.h'
--- a/libcore/swf/DefineButtonTag.h     2009-10-26 09:54:37 +0000
+++ b/libcore/swf/DefineButtonTag.h     2009-12-19 19:03:28 +0000
@@ -101,12 +101,6 @@
         return (_definitionTag);
     }
 
-#ifdef GNASH_USE_GC
-    void markReachableResources() const {
-        if (_definitionTag) _definitionTag->setReachable();
-    }
-#endif // GNASH_USE_GC
-
 private:
 
     /// SWF8 and above can have a number of filters
@@ -263,28 +257,6 @@
         }
     }
     
-protected:
-
-#ifdef GNASH_USE_GC
-    /// Mark all reachable resources (for GC)
-    //
-    /// Reachable resources are:
-    ///  - button records (_button_records)
-    ///  - button sound definition (_sound)
-    ///
-    void markReachableResources() const
-    {
-        assert(isReachable());
-        for (ButtonRecords::const_iterator i = _buttonRecords.begin(),
-                e = _buttonRecords.end(); i!=e; ++i)
-        {
-            i->markReachableResources();
-        }
-
-        if (_soundTag) _soundTag->markReachableResources();
-    }
-#endif // GNASH_USE_GC
-
 private:
 
     /// DefineButton2Tag::loader also needs to create a DefineButtonTag.

=== modified file 'libcore/swf/DefineEditTextTag.h'
--- a/libcore/swf/DefineEditTextTag.h   2009-10-26 09:54:37 +0000
+++ b/libcore/swf/DefineEditTextTag.h   2009-12-19 19:03:28 +0000
@@ -186,15 +186,6 @@
         return _font;
     }
 
-protected:
-
-#ifdef GNASH_USE_GC
-    void markReachableResources() const
-    {
-        if (_font) _font->setReachable();
-    }
-#endif
-
 private:
 
     /// Construct a DefineEditTextTag.

=== modified file 'libcore/swf/DefineFontTag.cpp'
--- a/libcore/swf/DefineFontTag.cpp     2009-10-06 07:45:26 +0000
+++ b/libcore/swf/DefineFontTag.cpp     2009-12-19 19:03:28 +0000
@@ -80,19 +80,6 @@
     }
 }
 
-#ifdef GNASH_USE_GC
-void
-DefineFontTag::markReachableResources() const
-{
-       // Mark glyphs
-       for (Font::GlyphInfoRecords::const_iterator i = _glyphTable.begin(),
-            e = _glyphTable.end(); i != e; ++i)
-       {
-               i->markReachableResources();
-       }
-}
-#endif
-
 
 DefineFontTag::DefineFontTag(SWFStream& in, movie_definition& m, TagType tag,
         const RunResources& r)

=== modified file 'libcore/swf/DefineFontTag.h'
--- a/libcore/swf/DefineFontTag.h       2009-07-13 08:06:09 +0000
+++ b/libcore/swf/DefineFontTag.h       2009-12-19 19:03:28 +0000
@@ -92,14 +92,9 @@
     bool descent() const { return _descent; }
     const std::string& name() const { return _name; }
 
-#ifdef GNASH_USE_GC
-        /// Mark glyph resources as reachable
-        void markReachableResources() const;
-#endif
-
     /// Read Font::CodeTable, which maps glyph indices to DisplayObject codes.
-       static void readCodeTable(SWFStream& in, Font::CodeTable& table,
-            bool wideCodes, size_t glyphCount);
+    static void readCodeTable(SWFStream& in, Font::CodeTable& table,
+        bool wideCodes, size_t glyphCount);
 
 private:
 

=== modified file 'libcore/swf/DefineShapeTag.cpp'
--- a/libcore/swf/DefineShapeTag.cpp    2009-11-04 15:03:15 +0000
+++ b/libcore/swf/DefineShapeTag.cpp    2009-12-19 19:03:28 +0000
@@ -92,11 +92,6 @@
     renderer.drawShape(_shape, inst.get_world_cxform(), inst.getWorldMatrix());
 }
 
-void
-DefineShapeTag::markReachableResources() const
-{
-}
-
 } // namespace SWF
 } // namespace gnash
 

=== modified file 'libcore/swf/DefineShapeTag.h'
--- a/libcore/swf/DefineShapeTag.h      2009-10-26 09:54:37 +0000
+++ b/libcore/swf/DefineShapeTag.h      2009-12-19 19:03:28 +0000
@@ -53,16 +53,6 @@
 
 protected:
 
-#ifdef GNASH_USE_GC
-    /// Mark reachable resources (for the GC)
-    //
-    /// Reachable resources are:
-    ///        - Associated fill styles (_fill_styles).
-    ///          These are not actual resources, but may contain some.
-    ///
-    virtual void markReachableResources() const;
-#endif 
-
 private:
 
     DefineShapeTag(SWFStream& in, TagType tag, movie_definition& m,