98331 2012-10-03 17:11:18 -0700 Remove unused features of BlobBuilder 2012-10-08 17:08:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric haraken japhet ojan webkit.review.bot oldest_to_newest 734232 0 abarth 2012-10-03 17:11:18 -0700 Remove unused features of BlobBuilder 734234 1 167002 abarth 2012-10-03 17:13:23 -0700 Created attachment 167002 Patch 737162 2 167002 eric 2012-10-08 16:07:55 -0700 Comment on attachment 167002 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167002&action=review Hot damn! > Source/WebCore/page/FeatureObserver.h:44 > + UnusedSlot01, // Prior to 10/2012, we used this slot for LegacyBlobBuilder. Are you trying to maintain binary compat? 737164 3 abarth 2012-10-08 16:10:47 -0700 (In reply to comment #2) > (From update of attachment 167002 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167002&action=review > > Hot damn! > > > Source/WebCore/page/FeatureObserver.h:44 > > + UnusedSlot01, // Prior to 10/2012, we used this slot for LegacyBlobBuilder. > > Are you trying to maintain binary compat? Yes. The enum values are stored on the server. We can re-use values once we don't care about cross-talk with older versions. 737195 4 167002 webkit.review.bot 2012-10-08 16:17:05 -0700 Comment on attachment 167002 Patch Rejecting attachment 167002 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebKit2/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/14209658 737243 5 167002 webkit.review.bot 2012-10-08 17:08:51 -0700 Comment on attachment 167002 Patch Clearing flags on attachment: 167002 Committed r130705: <http://trac.webkit.org/changeset/130705> 737244 6 webkit.review.bot 2012-10-08 17:08:55 -0700 All reviewed patches have been landed. Closing bug. 167002 2012-10-03 17:13:23 -0700 2012-10-08 17:08:51 -0700 Patch bug-98331-20121003171235.patch text/plain 12897 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE5MGYzNzNjMjc4NzU0 Y2RhMGUxMDZiYzM5MWY0MTY5MjVhMTk5YS4uNWEyYTdiZjgyMTc4ZWFmY2MwMTc0NmI0NDdiMGE0 M2M0ZTIwNGM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEyLTEwLTAzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBmZWF0 dXJlcyBvZiBCbG9iQnVpbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTgzMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBOb3cgdGhhdCB3ZSBkb24ndCBleHBvc2UgQmxvYkJ1aWxkZXIgYXMgYSB3ZWIg cGxhdGZvcm0gQVBJLCB3ZSBjYW4KKyAgICAgICAgc3RyaXAgZG93biB0aGUgY2xhc3MgdG8gaGFu ZGxlIG9ubHkgdGhvc2UgY2FzZXMgdGhhdCBhcmUgbmVlZGVkIGJ5IHRoZQorICAgICAgICBCbG9i IGNvbnN0cnVjdG9yLgorCisgICAgICAgIEkndmUgYWxzbyByZW5hbWVkIHRoZSBjbGFzcyBmcm9t IFdlYktpdEJsb2JCdWlsZGVyIHRvIEJsb2JCdWlsZGVyIGFuZAorICAgICAgICBtYWRlIGl0IHN0 YWNrIGFsbG9jYXRlZCByYXRoZXIgdGhhbiBSZWZDb3VudGVkLiBBIGZ1dHVyZSBwYXRjaCB3aWxs CisgICAgICAgIGFjdHVhbGx5IG1vdmUgdGhlIGZpbGVzIGFyb3VuZC4gKEkgZGlkbid0IHdhbnQg dG8gbWl4IG1vdmluZyBjb2RlCisgICAgICAgIGFyb3VuZCB3aXRoIG1vZGlmeWluZyB0aGUgY29k ZS4pCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0Jsb2JDdXN0b20uY3BwOgorICAgICAgICAo V2ViQ29yZTo6SlNCbG9iQ29uc3RydWN0b3I6OmNvbnN0cnVjdEpTQmxvYik6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4QmxvYkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpW OEJsb2I6OmNvbnN0cnVjdG9yQ2FsbGJhY2spOgorICAgICAgICAqIGZpbGVhcGkvV2ViS2l0Qmxv YkJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpCbG9i QnVpbGRlcjo6QmxvYkJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QmxvYkJ1aWxkZXI6Omdl dEJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpCbG9iQnVpbGRlcjo6YXBwZW5kKToKKyAgICAg ICAgKFdlYkNvcmU6OkJsb2JCdWlsZGVyOjphcHBlbmRCeXRlc0RhdGEpOgorICAgICAgICAoV2Vi Q29yZTo6QmxvYkJ1aWxkZXI6OmdldEJsb2IpOgorICAgICAgICAqIGZpbGVhcGkvV2ViS2l0Qmxv YkJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoQmxvYkJ1aWxkZXIpOgor ICAgICAgICAqIHBhZ2UvRmVhdHVyZU9ic2VydmVyLmg6CisKKzIwMTItMTAtMDMgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZW1vdmUgc3VwcG9ydCBmb3IgRU5B QkxFKExFR0FDWV9XRUJLSVRfQkxPQl9CVUlMREVSKQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgzMDEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNCbG9iQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTQmxvYkN1c3RvbS5jcHAKaW5kZXggNWVhNDQwMTUyOGRlNDYzYzJkODBlZGNiYWYxMTAy MzY3Y2MyMTA1NC4uZjY5OWZlZDc3NWU2ZTE4YzFkMzIyMGY1Yzc2NzQyNmI2N2JlNGM2OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNCbG9iQ3VzdG9tLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0Jsb2JDdXN0b20uY3BwCkBAIC0xMTEsOCAr MTExLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU0Jsb2JDb25zdHJ1Y3Rvcjo6 Y29uc3RydWN0SlNCbG9iKEV4ZWNTdGF0ZSogZXhlYykKIAogICAgIEFTU0VSVChlbmRpbmdzID09 ICJ0cmFuc3BhcmVudCIgfHwgZW5kaW5ncyA9PSAibmF0aXZlIik7CiAKLSAgICAvLyBGSVhNRTog dGhpcyB3b3VsZCBiZSBiZXR0ZXIgaWYgdGhlIFdlYktpdEJsb2JCdWlsZGVyIHdlcmUgYSBzdGFj ayBvYmplY3QgdG8gYXZvaWQgdGhlIGFsbG9jYXRpb24uCi0gICAgUmVmUHRyPFdlYktpdEJsb2JC dWlsZGVyPiBibG9iQnVpbGRlciA9IFdlYktpdEJsb2JCdWlsZGVyOjpjcmVhdGUoKTsKKyAgICBC bG9iQnVpbGRlciBibG9iQnVpbGRlcjsKIAogICAgIEpTQXJyYXkqIGFycmF5ID0gYXNBcnJheShm aXJzdEFyZyk7CiAgICAgdW5zaWduZWQgbGVuZ3RoID0gYXJyYXktPmxlbmd0aCgpOwpAQCAtMTIx LDIyICsxMjAsMjIgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU0Jsb2JDb25zdHJ1 Y3Rvcjo6Y29uc3RydWN0SlNCbG9iKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgSlNWYWx1ZSBp dGVtID0gYXJyYXktPmdldEluZGV4KGV4ZWMsIGkpOwogI2lmIEVOQUJMRShCTE9CKQogICAgICAg ICBpZiAoaXRlbS5pbmhlcml0cygmSlNBcnJheUJ1ZmZlcjo6c19pbmZvKSkKLSAgICAgICAgICAg IGJsb2JCdWlsZGVyLT5hcHBlbmQoY29udGV4dCwgdG9BcnJheUJ1ZmZlcihpdGVtKSk7CisgICAg ICAgICAgICBibG9iQnVpbGRlci5hcHBlbmQoY29udGV4dCwgdG9BcnJheUJ1ZmZlcihpdGVtKSk7 CiAgICAgICAgIGVsc2UgaWYgKGl0ZW0uaW5oZXJpdHMoJkpTQXJyYXlCdWZmZXJWaWV3OjpzX2lu Zm8pKQotICAgICAgICAgICAgYmxvYkJ1aWxkZXItPmFwcGVuZCh0b0FycmF5QnVmZmVyVmlldyhp dGVtKSk7CisgICAgICAgICAgICBibG9iQnVpbGRlci5hcHBlbmQodG9BcnJheUJ1ZmZlclZpZXco aXRlbSkpOwogICAgICAgICBlbHNlCiAjZW5kaWYKICAgICAgICAgaWYgKGl0ZW0uaW5oZXJpdHMo JkpTQmxvYjo6c19pbmZvKSkKLSAgICAgICAgICAgIGJsb2JCdWlsZGVyLT5hcHBlbmQodG9CbG9i KGl0ZW0pKTsKKyAgICAgICAgICAgIGJsb2JCdWlsZGVyLmFwcGVuZCh0b0Jsb2IoaXRlbSkpOwog ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIFN0cmluZyBzdHJpbmcgPSBpdGVtLnRvU3RyaW5n KGV4ZWMpLT52YWx1ZShleGVjKTsKICAgICAgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24o KSkKICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkp OwotICAgICAgICAgICAgYmxvYkJ1aWxkZXItPmFwcGVuZChzdHJpbmcsIGVuZGluZ3MsIEFTU0VS VF9OT19FWENFUFRJT04pOworICAgICAgICAgICAgYmxvYkJ1aWxkZXIuYXBwZW5kKHN0cmluZywg ZW5kaW5ncyk7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBSZWZQdHI8QmxvYj4gYmxvYiA9IGJs b2JCdWlsZGVyLT5nZXRCbG9iKHR5cGUsIEJsb2JDb25zdHJ1Y3RlZEJ5Q29uc3RydWN0b3IpOwor ICAgIFJlZlB0cjxCbG9iPiBibG9iID0gYmxvYkJ1aWxkZXIuZ2V0QmxvYih0eXBlKTsKICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKENSRUFURV9ET01fV1JBUFBFUihleGVjLCBqc0NvbnN0cnVj dG9yLT5nbG9iYWxPYmplY3QoKSwgQmxvYiwgYmxvYi5nZXQoKSkpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhCbG9iQ3VzdG9tLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEJsb2JDdXN0b20uY3BwCmluZGV4IDBh ODFhOGQ2NjQ3MDU0MzNhYjdjMjRlN2RiMWVkNjYxMTJkOTEzMzIuLjBlY2M1OWUzMGM3NWZlYTYx YjAxN2JhMTdjODU5MjNmOTBjZDI1MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEJsb2JDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEJsb2JDdXN0b20uY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IFY4QmxvYjo6Y29uc3RydWN0b3JDYWxsYmFjayhjb25zdCB2ODo6QXJn dW1lbnRzJiBhcmdzKQogCiAgICAgQVNTRVJUKGVuZGluZ3MgPT0gInRyYW5zcGFyZW50IiB8fCBl bmRpbmdzID09ICJuYXRpdmUiKTsKIAotICAgIFJlZlB0cjxXZWJLaXRCbG9iQnVpbGRlcj4gYmxv YkJ1aWxkZXIgPSBXZWJLaXRCbG9iQnVpbGRlcjo6Y3JlYXRlKCk7CisgICAgQmxvYkJ1aWxkZXIg YmxvYkJ1aWxkZXI7CiAKICAgICBFWENFUFRJT05fQkxPQ0sodjg6OkxvY2FsPHY4OjpBcnJheT4s IGJsb2JQYXJ0cywgdjg6OkxvY2FsPHY4OjpBcnJheT46OkNhc3QoZmlyc3RBcmcpKTsKICAgICB1 aW50MzJfdCBsZW5ndGggPSBibG9iUGFydHMtPkxlbmd0aCgpOwpAQCAtMTE3LDI0ICsxMTcsMjQg QEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4QmxvYjo6Y29uc3RydWN0b3JDYWxsYmFjayhjb25z dCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgICAgICBpZiAoVjhBcnJheUJ1ZmZlcjo6SGFzSW5z dGFuY2UoaXRlbSkpIHsKICAgICAgICAgICAgIEFycmF5QnVmZmVyKiBhcnJheUJ1ZmZlciA9IFY4 QXJyYXlCdWZmZXI6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoaXRlbSkp OwogICAgICAgICAgICAgQVNTRVJUKGFycmF5QnVmZmVyKTsKLSAgICAgICAgICAgIGJsb2JCdWls ZGVyLT5hcHBlbmQoY29udGV4dCwgYXJyYXlCdWZmZXIpOworICAgICAgICAgICAgYmxvYkJ1aWxk ZXIuYXBwZW5kKGNvbnRleHQsIGFycmF5QnVmZmVyKTsKICAgICAgICAgfSBlbHNlIGlmIChWOEFy cmF5QnVmZmVyVmlldzo6SGFzSW5zdGFuY2UoaXRlbSkpIHsKICAgICAgICAgICAgIEFycmF5QnVm ZmVyVmlldyogYXJyYXlCdWZmZXJWaWV3ID0gVjhBcnJheUJ1ZmZlclZpZXc6OnRvTmF0aXZlKHY4 OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoaXRlbSkpOwogICAgICAgICAgICAgQVNTRVJUKGFy cmF5QnVmZmVyVmlldyk7Ci0gICAgICAgICAgICBibG9iQnVpbGRlci0+YXBwZW5kKGFycmF5QnVm ZmVyVmlldyk7CisgICAgICAgICAgICBibG9iQnVpbGRlci5hcHBlbmQoYXJyYXlCdWZmZXJWaWV3 KTsKICAgICAgICAgfSBlbHNlCiAjZW5kaWYKICAgICAgICAgaWYgKFY4QmxvYjo6SGFzSW5zdGFu Y2UoaXRlbSkpIHsKICAgICAgICAgICAgIEJsb2IqIGJsb2IgPSBWOEJsb2I6OnRvTmF0aXZlKHY4 OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoaXRlbSkpOwogICAgICAgICAgICAgQVNTRVJUKGJs b2IpOwotICAgICAgICAgICAgYmxvYkJ1aWxkZXItPmFwcGVuZChibG9iKTsKKyAgICAgICAgICAg IGJsb2JCdWlsZGVyLmFwcGVuZChibG9iKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIHN0cmluZ1ZhbHVlLCB0b1dlYkNvcmVTdHJpbmcoaXRl bSkpOwotICAgICAgICAgICAgYmxvYkJ1aWxkZXItPmFwcGVuZChzdHJpbmdWYWx1ZSwgZW5kaW5n cywgQVNTRVJUX05PX0VYQ0VQVElPTik7CisgICAgICAgICAgICBibG9iQnVpbGRlci5hcHBlbmQo c3RyaW5nVmFsdWUsIGVuZGluZ3MpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgUmVmUHRyPEJs b2I+IGJsb2IgPSBibG9iQnVpbGRlci0+Z2V0QmxvYih0eXBlLCBCbG9iQ29uc3RydWN0ZWRCeUNv bnN0cnVjdG9yKTsKKyAgICBSZWZQdHI8QmxvYj4gYmxvYiA9IGJsb2JCdWlsZGVyLmdldEJsb2Io dHlwZSk7CiAgICAgcmV0dXJuIHRvVjgoYmxvYi5nZXQoKSwgYXJncy5Ib2xkZXIoKSwgYXJncy5H ZXRJc29sYXRlKCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1dl YktpdEJsb2JCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvV2ViS2l0QmxvYkJ1 aWxkZXIuY3BwCmluZGV4IGQwNzNjMzZmZjA0NjNkOWMxYTA0ZDM0NmIwMzFkYTZhNzRlOTdmMzEu LjgzMTJhNTQ3YzYyODgwNzVkMTQxZjg0NzMwMWM0YjU1MmY3OGZkZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2ZpbGVhcGkvV2ViS2l0QmxvYkJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2ZpbGVhcGkvV2ViS2l0QmxvYkJ1aWxkZXIuY3BwCkBAIC0zNSw3ICszNSw2IEBACiAj aW5jbHVkZSAiQmxvYi5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXhjZXB0 aW9uQ29kZS5oIgotI2luY2x1ZGUgIkZlYXR1cmVPYnNlcnZlci5oIgogI2luY2x1ZGUgIkZpbGUu aCIKICNpbmNsdWRlICJIaXN0b2dyYW1TdXBwb3J0LmgiCiAjaW5jbHVkZSAiTGluZUVuZGluZy5o IgpAQCAtNTEsMzIgKzUwLDIwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorLy8gRklYTUU6 IE1vdmUgdGhpcyBmaWxlIHRvIEJsb2JCdWlsZGVyLmNwcAorCiBlbnVtIEJsb2JDb25zdHJ1Y3Rv ckFycmF5QnVmZmVyT3JWaWV3IHsKICAgICBCbG9iQ29uc3RydWN0b3JBcnJheUJ1ZmZlciwKICAg ICBCbG9iQ29uc3RydWN0b3JBcnJheUJ1ZmZlclZpZXcsCiAgICAgQmxvYkNvbnN0cnVjdG9yQXJy YXlCdWZmZXJPclZpZXdNYXgsCiB9OwogCi0vLyBzdGF0aWMKLVBhc3NSZWZQdHI8V2ViS2l0Qmxv YkJ1aWxkZXI+IFdlYktpdEJsb2JCdWlsZGVyOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogY29udGV4dCkKLXsKLSAgICBTdHJpbmcgbWVzc2FnZSgiQmxvYkJ1aWxkZXIgaXMgZGVwcmVj YXRlZC4gVXNlIFwiQmxvYlwiIGNvbnN0cnVjdG9yIGluc3RlYWQuIik7Ci0gICAgY29udGV4dC0+ YWRkQ29uc29sZU1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgV2Fybmlu Z01lc3NhZ2VMZXZlbCwgbWVzc2FnZSk7Ci0KLSAgICBpZiAoY29udGV4dC0+aXNEb2N1bWVudCgp KSB7Ci0gICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4o Y29udGV4dCk7Ci0gICAgICAgIEZlYXR1cmVPYnNlcnZlcjo6b2JzZXJ2ZShkb2N1bWVudC0+ZG9t V2luZG93KCksIEZlYXR1cmVPYnNlcnZlcjo6TGVnYWN5QmxvYkJ1aWxkZXIpOwotICAgIH0KLQot ICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViS2l0QmxvYkJ1aWxkZXIoKSk7Ci19Ci0KLVdlYktp dEJsb2JCdWlsZGVyOjpXZWJLaXRCbG9iQnVpbGRlcigpCitCbG9iQnVpbGRlcjo6QmxvYkJ1aWxk ZXIoKQogICAgIDogbV9zaXplKDApCiB7CiB9CiAKLVZlY3RvcjxjaGFyPiYgV2ViS2l0QmxvYkJ1 aWxkZXI6OmdldEJ1ZmZlcigpCitWZWN0b3I8Y2hhcj4mIEJsb2JCdWlsZGVyOjpnZXRCdWZmZXIo KQogewogICAgIC8vIElmIHRoZSBsYXN0IGl0ZW0gaXMgbm90IGEgZGF0YSBpdGVtLCBjcmVhdGUg b25lLiBPdGhlcndpc2UsIHdlIHNpbXBseSBhcHBlbmQgdGhlIG5ldyBzdHJpbmcgdG8gdGhlIGxh c3QgZGF0YSBpdGVtLgogICAgIGlmIChtX2l0ZW1zLmlzRW1wdHkoKSB8fCBtX2l0ZW1zW21faXRl bXMuc2l6ZSgpIC0gMV0udHlwZSAhPSBCbG9iRGF0YUl0ZW06OkRhdGEpCkBAIC04NSwzNCArNzIs MjQgQEAgVmVjdG9yPGNoYXI+JiBXZWJLaXRCbG9iQnVpbGRlcjo6Z2V0QnVmZmVyKCkKICAgICBy ZXR1cm4gKm1faXRlbXNbbV9pdGVtcy5zaXplKCkgLSAxXS5kYXRhLT5tdXRhYmxlRGF0YSgpOwog fQogCi12b2lkIFdlYktpdEJsb2JCdWlsZGVyOjphcHBlbmQoY29uc3QgU3RyaW5nJiB0ZXh0LCBj b25zdCBTdHJpbmcmIGVuZGluZ1R5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQordm9pZCBCbG9iQnVp bGRlcjo6YXBwZW5kKGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgU3RyaW5nJiBlbmRpbmdUeXBl KQogewotICAgIGJvb2wgaXNFbmRpbmdUeXBlVHJhbnNwYXJlbnQgPSBlbmRpbmdUeXBlID09ICJ0 cmFuc3BhcmVudCI7Ci0gICAgYm9vbCBpc0VuZGluZ1R5cGVOYXRpdmUgPSBlbmRpbmdUeXBlID09 ICJuYXRpdmUiOwotICAgIGlmICghZW5kaW5nVHlwZS5pc0VtcHR5KCkgJiYgIWlzRW5kaW5nVHlw ZVRyYW5zcGFyZW50ICYmICFpc0VuZGluZ1R5cGVOYXRpdmUpIHsKLSAgICAgICAgZWMgPSBTWU5U QVhfRVJSOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgQ1N0cmluZyB1dGY4VGV4dCA9 IFVURjhFbmNvZGluZygpLmVuY29kZSh0ZXh0LmNoYXJhY3RlcnMoKSwgdGV4dC5sZW5ndGgoKSwg RW50aXRpZXNGb3JVbmVuY29kYWJsZXMpOwogCiAgICAgVmVjdG9yPGNoYXI+JiBidWZmZXIgPSBn ZXRCdWZmZXIoKTsKICAgICBzaXplX3Qgb2xkU2l6ZSA9IGJ1ZmZlci5zaXplKCk7CiAKLSAgICBp ZiAoaXNFbmRpbmdUeXBlTmF0aXZlKQorICAgIGlmIChlbmRpbmdUeXBlID09ICJuYXRpdmUiKQog ICAgICAgICBub3JtYWxpemVMaW5lRW5kaW5nc1RvTmF0aXZlKHV0ZjhUZXh0LCBidWZmZXIpOwot ICAgIGVsc2UKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKGVuZGluZ1R5cGUgPT0gInRyYW5z cGFyZW50Iik7CiAgICAgICAgIGJ1ZmZlci5hcHBlbmQodXRmOFRleHQuZGF0YSgpLCB1dGY4VGV4 dC5sZW5ndGgoKSk7CisgICAgfQogICAgIG1fc2l6ZSArPSBidWZmZXIuc2l6ZSgpIC0gb2xkU2l6 ZTsKIH0KIAotdm9pZCBXZWJLaXRCbG9iQnVpbGRlcjo6YXBwZW5kKGNvbnN0IFN0cmluZyYgdGV4 dCwgRXhjZXB0aW9uQ29kZSYgZWMpCi17Ci0gICAgYXBwZW5kKHRleHQsIFN0cmluZygpLCBlYyk7 Ci19Ci0KICNpZiBFTkFCTEUoQkxPQikKLXZvaWQgV2ViS2l0QmxvYkJ1aWxkZXI6OmFwcGVuZChT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBBcnJheUJ1ZmZlciogYXJyYXlCdWZmZXIp Cit2b2lkIEJsb2JCdWlsZGVyOjphcHBlbmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgQXJyYXlCdWZmZXIqIGFycmF5QnVmZmVyKQogewogICAgIFN0cmluZyBjb25zb2xlTWVzc2Fn ZSgiQXJyYXlCdWZmZXIgdmFsdWVzIGFyZSBkZXByZWNhdGVkIGluIEJsb2IgQ29uc3RydWN0b3Iu IFVzZSBBcnJheUJ1ZmZlclZpZXcgaW5zdGVhZC4iKTsKICAgICBjb250ZXh0LT5hZGRDb25zb2xl TWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBXYXJuaW5nTWVzc2FnZUxl dmVsLCBjb25zb2xlTWVzc2FnZSk7CkBAIC0xMjUsNyArMTAyLDcgQEAgdm9pZCBXZWJLaXRCbG9i QnVpbGRlcjo6YXBwZW5kKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIEFycmF5QnVm ZmVyKiBhcnIKICAgICBhcHBlbmRCeXRlc0RhdGEoYXJyYXlCdWZmZXItPmRhdGEoKSwgYXJyYXlC dWZmZXItPmJ5dGVMZW5ndGgoKSk7CiB9CiAKLXZvaWQgV2ViS2l0QmxvYkJ1aWxkZXI6OmFwcGVu ZChBcnJheUJ1ZmZlclZpZXcqIGFycmF5QnVmZmVyVmlldykKK3ZvaWQgQmxvYkJ1aWxkZXI6OmFw cGVuZChBcnJheUJ1ZmZlclZpZXcqIGFycmF5QnVmZmVyVmlldykKIHsKICAgICBIaXN0b2dyYW1T dXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbigiV2ViQ29yZS5CbG9iLmNvbnN0cnVjdG9yLkFy cmF5QnVmZmVyT3JWaWV3IiwgQmxvYkNvbnN0cnVjdG9yQXJyYXlCdWZmZXJWaWV3LCBCbG9iQ29u c3RydWN0b3JBcnJheUJ1ZmZlck9yVmlld01heCk7CiAKQEAgLTEzNiw3ICsxMTMsNyBAQCB2b2lk IFdlYktpdEJsb2JCdWlsZGVyOjphcHBlbmQoQXJyYXlCdWZmZXJWaWV3KiBhcnJheUJ1ZmZlclZp ZXcpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJLaXRCbG9iQnVpbGRlcjo6YXBwZW5kKEJsb2IqIGJs b2IpCit2b2lkIEJsb2JCdWlsZGVyOjphcHBlbmQoQmxvYiogYmxvYikKIHsKICAgICBpZiAoIWJs b2IpCiAgICAgICAgIHJldHVybjsKQEAgLTE2Miw3ICsxMzksNyBAQCB2b2lkIFdlYktpdEJsb2JC dWlsZGVyOjphcHBlbmQoQmxvYiogYmxvYikKICAgICB9CiB9CiAKLXZvaWQgV2ViS2l0QmxvYkJ1 aWxkZXI6OmFwcGVuZEJ5dGVzRGF0YShjb25zdCB2b2lkKiBkYXRhLCBzaXplX3QgbGVuZ3RoKQor dm9pZCBCbG9iQnVpbGRlcjo6YXBwZW5kQnl0ZXNEYXRhKGNvbnN0IHZvaWQqIGRhdGEsIHNpemVf dCBsZW5ndGgpCiB7CiAgICAgVmVjdG9yPGNoYXI+JiBidWZmZXIgPSBnZXRCdWZmZXIoKTsKICAg ICBzaXplX3Qgb2xkU2l6ZSA9IGJ1ZmZlci5zaXplKCk7CkBAIC0xNzAsMTAgKzE0Nyw4IEBAIHZv aWQgV2ViS2l0QmxvYkJ1aWxkZXI6OmFwcGVuZEJ5dGVzRGF0YShjb25zdCB2b2lkKiBkYXRhLCBz aXplX3QgbGVuZ3RoKQogICAgIG1fc2l6ZSArPSBidWZmZXIuc2l6ZSgpIC0gb2xkU2l6ZTsKIH0K IAotUGFzc1JlZlB0cjxCbG9iPiBXZWJLaXRCbG9iQnVpbGRlcjo6Z2V0QmxvYihjb25zdCBTdHJp bmcmIGNvbnRlbnRUeXBlLCBCbG9iQ29uc3RydWN0aW9uUmVhc29uIGNvbnN0cnVjdGlvblJlYXNv bikKK1Bhc3NSZWZQdHI8QmxvYj4gQmxvYkJ1aWxkZXI6OmdldEJsb2IoY29uc3QgU3RyaW5nJiBj b250ZW50VHlwZSkKIHsKLSAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlv bigiV2ViQ29yZS5CbG9iQnVpbGRlci5nZXRCbG9iIiwgY29uc3RydWN0aW9uUmVhc29uLCBCbG9i Q29uc3RydWN0aW9uUmVhc29uTWF4KTsKLQogICAgIE93blB0cjxCbG9iRGF0YT4gYmxvYkRhdGEg PSBCbG9iRGF0YTo6Y3JlYXRlKCk7CiAgICAgYmxvYkRhdGEtPnNldENvbnRlbnRUeXBlKGNvbnRl bnRUeXBlKTsKICAgICBibG9iRGF0YS0+c3dhcEl0ZW1zKG1faXRlbXMpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9XZWJLaXRCbG9iQnVpbGRlci5oIGIvU291cmNlL1dlYkNv cmUvZmlsZWFwaS9XZWJLaXRCbG9iQnVpbGRlci5oCmluZGV4IGI4NjlkZWZiMjVlOGVmN2NiYjhm NjIyMDNiNDY5NWUwNDU0MjdlYjAuLjc1MDkwYmEzZWVmZjM5ZmFmOTg2Y2YwMjk3ZTQ3NmVkNzA4 NDNlYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvV2ViS2l0QmxvYkJ1aWxk ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1dlYktpdEJsb2JCdWlsZGVyLmgKQEAg LTM3LDM5ICszNywyOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKy8vIEZJWE1FOiBNb3Zl IHRoaXMgZmlsZSB0byBCbG9iQnVpbGRlci5oCisKIGNsYXNzIEJsb2I7CiBjbGFzcyBTY3JpcHRF eGVjdXRpb25Db250ZXh0OwogY2xhc3MgVGV4dEVuY29kaW5nOwogCiB0eXBlZGVmIGludCBFeGNl cHRpb25Db2RlOwogCi1lbnVtIEJsb2JDb25zdHJ1Y3Rpb25SZWFzb24gewotICAgIEJsb2JDb25z dHJ1Y3RlZEJ5QmxvYkJ1aWxkZXIsCi0gICAgQmxvYkNvbnN0cnVjdGVkQnlDb25zdHJ1Y3RvciwK LSAgICBCbG9iQ29uc3RydWN0aW9uUmVhc29uTWF4LAotfTsKLQotY2xhc3MgV2ViS2l0QmxvYkJ1 aWxkZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJLaXRCbG9iQnVpbGRlcj4geworY2xhc3MgQmxv YkJ1aWxkZXIgewogcHVibGljOgotICAgIC8vIENhbGxlZCB3aGVuIEJsb2JCdWlsZGVyIGlzIGlu c3RhbnRpYXRlZCBpbiBKUyBBUEkuIFdlIHNob3cgZGVwcmVjYXRlIHdhcm5pbmcgbWVzc2FnZS4K LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJLaXRCbG9iQnVpbGRlcj4gY3JlYXRlKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqKTsKLQotICAgIC8vIENhbGxlZCBieSBCbG9iIGNvbnN0cnVjdG9yLgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYktpdEJsb2JCdWlsZGVyPiBjcmVhdGUoKSB7IHJldHVy biBhZG9wdFJlZihuZXcgV2ViS2l0QmxvYkJ1aWxkZXIoKSk7IH0KKyAgICBCbG9iQnVpbGRlcigp OwogCiAgICAgdm9pZCBhcHBlbmQoQmxvYiopOwotICAgIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmlu ZyYgdGV4dCwgRXhjZXB0aW9uQ29kZSYpOwotICAgIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmluZyYg dGV4dCwgY29uc3QgU3RyaW5nJiBlbmRpbmcsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2b2lkIGFw cGVuZChjb25zdCBTdHJpbmcmIHRleHQsIGNvbnN0IFN0cmluZyYgZW5kaW5nKTsKICNpZiBFTkFC TEUoQkxPQikKICAgICB2b2lkIGFwcGVuZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQXJyYXlC dWZmZXIqKTsKICAgICB2b2lkIGFwcGVuZChBcnJheUJ1ZmZlclZpZXcqKTsKICNlbmRpZgogCi0g ICAgUGFzc1JlZlB0cjxCbG9iPiBnZXRCbG9iKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUgPSBT dHJpbmcoKSwgQmxvYkNvbnN0cnVjdGlvblJlYXNvbiA9IEJsb2JDb25zdHJ1Y3RlZEJ5QmxvYkJ1 aWxkZXIpOworICAgIFBhc3NSZWZQdHI8QmxvYj4gZ2V0QmxvYihjb25zdCBTdHJpbmcmIGNvbnRl bnRUeXBlKTsKIAogcHJpdmF0ZToKLSAgICBXZWJLaXRCbG9iQnVpbGRlcigpOwotCiAgICAgdm9p ZCBhcHBlbmRCeXRlc0RhdGEoY29uc3Qgdm9pZCosIHNpemVfdCk7CiAKICAgICBWZWN0b3I8Y2hh cj4mIGdldEJ1ZmZlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJl T2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVhdHVyZU9ic2VydmVyLmgKaW5kZXgg NmE1MGM1M2RmMzk2YmZmNTdhN2YzZjhiYjA2NDE4ZGRjNDM4ZTM5Ni4uMTRiMDdkN2M5ODJjYjQ4 Yjc0NTRlYTBiY2ZkMWU0MWEzZjFkMDM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GZWF0dXJlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNl cnZlci5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKICAgICBlbnVtIEZlYXR1cmUgewogICAg ICAgICBQYWdlRGVzdHJ1Y3Rpb24sCiAgICAgICAgIExlZ2FjeU5vdGlmaWNhdGlvbnMsCi0gICAg ICAgIExlZ2FjeUJsb2JCdWlsZGVyLAorICAgICAgICBVbnVzZWRTbG90MDEsIC8vIFByaW9yIHRv IDEwLzIwMTIsIHdlIHVzZWQgdGhpcyBzbG90IGZvciBMZWdhY3lCbG9iQnVpbGRlci4KICAgICAg ICAgUHJlZml4ZWRJbmRleGVkREIsCiAgICAgICAgIFdvcmtlclN0YXJ0LAogICAgICAgICBTaGFy ZWRXb3JrZXJTdGFydCwK