132912 2014-05-14 09:50:05 -0700 Implement NSSharingServiceDelegate method "transitionImageForShareItem" 2014-05-14 13:12:52 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson simon.fraser thorton zalan oldest_to_newest 1009274 0 beidson 2014-05-14 09:50:05 -0700 Implement NSSharingServiceDelegate method "transitionImageForShareItem" <rdar://problem/16878020> 1009308 1 231461 beidson 2014-05-14 11:44:46 -0700 Created attachment 231461 Patch v1 1009311 2 231461 thorton 2014-05-14 11:52:29 -0700 Comment on attachment 231461 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=231461&action=review > Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm:443 > + buffer->context()->translate(-FloatSize(rect.x(), rect.y())); -toFloatSize(rect.location()) > Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm:444 > + frameView->paintContents(buffer->context(), IntRect(rect)); is this truncated FloatRect->IntRect right? 1009316 3 231462 beidson 2014-05-14 12:36:50 -0700 Created attachment 231462 Patch v2 - Review feedback, build fix, and add "paint selection only" mode as discussed on IRC. 1009319 4 beidson 2014-05-14 13:12:52 -0700 http://trac.webkit.org/changeset/168859 231461 2014-05-14 11:44:46 -0700 2014-05-14 12:36:50 -0700 Patch v1 patch text/plain 7638 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NzQ4NjBjLi5kMTNiZDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTQtMDUtMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEltcGxlbWVudCBOU1NoYXJpbmdTZXJ2aWNlRGVsZWdhdGUgbWV0aG9kICJ0cmFuc2l0aW9u SW1hZ2VGb3JTaGFyZUl0ZW0iCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg3ODAyMD4gYW5k IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmlu OgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxNC0w NS0xNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVzZSByZWZlcmVuY2VzIGluc3RlYWQgb2YgcG9pbnRlcnMgd2l0aCBSZXNvdXJjZUxvYWRU aW1pbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IDA4ODhjZjMuLjc0OGZiNDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCkBAIC0zMjcwLDcgKzMyNzAsMTEgQEAgX19aTks3V2ViQ29yZTlGcmFtZVZp ZXczNHNldFdhbnRzTGF5ZXJGb3JCb3R0b21PdmVySGFuZ0FyZWFFYgogI2VuZGlmCiAKICNpZiBF TkFCTEUoU0VSVklDRV9DT05UUk9MUykKK19fWk43V2ViQ29yZTExSW1hZ2VCdWZmZXJDMUVSS05T XzlGbG9hdFNpemVFZk5TXzEwQ29sb3JTcGFjZUVOU18xM1JlbmRlcmluZ01vZGVFUmIKK19fWk43 V2ViQ29yZTExSW1hZ2VCdWZmZXJEMUV2CiBfX1pON1dlYkNvcmUyNWF0dHJpYnV0ZWRTdHJpbmdG cm9tUmFuZ2VFUk5TXzVSYW5nZUUKK19fWk5LN1dlYkNvcmUxMUltYWdlQnVmZmVyN2NvbnRleHRF dgorX19aTks3V2ViQ29yZTExSW1hZ2VCdWZmZXI5Y29weUltYWdlRU5TXzE2QmFja2luZ1N0b3Jl Q29weUVOU18xM1NjYWxlQmVoYXZpb3JFCiBfX1pOSzdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0aW9u MTBmaXJzdFJhbmdlRXYKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNmM3NWMxNy4uYWU1ODA4YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtOTY3 LDggKzk2Nyw4IEBACiAJCTIyNzc3NzYwMTM0NURFQTkwMDhFQTQ1NSAvKiBJbnNwZWN0b3JGb3J3 YXJkaW5nLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAy Mjc3Nzc1RjEzNDVERUE5MDA4RUE0NTUgLyogSW5zcGVjdG9yRm9yd2FyZGluZy5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTIyOEMyODQ1MTBEODI1 MDAwMDlEMEQwRSAvKiBTY3JpcHRXcmFwcGFibGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDIyOEMyODQ0MTBEODI1MDAwMDlEMEQwRSAvKiBTY3JpcHRX cmFwcGFibGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwogCQkyMjkyQjI3QzEzNTY2Njk0MDBDRjExRUYgLyogSW1hZ2VCdWZmZXJEYXRhQ0cuY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjI5MkIyN0IxMzU2 NjY5NDAwQ0YxMUVGIC8qIEltYWdlQnVmZmVyRGF0YUNHLmNwcCAqLzsgfTsKLQkJMjJCRDlGN0Yx MzUzNjI1QzAwOUJEMTAyIC8qIEltYWdlQnVmZmVyRGF0YS5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjJCRDlGN0QxMzUzNjI1QzAwOUJEMTAyIC8qIElt YWdlQnVmZmVyRGF0YS5oICovOyB9OwotCQkyMkJEOUY4MTEzNTM2NEZFMDA5QkQxMDIgLyogSW1h Z2VCdWZmZXJEYXRhQ0cuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDIyQkQ5RjgwMTM1MzY0RkUwMDlCRDEwMiAvKiBJbWFnZUJ1ZmZlckRhdGFDRy5oICov OyB9OworCQkyMkJEOUY3RjEzNTM2MjVDMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJEYXRhLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyMkJEOUY3RDEzNTM2 MjVDMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJEYXRhLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJMjJCRDlGODExMzUzNjRGRTAwOUJEMTAyIC8qIElt YWdlQnVmZmVyRGF0YUNHLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAyMkJEOUY4MDEzNTM2NEZFMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJEYXRhQ0cuaCAq Lzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkyNEQ5MTI5 MTEzQ0E5NTFFMDBEMjE5MTUgLyogSlNTVkdBbHRHbHlwaERlZkVsZW1lbnQuY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjREOTEyOEYxM0NBOTUxRTAw RDIxOTE1IC8qIEpTU1ZHQWx0R2x5cGhEZWZFbGVtZW50LmNwcCAqLzsgfTsKIAkJMjREOTEyOTIx M0NBOTUxRTAwRDIxOTE1IC8qIEpTU1ZHQWx0R2x5cGhEZWZFbGVtZW50LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyNEQ5MTI5MDEzQ0E5NTFFMDBEMjE5 MTUgLyogSlNTVkdBbHRHbHlwaERlZkVsZW1lbnQuaCAqLzsgfTsKIAkJMjREOTEyOTUxM0NBOTU2 MTAwRDIxOTE1IC8qIEpTU1ZHQWx0R2x5cGhJdGVtRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyNEQ5MTI5MzEzQ0E5NTYxMDBEMjE5MTUg LyogSlNTVkdBbHRHbHlwaEl0ZW1FbGVtZW50LmNwcCAqLzsgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRl eCA0NDM0YzgzLi45NzZjZWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIw MTQtMDUtMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIElt cGxlbWVudCBOU1NoYXJpbmdTZXJ2aWNlRGVsZWdhdGUgbWV0aG9kICJ0cmFuc2l0aW9uSW1hZ2VG b3JTaGFyZUl0ZW0iCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg3ODAyMD4gYW5kIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pc2MvV2ViU2hhcmluZ1NlcnZp Y2VQaWNrZXJDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJTaGFyaW5nU2VydmljZVBpY2tl ckNvbnRyb2xsZXIgc2hhcmluZ1NlcnZpY2U6dHJhbnNpdGlvbkltYWdlRm9yU2hhcmVJdGVtOmNv bnRlbnRSZWN0Ol0pOgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVD bGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5t bToKKyAgICAgICAgKFdlYkNvbnRleHRNZW51Q2xpZW50OjpyZW5kZXJlZEltYWdlRm9yQ29udHJv bGxlZEltYWdlKTogUGFpbnQgdGhlIGVudGlyZSBjb250ZW50IHJlY3QgZm9yIHRoZSBjb250cm9s bGVkIGltYWdlCisgICAgICAgICAgaW50byBhbiBJbWFnZUJ1ZmZlciwgdGhlbiByZXR1cm4gdGhl IHJlc3VsdGluZyBOU0ltYWdlLgorCisyMDE0LTA1LTE0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KKwogICAgICAgICBzb3VyY2VGcmFtZU9uU2NyZWVuRm9yU2hhcmVJdGVtOiBj YW4gYmUgb2ZmIGJ5IGEgcGl4ZWwKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2ODc4MDIwPiBh bmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjkxMQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29u dHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNr ZXJDb250cm9sbGVyLm1tCmluZGV4IDhiNmI1ZDcuLmQyMWJjMzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9s bGVyLm1tCkBAIC0yMTIsNiArMjEyLDE0IEBAIC0gKE5TUmVjdClzaGFyaW5nU2VydmljZTooTlNT aGFyaW5nU2VydmljZSAqKXNoYXJpbmdTZXJ2aWNlIHNvdXJjZUZyYW1lT25TY3JlZW5GCiAgICAg cmV0dXJuIF9tZW51Q2xpZW50LT5zY3JlZW5SZWN0Rm9ySGl0VGVzdE5vZGUoKTsKIH0KIAorLSAo TlNJbWFnZSAqKXNoYXJpbmdTZXJ2aWNlOihOU1NoYXJpbmdTZXJ2aWNlICopc2hhcmluZ1NlcnZp Y2UgdHJhbnNpdGlvbkltYWdlRm9yU2hhcmVJdGVtOihpZCA8TlNQYXN0ZWJvYXJkV3JpdGluZz4p aXRlbSBjb250ZW50UmVjdDooTlNSZWN0ICopY29udGVudFJlY3QKK3sKKyAgICBpZiAoIV9tZW51 Q2xpZW50KQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgcmV0dXJuIF9tZW51Q2xpZW50LT5y ZW5kZXJlZEltYWdlRm9yQ29udHJvbGxlZEltYWdlKCk7Cit9CisKIC0gKE5TV2luZG93ICopc2hh cmluZ1NlcnZpY2U6KE5TU2hhcmluZ1NlcnZpY2UgKilzaGFyaW5nU2VydmljZSBzb3VyY2VXaW5k b3dGb3JTaGFyZUl0ZW1zOihOU0FycmF5ICopaXRlbXMgc2hhcmluZ0NvbnRlbnRTY29wZTooTlNT aGFyaW5nQ29udGVudFNjb3BlICopc2hhcmluZ0NvbnRlbnRTY29wZQogewogICAgIHJldHVybiBb X21lbnVDbGllbnQtPndlYlZpZXcoKSB3aW5kb3ddOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuaCBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmgKaW5kZXggM2MyMzQ5 ZS4uMTcwYjRkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViQ29udGV4dE1lbnVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5oCkBAIC01OSw2ICs1OSw3IEBAIHB1YmxpYzoKIAog I2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIHZvaWQgY2xlYXJTaGFyaW5nU2Vydmlj ZVBpY2tlckNvbnRyb2xsZXIoKTsKKyAgICBOU0ltYWdlICpyZW5kZXJlZEltYWdlRm9yQ29udHJv bGxlZEltYWdlKCkgY29uc3Q7CiAjZW5kaWYKIAogICAgIFdlYlZpZXcgKndlYlZpZXcoKSB7IHJl dHVybiBtX3dlYlZpZXc7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW0KaW5kZXggNDM4MDE4NC4uNzVlZWY3NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1l bnVDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQubW0KQEAgLTQ5LDYgKzQ5LDggQEAKICNpbXBvcnQgPFdlYkNvcmUvRG9j dW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJhbWUuaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJh bWVWaWV3Lmg+CisjaW1wb3J0IDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dC5oPgorI2ltcG9ydCA8 V2ViQ29yZS9JbWFnZUJ1ZmZlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRTdHJpbmdz Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyQm94 Lmg+CkBAIC00MTMsNiArNDE1LDM5IEBAIE5TUmVjdCBXZWJDb250ZXh0TWVudUNsaWVudDo6c2Ny ZWVuUmVjdEZvckhpdFRlc3ROb2RlKCkgY29uc3QKICAgICByZXR1cm4gZnJhbWVWaWV3LT5jb250 ZW50c1RvU2NyZWVuKGludFJlY3QpOwogfQogCitOU0ltYWdlICpXZWJDb250ZXh0TWVudUNsaWVu dDo6cmVuZGVyZWRJbWFnZUZvckNvbnRyb2xsZWRJbWFnZSgpIGNvbnN0Cit7CisgICAgUGFnZSog cGFnZSA9IFttX3dlYlZpZXcgcGFnZV07CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4g bmlsOworCisgICAgTm9kZSogbm9kZSA9IHBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLmNv bnRleHQoKS5oaXRUZXN0UmVzdWx0KCkuaW5uZXJOb2RlKCk7CisgICAgaWYgKCFub2RlKQorICAg ICAgICByZXR1cm4gbmlsOworCisgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBub2RlLT5kb2N1 bWVudCgpLnZpZXcoKTsKKyAgICBpZiAoIWZyYW1lVmlldykgeworICAgICAgICAvLyBUaGlzIG1l dGhvZCBzaG91bGRuJ3QgYmUgY2FsbGVkIGluIGNhc2VzIHdoZXJlIHRoZSBjb250cm9sbGVkIG5v ZGUgaXNuJ3QgaW4gYSByZW5kZXJlZCB2aWV3LgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICB9CisKKyAgICBGbG9hdFJlY3QgcmVjdDsKKyAg ICBpZiAoIWNsaWVudEZsb2F0UmVjdEZvck5vZGUoKm5vZGUsIHJlY3QpKQorICAgICAgICByZXR1 cm4gbmlsOworCisgICAgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBidWZmZXIgPSBJbWFn ZUJ1ZmZlcjo6Y3JlYXRlKHJlY3Quc2l6ZSgpKTsKKyAgICBpZiAoIWJ1ZmZlcikKKyAgICAgICAg cmV0dXJuIG5pbDsKKworICAgIGJ1ZmZlci0+Y29udGV4dCgpLT50cmFuc2xhdGUoLUZsb2F0U2l6 ZShyZWN0LngoKSwgcmVjdC55KCkpKTsKKyAgICBmcmFtZVZpZXctPnBhaW50Q29udGVudHMoYnVm ZmVyLT5jb250ZXh0KCksIEludFJlY3QocmVjdCkpOworCisgICAgUmVmUHRyPEltYWdlPiBpbWFn ZSA9IGJ1ZmZlci0+Y29weUltYWdlKERvbnRDb3B5QmFja2luZ1N0b3JlKTsKKyAgICByZXR1cm4g W1tpbWFnZS0+Z2V0TlNJbWFnZSgpIHJldGFpbl0gYXV0b3JlbGVhc2VdOworfQorCisKIE5TTWVu dSAqV2ViQ29udGV4dE1lbnVDbGllbnQ6OmNvbnRleHRNZW51Rm9yRXZlbnQoTlNFdmVudCAqZXZl bnQsIE5TVmlldyAqdmlldykKIHsKICAgICBQYWdlKiBwYWdlID0gW21fd2ViVmlldyBwYWdlXTsK 231462 2014-05-14 12:36:50 -0700 2014-05-14 12:43:06 -0700 Patch v2 - Review feedback, build fix, and add "paint selection only" mode as discussed on IRC. patch text/plain 8579 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NzQ4NjBjLi5kMTNiZDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTQtMDUtMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEltcGxlbWVudCBOU1NoYXJpbmdTZXJ2aWNlRGVsZWdhdGUgbWV0aG9kICJ0cmFuc2l0aW9u SW1hZ2VGb3JTaGFyZUl0ZW0iCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg3ODAyMD4gYW5k IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmlu OgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxNC0w NS0xNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVzZSByZWZlcmVuY2VzIGluc3RlYWQgb2YgcG9pbnRlcnMgd2l0aCBSZXNvdXJjZUxvYWRU aW1pbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IDA4ODhjZjMuLjljMzE2MDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCkBAIC0zMjcwLDggKzMyNzAsMTQgQEAgX19aTks3V2ViQ29yZTlGcmFtZVZp ZXczNHNldFdhbnRzTGF5ZXJGb3JCb3R0b21PdmVySGFuZ0FyZWFFYgogI2VuZGlmCiAKICNpZiBF TkFCTEUoU0VSVklDRV9DT05UUk9MUykKK19fWk43V2ViQ29yZTExSW1hZ2VCdWZmZXJDMUVSS05T XzlGbG9hdFNpemVFZk5TXzEwQ29sb3JTcGFjZUVOU18xM1JlbmRlcmluZ01vZGVFUmIKK19fWk43 V2ViQ29yZTExSW1hZ2VCdWZmZXJEMUV2CiBfX1pON1dlYkNvcmUyNWF0dHJpYnV0ZWRTdHJpbmdG cm9tUmFuZ2VFUk5TXzVSYW5nZUUKK19fWk5LN1dlYkNvcmUxMUltYWdlQnVmZmVyN2NvbnRleHRF dgorX19aTks3V2ViQ29yZTExSW1hZ2VCdWZmZXI5Y29weUltYWdlRU5TXzE2QmFja2luZ1N0b3Jl Q29weUVOU18xM1NjYWxlQmVoYXZpb3JFCiBfX1pOSzdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0aW9u MTBmaXJzdFJhbmdlRXYKK19fWk43V2ViQ29yZThQb3NpdGlvbkMxRU4zV1RGMTBQYXNzUmVmUHRy SU5TXzROb2RlRUVFTlMwXzEwQW5jaG9yVHlwZUUKK19fWk43V2ViQ29yZTVSYW5nZTZjcmVhdGVF Uk5TXzhEb2N1bWVudEVSS05TXzhQb3NpdGlvbkVTNV8KICNlbmRpZgogCiAjaWYgRU5BQkxFKFNQ RUVDSF9TWU5USEVTSVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggNmM3NWMxNy4uYWU1ODA4YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtOTY3LDggKzk2Nyw4 IEBACiAJCTIyNzc3NzYwMTM0NURFQTkwMDhFQTQ1NSAvKiBJbnNwZWN0b3JGb3J3YXJkaW5nLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyMjc3Nzc1RjEz NDVERUE5MDA4RUE0NTUgLyogSW5zcGVjdG9yRm9yd2FyZGluZy5oICovOyBzZXR0aW5ncyA9IHtB VFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTIyOEMyODQ1MTBEODI1MDAwMDlEMEQw RSAvKiBTY3JpcHRXcmFwcGFibGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDIyOEMyODQ0MTBEODI1MDAwMDlEMEQwRSAvKiBTY3JpcHRXcmFwcGFibGUu aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkyMjky QjI3QzEzNTY2Njk0MDBDRjExRUYgLyogSW1hZ2VCdWZmZXJEYXRhQ0cuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjI5MkIyN0IxMzU2NjY5NDAwQ0Yx MUVGIC8qIEltYWdlQnVmZmVyRGF0YUNHLmNwcCAqLzsgfTsKLQkJMjJCRDlGN0YxMzUzNjI1QzAw OUJEMTAyIC8qIEltYWdlQnVmZmVyRGF0YS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjJCRDlGN0QxMzUzNjI1QzAwOUJEMTAyIC8qIEltYWdlQnVmZmVy RGF0YS5oICovOyB9OwotCQkyMkJEOUY4MTEzNTM2NEZFMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJE YXRhQ0cuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDIy QkQ5RjgwMTM1MzY0RkUwMDlCRDEwMiAvKiBJbWFnZUJ1ZmZlckRhdGFDRy5oICovOyB9OworCQky MkJEOUY3RjEzNTM2MjVDMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJEYXRhLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyMkJEOUY3RDEzNTM2MjVDMDA5QkQx MDIgLyogSW1hZ2VCdWZmZXJEYXRhLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKKwkJMjJCRDlGODExMzUzNjRGRTAwOUJEMTAyIC8qIEltYWdlQnVmZmVy RGF0YUNHLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAy MkJEOUY4MDEzNTM2NEZFMDA5QkQxMDIgLyogSW1hZ2VCdWZmZXJEYXRhQ0cuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkyNEQ5MTI5MTEzQ0E5NTFF MDBEMjE5MTUgLyogSlNTVkdBbHRHbHlwaERlZkVsZW1lbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjREOTEyOEYxM0NBOTUxRTAwRDIxOTE1IC8q IEpTU1ZHQWx0R2x5cGhEZWZFbGVtZW50LmNwcCAqLzsgfTsKIAkJMjREOTEyOTIxM0NBOTUxRTAw RDIxOTE1IC8qIEpTU1ZHQWx0R2x5cGhEZWZFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyNEQ5MTI5MDEzQ0E5NTFFMDBEMjE5MTUgLyogSlNT VkdBbHRHbHlwaERlZkVsZW1lbnQuaCAqLzsgfTsKIAkJMjREOTEyOTUxM0NBOTU2MTAwRDIxOTE1 IC8qIEpTU1ZHQWx0R2x5cGhJdGVtRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyNEQ5MTI5MzEzQ0E5NTYxMDBEMjE5MTUgLyogSlNTVkdB bHRHbHlwaEl0ZW1FbGVtZW50LmNwcCAqLzsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA0NDM0Yzgz Li44OTZiODExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTQtMDUtMTQg IEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIEltcGxlbWVudCBO U1NoYXJpbmdTZXJ2aWNlRGVsZWdhdGUgbWV0aG9kICJ0cmFuc2l0aW9uSW1hZ2VGb3JTaGFyZUl0 ZW0iCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg3ODAyMD4gYW5kIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJD b250cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xs ZXIgc2hhcmluZ1NlcnZpY2U6dHJhbnNpdGlvbkltYWdlRm9yU2hhcmVJdGVtOmNvbnRlbnRSZWN0 Ol0pOgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuaDoK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbToKKyAgICAg ICAgKFdlYkNvbnRleHRNZW51Q2xpZW50OjpyZW5kZXJlZEltYWdlRm9yQ29udHJvbGxlZEltYWdl KTogUGFpbnQgdGhlIGVudGlyZSBjb250ZW50IHJlY3QgZm9yIHRoZSBjb250cm9sbGVkIGltYWdl CisgICAgICAgICAgaW50byBhbiBJbWFnZUJ1ZmZlciwgdGhlbiByZXR1cm4gdGhlIHJlc3VsdGlu ZyBOU0ltYWdlLiBUaGlzIG9ubHkgcGFpbnRzIHRoZSBpbWFnZSBpdHNlbGYgYW5kIG5vdCBhbnkK KyAgICAgICAgICBvdmVybGFwcGluZyBjb250ZW50IGJ5IHNldHRpbmcgdGhlIHNlbGVjdGlvbiBh bmQgYXBwcm9wcmlhdGUgcGFpbnRpbmcgbW9kZS4KKworMjAxNC0wNS0xNCAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgc291cmNlRnJhbWVPblNjcmVlbkZvclNo YXJlSXRlbTogY2FuIGJlIG9mZiBieSBhIHBpeGVsCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x Njg3ODAyMD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5 MTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJTaGFyaW5nU2Vydmlj ZVBpY2tlckNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdT ZXJ2aWNlUGlja2VyQ29udHJvbGxlci5tbQppbmRleCA4YjZiNWQ3Li5kMjFiYzM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJv bGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlj a2VyQ29udHJvbGxlci5tbQpAQCAtMjEyLDYgKzIxMiwxNCBAQCAtIChOU1JlY3Qpc2hhcmluZ1Nl cnZpY2U6KE5TU2hhcmluZ1NlcnZpY2UgKilzaGFyaW5nU2VydmljZSBzb3VyY2VGcmFtZU9uU2Ny ZWVuRgogICAgIHJldHVybiBfbWVudUNsaWVudC0+c2NyZWVuUmVjdEZvckhpdFRlc3ROb2RlKCk7 CiB9CiAKKy0gKE5TSW1hZ2UgKilzaGFyaW5nU2VydmljZTooTlNTaGFyaW5nU2VydmljZSAqKXNo YXJpbmdTZXJ2aWNlIHRyYW5zaXRpb25JbWFnZUZvclNoYXJlSXRlbTooaWQgPE5TUGFzdGVib2Fy ZFdyaXRpbmc+KWl0ZW0gY29udGVudFJlY3Q6KE5TUmVjdCAqKWNvbnRlbnRSZWN0Cit7CisgICAg aWYgKCFfbWVudUNsaWVudCkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBfbWVu dUNsaWVudC0+cmVuZGVyZWRJbWFnZUZvckNvbnRyb2xsZWRJbWFnZSgpOworfQorCiAtIChOU1dp bmRvdyAqKXNoYXJpbmdTZXJ2aWNlOihOU1NoYXJpbmdTZXJ2aWNlICopc2hhcmluZ1NlcnZpY2Ug c291cmNlV2luZG93Rm9yU2hhcmVJdGVtczooTlNBcnJheSAqKWl0ZW1zIHNoYXJpbmdDb250ZW50 U2NvcGU6KE5TU2hhcmluZ0NvbnRlbnRTY29wZSAqKXNoYXJpbmdDb250ZW50U2NvcGUKIHsKICAg ICByZXR1cm4gW19tZW51Q2xpZW50LT53ZWJWaWV3KCkgd2luZG93XTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmggYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5oCmlu ZGV4IDNjMjM0OWUuLjE3MGI0ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuaApAQCAtNTksNiArNTksNyBAQCBw dWJsaWM6CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAgICB2b2lkIGNsZWFyU2hh cmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyKCk7CisgICAgTlNJbWFnZSAqcmVuZGVyZWRJbWFn ZUZvckNvbnRyb2xsZWRJbWFnZSgpIGNvbnN0OwogI2VuZGlmCiAKICAgICBXZWJWaWV3ICp3ZWJW aWV3KCkgeyByZXR1cm4gbV93ZWJWaWV3OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCmluZGV4IDQzODAxODQu Ljg4NzMxZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkNvbnRleHRNZW51Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCkBAIC00OSw2ICs0OSw4IEBACiAjaW1wb3J0IDxX ZWJDb3JlL0RvY3VtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0ZyYW1lVmlldy5oPgorI2ltcG9ydCA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHQuaD4K KyNpbXBvcnQgPFdlYkNvcmUvSW1hZ2VCdWZmZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvTG9jYWxp emVkU3RyaW5ncy5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L1JlbmRlckJveC5oPgpAQCAtNDEzLDYgKzQxNSw1MSBAQCBOU1JlY3QgV2ViQ29udGV4dE1lbnVD bGllbnQ6OnNjcmVlblJlY3RGb3JIaXRUZXN0Tm9kZSgpIGNvbnN0CiAgICAgcmV0dXJuIGZyYW1l Vmlldy0+Y29udGVudHNUb1NjcmVlbihpbnRSZWN0KTsKIH0KIAorI2lmIEVOQUJMRShTRVJWSUNF X0NPTlRST0xTKQorTlNJbWFnZSAqV2ViQ29udGV4dE1lbnVDbGllbnQ6OnJlbmRlcmVkSW1hZ2VG b3JDb250cm9sbGVkSW1hZ2UoKSBjb25zdAoreworICAgIFBhZ2UqIHBhZ2UgPSBbbV93ZWJWaWV3 IHBhZ2VdOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIE5vZGUq IG5vZGUgPSBwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS5jb250ZXh0KCkuaGl0VGVzdFJl c3VsdCgpLmlubmVyTm9kZSgpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIG5pbDsK KworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbm9kZS0+ZG9jdW1lbnQoKS52aWV3KCk7Cisg ICAgaWYgKCFmcmFtZVZpZXcpIHsKKyAgICAgICAgLy8gVGhpcyBtZXRob2Qgc2hvdWxkbid0IGJl IGNhbGxlZCBpbiBjYXNlcyB3aGVyZSB0aGUgY29udHJvbGxlZCBub2RlIGlzbid0IGluIGEgcmVu ZGVyZWQgdmlldy4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVy biBuaWw7CisgICAgfQorCisgICAgRmxvYXRSZWN0IHJlY3Q7CisgICAgaWYgKCFjbGllbnRGbG9h dFJlY3RGb3JOb2RlKCpub2RlLCByZWN0KSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHN0 ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gYnVmZmVyID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZShy ZWN0LnNpemUoKSk7CisgICAgaWYgKCFidWZmZXIpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAg ICBWaXNpYmxlU2VsZWN0aW9uIG9sZFNlbGVjdGlvbiA9IGZyYW1lVmlldy0+ZnJhbWUoKS5zZWxl Y3Rpb24oKS5zZWxlY3Rpb24oKTsKKyAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gUmFuZ2U6OmNy ZWF0ZShub2RlLT5kb2N1bWVudCgpLCBQb3NpdGlvbihub2RlLCBQb3NpdGlvbjo6UG9zaXRpb25J c0JlZm9yZUFuY2hvciksIFBvc2l0aW9uKG5vZGUsIFBvc2l0aW9uOjpQb3NpdGlvbklzQWZ0ZXJB bmNob3IpKTsKKyAgICBmcmFtZVZpZXctPmZyYW1lKCkuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9u KFZpc2libGVTZWxlY3Rpb24ocmFuZ2UuZ2V0KCkpLCBGcmFtZVNlbGVjdGlvbjo6RG9Ob3RTZXRG b2N1cyk7CisKKyAgICBQYWludEJlaGF2aW9yIG9sZFBhaW50QmVoYXZpb3IgPSBmcmFtZVZpZXct PnBhaW50QmVoYXZpb3IoKTsKKyAgICBmcmFtZVZpZXctPnNldFBhaW50QmVoYXZpb3IoUGFpbnRC ZWhhdmlvclNlbGVjdGlvbk9ubHkpOworCisgICAgYnVmZmVyLT5jb250ZXh0KCktPnRyYW5zbGF0 ZSgtdG9GbG9hdFNpemUocmVjdC5sb2NhdGlvbigpKSk7CisgICAgZnJhbWVWaWV3LT5wYWludENv bnRlbnRzKGJ1ZmZlci0+Y29udGV4dCgpLCByb3VuZGVkSW50UmVjdChyZWN0KSk7CisKKyAgICBm cmFtZVZpZXctPmZyYW1lKCkuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKG9sZFNlbGVjdGlvbik7 CisgICAgZnJhbWVWaWV3LT5zZXRQYWludEJlaGF2aW9yKG9sZFBhaW50QmVoYXZpb3IpOworCisg ICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IGJ1ZmZlci0+Y29weUltYWdlKERvbnRDb3B5QmFja2lu Z1N0b3JlKTsKKyAgICByZXR1cm4gW1tpbWFnZS0+Z2V0TlNJbWFnZSgpIHJldGFpbl0gYXV0b3Jl bGVhc2VdOworfQorI2VuZGlmCisKKwogTlNNZW51ICpXZWJDb250ZXh0TWVudUNsaWVudDo6Y29u dGV4dE1lbnVGb3JFdmVudChOU0V2ZW50ICpldmVudCwgTlNWaWV3ICp2aWV3KQogewogICAgIFBh Z2UqIHBhZ2UgPSBbbV93ZWJWaWV3IHBhZ2VdOwo=