3 Commits

Author	SHA1	Message	Date
Michael Howell	ed608d9b15	servo: Merge #6776 - Remove unnecessarily verbose matches (from notriddle:filereader-matches); r=jdm ... Fixes #6766. Source-Repo: https://github.com/servo/servo Source-Revision: fd1bf1900d876be2da4743c65ea0956be1057453	2015-07-26 00:18:10 -06:00
Ravi Shankar	9a6f1bfbc2	servo: Merge #6761 - Combining FileReaderEvent and Process into an enum; r=jdm (from Wafflespeanut:filereader); r=jdm ... This one's for #6752. The build was successful for this change. I'll commit the next one for `perform_annotated_read_operation` in a moment... Source-Repo: https://github.com/servo/servo Source-Revision: 3af6992151b087412b2dd460d20b34fb9fc2f28f	2015-07-25 13:58:34 -06:00
farodin91	1bcc16dc72	servo: Merge #6716 - Implement FileReader.{readAsText,readAsDataUrl}. Fixes #6172 (from farodin91:filereader); r=jdm ... Source-Repo: https://github.com/servo/servo Source-Revision: e32068d17bdf6a87a63bea97b6364caa22b37e79	2015-07-23 14:37:00 -06:00