Bug 804301: add support for swf=19 (p=turo,r=turo,r=smarkets)
authorDan Schaffer <Dan.Schaffer@adobe.com>
Mon, 22 Oct 2012 12:59:30 -0700
changeset 7569 d391629fbd64ad72c0899b7eba38c6f1ea9b6f9a
parent 7568 165e49235c6b367faaf593dbad754a61f385dc45
child 7570 a3f97c1a2bf82ce32df15503c6f55eaf9f8d2834
push id4262
push userdschaffe@adobe.com
push dateWed, 30 Jan 2013 19:01:31 +0000
reviewersturo, smarkets
bugs804301, 1124190, 1127728
Bug 804301: add support for swf=19 (p=turo,r=turo,r=smarkets) integrate 1124190 CL@1127728
core/AvmCore.cpp
core/AvmCore.h
core/api-versions.as
core/api-versions.cpp
core/api-versions.h
core/api-versions.java
core/api-versions.xml
--- a/core/AvmCore.cpp
+++ b/core/AvmCore.cpp
@@ -5861,24 +5861,28 @@ 22. Return false.
         {
         }
 
         if (v >= kSWF18)    /* Ellis */
         {
             bugzilla619148 = 1;     // Stack traces in release builds
         }
         
+        if (v >= kSWF19)    /* Folsom */
+        {
+        }
     }
 
     /*static*/ uint32_t const BugCompatibility::kNames[BugCompatibility::VersionCount] =
     {
         9,
         10,
         11,
         12,
         13,
         14,
         15,
         16,
         17,
-		18
+		18,
+		19
     };
 }
--- a/core/AvmCore.h
+++ b/core/AvmCore.h
@@ -312,16 +312,17 @@ const int kBufferPadding = 16;
             kSWF11,             // SWF11 (Flash Player 10.2 Spicy)
             kSWF12,             // SWF12 (Flash Player 10.3 Wasabi)
             kSWF13,             // SWF13 (Flash Player 11.0 Serrano)
             kSWF14,             // SWF14 (Flash Player 11.1 Anza)
             kSWF15,             // SWF15 (Flash Player 11.2 Brannan)
             kSWF16,             // SWF16 (Flash Player 11.3 Cyril)
             kSWF17,             // SWF17 (Flash Player 11.4 Dolores)
             kSWF18,             // SWF18 (Flash Player 11.5 Ellis)
+            kSWF19,             // SWF18 (Flash Player 11.6 Folsom)
 
             VersionCount,
 
             kLatest = VersionCount - 1 // alias for "most recent"
 
         };
 
         /** These are the external names for swf versions - all integers.
--- a/core/api-versions.as
+++ b/core/api-versions.as
@@ -1,14 +1,11 @@
 /* DO NOT EDIT THIS FILE!  It was generated by utils/apivergen.abc. */
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+/* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 CONFIG const AIR_1_0 = 661;
 CONFIG const FP_10_0 = 662;
 CONFIG const AIR_1_5 = 663;
 CONFIG const AIR_1_5_1 = 664;
 CONFIG const FP_10_0_32 = 665;
 CONFIG const AIR_1_5_2 = 666;
 CONFIG const FP_10_1 = 667;
 CONFIG const AIR_2_0 = 668;
@@ -24,9 +21,11 @@ CONFIG const AIR_3_1 = 677;
 CONFIG const SWF_15 = 678;
 CONFIG const AIR_3_2 = 679;
 CONFIG const SWF_16 = 680;
 CONFIG const AIR_3_3 = 681;
 CONFIG const SWF_17 = 682;
 CONFIG const AIR_3_4 = 683;
 CONFIG const SWF_18 = 684;
 CONFIG const AIR_3_5 = 685;
-CONFIG const VM_INTERNAL = 686;
+CONFIG const SWF_19 = 686;
+CONFIG const AIR_3_6 = 687;
+CONFIG const VM_INTERNAL = 688;
--- a/core/api-versions.cpp
+++ b/core/api-versions.cpp
@@ -1,14 +1,11 @@
 /* DO NOT EDIT THIS FILE!  It was generated by utils/apivergen.abc. */
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+/* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 namespace avmplus {
 
 const char* const kApiVersionNames[kApiVersion_count] = {
     "VM_ALLVERSIONS", 
     "AIR_1_0", 
     "FP_10_0", 
     "AIR_1_5", 
     "AIR_1_5_1", 
@@ -28,16 +25,18 @@ const char* const kApiVersionNames[kApiV
     "SWF_15", 
     "AIR_3_2", 
     "SWF_16", 
     "AIR_3_3", 
     "SWF_17", 
     "AIR_3_4", 
     "SWF_18", 
     "AIR_3_5", 
+    "SWF_19", 
+    "AIR_3_6", 
     "VM_INTERNAL"
 };
 
 uint32_t const kApiVersionSeriesMembership[kApiVersion_count] = {
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
@@ -58,16 +57,18 @@ uint32_t const kApiVersionSeriesMembersh
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
+    (1<<kApiVersionSeries_FP),
+    (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP)
 };
 
 // If a version is in an inactive series, what is the closest superset in the active series?
 ApiVersion const kApiVersionSeriesTransfer[kApiVersion_count][kApiVersionSeries_count] = {
     { kApiVersion_VM_ALLVERSIONS, kApiVersion_VM_ALLVERSIONS }, // VM_ALLVERSIONS
     { kApiVersion_AIR_1_0, kApiVersion_VM_INTERNAL }, // AIR_1_0
     { kApiVersion_AIR_1_5, kApiVersion_FP_10_0 }, // FP_10_0
@@ -89,22 +90,24 @@ ApiVersion const kApiVersionSeriesTransf
     { kApiVersion_AIR_3_2, kApiVersion_SWF_15 }, // SWF_15
     { kApiVersion_AIR_3_2, kApiVersion_VM_INTERNAL }, // AIR_3_2
     { kApiVersion_AIR_3_3, kApiVersion_SWF_16 }, // SWF_16
     { kApiVersion_AIR_3_3, kApiVersion_VM_INTERNAL }, // AIR_3_3
     { kApiVersion_AIR_3_4, kApiVersion_SWF_17 }, // SWF_17
     { kApiVersion_AIR_3_4, kApiVersion_VM_INTERNAL }, // AIR_3_4
     { kApiVersion_AIR_3_5, kApiVersion_SWF_18 }, // SWF_18
     { kApiVersion_AIR_3_5, kApiVersion_VM_INTERNAL }, // AIR_3_5
+    { kApiVersion_AIR_3_6, kApiVersion_SWF_19 }, // SWF_19
+    { kApiVersion_AIR_3_6, kApiVersion_VM_INTERNAL }, // AIR_3_6
     { kApiVersion_VM_INTERNAL, kApiVersion_VM_INTERNAL } // VM_INTERNAL
 };
 
 ApiVersion const kApiVersionFirst[kApiVersionSeries_count] = {
     kApiVersion_AIR_1_0,
     kApiVersion_FP_10_0
 };
 
 ApiVersion const kApiVersionLatest[kApiVersionSeries_count] = {
-    kApiVersion_AIR_3_5,
-    kApiVersion_SWF_18
+    kApiVersion_AIR_3_6,
+    kApiVersion_SWF_19
 };
 
 }
--- a/core/api-versions.h
+++ b/core/api-versions.h
@@ -1,14 +1,11 @@
 /* DO NOT EDIT THIS FILE!  It was generated by utils/apivergen.abc. */
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+/* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef api_versions_H_
 #define api_versions_H_
 
 namespace avmplus {
 
 enum ApiVersionSeries {
     kApiVersionSeries_AIR,
     kApiVersionSeries_FP
@@ -40,21 +37,23 @@ enum ApiVersion {
     kApiVersion_SWF_15 = 18,
     kApiVersion_AIR_3_2 = 19,
     kApiVersion_SWF_16 = 20,
     kApiVersion_AIR_3_3 = 21,
     kApiVersion_SWF_17 = 22,
     kApiVersion_AIR_3_4 = 23,
     kApiVersion_SWF_18 = 24,
     kApiVersion_AIR_3_5 = 25,
-    kApiVersion_VM_INTERNAL = 26
+    kApiVersion_SWF_19 = 26,
+    kApiVersion_AIR_3_6 = 27,
+    kApiVersion_VM_INTERNAL = 28
 };
 
 enum {
-    kApiVersion_count = 27
+    kApiVersion_count = 29
 };
 
 extern const char* const kApiVersionNames[kApiVersion_count];
 extern uint32_t const kApiVersionSeriesMembership[kApiVersion_count];
 extern ApiVersion const kApiVersionSeriesTransfer[kApiVersion_count][kApiVersionSeries_count];
 extern ApiVersion const kApiVersionFirst[kApiVersionSeries_count];
 extern ApiVersion const kApiVersionLatest[kApiVersionSeries_count];
 
--- a/core/api-versions.java
+++ b/core/api-versions.java
@@ -1,14 +1,11 @@
 /* DO NOT EDIT THIS FILE!  It was generated by utils/apivergen.abc. */
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+/* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package adobe.abc;
 
 public class APIVersions {
 
 public static final int kApiVersionSeries_AIR = 0;
 public static final int kApiVersionSeries_FP = 1;
 
@@ -35,19 +32,21 @@ public static final int kApiVersion_AIR_
 public static final int kApiVersion_SWF_15 = 18;
 public static final int kApiVersion_AIR_3_2 = 19;
 public static final int kApiVersion_SWF_16 = 20;
 public static final int kApiVersion_AIR_3_3 = 21;
 public static final int kApiVersion_SWF_17 = 22;
 public static final int kApiVersion_AIR_3_4 = 23;
 public static final int kApiVersion_SWF_18 = 24;
 public static final int kApiVersion_AIR_3_5 = 25;
-public static final int kApiVersion_VM_INTERNAL = 26;
+public static final int kApiVersion_SWF_19 = 26;
+public static final int kApiVersion_AIR_3_6 = 27;
+public static final int kApiVersion_VM_INTERNAL = 28;
 
-public static final int kApiVersion_count = 27;
+public static final int kApiVersion_count = 29;
 
 public static final String kApiVersionNames[]= {
     "VM_ALLVERSIONS", 
     "AIR_1_0", 
     "FP_10_0", 
     "AIR_1_5", 
     "AIR_1_5_1", 
     "FP_10_0_32", 
@@ -66,16 +65,18 @@ public static final String kApiVersionNa
     "SWF_15", 
     "AIR_3_2", 
     "SWF_16", 
     "AIR_3_3", 
     "SWF_17", 
     "AIR_3_4", 
     "SWF_18", 
     "AIR_3_5", 
+    "SWF_19", 
+    "AIR_3_6", 
     "VM_INTERNAL"
 };
 
 public static final int kApiVersionSeriesMembership[] = {
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
@@ -96,16 +97,18 @@ public static final int kApiVersionSerie
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
+    (1<<kApiVersionSeries_FP),
+    (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP)
 };
 
 public static final int kApiVersionSeriesTransfer[][] = {
     { kApiVersion_VM_ALLVERSIONS, kApiVersion_VM_ALLVERSIONS }, // VM_ALLVERSIONS
     { kApiVersion_AIR_1_0, kApiVersion_VM_INTERNAL }, // AIR_1_0
     { kApiVersion_AIR_1_5, kApiVersion_FP_10_0 }, // FP_10_0
     { kApiVersion_AIR_1_5, kApiVersion_VM_INTERNAL }, // AIR_1_5
@@ -126,22 +129,24 @@ public static final int kApiVersionSerie
     { kApiVersion_AIR_3_2, kApiVersion_SWF_15 }, // SWF_15
     { kApiVersion_AIR_3_2, kApiVersion_VM_INTERNAL }, // AIR_3_2
     { kApiVersion_AIR_3_3, kApiVersion_SWF_16 }, // SWF_16
     { kApiVersion_AIR_3_3, kApiVersion_VM_INTERNAL }, // AIR_3_3
     { kApiVersion_AIR_3_4, kApiVersion_SWF_17 }, // SWF_17
     { kApiVersion_AIR_3_4, kApiVersion_VM_INTERNAL }, // AIR_3_4
     { kApiVersion_AIR_3_5, kApiVersion_SWF_18 }, // SWF_18
     { kApiVersion_AIR_3_5, kApiVersion_VM_INTERNAL }, // AIR_3_5
+    { kApiVersion_AIR_3_6, kApiVersion_SWF_19 }, // SWF_19
+    { kApiVersion_AIR_3_6, kApiVersion_VM_INTERNAL }, // AIR_3_6
     { kApiVersion_VM_INTERNAL, kApiVersion_VM_INTERNAL } // VM_INTERNAL
 };
 
 public static final int kApiVersionFirst[] = {
     kApiVersion_AIR_1_0,
     kApiVersion_FP_10_0
 };
 
 public static final int kApiVersionLatest[] = {
-    kApiVersion_AIR_3_5,
-    kApiVersion_SWF_18
+    kApiVersion_AIR_3_6,
+    kApiVersion_SWF_19
 };
 
 };
--- a/core/api-versions.xml
+++ b/core/api-versions.xml
@@ -39,41 +39,44 @@ ASC and AVM to control the visibility of
         <version name="AIR_2_6"/>
         <version name="AIR_2_7"/>
         <version name="AIR_3_0"/>
         <version name="AIR_3_1"/>
         <version name="AIR_3_2"/>
         <version name="AIR_3_3"/>
         <version name="AIR_3_4"/>
         <version name="AIR_3_5"/>
+        <version name="AIR_3_6"/>
     </series>
     <series name="FP">
         <version name="FP_10_0"/>
         <!-- note that nothing has ever been tagged with FP_10_0_32, but it needs to
             remain for acceptance tests to pass -->
         <version name="FP_10_0_32"/>
         <!-- note that FP_10_1 is essentially equivalent to FP_10_0_32 and FP_10_0 -->
         <version name="FP_10_1"/>
         <version name="FP_10_2"/>
         <version name="SWF_12"/>
         <version name="SWF_13"/>
         <version name="SWF_14"/>
         <version name="SWF_15"/>
         <version name="SWF_16"/>
         <version name="SWF_17"/>
         <version name="SWF_18"/>
+        <version name="SWF_19"/>
     </series>
 
     <!-- this means "every API in sub is also in super" -->
     <ordering>
         <set sub="FP_10_0" super="AIR_1_5"/>
         <set sub="FP_10_0_32" super="AIR_1_5_2"/>
         <set sub="FP_10_1" super="AIR_2_0"/>
         <set sub="FP_10_2" super="AIR_2_6"/>
         <set sub="SWF_12" super="AIR_2_7"/>
         <set sub="SWF_13" super="AIR_3_0"/>
         <set sub="SWF_14" super="AIR_3_1"/>
         <set sub="SWF_15" super="AIR_3_2"/>
         <set sub="SWF_16" super="AIR_3_3"/>
         <set sub="SWF_17" super="AIR_3_4"/>
         <set sub="SWF_18" super="AIR_3_5"/>
+        <set sub="SWF_19" super="AIR_3_6"/>
     </ordering>
 </api>