← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnash/maverick

« back to all changes in this revision

Viewing changes to libcore/swf/ScriptLimitsTag.h

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten, Micah Gersten, Chris Coulson
  • Date: 2010-09-28 23:38:37 UTC
  • mfrom: (1.1.14 upstream) (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100928233837-wcay0dodera1c7sz
Tags: 0.8.8-5ubuntu1
https://launchpad.net/bugs/636667
[ Micah Gersten <micahg@ubuntu.com> ]
* FFe - LP: #636667
* Merge from debian unstable.  Remaining changes:
  + Add Ubuntu flash alternatives in postinst and prerm
    - update debian/browser-plugin-gnash.postinst
    - update debian/browser-plugin-gnash.prerm

[ Chris Coulson <chris.coulson@canonical.com> ]
* Ensure the directories we are installing alternatives too exist
  already
  - add debian/browser-plugin-gnash.dirs

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcore/swf/ScriptLimitsTag.h
23
23
#include "movie_root.h"
24
24
#include "movie_definition.h"
25
25
#include "ControlTag.h"
26
 
#include "VM.h"
27
26
 
28
27
namespace gnash {
29
28
namespace SWF {
39
38
 
40
39
    virtual ~ScriptLimitsTag() {}
41
40
 
42
 
    virtual void execute(MovieClip* m, DisplayList& /*dl*/) const
43
 
    {
 
41
    virtual void executeState(MovieClip* m, DisplayList& /*dl*/) const {
 
42
 
44
43
        log_debug("Setting script limits: recursion %s, timeout %s",
45
44
                _recursionLimit, _timeoutLimit);
46
45
        getRoot(*getObject(m)).setScriptLimits(_recursionLimit, _timeoutLimit);