[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-43-g5dd5326

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  5dd53262b53d22e3052cb42cc626a254457d0d17 (commit)
      from  45c184b38b49d0d67121f33eb5caed342da00c76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=5dd53262b53d22e3052cb42cc626a254457d0d17


commit 5dd53262b53d22e3052cb42cc626a254457d0d17
Author: Sandro Santilli <address@hidden>
Date:   Fri Feb 11 13:29:38 2011 +0100

    Don't log scripts limit settings too much (once for each change is enough)

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 24d63f4..5e078da 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -2147,6 +2147,11 @@ movie_root::getURL(const std::string& urlstr, const 
std::string& target,
 void
 movie_root::setScriptLimits(boost::uint16_t recursion, boost::uint16_t timeout)
 {
+    
+    if ( recursion == _recursionLimit && _timeoutLimit == timeout ) {
+        // avoid the debug log...
+        return;
+    }
 
     // This tag reported in some sources to be ignored for movies
     // below SWF7. However, on Linux with PP version 9, the tag
diff --git a/libcore/swf/ScriptLimitsTag.h b/libcore/swf/ScriptLimitsTag.h
index 24213b3..8f04ab4 100644
--- a/libcore/swf/ScriptLimitsTag.h
+++ b/libcore/swf/ScriptLimitsTag.h
@@ -40,8 +40,10 @@ public:
 
     virtual void executeState(MovieClip* m, DisplayList& /*dl*/) const {
 
+        LOG_ONCE( // movie_root will always log on change
         log_debug("Setting script limits: recursion %s, timeout %s",
                 _recursionLimit, _timeoutLimit);
+        );
         getRoot(*getObject(m)).setScriptLimits(_recursionLimit, _timeoutLimit);
     }
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/movie_root.cpp        |    5 +++++
 libcore/swf/ScriptLimitsTag.h |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Gnash