Title: [107003] branches/safari-534.54-branch/Source/_javascript_Core
- Revision
- 107003
- Author
- [email protected]
- Date
- 2012-02-07 15:58:33 -0800 (Tue, 07 Feb 2012)
Log Message
Merge patch for 78045.
Modified Paths
Diff
Modified: branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog (107002 => 107003)
--- branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2012-02-07 23:53:02 UTC (rev 107002)
+++ branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2012-02-07 23:58:33 UTC (rev 107003)
@@ -1,3 +1,18 @@
+2012-02-07 Gavin Barraclough <[email protected]>
+
+ Crash on http://www.rickshawbags.com/
+ https://bugs.webkit.org/show_bug.cgi?id=78045
+
+ Problem URL is: http://www.rickshawbags.com/customize/custom-bag#!thl=rickshaw/bag()
+
+ This is a bug introduced by https://bugs.webkit.org/show_bug.cgi?id=71933,
+ isVariableObject() checks were excluding StaticScopeObjects, this patch
+ inadvertently changed them to be included.
+
+ * runtime/JSType.h:
+ - sort JSType enum such that StaticScopeObjectType comes before VariableObjectType,
+ and thus is excluded from isVariableObject() checks.
+
2011-02-06 Lucas Forschler <[email protected]>
Merge 106594
Modified: branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSType.h (107002 => 107003)
--- branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSType.h 2012-02-07 23:53:02 UTC (rev 107002)
+++ branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSType.h 2012-02-07 23:58:33 UTC (rev 107003)
@@ -49,11 +49,12 @@
ErrorInstanceType,
GlobalThisType,
- // VariableObjectType must come before all of the types of its subclasses and only its subclasses.
+ StaticScopeObjectType,
+ // VariableObjectType must be less than MOST of the types of its subclasses and only its subclasses.
+ // We use >=VariableObjectType checks to test for Global & Activation objects, but exclude StaticScopes.
VariableObjectType,
GlobalObjectType,
ActivationObjectType,
- StaticScopeObjectType,
};
} // namespace JSC
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
