Author: hqm
Date: 2007-11-29 06:01:34 -0800 (Thu, 29 Nov 2007)
New Revision: 7413
Added:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/api/ScriptLimits.java
Modified:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/util/Tag.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ObjectWriter.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFFile.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
Log:
Change 20071128-hqm-4 by [EMAIL PROTECTED] on 2007-11-28 19:58:01 EST
in /cygdrive/c/users/hqm/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: implement script limits tag
New Features:
Bugs Fixed:
Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
implement scriptlimits tag
Tests:
Added:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/api/ScriptLimits.java
Property changes on:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/api/ScriptLimits.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/util/Tag.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/util/Tag.java
2007-11-29 05:00:09 UTC (rev 7412)
+++
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/util/Tag.java
2007-11-29 14:01:34 UTC (rev 7413)
@@ -124,6 +124,7 @@
public static final int DEFINEVIDEOSTEAM = 60; // Flash 6
//public static final int = 61;
public static final int DEFINEFONTINFO2 = 62; // Flash 6
+ public static final int SCRIPTLIMITS = 65; // Flash 8
public static final int IMPORTASSETS2 = 71; // Flash 8
@@ -193,12 +194,12 @@
"DefineFontInfo2",
"Unknown",
"Unknown",
+ "ScriptLimits",
"Unknown",
"Unknown",
"Unknown",
"Unknown",
"Unknown",
- "Unknown",
"ImportAssets2"
};
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-11-29 05:00:09 UTC (rev 7412)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-11-29 14:01:34 UTC (rev 7413)
@@ -273,6 +273,12 @@
this.mMainObjectWriter = writer;
}
+ public void setScriptLimits(int recursion, int timeout) {
+ if (this.mMainObjectWriter != null) {
+ this.mMainObjectWriter.setScriptLimits(recursion, timeout);
+ }
+ }
+
public ViewSchema getSchema() {
return mSchema;
}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ObjectWriter.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ObjectWriter.java
2007-11-29 05:00:09 UTC (rev 7412)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ObjectWriter.java
2007-11-29 14:01:34 UTC (rev 7413)
@@ -94,6 +94,9 @@
/** Canvas Width */
protected int mWidth = 0;
+ protected int mRecursionLimit = 0;
+ protected int mExecutionTimeout = 0;
+
/**
* Initialize jgenerator
*/
@@ -530,5 +533,12 @@
abstract void importFontStyle(String fileName, String face, String style,
CompilationEnvironment env)
throws FileNotFoundException, CompilationError;
+
+
+ public void setScriptLimits(int recursion, int timeout) {
+ this.mRecursionLimit = recursion;
+ this.mExecutionTimeout = timeout;
+ }
+
}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFFile.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFFile.java
2007-11-29 05:00:09 UTC (rev 7412)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFFile.java
2007-11-29 14:01:34 UTC (rev 7413)
@@ -117,6 +117,7 @@
Frame frame = getMainScript().getFrameAt(0);
Shape rectShape = rectangle();
+
// 1. Button moved offscreen so that it's not vis. rectangle with
actions
but = new Button2();
states = ButtonRecord.HitTest;
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
2007-11-29 05:00:09 UTC (rev 7412)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
2007-11-29 14:01:34 UTC (rev 7413)
@@ -825,6 +825,16 @@
return s2;
}
+ public void setScriptLimits(int recursion, int timeout) {
+ this.mRecursionLimit = recursion;
+ this.mExecutionTimeout = timeout;
+ // ScriptLimits tag, to set max recursion depth and timeout
+ Frame frame = mFlashFile.getMainScript().getFrameAt(0);
+ ScriptLimits slimit = new ScriptLimits(recursion, timeout);
+ frame.addFlashObject(slimit);
+ }
+
+
/** Writes the SWF to the <code>OutputStream</code> that was
* supplied to the SWFWriter's constructor.
* @throws IOException if an error occurs
@@ -834,7 +844,7 @@
if (mCloseCalled) {
throw new IllegalStateException("SWFWriter.close() called twice");
}
-
+
// Add font information
addFontTable();
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
