118168 2013-06-27 22:06:46 -0700 Avoid duplicating hostWindow() call in ScrollView.cpp 2013-06-28 04:14:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 sh53.lee webkit-unassigned cdumez commit-queue oldest_to_newest 904445 0 sh53.lee 2013-06-27 22:06:46 -0700 Patch follows. 904449 1 205664 sh53.lee 2013-06-27 22:14:32 -0700 Created attachment 205664 Patch 904450 2 205664 gyuyoung.kim 2013-06-27 22:19:13 -0700 Comment on attachment 205664 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205664&action=review > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). Please read "ChangeLog files" in https://www.webkit.org/coding/contributing.html 904457 3 205667 sh53.lee 2013-06-27 22:56:56 -0700 Created attachment 205667 Patch 904470 4 205667 cdumez 2013-06-27 23:55:08 -0700 Comment on attachment 205667 Patch There are several other similar cases in ScrollView.cpp, why not fix them as well? 904477 5 205675 sh53.lee 2013-06-28 00:43:35 -0700 Created attachment 205675 Patch 904511 6 sh53.lee 2013-06-28 02:25:33 -0700 (In reply to comment #4) > (From update of attachment 205667 [details]) > There are several other similar cases in ScrollView.cpp, why not fix them as well? OK. I had fixed it. 904519 7 205675 cdumez 2013-06-28 02:41:43 -0700 Comment on attachment 205675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205675&action=review Looks fine. r=me with nit. > Source/WebCore/ChangeLog:8 > + Remove a redundant call in ScrollView.cpp nit: "redundant hostWindow() calls". 904531 8 205687 sh53.lee 2013-06-28 03:11:33 -0700 Created attachment 205687 Patch for landing 904553 9 205687 commit-queue 2013-06-28 04:14:55 -0700 Comment on attachment 205687 Patch for landing Clearing flags on attachment: 205687 Committed r152161: <http://trac.webkit.org/changeset/152161> 904554 10 commit-queue 2013-06-28 04:14:58 -0700 All reviewed patches have been landed. Closing bug. 205664 2013-06-27 22:14:32 -0700 2013-06-27 22:56:48 -0700 Patch bug-118168-20130628141234.patch text/plain 5929 sh53.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYzNjc2ZDM4YmE0OTAy ZDkwMDdiZjM0MmZiZmU1OWI1ZjhkOTFiYi4uYmFmNjA4MmEwMmZmYmQ0ZGRjZGMzZGE3N2ZkYTU5 YjY2ZmRmOTA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA2LTI3ICBTYW5n aHl1cCBMZWUgIDxzaDUzLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBBdm9pZCBkdXBsaWNh dGluZyBob3N0V2luZG93KCkgY2FsbCBpbiBTY3JvbGxWaWV3CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgxNjgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6c2Nyb2xsQ29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cmVw YWludENvbnRlbnRSZWN0YW5nbGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dXBk YXRlT3ZlcmhhbmdBcmVhcyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjphZGRQYW5T Y3JvbGxJY29uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnJlbW92ZVBhblNjcm9s bEljb24pOgorCiAyMDEzLTA2LTI3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBVc2UgRGVmZXJyYWJsZU9uZVNob3RUaW1lciBmb3IgZGVsZXRpbmcgZGVjb2Rl ZCBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IDMxM2UyNjc4 N2VkMmNkZDNkOGI5NDliMDZkMjQwYzgzNTljMzg3OWIuLjQyMzRhNTA2ZDI2NDZhNDlhMDQzMjBh YzczZTI4NTk5Y2E3OWMxMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3Bw CkBAIC02NTgsNyArNjU4LDggQEAgSW50UmVjdCBTY3JvbGxWaWV3OjpyZWN0VG9Db3B5T25TY3Jv bGwoKSBjb25zdAogCiB2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzKGNvbnN0IEludFNp emUmIHNjcm9sbERlbHRhKQogewotICAgIGlmICghaG9zdFdpbmRvdygpKQorICAgIEhvc3RXaW5k b3cqIHdpbmRvdyA9IGhvc3RXaW5kb3coKTsKKyAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gU2luY2Ugc2Nyb2xsaW5nIGlzIGRvdWJsZSBidWZmZXJlZCwgd2Ugd2ls bCBiZSBibGl0dGluZyB0aGUgc2Nyb2xsIHZpZXcncyBpbnRlcnNlY3Rpb24KQEAgLTY2OSw3ICs2 NzAsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzKGNvbnN0IEludFNpemUmIHNj cm9sbERlbHRhKQogICAgIHVwZGF0ZVJlY3QuaW50ZXJzZWN0KHNjcm9sbFZpZXdSZWN0KTsKIAog ICAgIC8vIEludmFsaWRhdGUgdGhlIHJvb3QgdmlldyAobm90IHRoZSBiYWNraW5nIHN0b3JlKS4K LSAgICBob3N0V2luZG93KCktPmludmFsaWRhdGVSb290Vmlldyh1cGRhdGVSZWN0LCBmYWxzZSAv KmltbWVkaWF0ZSovKTsKKyAgICB3aW5kb3ctPmludmFsaWRhdGVSb290Vmlldyh1cGRhdGVSZWN0 LCBmYWxzZSAvKmltbWVkaWF0ZSovKTsKIAogICAgIGlmIChtX2RyYXdQYW5TY3JvbGxJY29uKSB7 CiAgICAgICAgIC8vIEZJWE1FOiB0aGUgcGFuIGljb24gaXMgYnJva2VuIHdoZW4gYWNjZWxlcmF0 ZWQgY29tcG9zaXRpbmcgaXMgb24sIHNpbmNlIGl0IHdpbGwgZHJhdyB1bmRlciB0aGUgY29tcG9z aXRpbmcgbGF5ZXJzLgpAQCAtNjc4LDcgKzY3OSw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2Nyb2xs Q29udGVudHMoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEpCiAgICAgICAgIEludFBvaW50IHBh bkljb25EaXJ0eVNxdWFyZUxvY2F0aW9uID0gSW50UG9pbnQobV9wYW5TY3JvbGxJY29uUG9pbnQu eCgpIC0gKHBhbkljb25EaXJ0eVNxdWFyZVNpemVMZW5ndGggLyAyKSwgbV9wYW5TY3JvbGxJY29u UG9pbnQueSgpIC0gKHBhbkljb25EaXJ0eVNxdWFyZVNpemVMZW5ndGggLyAyKSk7CiAgICAgICAg IEludFJlY3QgcGFuU2Nyb2xsSWNvbkRpcnR5UmVjdCA9IEludFJlY3QocGFuSWNvbkRpcnR5U3F1 YXJlTG9jYXRpb24sIEludFNpemUocGFuSWNvbkRpcnR5U3F1YXJlU2l6ZUxlbmd0aCwgcGFuSWNv bkRpcnR5U3F1YXJlU2l6ZUxlbmd0aCkpOwogICAgICAgICBwYW5TY3JvbGxJY29uRGlydHlSZWN0 LmludGVyc2VjdChjbGlwUmVjdCk7Ci0gICAgICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0ZUNv bnRlbnRzQW5kUm9vdFZpZXcocGFuU2Nyb2xsSWNvbkRpcnR5UmVjdCwgZmFsc2UgLyppbW1lZGlh dGUqLyk7CisgICAgICAgIHdpbmRvdy0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcocGFu U2Nyb2xsSWNvbkRpcnR5UmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CiAgICAgfQogCiAgICAg aWYgKGNhbkJsaXRPblNjcm9sbCgpKSB7IC8vIFRoZSBtYWluIGZyYW1lIGNhbiBqdXN0IGJsaXQg dGhlIFdlYlZpZXcgd2luZG93CkBAIC02OTgsNyArNjk5LDcgQEAgdm9pZCBTY3JvbGxWaWV3Ojpz Y3JvbGxDb250ZW50cyhjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKICAgICBmcmFtZVJlY3Rz Q2hhbmdlZCgpOwogCiAgICAgLy8gTm93IGJsaXQgdGhlIGJhY2tpbmdzdG9yZSBpbnRvIHRoZSB3 aW5kb3cgd2hpY2ggc2hvdWxkIGJlIHZlcnkgZmFzdC4KLSAgICBob3N0V2luZG93KCktPmludmFs aWRhdGVSb290VmlldyhJbnRSZWN0KCksIHRydWUpOworICAgIHdpbmRvdy0+aW52YWxpZGF0ZVJv b3RWaWV3KEludFJlY3QoKSwgdHJ1ZSk7CiB9CiAKIGJvb2wgU2Nyb2xsVmlldzo6c2Nyb2xsQ29u dGVudHNGYXN0UGF0aChjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgY29uc3QgSW50UmVjdCYg cmVjdFRvU2Nyb2xsLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKQEAgLTk2Nyw4ICs5NjgsOCBA QCB2b2lkIFNjcm9sbFZpZXc6OnJlcGFpbnRDb250ZW50UmVjdGFuZ2xlKGNvbnN0IEludFJlY3Qm IHJlY3QsIGJvb2wgbm93KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKGhvc3RX aW5kb3coKSkKLSAgICAgICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290 Vmlldyhjb250ZW50c1RvV2luZG93KHBhaW50UmVjdCksIG5vdyAvKmltbWVkaWF0ZSovKTsKKyAg ICBpZiAoSG9zdFdpbmRvdyogd2luZG93ID0gaG9zdFdpbmRvdygpKQorICAgICAgICB3aW5kb3ct PmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KGNvbnRlbnRzVG9XaW5kb3cocGFpbnRSZWN0 KSwgbm93IC8qaW1tZWRpYXRlKi8pOwogfQogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OnNjcm9sbENv cm5lclJlY3QoKSBjb25zdApAQCAtMTE2MSwxNiArMTE2MiwxNyBAQCB2b2lkIFNjcm9sbFZpZXc6 OmNhbGN1bGF0ZU92ZXJoYW5nQXJlYXNGb3JQYWludGluZyhJbnRSZWN0JiBob3Jpem9udGFsT3Zl cmhhbmdSZQogCiB2b2lkIFNjcm9sbFZpZXc6OnVwZGF0ZU92ZXJoYW5nQXJlYXMoKQogewotICAg IGlmICghaG9zdFdpbmRvdygpKQorICAgIEhvc3RXaW5kb3cqIHdpbmRvdyA9IGhvc3RXaW5kb3co KTsKKyAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW50UmVjdCBob3Jp em9udGFsT3ZlcmhhbmdSZWN0OwogICAgIEludFJlY3QgdmVydGljYWxPdmVyaGFuZ1JlY3Q7CiAg ICAgY2FsY3VsYXRlT3ZlcmhhbmdBcmVhc0ZvclBhaW50aW5nKGhvcml6b250YWxPdmVyaGFuZ1Jl Y3QsIHZlcnRpY2FsT3ZlcmhhbmdSZWN0KTsKICAgICBpZiAoIWhvcml6b250YWxPdmVyaGFuZ1Jl Y3QuaXNFbXB0eSgpKQotICAgICAgICBob3N0V2luZG93KCktPmludmFsaWRhdGVDb250ZW50c0Fu ZFJvb3RWaWV3KGhvcml6b250YWxPdmVyaGFuZ1JlY3QsIGZhbHNlIC8qaW1tZWRpYXRlKi8pOwor ICAgICAgICB3aW5kb3ctPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KGhvcml6b250YWxP dmVyaGFuZ1JlY3QsIGZhbHNlIC8qaW1tZWRpYXRlKi8pOwogICAgIGlmICghdmVydGljYWxPdmVy aGFuZ1JlY3QuaXNFbXB0eSgpKQotICAgICAgICBob3N0V2luZG93KCktPmludmFsaWRhdGVDb250 ZW50c0FuZFJvb3RWaWV3KHZlcnRpY2FsT3ZlcmhhbmdSZWN0LCBmYWxzZSAvKmltbWVkaWF0ZSov KTsKKyAgICAgICAgd2luZG93LT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmlldyh2ZXJ0aWNh bE92ZXJoYW5nUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CiB9CiAKIHZvaWQgU2Nyb2xsVmll dzo6cGFpbnRPdmVyaGFuZ0FyZWFzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50 UmVjdCYgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdCwgY29uc3QgSW50UmVjdCYgdmVydGljYWxPdmVy aGFuZ1JlY3QsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKQEAgLTEzMDgsMTkgKzEzMTAsMjEg QEAgYm9vbCBTY3JvbGxWaWV3Ojppc09mZnNjcmVlbigpIGNvbnN0CiAKIHZvaWQgU2Nyb2xsVmll dzo6YWRkUGFuU2Nyb2xsSWNvbihjb25zdCBJbnRQb2ludCYgaWNvblBvc2l0aW9uKQogewotICAg IGlmICghaG9zdFdpbmRvdygpKQorICAgIEhvc3RXaW5kb3cqIHdpbmRvdyA9IGhvc3RXaW5kb3co KTsKKyAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuOwogICAgIG1fZHJhd1BhblNjcm9s bEljb24gPSB0cnVlOyAgICAKICAgICBtX3BhblNjcm9sbEljb25Qb2ludCA9IEludFBvaW50KGlj b25Qb3NpdGlvbi54KCkgLSBwYW5JY29uU2l6ZUxlbmd0aCAvIDIgLCBpY29uUG9zaXRpb24ueSgp IC0gcGFuSWNvblNpemVMZW5ndGggLyAyKSA7Ci0gICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRl Q29udGVudHNBbmRSb290VmlldyhJbnRSZWN0KG1fcGFuU2Nyb2xsSWNvblBvaW50LCBJbnRTaXpl KHBhbkljb25TaXplTGVuZ3RoLCBwYW5JY29uU2l6ZUxlbmd0aCkpLCB0cnVlIC8qaW1tZWRpYXRl Ki8pOworICAgIHdpbmRvdy0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcoSW50UmVjdCht X3BhblNjcm9sbEljb25Qb2ludCwgSW50U2l6ZShwYW5JY29uU2l6ZUxlbmd0aCwgcGFuSWNvblNp emVMZW5ndGgpKSwgdHJ1ZSAvKmltbWVkaWF0ZSovKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3Ojpy ZW1vdmVQYW5TY3JvbGxJY29uKCkKIHsKLSAgICBpZiAoIWhvc3RXaW5kb3coKSkKKyAgICBIb3N0 V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CisgICAgaWYgKCF3aW5kb3cpCiAgICAgICAg IHJldHVybjsKICAgICBtX2RyYXdQYW5TY3JvbGxJY29uID0gZmFsc2U7IAotICAgIGhvc3RXaW5k b3coKS0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcoSW50UmVjdChtX3BhblNjcm9sbElj b25Qb2ludCwgSW50U2l6ZShwYW5JY29uU2l6ZUxlbmd0aCwgcGFuSWNvblNpemVMZW5ndGgpKSwg dHJ1ZSAvKmltbWVkaWF0ZSovKTsKKyAgICB3aW5kb3ctPmludmFsaWRhdGVDb250ZW50c0FuZFJv b3RWaWV3KEludFJlY3QobV9wYW5TY3JvbGxJY29uUG9pbnQsIEludFNpemUocGFuSWNvblNpemVM ZW5ndGgsIHBhbkljb25TaXplTGVuZ3RoKSksIHRydWUgLyppbW1lZGlhdGUqLyk7CiB9CiAKIHZv aWQgU2Nyb2xsVmlldzo6c2V0U2Nyb2xsT3JpZ2luKGNvbnN0IEludFBvaW50JiBvcmlnaW4sIGJv b2wgdXBkYXRlUG9zaXRpb25BdEFsbCwgYm9vbCB1cGRhdGVQb3NpdGlvblN5bmNocm9ub3VzbHkp Cg== 205667 2013-06-27 22:56:56 -0700 2013-06-28 00:43:28 -0700 Patch bug-118168-20130628145457.patch text/plain 1540 sh53.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYzNjc2ZDM4YmE0OTAy ZDkwMDdiZjM0MmZiZmU1OWI1ZjhkOTFiYi4uMmRiZWE4OGE1OGE1NWYzNDc0Yjg4ZDY2OGNiYWJj OGJhMmU2ZjdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA2LTI3ICBTYW5n aHl1cCBMZWUgIDxzaDUzLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBBdm9pZCBkdXBsaWNh dGluZyBob3N0V2luZG93KCkgY2FsbCBpbiBTY3JvbGxWaWV3OjpyZXBhaW50Q29udGVudFJlY3Rh bmdsZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgxNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgYSByZWR1bmRhbnQgY2FsbCBpbiBTY3JvbGxWaWV3OjpyZXBhaW50Q29udGVudFJlY3Rh bmdsZSgpLgorCisgICAgICAgIE5vIGZ1bmN0aW9uIGNoYW5nZSwgbm8gdGVzdHMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZp ZXc6OnJlcGFpbnRDb250ZW50UmVjdGFuZ2xlKToKKwogMjAxMy0wNi0yNyAgQW50dGkgS29pdmlz dG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIERlZmVycmFibGVPbmVTaG90VGlt ZXIgZm9yIGRlbGV0aW5nIGRlY29kZWQgZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmNwcAppbmRleCAzMTNlMjY3ODdlZDJjZGQzZDhiOTQ5YjA2ZDI0MGM4MzU5YzM4NzliLi5j NjMzMjQ4MDBiYTI4Y2M5MGVjMjY0YzFiNjEwZjhkZTI0ZmMzM2E4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtOTY3LDggKzk2Nyw4IEBAIHZvaWQgU2Nyb2xsVmll dzo6cmVwYWludENvbnRlbnRSZWN0YW5nbGUoY29uc3QgSW50UmVjdCYgcmVjdCwgYm9vbCBub3cp CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoaG9zdFdpbmRvdygpKQotICAgICAg ICBob3N0V2luZG93KCktPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KGNvbnRlbnRzVG9X aW5kb3cocGFpbnRSZWN0KSwgbm93IC8qaW1tZWRpYXRlKi8pOworICAgIGlmIChIb3N0V2luZG93 KiB3aW5kb3cgPSBob3N0V2luZG93KCkpCisgICAgICAgIHdpbmRvdy0+aW52YWxpZGF0ZUNvbnRl bnRzQW5kUm9vdFZpZXcoY29udGVudHNUb1dpbmRvdyhwYWludFJlY3QpLCBub3cgLyppbW1lZGlh dGUqLyk7CiB9CiAKIEludFJlY3QgU2Nyb2xsVmlldzo6c2Nyb2xsQ29ybmVyUmVjdCgpIGNvbnN0 Cg== 205675 2013-06-28 00:43:35 -0700 2013-06-28 03:11:23 -0700 Patch bug-118168-20130628164136.patch text/plain 6998 sh53.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYzNjc2ZDM4YmE0OTAy ZDkwMDdiZjM0MmZiZmU1OWI1ZjhkOTFiYi4uMDY1Mjk1M2FiNzM0MGZhNTQzYjFjYzdkYzU0ODQ3 MTNjZDEzMTk2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTI4ICBTYW5n aHl1cCBMZWUgIDxzaDUzLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBBdm9pZCBkdXBsaWNh dGluZyBob3N0V2luZG93KCkgY2FsbCBpbiBTY3JvbGxWaWV3LmNwcAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MTY4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGEgcmVkdW5kYW50IGNhbGwg aW4gU2Nyb2xsVmlldy5jcHAKKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2Nyb2xsQ29udGVudHMpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1NjcmVlbik6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxWaWV3OjpzY3JlZW5Ub0NvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnJlcGFpbnRDb250ZW50UmVjdGFuZ2xlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnVwZGF0ZU92ZXJoYW5nQXJlYXMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmll dzo6YWRkUGFuU2Nyb2xsSWNvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpyZW1v dmVQYW5TY3JvbGxJY29uKToKKwogMjAxMy0wNi0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBh cHBsZS5jb20+CiAKICAgICAgICAgVXNlIERlZmVycmFibGVPbmVTaG90VGltZXIgZm9yIGRlbGV0 aW5nIGRlY29kZWQgZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRl eCAzMTNlMjY3ODdlZDJjZGQzZDhiOTQ5YjA2ZDI0MGM4MzU5YzM4NzliLi41ZGI1YWMwNGFmYzRh MDA1YzBjYjYwNzIxMjZhNWI1YjNmMGI1NzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmNwcApAQCAtNjU4LDcgKzY1OCw4IEBAIEludFJlY3QgU2Nyb2xsVmlldzo6cmVjdFRv Q29weU9uU2Nyb2xsKCkgY29uc3QKIAogdm9pZCBTY3JvbGxWaWV3OjpzY3JvbGxDb250ZW50cyhj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKIHsKLSAgICBpZiAoIWhvc3RXaW5kb3coKSkKKyAg ICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CisgICAgaWYgKCF3aW5kb3cpCiAg ICAgICAgIHJldHVybjsKIAogICAgIC8vIFNpbmNlIHNjcm9sbGluZyBpcyBkb3VibGUgYnVmZmVy ZWQsIHdlIHdpbGwgYmUgYmxpdHRpbmcgdGhlIHNjcm9sbCB2aWV3J3MgaW50ZXJzZWN0aW9uCkBA IC02NjksNyArNjcwLDcgQEAgdm9pZCBTY3JvbGxWaWV3OjpzY3JvbGxDb250ZW50cyhjb25zdCBJ bnRTaXplJiBzY3JvbGxEZWx0YSkKICAgICB1cGRhdGVSZWN0LmludGVyc2VjdChzY3JvbGxWaWV3 UmVjdCk7CiAKICAgICAvLyBJbnZhbGlkYXRlIHRoZSByb290IHZpZXcgKG5vdCB0aGUgYmFja2lu ZyBzdG9yZSkuCi0gICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlUm9vdFZpZXcodXBkYXRlUmVj dCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CisgICAgd2luZG93LT5pbnZhbGlkYXRlUm9vdFZpZXco dXBkYXRlUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CiAKICAgICBpZiAobV9kcmF3UGFuU2Ny b2xsSWNvbikgewogICAgICAgICAvLyBGSVhNRTogdGhlIHBhbiBpY29uIGlzIGJyb2tlbiB3aGVu IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGlzIG9uLCBzaW5jZSBpdCB3aWxsIGRyYXcgdW5kZXIg dGhlIGNvbXBvc2l0aW5nIGxheWVycy4KQEAgLTY3OCw3ICs2NzksNyBAQCB2b2lkIFNjcm9sbFZp ZXc6OnNjcm9sbENvbnRlbnRzKGNvbnN0IEludFNpemUmIHNjcm9sbERlbHRhKQogICAgICAgICBJ bnRQb2ludCBwYW5JY29uRGlydHlTcXVhcmVMb2NhdGlvbiA9IEludFBvaW50KG1fcGFuU2Nyb2xs SWNvblBvaW50LngoKSAtIChwYW5JY29uRGlydHlTcXVhcmVTaXplTGVuZ3RoIC8gMiksIG1fcGFu U2Nyb2xsSWNvblBvaW50LnkoKSAtIChwYW5JY29uRGlydHlTcXVhcmVTaXplTGVuZ3RoIC8gMikp OwogICAgICAgICBJbnRSZWN0IHBhblNjcm9sbEljb25EaXJ0eVJlY3QgPSBJbnRSZWN0KHBhbklj b25EaXJ0eVNxdWFyZUxvY2F0aW9uLCBJbnRTaXplKHBhbkljb25EaXJ0eVNxdWFyZVNpemVMZW5n dGgsIHBhbkljb25EaXJ0eVNxdWFyZVNpemVMZW5ndGgpKTsKICAgICAgICAgcGFuU2Nyb2xsSWNv bkRpcnR5UmVjdC5pbnRlcnNlY3QoY2xpcFJlY3QpOwotICAgICAgICBob3N0V2luZG93KCktPmlu dmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KHBhblNjcm9sbEljb25EaXJ0eVJlY3QsIGZhbHNl IC8qaW1tZWRpYXRlKi8pOworICAgICAgICB3aW5kb3ctPmludmFsaWRhdGVDb250ZW50c0FuZFJv b3RWaWV3KHBhblNjcm9sbEljb25EaXJ0eVJlY3QsIGZhbHNlIC8qaW1tZWRpYXRlKi8pOwogICAg IH0KIAogICAgIGlmIChjYW5CbGl0T25TY3JvbGwoKSkgeyAvLyBUaGUgbWFpbiBmcmFtZSBjYW4g anVzdCBibGl0IHRoZSBXZWJWaWV3IHdpbmRvdwpAQCAtNjk4LDcgKzY5OSw3IEBAIHZvaWQgU2Ny b2xsVmlldzo6c2Nyb2xsQ29udGVudHMoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEpCiAgICAg ZnJhbWVSZWN0c0NoYW5nZWQoKTsKIAogICAgIC8vIE5vdyBibGl0IHRoZSBiYWNraW5nc3RvcmUg aW50byB0aGUgd2luZG93IHdoaWNoIHNob3VsZCBiZSB2ZXJ5IGZhc3QuCi0gICAgaG9zdFdpbmRv dygpLT5pbnZhbGlkYXRlUm9vdFZpZXcoSW50UmVjdCgpLCB0cnVlKTsKKyAgICB3aW5kb3ctPmlu dmFsaWRhdGVSb290VmlldyhJbnRSZWN0KCksIHRydWUpOwogfQogCiBib29sIFNjcm9sbFZpZXc6 OnNjcm9sbENvbnRlbnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0 IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpCkBAIC03ODQs MjAgKzc4NSwyMiBAQCBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9XaW5kb3coY29uc3Qg SW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRl bnRzVG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkgY29uc3QKIHsKKyAgICBIb3N0V2luZG93 KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CiAgICAgaWYgKHBsYXRmb3JtV2lkZ2V0KCkpCiAgICAg ICAgIHJldHVybiBwbGF0Zm9ybUNvbnRlbnRzVG9TY3JlZW4ocmVjdCk7Ci0gICAgaWYgKCFob3N0 V2luZG93KCkpCisgICAgaWYgKCF3aW5kb3cpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7Ci0g ICAgcmV0dXJuIGhvc3RXaW5kb3coKS0+cm9vdFZpZXdUb1NjcmVlbihjb250ZW50c1RvUm9vdFZp ZXcocmVjdCkpOworICAgIHJldHVybiB3aW5kb3ctPnJvb3RWaWV3VG9TY3JlZW4oY29udGVudHNU b1Jvb3RWaWV3KHJlY3QpKTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6c2NyZWVuVG9Db250 ZW50cyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CisgICAgSG9zdFdpbmRvdyogd2lu ZG93ID0gaG9zdFdpbmRvdygpOwogICAgIGlmIChwbGF0Zm9ybVdpZGdldCgpKQogICAgICAgICBy ZXR1cm4gcGxhdGZvcm1TY3JlZW5Ub0NvbnRlbnRzKHBvaW50KTsKLSAgICBpZiAoIWhvc3RXaW5k b3coKSkKKyAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuIEludFBvaW50KCk7Ci0gICAg cmV0dXJuIHJvb3RWaWV3VG9Db250ZW50cyhob3N0V2luZG93KCktPnNjcmVlblRvUm9vdFZpZXco cG9pbnQpKTsKKyAgICByZXR1cm4gcm9vdFZpZXdUb0NvbnRlbnRzKHdpbmRvdy0+c2NyZWVuVG9S b290Vmlldyhwb2ludCkpOwogfQogCiBib29sIFNjcm9sbFZpZXc6OmNvbnRhaW5zU2Nyb2xsYmFy c0F2b2lkaW5nUmVzaXplcigpIGNvbnN0CkBAIC05NjcsOCArOTcwLDggQEAgdm9pZCBTY3JvbGxW aWV3OjpyZXBhaW50Q29udGVudFJlY3RhbmdsZShjb25zdCBJbnRSZWN0JiByZWN0LCBib29sIG5v dykKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChob3N0V2luZG93KCkpCi0gICAg ICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcoY29udGVudHNU b1dpbmRvdyhwYWludFJlY3QpLCBub3cgLyppbW1lZGlhdGUqLyk7CisgICAgaWYgKEhvc3RXaW5k b3cqIHdpbmRvdyA9IGhvc3RXaW5kb3coKSkKKyAgICAgICAgd2luZG93LT5pbnZhbGlkYXRlQ29u dGVudHNBbmRSb290Vmlldyhjb250ZW50c1RvV2luZG93KHBhaW50UmVjdCksIG5vdyAvKmltbWVk aWF0ZSovKTsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3OjpzY3JvbGxDb3JuZXJSZWN0KCkgY29u c3QKQEAgLTExNjEsMTYgKzExNjQsMTcgQEAgdm9pZCBTY3JvbGxWaWV3OjpjYWxjdWxhdGVPdmVy aGFuZ0FyZWFzRm9yUGFpbnRpbmcoSW50UmVjdCYgaG9yaXpvbnRhbE92ZXJoYW5nUmUKIAogdm9p ZCBTY3JvbGxWaWV3Ojp1cGRhdGVPdmVyaGFuZ0FyZWFzKCkKIHsKLSAgICBpZiAoIWhvc3RXaW5k b3coKSkKKyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CisgICAgaWYgKCF3 aW5kb3cpCiAgICAgICAgIHJldHVybjsKIAogICAgIEludFJlY3QgaG9yaXpvbnRhbE92ZXJoYW5n UmVjdDsKICAgICBJbnRSZWN0IHZlcnRpY2FsT3ZlcmhhbmdSZWN0OwogICAgIGNhbGN1bGF0ZU92 ZXJoYW5nQXJlYXNGb3JQYWludGluZyhob3Jpem9udGFsT3ZlcmhhbmdSZWN0LCB2ZXJ0aWNhbE92 ZXJoYW5nUmVjdCk7CiAgICAgaWYgKCFob3Jpem9udGFsT3ZlcmhhbmdSZWN0LmlzRW1wdHkoKSkK LSAgICAgICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmlldyhob3Jp em9udGFsT3ZlcmhhbmdSZWN0LCBmYWxzZSAvKmltbWVkaWF0ZSovKTsKKyAgICAgICAgd2luZG93 LT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmlldyhob3Jpem9udGFsT3ZlcmhhbmdSZWN0LCBm YWxzZSAvKmltbWVkaWF0ZSovKTsKICAgICBpZiAoIXZlcnRpY2FsT3ZlcmhhbmdSZWN0LmlzRW1w dHkoKSkKLSAgICAgICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmll dyh2ZXJ0aWNhbE92ZXJoYW5nUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CisgICAgICAgIHdp bmRvdy0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcodmVydGljYWxPdmVyaGFuZ1JlY3Qs IGZhbHNlIC8qaW1tZWRpYXRlKi8pOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnBhaW50T3Zlcmhh bmdBcmVhcyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGhvcml6b250 YWxPdmVyaGFuZ1JlY3QsIGNvbnN0IEludFJlY3QmIHZlcnRpY2FsT3ZlcmhhbmdSZWN0LCBjb25z dCBJbnRSZWN0JiBkaXJ0eVJlY3QpCkBAIC0xMzA4LDE5ICsxMzEyLDIxIEBAIGJvb2wgU2Nyb2xs Vmlldzo6aXNPZmZzY3JlZW4oKSBjb25zdAogCiB2b2lkIFNjcm9sbFZpZXc6OmFkZFBhblNjcm9s bEljb24oY29uc3QgSW50UG9pbnQmIGljb25Qb3NpdGlvbikKIHsKLSAgICBpZiAoIWhvc3RXaW5k b3coKSkKKyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CisgICAgaWYgKCF3 aW5kb3cpCiAgICAgICAgIHJldHVybjsKICAgICBtX2RyYXdQYW5TY3JvbGxJY29uID0gdHJ1ZTsg ICAgCiAgICAgbV9wYW5TY3JvbGxJY29uUG9pbnQgPSBJbnRQb2ludChpY29uUG9zaXRpb24ueCgp IC0gcGFuSWNvblNpemVMZW5ndGggLyAyICwgaWNvblBvc2l0aW9uLnkoKSAtIHBhbkljb25TaXpl TGVuZ3RoIC8gMikgOwotICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9v dFZpZXcoSW50UmVjdChtX3BhblNjcm9sbEljb25Qb2ludCwgSW50U2l6ZShwYW5JY29uU2l6ZUxl bmd0aCwgcGFuSWNvblNpemVMZW5ndGgpKSwgdHJ1ZSAvKmltbWVkaWF0ZSovKTsKKyAgICB3aW5k b3ctPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KEludFJlY3QobV9wYW5TY3JvbGxJY29u UG9pbnQsIEludFNpemUocGFuSWNvblNpemVMZW5ndGgsIHBhbkljb25TaXplTGVuZ3RoKSksIHRy dWUgLyppbW1lZGlhdGUqLyk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6cmVtb3ZlUGFuU2Nyb2xs SWNvbigpCiB7Ci0gICAgaWYgKCFob3N0V2luZG93KCkpCisgICAgSG9zdFdpbmRvdyogd2luZG93 ID0gaG9zdFdpbmRvdygpOworICAgIGlmICghd2luZG93KQogICAgICAgICByZXR1cm47CiAgICAg bV9kcmF3UGFuU2Nyb2xsSWNvbiA9IGZhbHNlOyAKLSAgICBob3N0V2luZG93KCktPmludmFsaWRh dGVDb250ZW50c0FuZFJvb3RWaWV3KEludFJlY3QobV9wYW5TY3JvbGxJY29uUG9pbnQsIEludFNp emUocGFuSWNvblNpemVMZW5ndGgsIHBhbkljb25TaXplTGVuZ3RoKSksIHRydWUgLyppbW1lZGlh dGUqLyk7CisgICAgd2luZG93LT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290VmlldyhJbnRSZWN0 KG1fcGFuU2Nyb2xsSWNvblBvaW50LCBJbnRTaXplKHBhbkljb25TaXplTGVuZ3RoLCBwYW5JY29u U2l6ZUxlbmd0aCkpLCB0cnVlIC8qaW1tZWRpYXRlKi8pOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6 OnNldFNjcm9sbE9yaWdpbihjb25zdCBJbnRQb2ludCYgb3JpZ2luLCBib29sIHVwZGF0ZVBvc2l0 aW9uQXRBbGwsIGJvb2wgdXBkYXRlUG9zaXRpb25TeW5jaHJvbm91c2x5KQo= 205687 2013-06-28 03:11:33 -0700 2013-06-28 04:14:55 -0700 Patch for landing bug-118168-20130628190934.patch text/plain 7013 sh53.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdlMmIxMmFhMGVlMTdm NGZlMDEyZTc4MWI5ZTI5NzZlNWVlZmQ5Zi4uMzdjOWU2ZGU2MGM1MzI4NWNiMGIzZGI0NTcwNGE1 ZjNjMTgyYzcwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTI4ICBTYW5n aHl1cCBMZWUgIDxzaDUzLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBBdm9pZCBkdXBsaWNh dGluZyBob3N0V2luZG93KCkgY2FsbCBpbiBTY3JvbGxWaWV3LmNwcAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MTY4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQ2hyaXN0b3BoZSBEdW1lei4KKworICAgICAgICBSZW1vdmUgcmVkdW5kYW50IGhvc3RX aW5kb3coKSBjYWxscyBpbiBTY3JvbGxWaWV3LmNwcC4KKworICAgICAgICAqIHBsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2Nyb2xsQ29udGVu dHMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1NjcmVlbik6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzY3JlZW5Ub0NvbnRlbnRzKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OnJlcGFpbnRDb250ZW50UmVjdGFuZ2xlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OnVwZGF0ZU92ZXJoYW5nQXJlYXMpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsVmlldzo6YWRkUGFuU2Nyb2xsSWNvbik6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxWaWV3OjpyZW1vdmVQYW5TY3JvbGxJY29uKToKKwogMjAxMy0wNi0yOCAgQ2hyaXN0b3Bo ZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgZml4IEdUSyBidWlsZCBhZnRlciByMTUyMTU2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmNwcAppbmRleCAzMTNlMjY3ODdlZDJjZGQzZDhiOTQ5YjA2ZDI0MGM4MzU5YzM4Nzli Li41ZGI1YWMwNGFmYzRhMDA1YzBjYjYwNzIxMjZhNWI1YjNmMGI1NzdkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtNjU4LDcgKzY1OCw4IEBAIEludFJlY3QgU2Ny b2xsVmlldzo6cmVjdFRvQ29weU9uU2Nyb2xsKCkgY29uc3QKIAogdm9pZCBTY3JvbGxWaWV3Ojpz Y3JvbGxDb250ZW50cyhjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKIHsKLSAgICBpZiAoIWhv c3RXaW5kb3coKSkKKyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CisgICAg aWYgKCF3aW5kb3cpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFNpbmNlIHNjcm9sbGluZyBp cyBkb3VibGUgYnVmZmVyZWQsIHdlIHdpbGwgYmUgYmxpdHRpbmcgdGhlIHNjcm9sbCB2aWV3J3Mg aW50ZXJzZWN0aW9uCkBAIC02NjksNyArNjcwLDcgQEAgdm9pZCBTY3JvbGxWaWV3OjpzY3JvbGxD b250ZW50cyhjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKICAgICB1cGRhdGVSZWN0LmludGVy c2VjdChzY3JvbGxWaWV3UmVjdCk7CiAKICAgICAvLyBJbnZhbGlkYXRlIHRoZSByb290IHZpZXcg KG5vdCB0aGUgYmFja2luZyBzdG9yZSkuCi0gICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlUm9v dFZpZXcodXBkYXRlUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CisgICAgd2luZG93LT5pbnZh bGlkYXRlUm9vdFZpZXcodXBkYXRlUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUqLyk7CiAKICAgICBp ZiAobV9kcmF3UGFuU2Nyb2xsSWNvbikgewogICAgICAgICAvLyBGSVhNRTogdGhlIHBhbiBpY29u IGlzIGJyb2tlbiB3aGVuIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGlzIG9uLCBzaW5jZSBpdCB3 aWxsIGRyYXcgdW5kZXIgdGhlIGNvbXBvc2l0aW5nIGxheWVycy4KQEAgLTY3OCw3ICs2NzksNyBA QCB2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzKGNvbnN0IEludFNpemUmIHNjcm9sbERl bHRhKQogICAgICAgICBJbnRQb2ludCBwYW5JY29uRGlydHlTcXVhcmVMb2NhdGlvbiA9IEludFBv aW50KG1fcGFuU2Nyb2xsSWNvblBvaW50LngoKSAtIChwYW5JY29uRGlydHlTcXVhcmVTaXplTGVu Z3RoIC8gMiksIG1fcGFuU2Nyb2xsSWNvblBvaW50LnkoKSAtIChwYW5JY29uRGlydHlTcXVhcmVT aXplTGVuZ3RoIC8gMikpOwogICAgICAgICBJbnRSZWN0IHBhblNjcm9sbEljb25EaXJ0eVJlY3Qg PSBJbnRSZWN0KHBhbkljb25EaXJ0eVNxdWFyZUxvY2F0aW9uLCBJbnRTaXplKHBhbkljb25EaXJ0 eVNxdWFyZVNpemVMZW5ndGgsIHBhbkljb25EaXJ0eVNxdWFyZVNpemVMZW5ndGgpKTsKICAgICAg ICAgcGFuU2Nyb2xsSWNvbkRpcnR5UmVjdC5pbnRlcnNlY3QoY2xpcFJlY3QpOwotICAgICAgICBo b3N0V2luZG93KCktPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KHBhblNjcm9sbEljb25E aXJ0eVJlY3QsIGZhbHNlIC8qaW1tZWRpYXRlKi8pOworICAgICAgICB3aW5kb3ctPmludmFsaWRh dGVDb250ZW50c0FuZFJvb3RWaWV3KHBhblNjcm9sbEljb25EaXJ0eVJlY3QsIGZhbHNlIC8qaW1t ZWRpYXRlKi8pOwogICAgIH0KIAogICAgIGlmIChjYW5CbGl0T25TY3JvbGwoKSkgeyAvLyBUaGUg bWFpbiBmcmFtZSBjYW4ganVzdCBibGl0IHRoZSBXZWJWaWV3IHdpbmRvdwpAQCAtNjk4LDcgKzY5 OSw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2Nyb2xsQ29udGVudHMoY29uc3QgSW50U2l6ZSYgc2Ny b2xsRGVsdGEpCiAgICAgZnJhbWVSZWN0c0NoYW5nZWQoKTsKIAogICAgIC8vIE5vdyBibGl0IHRo ZSBiYWNraW5nc3RvcmUgaW50byB0aGUgd2luZG93IHdoaWNoIHNob3VsZCBiZSB2ZXJ5IGZhc3Qu Ci0gICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlUm9vdFZpZXcoSW50UmVjdCgpLCB0cnVlKTsK KyAgICB3aW5kb3ctPmludmFsaWRhdGVSb290VmlldyhJbnRSZWN0KCksIHRydWUpOwogfQogCiBi b29sIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Ny b2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xp cFJlY3QpCkBAIC03ODQsMjAgKzc4NSwyMiBAQCBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRz VG9XaW5kb3coY29uc3QgSW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAogCiBJbnRSZWN0IFNj cm9sbFZpZXc6OmNvbnRlbnRzVG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkgY29uc3QKIHsK KyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93KCk7CiAgICAgaWYgKHBsYXRmb3Jt V2lkZ2V0KCkpCiAgICAgICAgIHJldHVybiBwbGF0Zm9ybUNvbnRlbnRzVG9TY3JlZW4ocmVjdCk7 Ci0gICAgaWYgKCFob3N0V2luZG93KCkpCisgICAgaWYgKCF3aW5kb3cpCiAgICAgICAgIHJldHVy biBJbnRSZWN0KCk7Ci0gICAgcmV0dXJuIGhvc3RXaW5kb3coKS0+cm9vdFZpZXdUb1NjcmVlbihj b250ZW50c1RvUm9vdFZpZXcocmVjdCkpOworICAgIHJldHVybiB3aW5kb3ctPnJvb3RWaWV3VG9T Y3JlZW4oY29udGVudHNUb1Jvb3RWaWV3KHJlY3QpKTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmll dzo6c2NyZWVuVG9Db250ZW50cyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CisgICAg SG9zdFdpbmRvdyogd2luZG93ID0gaG9zdFdpbmRvdygpOwogICAgIGlmIChwbGF0Zm9ybVdpZGdl dCgpKQogICAgICAgICByZXR1cm4gcGxhdGZvcm1TY3JlZW5Ub0NvbnRlbnRzKHBvaW50KTsKLSAg ICBpZiAoIWhvc3RXaW5kb3coKSkKKyAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuIElu dFBvaW50KCk7Ci0gICAgcmV0dXJuIHJvb3RWaWV3VG9Db250ZW50cyhob3N0V2luZG93KCktPnNj cmVlblRvUm9vdFZpZXcocG9pbnQpKTsKKyAgICByZXR1cm4gcm9vdFZpZXdUb0NvbnRlbnRzKHdp bmRvdy0+c2NyZWVuVG9Sb290Vmlldyhwb2ludCkpOwogfQogCiBib29sIFNjcm9sbFZpZXc6OmNv bnRhaW5zU2Nyb2xsYmFyc0F2b2lkaW5nUmVzaXplcigpIGNvbnN0CkBAIC05NjcsOCArOTcwLDgg QEAgdm9pZCBTY3JvbGxWaWV3OjpyZXBhaW50Q29udGVudFJlY3RhbmdsZShjb25zdCBJbnRSZWN0 JiByZWN0LCBib29sIG5vdykKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChob3N0 V2luZG93KCkpCi0gICAgICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9v dFZpZXcoY29udGVudHNUb1dpbmRvdyhwYWludFJlY3QpLCBub3cgLyppbW1lZGlhdGUqLyk7Cisg ICAgaWYgKEhvc3RXaW5kb3cqIHdpbmRvdyA9IGhvc3RXaW5kb3coKSkKKyAgICAgICAgd2luZG93 LT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmlldyhjb250ZW50c1RvV2luZG93KHBhaW50UmVj dCksIG5vdyAvKmltbWVkaWF0ZSovKTsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3OjpzY3JvbGxD b3JuZXJSZWN0KCkgY29uc3QKQEAgLTExNjEsMTYgKzExNjQsMTcgQEAgdm9pZCBTY3JvbGxWaWV3 OjpjYWxjdWxhdGVPdmVyaGFuZ0FyZWFzRm9yUGFpbnRpbmcoSW50UmVjdCYgaG9yaXpvbnRhbE92 ZXJoYW5nUmUKIAogdm9pZCBTY3JvbGxWaWV3Ojp1cGRhdGVPdmVyaGFuZ0FyZWFzKCkKIHsKLSAg ICBpZiAoIWhvc3RXaW5kb3coKSkKKyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93 KCk7CisgICAgaWYgKCF3aW5kb3cpCiAgICAgICAgIHJldHVybjsKIAogICAgIEludFJlY3QgaG9y aXpvbnRhbE92ZXJoYW5nUmVjdDsKICAgICBJbnRSZWN0IHZlcnRpY2FsT3ZlcmhhbmdSZWN0Owog ICAgIGNhbGN1bGF0ZU92ZXJoYW5nQXJlYXNGb3JQYWludGluZyhob3Jpem9udGFsT3ZlcmhhbmdS ZWN0LCB2ZXJ0aWNhbE92ZXJoYW5nUmVjdCk7CiAgICAgaWYgKCFob3Jpem9udGFsT3ZlcmhhbmdS ZWN0LmlzRW1wdHkoKSkKLSAgICAgICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlQ29udGVudHNB bmRSb290Vmlldyhob3Jpem9udGFsT3ZlcmhhbmdSZWN0LCBmYWxzZSAvKmltbWVkaWF0ZSovKTsK KyAgICAgICAgd2luZG93LT5pbnZhbGlkYXRlQ29udGVudHNBbmRSb290Vmlldyhob3Jpem9udGFs T3ZlcmhhbmdSZWN0LCBmYWxzZSAvKmltbWVkaWF0ZSovKTsKICAgICBpZiAoIXZlcnRpY2FsT3Zl cmhhbmdSZWN0LmlzRW1wdHkoKSkKLSAgICAgICAgaG9zdFdpbmRvdygpLT5pbnZhbGlkYXRlQ29u dGVudHNBbmRSb290Vmlldyh2ZXJ0aWNhbE92ZXJoYW5nUmVjdCwgZmFsc2UgLyppbW1lZGlhdGUq Lyk7CisgICAgICAgIHdpbmRvdy0+aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcodmVydGlj YWxPdmVyaGFuZ1JlY3QsIGZhbHNlIC8qaW1tZWRpYXRlKi8pOwogfQogCiB2b2lkIFNjcm9sbFZp ZXc6OnBhaW50T3ZlcmhhbmdBcmVhcyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IElu dFJlY3QmIGhvcml6b250YWxPdmVyaGFuZ1JlY3QsIGNvbnN0IEludFJlY3QmIHZlcnRpY2FsT3Zl cmhhbmdSZWN0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCkBAIC0xMzA4LDE5ICsxMzEyLDIx IEBAIGJvb2wgU2Nyb2xsVmlldzo6aXNPZmZzY3JlZW4oKSBjb25zdAogCiB2b2lkIFNjcm9sbFZp ZXc6OmFkZFBhblNjcm9sbEljb24oY29uc3QgSW50UG9pbnQmIGljb25Qb3NpdGlvbikKIHsKLSAg ICBpZiAoIWhvc3RXaW5kb3coKSkKKyAgICBIb3N0V2luZG93KiB3aW5kb3cgPSBob3N0V2luZG93 KCk7CisgICAgaWYgKCF3aW5kb3cpCiAgICAgICAgIHJldHVybjsKICAgICBtX2RyYXdQYW5TY3Jv bGxJY29uID0gdHJ1ZTsgICAgCiAgICAgbV9wYW5TY3JvbGxJY29uUG9pbnQgPSBJbnRQb2ludChp Y29uUG9zaXRpb24ueCgpIC0gcGFuSWNvblNpemVMZW5ndGggLyAyICwgaWNvblBvc2l0aW9uLnko KSAtIHBhbkljb25TaXplTGVuZ3RoIC8gMikgOwotICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0 ZUNvbnRlbnRzQW5kUm9vdFZpZXcoSW50UmVjdChtX3BhblNjcm9sbEljb25Qb2ludCwgSW50U2l6 ZShwYW5JY29uU2l6ZUxlbmd0aCwgcGFuSWNvblNpemVMZW5ndGgpKSwgdHJ1ZSAvKmltbWVkaWF0 ZSovKTsKKyAgICB3aW5kb3ctPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KEludFJlY3Qo bV9wYW5TY3JvbGxJY29uUG9pbnQsIEludFNpemUocGFuSWNvblNpemVMZW5ndGgsIHBhbkljb25T aXplTGVuZ3RoKSksIHRydWUgLyppbW1lZGlhdGUqLyk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6 cmVtb3ZlUGFuU2Nyb2xsSWNvbigpCiB7Ci0gICAgaWYgKCFob3N0V2luZG93KCkpCisgICAgSG9z dFdpbmRvdyogd2luZG93ID0gaG9zdFdpbmRvdygpOworICAgIGlmICghd2luZG93KQogICAgICAg ICByZXR1cm47CiAgICAgbV9kcmF3UGFuU2Nyb2xsSWNvbiA9IGZhbHNlOyAKLSAgICBob3N0V2lu ZG93KCktPmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KEludFJlY3QobV9wYW5TY3JvbGxJ Y29uUG9pbnQsIEludFNpemUocGFuSWNvblNpemVMZW5ndGgsIHBhbkljb25TaXplTGVuZ3RoKSks IHRydWUgLyppbW1lZGlhdGUqLyk7CisgICAgd2luZG93LT5pbnZhbGlkYXRlQ29udGVudHNBbmRS b290VmlldyhJbnRSZWN0KG1fcGFuU2Nyb2xsSWNvblBvaW50LCBJbnRTaXplKHBhbkljb25TaXpl TGVuZ3RoLCBwYW5JY29uU2l6ZUxlbmd0aCkpLCB0cnVlIC8qaW1tZWRpYXRlKi8pOwogfQogCiB2 b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbE9yaWdpbihjb25zdCBJbnRQb2ludCYgb3JpZ2luLCBi b29sIHVwZGF0ZVBvc2l0aW9uQXRBbGwsIGJvb2wgdXBkYXRlUG9zaXRpb25TeW5jaHJvbm91c2x5 KQo=