Reviewers: felix8a,
Description:
All changes since the previous merge.
The merge command was
svn merge -c 5694,5695 ^/trunk
and there was one conflict:
test-scan-guest.js needed merging of the changes in r5695 to
WeakMap tests with the removed ES5/3 support.
Please review this at https://codereview.appspot.com/143260044/
Affected files (+31, -23 lines):
M .
M tests/com/google/caja/plugin/test-scan-guest.js
M third_party
M third_party/java/webdriver/README
M third_party/java/webdriver/VERSION
M third_party/java/webdriver/selenium-standalone.jar
Index: .
===================================================================
--- . (revision 5695)
+++ . (working copy)
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r5694-5695
Index: tests/com/google/caja/plugin/test-scan-guest.js
===================================================================
--- tests/com/google/caja/plugin/test-scan-guest.js (revision 5695)
+++ tests/com/google/caja/plugin/test-scan-guest.js (working copy)
@@ -935,30 +935,37 @@
}
}));
- argsByIdentity(WeakMap, annotate(
- freshResult(genAllCall()), function(context, thrown) {
+ // Some WeakMap shim impls are prototype based, some are closure
based; we
+ // deal with both, as well as the real thing.
+ var genWeakMapKey = genJSONValue;
+ function annotateWeakMapInstance(obj) {
+ // known harmless implementation details leak.
+ expectedUnfrozen.setByIdentity(obj, true);
+ if (inES5Mode) { // would fail on es53
+ argsByIdentity(obj['permitHostObjects___'],
genMethod(G.value('x')));
+ expectedAlwaysThrow.setByIdentity(obj['permitHostObjects___'],
true);
+ argsByIdentity(obj['delete___'], genMethod(genWeakMapKey));
+ argsByIdentity(obj['get___'], genMethod(genWeakMapKey));
+ argsByIdentity(obj['set___'], genMethod(genWeakMapKey, genObject));
+ argsByIdentity(obj['has___'], genMethod(genWeakMapKey));
+ }
+
+ argsByIdentity(obj['delete'], genMethod(genWeakMapKey));
+ argsByIdentity(obj.get, genMethod(genWeakMapKey));
+ argsByIdentity(obj.set, genMethod(genWeakMapKey, genObject));
+ argsByIdentity(obj.has, genMethod(genWeakMapKey));
+ return obj;
+ }
+ argsByIdentity(WeakMap, annotate(genAllCall(), function(context,
thrown) {
if (!thrown) {
- if (inES5Mode) { // would fail on es53
- // known harmless implementation details leak. TODO abuse anyway
- argsByIdentity(context.get()['delete___'],
- argsByIdentity(context.get()['get___'],
- argsByIdentity(context.get()['has___'],
- argsByIdentity(context.get()['set___'],
- argsByIdentity(context.get()['permitHostObjects___'],
- G.none)))));
- }
-
- argsByIdentity(context.get()['delete'], G.none); // TODO abuse
- argsByIdentity(context.get().get, G.none); // TODO abuse
- argsByIdentity(context.get().set, G.none); // TODO abuse
- argsByIdentity(context.get().has, G.none); // TODO abuse
+ annotateWeakMapInstance(context.get());
}
}));
- // some WeakMap impls are prototype based, some are closure based
- argsByIdentity(WeakMap.prototype['delete'], G.none); // TODO abuse
- argsByIdentity(WeakMap.prototype.get, G.none); // TODO abuse
- argsByIdentity(WeakMap.prototype.set, G.none); // TODO abuse
- argsByIdentity(WeakMap.prototype.has, G.none); // TODO abuse
+ obtainInstance.define(WeakMap, annotateWeakMapInstance(new WeakMap()));
+ argsByIdentity(WeakMap.prototype['delete'], genMethod(genWeakMapKey));
+ argsByIdentity(WeakMap.prototype.get, genMethod(genWeakMapKey));
+ argsByIdentity(WeakMap.prototype.set, genMethod(genWeakMapKey,
genObject));
+ argsByIdentity(WeakMap.prototype.has, genMethod(genWeakMapKey));
expectedAlwaysThrow.setByIdentity(
getSetter(window, 'location'), true);
Index: third_party
===================================================================
--- third_party (revision 5695)
+++ third_party (working copy)
Property changes on: third_party
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/third_party:r5694-5695
Index: third_party/java/webdriver/README
===================================================================
--- third_party/java/webdriver/README (revision 5695)
+++ third_party/java/webdriver/README (working copy)
@@ -1,2 +1,3 @@
origin
-
https://code.google.com/p/selenium/downloads/detail?name=selenium-server-standalone-2.39.0.jar
+
http://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.0.jar
+ from http://docs.seleniumhq.org/download/
Index: third_party/java/webdriver/VERSION
===================================================================
--- third_party/java/webdriver/VERSION (revision 5695)
+++ third_party/java/webdriver/VERSION (working copy)
@@ -1,2 +1,2 @@
-Version: 2.35.0
-URL:
https://code.google.com/p/selenium/downloads/detail?name=selenium-server-standalone-2.35.0.jar
+Version: 2.43.0
+URL:
http://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.0.jar
Index: third_party/java/webdriver/selenium-standalone.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
