Bug 1104622 (Part 1) - Remove DiscardTracker. r=tn
Bug 1104622 (Part 2) - Don't discard for redecoding. r=tn
Bug 1048747 - [WebGL2] Implement GetTexParameter for all valid WebGL2 pnames. r=jgilbert

--HG--
extra : rebase_source : d0fcd12dce683990b96c64528081b5429cdaa696
extra : histedit_source : 4b34b90d6b125641d8555ee2f3d0b00151989424
Bug 1048745 - [WebGL2] Extend UniformInfo with WebGL2/GLES3 types. r=jgilbert

--HG--
extra : rebase_source : bde0e59c0ab5f03e1e3a69156ddde9861459aae6
extra : histedit_source : d40023d4f0c0a511c822969fae15d273561ad30e
Bug 1048741 - [WebGL2] texParameter: TEXTURE_COMPARE_MODE and TEXTURE_COMPARE_FUNC support. r=jgilbert

--HG--
extra : rebase_source : 727064b75724cf72aa72d37c2989b06d2c2140bf
extra : histedit_source : 19b706d0208e621b1a0c10af3a48d90a2f1acdbd
Merge m-c to m-i
Bug 1088969 - Upgrade Mozilla 36 to use NSS 3.18, land beta 4 which backs out bug 1073330