Reviewers: jat,

Description:
Modify EmulateJsStack.gwt.xml and CoreWithUserAgent.gwt.xml to test
whether the new 'compiler.stackMode'
configuration property is set to 'emulated', rather than testing the
legacy boolean configuration property
'compiler.emulatedStack'. This will allow developers to specify either
syntax reliably and allow us to potentially
phase out the legacy syntax at some point:
<!-- new syntax -->
<set-property name="compiler.stackMode" value="emulated" />
or
<!-- legacy syntax -->
<set-property name="compiler.emulatedStack" value="true" />

Fixes issues: 5692


Please review this at http://gwt-code-reviews.appspot.com/1174801/show

Affected files:
  M user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml
  M user/src/com/google/gwt/core/EmulateJsStack.gwt.xml


Index: user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml
===================================================================
--- user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml      (revision 9305)
+++ user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml      (working copy)
@@ -18,7 +18,7 @@

<replace-with class="com.google.gwt.core.client.impl.StackTraceCreator.CollectorChrome"> <when-type-is class="com.google.gwt.core.client.impl.StackTraceCreator.Collector" />
-    <when-property-is name="compiler.emulatedStack" value="false" />
+    <when-property-is name="compiler.stackMode" value="native" />
     <any>
<!-- For now, only Chrome provides Error.stack support, so we hijack the
            entire WebKit permutation -->
@@ -28,13 +28,13 @@

<replace-with class="com.google.gwt.core.client.impl.StackTraceCreator.CollectorMoz"> <when-type-is class="com.google.gwt.core.client.impl.StackTraceCreator.Collector" />
-    <when-property-is name="compiler.emulatedStack" value="false" />
+    <when-property-is name="compiler.stackMode" value="native" />
     <when-property-is name="user.agent" value="gecko1_8" />
   </replace-with>

<replace-with class="com.google.gwt.core.client.impl.StackTraceCreator.CollectorOpera"> <when-type-is class="com.google.gwt.core.client.impl.StackTraceCreator.Collector" />
-    <when-property-is name="compiler.emulatedStack" value="false" />
+    <when-property-is name="compiler.stackMode" value="native" />
     <any>
       <when-property-is name="user.agent" value="opera" />
     </any>
Index: user/src/com/google/gwt/core/EmulateJsStack.gwt.xml
===================================================================
--- user/src/com/google/gwt/core/EmulateJsStack.gwt.xml (revision 9305)
+++ user/src/com/google/gwt/core/EmulateJsStack.gwt.xml (working copy)
@@ -17,6 +17,7 @@
 <module>
   <inherits name="com.google.gwt.core.Core" />

+  <!-- Legacy property, use 'compiler.stackMode' instead -->
<!-- If set to true, emulated stack frames will be emitted into the JS -->
   <define-property name="compiler.emulatedStack" values="true,false" />
   <set-property name="compiler.emulatedStack" value="false" />
@@ -29,16 +30,16 @@
<define-configuration-property name="compiler.emulatedStack.recordFileNames"
     is-multi-valued="false" />

-  <replace-with
- class="com.google.gwt.core.client.impl.StackTraceCreator.CollectorEmulated"> - <when-type-is class="com.google.gwt.core.client.impl.StackTraceCreator.Collector" />
-    <when-property-is name="compiler.emulatedStack" value="true" />
-  </replace-with>
-
   <!-- if set to 'strip', stack information can be removed or corrupted -->
<define-property name="compiler.stackMode" values="strip,native,emulated" />
   <set-property name="compiler.stackMode" value="native" />
   <set-property name="compiler.stackMode" value="emulated" >
     <when-property-is name="compiler.emulatedStack" value="true" />
   </set-property>
+
+  <replace-with
+ class="com.google.gwt.core.client.impl.StackTraceCreator.CollectorEmulated"> + <when-type-is class="com.google.gwt.core.client.impl.StackTraceCreator.Collector" />
+    <when-property-is name="compiler.stackMode" value="emulated" />
+  </replace-with>
 </module>


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to