← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to libcore/vm/ActionExec.cpp

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcore/vm/ActionExec.cpp
1
1
// ActionExec.cpp:  ActionScript execution, for Gnash.
2
2
//
3
 
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
4
 
//   2011 Free Software Foundation, Inc
 
3
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 
4
//   Free Software Foundation, Inc
5
5
//
6
6
// This program is free software; you can redistribute it and/or modify
7
7
// it under the terms of the GNU General Public License as published by
149
149
                pc, stop_pc, code.size(), _func ? _func : 0, codeVersion);
150
150
        std::stringstream ss;
151
151
        getVM(env).dumpState(ss, STACK_DUMP_LIMIT);
152
 
        log_action("%s", ss.str());
 
152
            log_action(_("%s"), ss.str());
153
153
    );
154
154
#endif
155
155
 
219
219
            boost::uint8_t action_id = code[pc];
220
220
 
221
221
            IF_VERBOSE_ACTION (
222
 
                log_action("PC:%d - EX: %s", pc, code.disasm(pc));
 
222
                log_action(_("PC:%d - EX: %s"), pc, code.disasm(pc));
223
223
            );
224
224
 
225
225
            // Set default next_pc offset, control flow action handlers
282
282
                    ss << "Discarding " << stop_pc-next_pc
283
283
                        << " bytes of remaining opcodes: " << std::endl;
284
284
                    dumpActions(next_pc, stop_pc, ss);
285
 
                    log_action("%s", ss.str());
 
285
                    log_action(_("%s"), ss.str());
286
286
                );
287
287
                break;
288
288
            }
293
293
                        "stack follows"), pc, next_pc);
294
294
                std::stringstream ss;
295
295
                getVM(env).dumpState(ss, STACK_DUMP_LIMIT);
296
 
                log_action("%s", ss.str());
 
296
                log_action(_("%s"), ss.str());
297
297
            );
298
298
#endif
299
299