|
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.
@r5707
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+360 lines, -88 lines) |
Patch |
|
M |
.
|
View
|
|
0 chunks |
+0 lines, -0 lines |
0 comments
|
Download
|
|
M |
src/com/google/caja/plugin/csslexer.js
|
View
|
|
1 chunk |
+12 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/com/google/caja/plugin/domado.js
|
View
|
|
8 chunks |
+111 lines, -41 lines |
0 comments
|
Download
|
|
M |
src/com/google/caja/plugin/html-emitter.js
|
View
|
|
2 chunks |
+16 lines, -18 lines |
0 comments
|
Download
|
|
M |
src/com/google/caja/plugin/ses-frame-group.js
|
View
|
|
1 chunk |
+6 lines, -1 line |
0 comments
|
Download
|
|
M |
src/com/google/caja/ses/repairES5.js
|
View
|
|
11 chunks |
+104 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/com/google/caja/ses/startSES.js
|
View
|
|
3 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
tests/com/google/caja/plugin/MainBrowserTest.java
|
View
|
|
2 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
tests/com/google/caja/plugin/jsunit.js
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
tests/com/google/caja/plugin/test-cajajs-invocation.js
|
View
|
|
1 chunk |
+35 lines, -0 lines |
0 comments
|
Download
|
|
MM |
tests/com/google/caja/plugin/test-domado-events-guest.html
|
View
|
|
5 chunks |
+47 lines, -9 lines |
0 comments
|
Download
|
|
M |
tests/com/google/caja/plugin/test-scan-guest.js
|
View
|
|
1 chunk |
+11 lines, -6 lines |
0 comments
|
Download
|
|
M |
tests/com/google/caja/plugin/test-taming-tamed-guest.html
|
View
|
|
1 chunk |
+8 lines, -1 line |
0 comments
|
Download
|
Total messages: 2
|