Reviewers: ihab.awad,
Description:
All changes since the previous merge.
The merge command was:
svn merge -c 5701,5702,5703,5704,5705,5706 ^/trunk
and there were several conflicts; omitting ones which were trivial
(modified code that doesn't exist on this branch, etc.), there were:
* MainBrowserTest has new commentary and timeout on guest-scan-* being
slow.
* test-scan-guest.js's handling of [[ThrowTypeError]] is now completely
different between es5 and es53 modes.
Please review this at https://codereview.appspot.com/186440043/
Affected files (+360, -88 lines):
M .
M src/com/google/caja/plugin/csslexer.js
M src/com/google/caja/plugin/domado.js
M src/com/google/caja/plugin/html-emitter.js
M src/com/google/caja/plugin/ses-frame-group.js
M src/com/google/caja/ses/repairES5.js
M src/com/google/caja/ses/startSES.js
M tests/com/google/caja/plugin/MainBrowserTest.java
M tests/com/google/caja/plugin/jsunit.js
M tests/com/google/caja/plugin/test-cajajs-invocation.js
MM tests/com/google/caja/plugin/test-domado-events-guest.html
M tests/com/google/caja/plugin/test-scan-guest.js
M tests/com/google/caja/plugin/test-taming-tamed-guest.html
--
---
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.
