114136 2013-04-07 20:27:03 -0700 Remove the android code from WebCore 2013-04-07 23:35:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114143 1 benjamin benjamin abecsi cdumez d-r esprehn+autocc laszlo.gombos mifenton ojan.autocc webkit.review.bot oldest_to_newest 870598 0 benjamin 2013-04-07 20:27:03 -0700 Remove the android code from WebCore 870599 1 196823 benjamin 2013-04-07 20:32:06 -0700 Created attachment 196823 Patch 870606 2 196823 benjamin 2013-04-07 21:19:02 -0700 Comment on attachment 196823 Patch Clearing flags on attachment: 196823 Committed r147893: <http://trac.webkit.org/changeset/147893> 870607 3 benjamin 2013-04-07 21:19:06 -0700 All reviewed patches have been landed. Closing bug. 870630 4 cdumez 2013-04-07 23:26:51 -0700 This patch failed to update test cases so it introduced a few failures: For e.g. in LayoutTests/editing/deleting/paragraph-in-preserveNewline.html: runTestsOn("android"); 196823 2013-04-07 20:32:06 -0700 2013-04-07 21:19:02 -0700 Patch bug-114136-20130407203150.patch text/plain 15271 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRkMTlkZDllNDNlMmQy MTNkMjUxZDE1ZWI1OTI5MDRlZjUyODI4MC4uNjYyM2IyZmQxOTVkMWRiODgzOWVlNWI3OWZhNmVm NDI5NzljYzBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDEzLTA0LTA3ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBSZW1vdmUgdGhl IGFuZHJvaWQgY29kZSBmcm9tIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDEzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogZG9tL1ZpZXdw b3J0QXJndW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 c2V0Vmlld3BvcnRGZWF0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OnZpZXdwb3J0RXJyb3JNZXNz YWdlVGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6dmlld3BvcnRFcnJvck1lc3NhZ2VMZXZl bCk6CisgICAgICAgICogZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmg6CisgICAgICAgIChXZWJDb3Jl OjpWaWV3cG9ydEFyZ3VtZW50czo6Vmlld3BvcnRBcmd1bWVudHMpOgorICAgICAgICAoVmlld3Bv cnRBcmd1bWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHM6Om9wZXJh dG9yPT0pOgorICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmg6CisgICAgICAgIChX ZWJDb3JlOjpFZGl0aW5nQmVoYXZpb3I6OnNob3VsZE1vdmVDYXJldFRvSG9yaXpvbnRhbEJvdW5k YXJ5V2hlblBhc3RUb3BPckJvdHRvbSk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nQmVoYXZp b3I6OnNob3VsZEFsbG93U3BlbGxpbmdTdWdnZXN0aW9uc1dpdGhvdXRTZWxlY3Rpb24pOgorICAg ICAgICAoV2ViQ29yZTo6RWRpdGluZ0JlaGF2aW9yOjpzaG91bGROYXZpZ2F0ZUJhY2tPbkJhY2tz cGFjZSk6CisgICAgICAgICogZWRpdGluZy9FZGl0aW5nQmVoYXZpb3JUeXBlcy5oOgorICAgICAg ICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl cjo6aGFuZGxlR2VzdHVyZUxvbmdUYXApOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVy OjpoYW5kbGVHZXN0dXJlRm9yVGV4dFNlbGVjdGlvbk9yQ29udGV4dE1lbnUpOgorICAgICAgICAq IHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl OjplZGl0aW5nQmVoYXZpb3JUeXBlRm9yUGxhdGZvcm0pOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAoRm9udENhY2hlKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Z2V0UmVuZGVyU3R5bGVGb3JTdHJpa2Up OgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnRlcm5hbFNldHRpbmdzOjpzZXRFZGl0aW5nQmVoYXZpb3IpOgorCisyMDEzLTA0LTA3 ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKwogICAgICAgICBEbyBu b3QgYWxsb2NhdGUgc3RhdGljIEF0b21pY1N0cmluZ3Mgd2hlbiBzZWFyY2hpbmcgZm9yIGFsdGVy bmF0ZSBmb250IG5hbWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTQxMTAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA2NWRkOThhNmNjZTgyMWI5 MTBkYTkzMzM0YTZlOTJmOWRhYmEzNTQ0Li4zMjA5MzlkMmE2Zjg5OGQxYTVkYWE0YWFmYjg1MWNk NWM2M2QyYTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNTY2LDcgKzU2Niw2IEBAIF9fWk43 V2ViQ29yZTE3TW91c2VSZWxhdGVkRXZlbnQ3b2Zmc2V0WUV2CiBfX1pON1dlYkNvcmUxN1JlZ3Vs YXJFeHByZXNzaW9uQzFFUktOM1dURjZTdHJpbmdFTlMxXzE5VGV4dENhc2VTZW5zaXRpdml0eUVO U18xM011bHRpbGluZU1vZGVFCiBfX1pON1dlYkNvcmUxN1JlZ3VsYXJFeHByZXNzaW9uRDFFdgog X19aTjdXZWJDb3JlMTdTdWJyZXNvdXJjZUxvYWRlcjZjcmVhdGVFUE5TXzVGcmFtZUVQTlNfMTRD YWNoZWRSZXNvdXJjZUVSS05TXzE1UmVzb3VyY2VSZXF1ZXN0RVJLTlNfMjFSZXNvdXJjZUxvYWRl ck9wdGlvbnNFCi1fX1pON1dlYkNvcmUxN1ZpZXdwb3J0QXJndW1lbnRzMTlkZXByZWNhdGVkVGFy Z2V0RFBJRQogX19aTjdXZWJDb3JlMTdjYWNoZURPTVN0cnVjdHVyZUVQTlNfMTdKU0RPTUdsb2Jh bE9iamVjdEVQTjNKU0M5U3RydWN0dXJlRVBLTlMyXzlDbGFzc0luZm9FCiBfX1pON1dlYkNvcmUx N29wZW5UZW1wb3JhcnlGaWxlRVJLTjNXVEY2U3RyaW5nRVJpCiBfX1pON1dlYkNvcmUxN3VzZXJW aXNpYmxlU3RyaW5nRVA1TlNVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3 cG9ydEFyZ3VtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMu Y3BwCmluZGV4IGM5NGFmZWM2MGRkNjdhNmNkZTRjMjJmZWU0MTA1MjQ0MjcyODkwZjUuLmRhOGIz YmZmYmY1ODNkZjE1MThmM2E4ZTA5NjJiMzRhN2VjMzE1NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L1ZpZXdwb3J0QXJndW1lbnRzLmNwcApAQCAtNDIsNyArNDIsOSBAQCB1c2luZyBuYW1lc3BhY2Ug c3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNpZiBQTEFURk9STShCTEFDS0JFUlJZKSB8 fCBQTEFURk9STShFRkwpIHx8IFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oUVQpCiBjb25zdCBm bG9hdCBWaWV3cG9ydEFyZ3VtZW50czo6ZGVwcmVjYXRlZFRhcmdldERQSSA9IDE2MDsKKyNlbmRp ZgogCiBzdGF0aWMgY29uc3QgZmxvYXQmIGNvbXBhcmVJZ25vcmluZ0F1dG8oY29uc3QgZmxvYXQm IHZhbHVlMSwgY29uc3QgZmxvYXQmIHZhbHVlMiwgY29uc3QgZmxvYXQmICgqY29tcGFyZSkgKGNv bnN0IGZsb2F0JiwgY29uc3QgZmxvYXQmKSkKIHsKQEAgLTM4MiwyNSArMzg0LDYgQEAgc3RhdGlj IGZsb2F0IGZpbmRVc2VyU2NhbGFibGVWYWx1ZShjb25zdCBTdHJpbmcmIGtleVN0cmluZywgY29u c3QgU3RyaW5nJiB2YWx1ZVMKICAgICByZXR1cm4gMTsKIH0KIAotc3RhdGljIGZsb2F0IGZpbmRU YXJnZXREZW5zaXR5RFBJVmFsdWUoY29uc3QgU3RyaW5nJiBrZXlTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgdmFsdWVTdHJpbmcsIERvY3VtZW50KiBkb2N1bWVudCkKLXsKLSAgICBpZiAoZXF1YWxJZ25v cmluZ0Nhc2UodmFsdWVTdHJpbmcsICJkZXZpY2UtZHBpIikpCi0gICAgICAgIHJldHVybiBWaWV3 cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VEUEk7Ci0gICAgaWYgKGVxdWFsSWdub3JpbmdDYXNl KHZhbHVlU3RyaW5nLCAibG93LWRwaSIpKQotICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVu dHM6OlZhbHVlTG93RFBJOwotICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZVN0cmluZywg Im1lZGl1bS1kcGkiKSkKLSAgICAgICAgcmV0dXJuIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZU1l ZGl1bURQSTsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWVTdHJpbmcsICJoaWdoLWRw aSIpKQotICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlSGlnaERQSTsKLQot ICAgIGJvb2wgb2s7Ci0gICAgZmxvYXQgdmFsdWUgPSBudW1lcmljUHJlZml4KGtleVN0cmluZywg dmFsdWVTdHJpbmcsIGRvY3VtZW50LCAmb2spOwotICAgIGlmICghb2sgfHwgdmFsdWUgPCA3MCB8 fCB2YWx1ZSA+IDQwMCkKLSAgICAgICAgcmV0dXJuIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1 dG87Ci0KLSAgICByZXR1cm4gdmFsdWU7Ci19Ci0KIHZvaWQgc2V0Vmlld3BvcnRGZWF0dXJlKGNv bnN0IFN0cmluZyYga2V5U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVlU3RyaW5nLCBEb2N1bWVu dCogZG9jdW1lbnQsIHZvaWQqIGRhdGEpCiB7CiAgICAgVmlld3BvcnRBcmd1bWVudHMqIGFyZ3Vt ZW50cyA9IHN0YXRpY19jYXN0PFZpZXdwb3J0QXJndW1lbnRzKj4oZGF0YSk7CkBAIC00MTcsMTAg KzQwMCw3IEBAIHZvaWQgc2V0Vmlld3BvcnRGZWF0dXJlKGNvbnN0IFN0cmluZyYga2V5U3RyaW5n LCBjb25zdCBTdHJpbmcmIHZhbHVlU3RyaW5nLCBEb2N1CiAgICAgICAgIGFyZ3VtZW50cy0+bWF4 Wm9vbSA9IGZpbmRTY2FsZVZhbHVlKGtleVN0cmluZywgdmFsdWVTdHJpbmcsIGRvY3VtZW50KTsK ICAgICBlbHNlIGlmIChrZXlTdHJpbmcgPT0gInVzZXItc2NhbGFibGUiKQogICAgICAgICBhcmd1 bWVudHMtPnVzZXJab29tID0gZmluZFVzZXJTY2FsYWJsZVZhbHVlKGtleVN0cmluZywgdmFsdWVT dHJpbmcsIGRvY3VtZW50KTsKLSAgICBlbHNlIGlmIChrZXlTdHJpbmcgPT0gInRhcmdldC1kZW5z aXR5ZHBpIikgewotICAgICAgICBhcmd1bWVudHMtPmRlcHJlY2F0ZWRUYXJnZXREZW5zaXR5RFBJ ID0gZmluZFRhcmdldERlbnNpdHlEUElWYWx1ZShrZXlTdHJpbmcsIHZhbHVlU3RyaW5nLCBkb2N1 bWVudCk7Ci0gICAgICAgIHJlcG9ydFZpZXdwb3J0V2FybmluZyhkb2N1bWVudCwgVGFyZ2V0RGVu c2l0eURwaVVuc3VwcG9ydGVkLCBTdHJpbmcoKSwgU3RyaW5nKCkpOwotICAgIH0gZWxzZQorICAg IGVsc2UKICAgICAgICAgcmVwb3J0Vmlld3BvcnRXYXJuaW5nKGRvY3VtZW50LCBVbnJlY29nbml6 ZWRWaWV3cG9ydEFyZ3VtZW50S2V5RXJyb3IsIGtleVN0cmluZywgU3RyaW5nKCkpOwogfQogCkBA IC00MzAsOCArNDEwLDcgQEAgc3RhdGljIGNvbnN0IGNoYXIqIHZpZXdwb3J0RXJyb3JNZXNzYWdl VGVtcGxhdGUoVmlld3BvcnRFcnJvckNvZGUgZXJyb3JDb2RlKQogICAgICAgICAiVmlld3BvcnQg YXJndW1lbnQga2V5IFwiJXJlcGxhY2VtZW50MVwiIG5vdCByZWNvZ25pemVkIGFuZCBpZ25vcmVk LiIsCiAgICAgICAgICJWaWV3cG9ydCBhcmd1bWVudCB2YWx1ZSBcIiVyZXBsYWNlbWVudDFcIiBm b3Iga2V5IFwiJXJlcGxhY2VtZW50MlwiIGlzIGludmFsaWQsIGFuZCBoYXMgYmVlbiBpZ25vcmVk LiIsCiAgICAgICAgICJWaWV3cG9ydCBhcmd1bWVudCB2YWx1ZSBcIiVyZXBsYWNlbWVudDFcIiBm b3Iga2V5IFwiJXJlcGxhY2VtZW50MlwiIHdhcyB0cnVuY2F0ZWQgdG8gaXRzIG51bWVyaWMgcHJl Zml4LiIsCi0gICAgICAgICJWaWV3cG9ydCBtYXhpbXVtLXNjYWxlIGNhbm5vdCBiZSBsYXJnZXIg dGhhbiAxMC4wLiBUaGUgbWF4aW11bS1zY2FsZSB3aWxsIGJlIHNldCB0byAxMC4wLiIsCi0gICAg ICAgICJWaWV3cG9ydCB0YXJnZXQtZGVuc2l0eWRwaSBpcyBub3Qgc3VwcG9ydGVkLiIsCisgICAg ICAgICJWaWV3cG9ydCBtYXhpbXVtLXNjYWxlIGNhbm5vdCBiZSBsYXJnZXIgdGhhbiAxMC4wLiBU aGUgbWF4aW11bS1zY2FsZSB3aWxsIGJlIHNldCB0byAxMC4wLiIKICAgICB9OwogCiAgICAgcmV0 dXJuIGVycm9yc1tlcnJvckNvZGVdOwpAQCAtNDQxLDcgKzQyMCw2IEBAIHN0YXRpYyBNZXNzYWdl TGV2ZWwgdmlld3BvcnRFcnJvck1lc3NhZ2VMZXZlbChWaWV3cG9ydEVycm9yQ29kZSBlcnJvckNv ZGUpCiB7CiAgICAgc3dpdGNoIChlcnJvckNvZGUpIHsKICAgICBjYXNlIFRydW5jYXRlZFZpZXdw b3J0QXJndW1lbnRWYWx1ZUVycm9yOgotICAgIGNhc2UgVGFyZ2V0RGVuc2l0eURwaVVuc3VwcG9y dGVkOgogICAgICAgICByZXR1cm4gV2FybmluZ01lc3NhZ2VMZXZlbDsKICAgICBjYXNlIFVucmVj b2duaXplZFZpZXdwb3J0QXJndW1lbnRLZXlFcnJvcjoKICAgICBjYXNlIFVucmVjb2duaXplZFZp ZXdwb3J0QXJndW1lbnRWYWx1ZUVycm9yOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L1ZpZXdwb3J0QXJndW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVu dHMuaAppbmRleCAxN2FmMDVlOTM2ZTRmNTc1NDAxOTVjZWYzNGQzM2Y4NjhkZDg1ZjkxLi41MjVm MzdhNjRkYmE4YTViYzliODdiYTNiZThkM2QxZWFmNDY2YjY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v Vmlld3BvcnRBcmd1bWVudHMuaApAQCAtMzksOCArMzksNyBAQCBlbnVtIFZpZXdwb3J0RXJyb3JD b2RlIHsKICAgICBVbnJlY29nbml6ZWRWaWV3cG9ydEFyZ3VtZW50S2V5RXJyb3IsCiAgICAgVW5y ZWNvZ25pemVkVmlld3BvcnRBcmd1bWVudFZhbHVlRXJyb3IsCiAgICAgVHJ1bmNhdGVkVmlld3Bv cnRBcmd1bWVudFZhbHVlRXJyb3IsCi0gICAgTWF4aW11bVNjYWxlVG9vTGFyZ2VFcnJvciwKLSAg ICBUYXJnZXREZW5zaXR5RHBpVW5zdXBwb3J0ZWQKKyAgICBNYXhpbXVtU2NhbGVUb29MYXJnZUVy cm9yCiB9OwogCiBzdHJ1Y3QgVmlld3BvcnRBdHRyaWJ1dGVzIHsKQEAgLTkzLDcgKzkyLDYgQEAg c3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICAgICAgLCBtYXhab29tKFZhbHVlQXV0bykK ICAgICAgICAgLCB1c2VyWm9vbShWYWx1ZUF1dG8pCiAgICAgICAgICwgb3JpZW50YXRpb24oVmFs dWVBdXRvKQotICAgICAgICAsIGRlcHJlY2F0ZWRUYXJnZXREZW5zaXR5RFBJKFZhbHVlQXV0bykK ICAgICB7CiAgICAgfQogCkBAIC0xMTEsNyArMTA5LDYgQEAgc3RydWN0IFZpZXdwb3J0QXJndW1l bnRzIHsKICAgICBmbG9hdCBtYXhab29tOwogICAgIGZsb2F0IHVzZXJab29tOwogICAgIGZsb2F0 IG9yaWVudGF0aW9uOwotICAgIGZsb2F0IGRlcHJlY2F0ZWRUYXJnZXREZW5zaXR5RFBJOyAvLyBP bmx5IHVzZWQgZm9yIEFuZHJvaWQgV2ViVmlldwogCiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0 IFZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikgY29uc3QKICAgICB7CkBAIC0xMjcsOCArMTI0LDcg QEAgc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICAgICAgICAgICYmIG1pblpvb20gPT0g b3RoZXIubWluWm9vbQogICAgICAgICAgICAgJiYgbWF4Wm9vbSA9PSBvdGhlci5tYXhab29tCiAg ICAgICAgICAgICAmJiB1c2VyWm9vbSA9PSBvdGhlci51c2VyWm9vbQotICAgICAgICAgICAgJiYg b3JpZW50YXRpb24gPT0gb3RoZXIub3JpZW50YXRpb24KLSAgICAgICAgICAgICYmIGRlcHJlY2F0 ZWRUYXJnZXREZW5zaXR5RFBJID09IG90aGVyLmRlcHJlY2F0ZWRUYXJnZXREZW5zaXR5RFBJOwor ICAgICAgICAgICAgJiYgb3JpZW50YXRpb24gPT0gb3RoZXIub3JpZW50YXRpb247CiAgICAgfQog CiAgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikgY29u c3QKQEAgLTEzNiw5ICsxMzIsMTEgQEAgc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICAg ICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOwogICAgIH0KIAorI2lmIFBMQVRGT1JNKEJMQUNL QkVSUlkpIHx8IFBMQVRGT1JNKEVGTCkgfHwgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShRVCkK ICAgICAvLyBGSVhNRTogV2UncmUgZ29pbmcgdG8ga2VlcCB0aGlzIGNvbnN0YW50IGFyb3VuZCB1 bnRpbCBhbGwgZW1iZWRkZXJzCiAgICAgLy8gcmVmYWN0b3IgdGhlaXIgY29kZSB0byBubyBsb25n ZXIgbmVlZCBpdC4KICAgICBzdGF0aWMgY29uc3QgZmxvYXQgZGVwcmVjYXRlZFRhcmdldERQSTsK KyNlbmRpZgogfTsKIAogVmlld3BvcnRBdHRyaWJ1dGVzIGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0 ZXMoVmlld3BvcnRBcmd1bWVudHMgYXJncywgaW50IGRlc2t0b3BXaWR0aCwgaW50IGRldmljZVdp ZHRoLCBpbnQgZGV2aWNlSGVpZ2h0LCBmbG9hdCBkZXZpY2VQaXhlbFJhdGlvLCBJbnRTaXplIHZp c2libGVWaWV3cG9ydCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRp bmdCZWhhdmlvci5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaApp bmRleCA1ZTdiYTUwOGI3NjcwMjFkZjkyNzY2NmMzM2VmNmZjZWU3MDI4NzNlLi5jZmY2Y2FiYThi ZDhiOTNhYjI0NDBiZTZmYTE4ODEyZTdmNWY5ZjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdGluZ0JlaGF2aW9yLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIC8vIGNvbnRl bnQgb24gTWFjLgogICAgIGJvb2wgc2hvdWxkTW92ZUNhcmV0VG9Ib3Jpem9udGFsQm91bmRhcnlX aGVuUGFzdFRvcE9yQm90dG9tKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBtX3R5cGUg IT0gRWRpdGluZ1dpbmRvd3NCZWhhdmlvciAmJiBtX3R5cGUgIT0gRWRpdGluZ0FuZHJvaWRCZWhh dmlvcjsKKyAgICAgICAgcmV0dXJuIG1fdHlwZSAhPSBFZGl0aW5nV2luZG93c0JlaGF2aW9yOwog ICAgIH0KIAogICAgIC8vIE9uIFdpbmRvd3MsIHNlbGVjdGlvbnMgc2hvdWxkIGFsd2F5cyBiZSBj b25zaWRlcmVkIGFzIGRpcmVjdGlvbmFsLCByZWdhcmRsZXNzIGlmIGl0IGlzCkBAIC02NiwxMyAr NjYsMTMgQEAgcHVibGljOgogICAgIC8vIE9uIExpbnV4LCBzaG91bGQgYmUgYWJsZSB0byBnZXQg YW5kIGluc2VydCBzcGVsbGluZyBzdWdnZXN0aW9ucyB3aXRob3V0IHNlbGVjdGluZyB0aGUgbWlz c3BlbGxlZCB3b3JkLgogICAgIGJvb2wgc2hvdWxkQWxsb3dTcGVsbGluZ1N1Z2dlc3Rpb25zV2l0 aG91dFNlbGVjdGlvbigpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gbV90eXBlID09IEVk aXRpbmdVbml4QmVoYXZpb3IgfHwgbV90eXBlID09IEVkaXRpbmdBbmRyb2lkQmVoYXZpb3I7Cisg ICAgICAgIHJldHVybiBtX3R5cGUgPT0gRWRpdGluZ1VuaXhCZWhhdmlvcjsKICAgICB9CiAgICAg CiAgICAgLy8gT24gTWFjIGFuZCBXaW5kb3dzLCBwcmVzc2luZyBiYWNrc3BhY2UgKHdoZW4gaXQg aXNuJ3QgaGFuZGxlZCBvdGhlcndpc2UpIHNob3VsZCBuYXZpZ2F0ZSBiYWNrLgogICAgIGJvb2wg c2hvdWxkTmF2aWdhdGVCYWNrT25CYWNrc3BhY2UoKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0 dXJuIG1fdHlwZSAhPSBFZGl0aW5nVW5peEJlaGF2aW9yICYmIG1fdHlwZSAhPSBFZGl0aW5nQW5k cm9pZEJlaGF2aW9yOworICAgICAgICByZXR1cm4gbV90eXBlICE9IEVkaXRpbmdVbml4QmVoYXZp b3I7CiAgICAgfQogCiAgICAgLy8gT24gTWFjLCBzZWxlY3RpbmcgYmFja3dhcmRzIGJ5IHdvcmQv bGluZSBmcm9tIHRoZSBtaWRkbGUgb2YgYSB3b3JkL2xpbmUsIGFuZCB0aGVuIGdvaW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvclR5cGVzLmggYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvclR5cGVzLmgKaW5kZXggYmUxOGUy NjllZTc5NWM0ZTlkODI4NzA2NTY3NGFhM2FjYmE2MGU2MS4uMTEzNDVkYTVkNDc4OGJkYTIxOTdi YzA3MWU1OTJiMDZmNDE3NTcwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9F ZGl0aW5nQmVoYXZpb3JUeXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGlu Z0JlaGF2aW9yVHlwZXMuaApAQCAtMzksOCArMzksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBl bnVtIEVkaXRpbmdCZWhhdmlvclR5cGUgewogICAgIEVkaXRpbmdNYWNCZWhhdmlvciwKICAgICBF ZGl0aW5nV2luZG93c0JlaGF2aW9yLAotICAgIEVkaXRpbmdVbml4QmVoYXZpb3IsCi0gICAgRWRp dGluZ0FuZHJvaWRCZWhhdmlvcgorICAgIEVkaXRpbmdVbml4QmVoYXZpb3IKIH07CiAKIH0gLy8g V2ViQ29yZSBuYW1lc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA5 OGU4YjNmZjk0OGMwYjQ3NGE5ODdlZDkwMTgzMjUwYjI5NTQ1OTQ2Li4yZDdlNDJlNTQwOTk0ZWVk MWY3MzVkY2NiN2ExYjk3MzJmMTk1YWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC0yNjc1LDI1ICsyNjc1LDE1IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVHZXN0 dXJlTG9uZ1ByZXNzKGNvbnN0IFBsYXRmb3JtR2VzdHVyZUV2ZW50JiBnZXN0dXJlRXZlCiAKIGJv b2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVHZXN0dXJlTG9uZ1RhcChjb25zdCBQbGF0Zm9ybUdlc3R1 cmVFdmVudCYgZ2VzdHVyZUV2ZW50KQogewotI2lmIEVOQUJMRShDT05URVhUX01FTlVTKSAmJiAh T1MoQU5EUk9JRCkKKyNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICBpZiAoIW1fZGlkTG9u Z1ByZXNzSW52b2tlQ29udGV4dE1lbnUpCiAgICAgICAgIHJldHVybiBzZW5kQ29udGV4dE1lbnVF dmVudEZvckdlc3R1cmUoZ2VzdHVyZUV2ZW50KTsKLSNlbmRpZgorI2VuZGlmIC8vIEVOQUJMRShD T05URVhUX01FTlVTKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBFdmVudEhhbmRsZXI6 OmhhbmRsZUdlc3R1cmVGb3JUZXh0U2VsZWN0aW9uT3JDb250ZXh0TWVudShjb25zdCBQbGF0Zm9y bUdlc3R1cmVFdmVudCYgZ2VzdHVyZUV2ZW50KQogewotI2lmIE9TKEFORFJPSUQpCi0gICAgSW50 UG9pbnQgaGl0VGVzdFBvaW50ID0gbV9mcmFtZS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKGdl c3R1cmVFdmVudC5wb3NpdGlvbigpKTsKLSAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IGhpdFRl c3RSZXN1bHRBdFBvaW50KGhpdFRlc3RQb2ludCwgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwg SGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSk7Ci0gICAgTm9kZSogaW5uZXJOb2RlID0gcmVzdWx0LnRh cmdldE5vZGUoKTsKLSAgICBpZiAoIXJlc3VsdC5pc0xpdmVMaW5rKCkgJiYgaW5uZXJOb2RlICYm IChpbm5lck5vZGUtPmlzQ29udGVudEVkaXRhYmxlKCkgfHwgaW5uZXJOb2RlLT5pc1RleHROb2Rl KCkpKSB7Ci0gICAgICAgIHNlbGVjdENsb3Nlc3RXb3JkRnJvbUhpdFRlc3RSZXN1bHQocmVzdWx0 LCBEb250QXBwZW5kVHJhaWxpbmdXaGl0ZXNwYWNlKTsKLSAgICAgICAgaWYgKG1fZnJhbWUtPnNl bGVjdGlvbigpLT5pc1JhbmdlKCkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0j ZW5kaWYKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICBtX2RpZExvbmdQcmVzc0ludm9r ZUNvbnRleHRNZW51ID0gKGdlc3R1cmVFdmVudC50eXBlKCkgPT0gUGxhdGZvcm1FdmVudDo6R2Vz dHVyZUxvbmdQcmVzcyk7CiAgICAgcmV0dXJuIHNlbmRDb250ZXh0TWVudUV2ZW50Rm9yR2VzdHVy ZShnZXN0dXJlRXZlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAppbmRleCAxODc2ZWIzNDkx Y2JhMzkzYWI3NDZhYTVjYmI5NTIyOWJjYzM4ZDVjLi4yM2M4NTU4ZjUwY2Q1YTc1NDI4ZmE4ZjNk ZDVhOWU3OWEwNTA5NzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAtMTEyLDggKzEx Miw3IEBAIGJvb2wgU2V0dGluZ3M6OmdTaG91bGRSZXNwZWN0UHJpb3JpdHlJbkNTU0F0dHJpYnV0 ZVNldHRlcnMgPSBmYWxzZTsKIC8vIE5PVEVzCiAvLyAgMSkgRWRpdGluZ01hY0JlaGF2aW9yIGNv bXByaXNlcyBUaWdlciwgTGVvcGFyZCwgU25vd0xlb3BhcmQgYW5kIGlPUyBidWlsZHMsIGFzIHdl bGwgYXMgUXRXZWJLaXQgd2hlbiBidWlsdCBvbiBNYWM7CiAvLyAgMikgRWRpdGluZ1dpbmRvd3NC ZWhhdmlvciBjb21wcmlzZXMgV2luMzIgYW5kIFdpbkNFIGJ1aWxkcywgYXMgd2VsbCBhcyBRdFdl YktpdCBhbmQgQ2hyb21pdW0gd2hlbiBidWlsdCBvbiBXaW5kb3dzOwotLy8gIDMpIEVkaXRpbmdV bml4QmVoYXZpb3IgY29tcHJpc2VzIGFsbCB1bml4LWJhc2VkIHN5c3RlbXMsIGJ1dCBEYXJ3aW4v TWFjT1MvQW5kcm9pZCAoYW5kIHRoZW4gYWJ1c2luZyB0aGUgdGVybWlub2xvZ3kpOwotLy8gIDQp IEVkaXRpbmdBbmRyb2lkQmVoYXZpb3IgY29tcHJpc2VzIEFuZHJvaWQgYnVpbGRzLgorLy8gIDMp IEVkaXRpbmdVbml4QmVoYXZpb3IgY29tcHJpc2VzIGFsbCB1bml4LWJhc2VkIHN5c3RlbXMsIGJ1 dCBEYXJ3aW4vTWFjT1MgKGFuZCB0aGVuIGFidXNpbmcgdGhlIHRlcm1pbm9sb2d5KTsKIC8vIDk5 KSBNYWNFZGl0aW5nQmVoYXZpb3IgaXMgdXNlZCBhcyBhIGZhbGxiYWNrLgogc3RhdGljIEVkaXRp bmdCZWhhdmlvclR5cGUgZWRpdGluZ0JlaGF2aW9yVHlwZUZvclBsYXRmb3JtKCkKIHsKQEAgLTEy Miw4ICsxMjEsNiBAQCBzdGF0aWMgRWRpdGluZ0JlaGF2aW9yVHlwZSBlZGl0aW5nQmVoYXZpb3JU eXBlRm9yUGxhdGZvcm0oKQogICAgIEVkaXRpbmdNYWNCZWhhdmlvcgogI2VsaWYgT1MoV0lORE9X UykKICAgICBFZGl0aW5nV2luZG93c0JlaGF2aW9yCi0jZWxpZiBPUyhBTkRST0lEKQotICAgIEVk aXRpbmdBbmRyb2lkQmVoYXZpb3IKICNlbGlmIE9TKFVOSVgpCiAgICAgRWRpdGluZ1VuaXhCZWhh dmlvcgogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hl LmgKaW5kZXggZjkwOGU4YzQwMGNjMjYxNGQ0ZDFkNzcwNTIzZTRhNzVlNmMwMGRjZC4uNDU0Y2Vm MjM5YzZjMjhmODdjNGM4ZTk2MTRiNjcxNmUxNzdmMGVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKQEAgLTE1NSw3ICsxNTUsNyBAQCBwcml2YXRl OgogICAgIC8vIERvbid0IHB1cmdlIGlmIHRoaXMgY291bnQgaXMgPiAwOwogICAgIGludCBtX3B1 cmdlUHJldmVudENvdW50OwogCi0jaWYgUExBVEZPUk0oTUFDKSB8fCBPUyhBTkRST0lEKQorI2lm IFBMQVRGT1JNKE1BQykKICAgICBmcmllbmQgY2xhc3MgQ29tcGxleFRleHRDb250cm9sbGVyOwog I2VuZGlmCiAgICAgZnJpZW5kIGNsYXNzIFNpbXBsZUZvbnREYXRhOyAvLyBGb3IgZ2V0Q2FjaGVk Rm9udERhdGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enou Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRm b3JtRGF0YUhhcmZCdXp6LmNwcAppbmRleCA2MGQ3OTJhMDNjODBiZTRlOWIwZTY0ODI2YmRiYjZl ODFiNzM2NDgzLi41YWQ1ZWM0ODM0MTBkMDRjYzM0YWFlZDhlMTc2YzA2MGQxMzU5ZjI5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxh dGZvcm1EYXRhSGFyZkJ1enouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2hhcmZidXp6L0ZvbnRQbGF0Zm9ybURhdGFIYXJmQnV6ei5jcHAKQEAgLTI2OSwxNiArMjY5 LDEyIEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6Z2V0UmVuZGVyU3R5bGVGb3JTdHJpa2UoY29u c3QgY2hhciogZm9udCwgaW50IHNpemVBbmRTdHlsCiB7CiAgICAgV2ViS2l0OjpXZWJGb250UmVu ZGVyU3R5bGUgc3R5bGU7CiAKLSNpZiBPUyhBTkRST0lEKQotICAgIHN0eWxlLnNldERlZmF1bHRz KCk7Ci0jZWxzZQogICAgIGlmICghZm9udCB8fCAhKmZvbnQpCiAgICAgICAgIHN0eWxlLnNldERl ZmF1bHRzKCk7IC8vIEl0J3MgcHJvYmFibHkgYSB3ZWJmb250LiBUYWtlIHRoZSBzeXN0ZW0gZGVm YXVsdHMuCiAgICAgZWxzZSBpZiAoV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5zYW5kYm94 U3VwcG9ydCgpKQogICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPnNhbmRib3hT dXBwb3J0KCktPmdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGZvbnQsIHNpemVBbmRTdHlsZSwgJnN0 eWxlKTsKICAgICBlbHNlCiAgICAgICAgIFdlYktpdDo6V2ViRm9udEluZm86OnJlbmRlclN0eWxl Rm9yU3RyaWtlKGZvbnQsIHNpemVBbmRTdHlsZSwgJnN0eWxlKTsKLSNlbmRpZgogCiAgICAgc3R5 bGUudG9Gb250UmVuZGVyU3R5bGUoJm1fc3R5bGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAKaW5kZXggNmMzZDc4OGRlNmJjMjdjZThmNDZmYjU4OWNl YzI2YTBjNmFiNzkxZi4uYWMwN2VmY2UzOWY2OGVkZDkyZWNhODBhYzFlNTZlYzU2NTViY2Y2YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCkBAIC0zODcs OCArMzg3LDYgQEAgdm9pZCBJbnRlcm5hbFNldHRpbmdzOjpzZXRFZGl0aW5nQmVoYXZpb3IoY29u c3QgU3RyaW5nJiBlZGl0aW5nQmVoYXZpb3IsIEV4Y2VwdGkKICAgICAgICAgc2V0dGluZ3MoKS0+ c2V0RWRpdGluZ0JlaGF2aW9yVHlwZShFZGl0aW5nTWFjQmVoYXZpb3IpOwogICAgIGVsc2UgaWYg KGVxdWFsSWdub3JpbmdDYXNlKGVkaXRpbmdCZWhhdmlvciwgInVuaXgiKSkKICAgICAgICAgc2V0 dGluZ3MoKS0+c2V0RWRpdGluZ0JlaGF2aW9yVHlwZShFZGl0aW5nVW5peEJlaGF2aW9yKTsKLSAg ICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShlZGl0aW5nQmVoYXZpb3IsICJhbmRyb2lkIikp Ci0gICAgICAgIHNldHRpbmdzKCktPnNldEVkaXRpbmdCZWhhdmlvclR5cGUoRWRpdGluZ0FuZHJv aWRCZWhhdmlvcik7CiAgICAgZWxzZQogICAgICAgICBlYyA9IFNZTlRBWF9FUlI7CiB9Cg==