Issue 231010043: Merge branch 'master' into es53

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 231010043: Merge branch 'master' into es53 (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 10 months ago by kpreid_google

Modified:
10 years, 10 months ago

Reviewers:
felix8a

CC:
google-caja-discuss_googlegroups.com

Visibility:
Public.

More Reviews

Description

Conflicts: .gitignore build.xml tests/com/google/caja/plugin/test-scan-guest.js tools/svnversion-nocolon Manual changes: Update test-compare-modes.js and test-scan-guest.js for cajaVM.anonIntrinsics. @ 415f7a934b899426751dad0802e5f735296997e1

Patch Set 1 #

Created: 10 years, 10 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+1219 lines, -196 lines)			Patch
M	.gitignore	View	2 chunks	+2 lines, -1 line	0 comments	Download
A +	LICENSE.txt	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	build.xml	View	2 chunks	+2 lines, -2 lines	0 comments	Download
M	src/com/google/caja/ancillary/opt/StatementSimplifier.java	View	3 chunks	+41 lines, -5 lines	0 comments	Download
M	src/com/google/caja/parser/js/Operation.java	View	2 chunks	+11 lines, -2 lines	0 comments	Download
M	src/com/google/caja/ses/WeakMap.js	View	1 chunk	+11 lines, -0 lines	0 comments	Download
M	src/com/google/caja/ses/repair-framework.js	View	3 chunks	+8 lines, -5 lines	0 comments	Download
M	src/com/google/caja/ses/repairES5.js	View	16 chunks	+808 lines, -49 lines	0 comments	Download
M	src/com/google/caja/ses/startSES.js	View	12 chunks	+175 lines, -88 lines	0 comments	Download
M	src/com/google/caja/ses/whitelist.js	View	5 chunks	+63 lines, -18 lines	0 comments	Download
M	tests/com/google/caja/ancillary/opt/JsOptimizerTest.java	View	1 chunk	+20 lines, -0 lines	0 comments	Download
M	tests/com/google/caja/plugin/test-compare-modes.js	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	tests/com/google/caja/plugin/test-scan-core.js	View	1 chunk	+5 lines, -1 line	0 comments	Download
M	tests/com/google/caja/plugin/test-scan-guest.js	View	5 chunks	+56 lines, -5 lines	0 comments	Download
M	tests/com/google/caja/plugin/test-success.js	View	1 chunk	+1 line, -1 line	0 comments	Download
M	tests/com/google/caja/ses/test-repair-framework.js	View	5 chunks	+8 lines, -7 lines	0 comments	Download
M	tools/appspot.py	View	2 chunks	+6 lines, -10 lines	0 comments	Download
M	tools/svnversion-nocolon	View	1 chunk	+2 lines, -3 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

lgtm

Expand All Messages | Collapse All Messages