Bug 780264: The emitj function in apivergen.as needs to be updated (p=enorton,r=dschaffe)
authorDan Schaffer <Dan.Schaffer@adobe.com>
Fri, 17 Aug 2012 12:33:59 -0700
changeset 7532 0f1a8318e89530201354f90c0b5691b859e99da4
parent 7531 c0e57db1ba075668aef10a3be3171c65f8dbc6ce
child 7533 d8af20a76a67e25a20e25012ae4618aa199ff3d0
push id4256
push userdschaffe@adobe.com
push dateMon, 20 Aug 2012 13:10:53 +0000
reviewersdschaffe
bugs780264, 1100753, 1101571
Bug 780264: The emitj function in apivergen.as needs to be updated (p=enorton,r=dschaffe) integrate CL 1100753 CL@1101571
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
@@ -5857,24 +5857,29 @@ 22. Return false.
 
         if (v >= kSWF16)    /* Cyril */
         {
         }
 
         if (v >= kSWF17)    /* Dolores */
         {
         }
+
+        if (v >= kSWF18)    /* Ellis */
+        {
+        }
         
     }
 
     /*static*/ uint32_t const BugCompatibility::kNames[BugCompatibility::VersionCount] =
     {
         9,
         10,
         11,
         12,
         13,
         14,
         15,
         16,
-        17
+        17,
+		18
     };
 }
--- a/core/AvmCore.h
+++ b/core/AvmCore.h
@@ -338,22 +338,23 @@ const int kBufferPadding = 16;
     class BugCompatibility : public MMgc::LeafObject
     {
     public:
         enum Version
         {
             kSWF9,              // SWF9  (Flash Player 9.x)
             kSWF10,             // SWF10 (Flash Player 10.0 & 10.1)
             kSWF11,             // SWF11 (Flash Player 10.2 Spicy)
-            kSWF12,             // SWF12 (Flash Player TBD Wasabi)
-            kSWF13,             // SWF13 (Flash Player TBD Serrano)
-            kSWF14,             // SWF14 (Flash Player TBD Anza)
-            kSWF15,             // SWF15 (Flash Player TBD Brannan)
-            kSWF16,             // SWF16 (Flash Player TBD Cyril)
-            kSWF17,             // SWF17 (Flash Player TBD Dolores)
+            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)
 
             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
@@ -55,9 +55,11 @@ CONFIG const AIR_3_0 = 675;
 CONFIG const SWF_14 = 676;
 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 VM_INTERNAL = 684;
+CONFIG const SWF_18 = 684;
+CONFIG const AIR_3_5 = 685;
+CONFIG const VM_INTERNAL = 686;
--- a/core/api-versions.cpp
+++ b/core/api-versions.cpp
@@ -59,16 +59,18 @@ const char* const kApiVersionNames[kApiV
     "SWF_14", 
     "AIR_3_1", 
     "SWF_15", 
     "AIR_3_2", 
     "SWF_16", 
     "AIR_3_3", 
     "SWF_17", 
     "AIR_3_4", 
+    "SWF_18", 
+    "AIR_3_5", 
     "VM_INTERNAL"
 };
 
 uint32_t const kApiVersionSeriesMembership[kApiVersion_count] = {
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
@@ -87,16 +89,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
@@ -116,22 +120,24 @@ ApiVersion const kApiVersionSeriesTransf
     { kApiVersion_AIR_3_1, kApiVersion_SWF_14 }, // SWF_14
     { kApiVersion_AIR_3_1, kApiVersion_VM_INTERNAL }, // AIR_3_1
     { 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_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_4,
-    kApiVersion_SWF_17
+    kApiVersion_AIR_3_5,
+    kApiVersion_SWF_18
 };
 
 }
--- a/core/api-versions.h
+++ b/core/api-versions.h
@@ -71,21 +71,23 @@ enum ApiVersion {
     kApiVersion_SWF_14 = 16,
     kApiVersion_AIR_3_1 = 17,
     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_VM_INTERNAL = 24
+    kApiVersion_SWF_18 = 24,
+    kApiVersion_AIR_3_5 = 25,
+    kApiVersion_VM_INTERNAL = 26
 };
 
 enum {
-    kApiVersion_count = 25
+    kApiVersion_count = 27
 };
 
 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
@@ -66,19 +66,21 @@ public static final int kApiVersion_AIR_
 public static final int kApiVersion_SWF_14 = 16;
 public static final int kApiVersion_AIR_3_1 = 17;
 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_VM_INTERNAL = 24;
+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_count = 25;
+public static final int kApiVersion_count = 27;
 
 public static final String kApiVersionNames[]= {
     "VM_ALLVERSIONS", 
     "AIR_1_0", 
     "FP_10_0", 
     "AIR_1_5", 
     "AIR_1_5_1", 
     "FP_10_0_32", 
@@ -95,16 +97,18 @@ public static final String kApiVersionNa
     "SWF_14", 
     "AIR_3_1", 
     "SWF_15", 
     "AIR_3_2", 
     "SWF_16", 
     "AIR_3_3", 
     "SWF_17", 
     "AIR_3_4", 
+    "SWF_18", 
+    "AIR_3_5", 
     "VM_INTERNAL"
 };
 
 public static final int kApiVersionSeriesMembership[] = {
     (1<<kApiVersionSeries_AIR)|(1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
     (1<<kApiVersionSeries_FP),
     (1<<kApiVersionSeries_AIR),
@@ -123,16 +127,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
@@ -151,22 +157,24 @@ public static final int kApiVersionSerie
     { kApiVersion_AIR_3_1, kApiVersion_SWF_14 }, // SWF_14
     { kApiVersion_AIR_3_1, kApiVersion_VM_INTERNAL }, // AIR_3_1
     { 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_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_4,
-    kApiVersion_SWF_17
+    kApiVersion_AIR_3_5,
+    kApiVersion_SWF_18
 };
 
 };
--- a/core/api-versions.xml
+++ b/core/api-versions.xml
@@ -71,39 +71,42 @@ ASC and AVM to control the visibility of
         <version name="AIR_2_5"/>
         <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"/>
     </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"/>
     </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"/>
     </ordering>
 </api>