139563 2014-12-11 15:07:25 -0800 Move the preview popover to WebImmediateActionController 2014-12-11 15:11:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue conrad_shultz eric.carlson glenn jer.noble philipj sergio oldest_to_newest 1054635 0 thorton 2014-12-11 15:07:25 -0800 Move the preview popover to WebImmediateActionController 1054637 1 243154 thorton 2014-12-11 15:07:51 -0800 Created attachment 243154 Patch 1054638 2 thorton 2014-12-11 15:11:40 -0800 http://trac.webkit.org/changeset/177186 243154 2014-12-11 15:07:51 -0800 2014-12-11 15:08:52 -0800 Patch bug-139563-20141211150833.patch text/plain 13500 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMGQ1ZmFkOGRm OWNhZDVlOTE4NzdkMmI2YjJhZWY4ODA5NTVjZTI4ZS4uZTFiNGNiNzM5OWFjNzQ0ODgxNzJhMDc2 MDJmN2UyNzI3OTc1NWIwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE0 LTEyLTExICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAorICAg ICAgICBNb3ZlIHRoZSBwcmV2aWV3IHBvcG92ZXIgdG8gV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJv bGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5 NTYzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTIwODI5MT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViQWN0aW9uTWVudUNv bnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0 TWVudUl0ZW1zRm9yTGlua10pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBt ZW51SXRlbTp2aWV3QXRTY3JlZW5Qb2ludDpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQWN0 aW9uTWVudUNvbnRyb2xsZXIgbWVudUl0ZW06cHJldmlld0l0ZW1BdFBvaW50Ol0pOiBEZWxldGVk LgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBtZW51SXRlbTpwcmVmZXJyZWRF ZGdlRm9yUG9pbnQ6XSk6IERlbGV0ZWQuCisgICAgICAgICogV2ViVmlldy9XZWJJbW1lZGlhdGVB Y3Rpb25Db250cm9sbGVyLmg6CisgICAgICAgICogV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIHdl YlZpZXdDbG9zZWRdKToKKyAgICAgICAgKC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBp bW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyV2lsbFByZXBhcmU6XSk6CisgICAgICAgICgtW1dlYklt bWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcldpbGxCZWdp bkFuaW1hdGlvbjpdKToKKyAgICAgICAgKC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBp bW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyRGlkQ2FuY2VsQW5pbWF0aW9uOl0pOgorICAgICAgICAo LVtXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIGltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXJE aWRDb21wbGV0ZUFuaW1hdGlvbjpdKToKKyAgICAgICAgKC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29u dHJvbGxlciBfdXBkYXRlSW1tZWRpYXRlQWN0aW9uSXRlbV0pOgorICAgICAgICAoLVtXZWJJbW1l ZGlhdGVBY3Rpb25Db250cm9sbGVyIG1lbnVJdGVtOnZpZXdBdFNjcmVlblBvaW50Ol0pOgorICAg ICAgICAoLVtXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIG1lbnVJdGVtOnByZXZpZXdJdGVt QXRQb2ludDpdKToKKyAgICAgICAgKC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBtZW51 SXRlbTpwcmVmZXJyZWRFZGdlRm9yUG9pbnQ6XSk6CisgICAgICAgIE1vdmUgcGFnZSBwcmV2aWV3 IHBvcG92ZXIgcmVsYXRlZCBjb2RlIHRvIFdlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuCisK KyAgICAgICAgKiBXZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgIEFkZCBh IGxpbmsgcHJldmlldyB0eXBlLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hbWU6Z3JvdXBO YW1lOl0pOgorICAgICAgICBQYXNzIHRoZSBnZXN0dXJlIHJlY29nbml6ZXIgdG8gdGhlIFdlYklt bWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuCisKKzIwMTQtMTItMTEgIFRpbW90aHkgSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCiAgICAgICAgIEZpeCB0aGUgYnVpbGQuCiAKICAg ICAgICAgKiBXZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaDoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCA3ZjhmYjk1ZDAyNzcwYjFlZDE3YjFhNzUzODczMjE3MGIzYTQxOGFhLi4wMzc5Yzg5ZGFm NjMyZTUxZjY0OTBhMWYwZDA4YzA0Y2YxNTc1MTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTQtMTItMTEgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgogCisgICAgICAgIE1vdmUgdGhlIHByZXZpZXcgcG9wb3ZlciB0byBXZWJJbW1lZGlhdGVBY3Rp b25Db250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzk1NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5MjA4MjkxPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9X S0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgUmVtb3ZlIGFuIHVubmVjZXNz YXJ5IGZvcndhcmQgZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1t ZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tJbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyIHdpbGxEZXN0cm95VmlldzpdKToKKyAgICAgICAgQ2xlYXIgdGhlIGltbWVkaWF0 ZSBhY3Rpb24gcmVjb2duaXplciB3aGVuIHRoZSB2aWV3IGdvZXMgYXdheS4KKworMjAxNC0xMi0x MSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAg Rml4IHRoZSBidWlsZC4KIAogICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rp b25Db250cm9sbGVyLmg6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YkFjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJB Y3Rpb25NZW51Q29udHJvbGxlci5tbQppbmRleCA0OWIzM2M2MmJiMzU2MmVhMDVhNjZjMzI2NjE1 MjQzODkxOWRmZmIzLi5lMGJkNjA3MTk3Yzc4NTQwMjEyZWNjMGZhYmRhMThjYjUxOTc3NWZkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9s bGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRy b2xsZXIubW0KQEAgLTcxLDE1ICs3MSw5IEBACiAjaW1wb3J0IDxvYmpjL29iamMtY2xhc3MuaD4K ICNpbXBvcnQgPG9iamMvb2JqYy5oPgogCi1TT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExB KFF1YXJ0eiwgUXVpY2tMb29rVUkpCi1TT0ZUX0xJTktfQ0xBU1MoUXVpY2tMb29rVUksIFFMUHJl dmlld01lbnVJdGVtKQotCiBTT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExBKFF1YXJ0eiwg SW1hZ2VLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoSW1hZ2VLaXQsIElLU2xpZGVzaG93KQogCi1AaW50 ZXJmYWNlIFdlYkFjdGlvbk1lbnVDb250cm9sbGVyICgpIDxRTFByZXZpZXdNZW51SXRlbURlbGVn YXRlPgotQGVuZAotCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGltcGxlbWVudGF0aW9u IFdlYkFjdGlvbk1lbnVDb250cm9sbGVyCkBAIC0yNjgsMjAgKzI2Miw5IEBAIHN0YXRpYyBJbnRS ZWN0IGVsZW1lbnRCb3VuZGluZ0JveEluV2luZG93Q29vcmRpbmF0ZXNGcm9tTm9kZShOb2RlKiBu b2RlKQogLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yTGluawogewogICAgIFJldGFp blB0cjxOU01lbnVJdGVtPiBvcGVuTGlua0l0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0 ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdPcGVuTGlua0luRGVmYXVsdEJyb3dzZXJdOwot Ci0gICAgQk9PTCBzaG91bGRVc2VTdGFuZGFyZFF1aWNrTG9va1ByZXZpZXcgPSBbTlNNZW51SXRl bSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHN0YW5kYXJkUXVpY2tMb29rTWVudUl0ZW0p XTsKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcHJldmlld0xpbmtJdGVtOwotICAgIFJldGFp blB0cjxRTFByZXZpZXdNZW51SXRlbT4gcWxQcmV2aWV3TGlua0l0ZW07Ci0gICAgaWYgKHNob3Vs ZFVzZVN0YW5kYXJkUXVpY2tMb29rUHJldmlldykgewotICAgICAgICBxbFByZXZpZXdMaW5rSXRl bSA9IFtOU01lbnVJdGVtIHN0YW5kYXJkUXVpY2tMb29rTWVudUl0ZW1dOwotICAgICAgICBbcWxQ cmV2aWV3TGlua0l0ZW0gc2V0UHJldmlld1N0eWxlOlFMUHJldmlld1N0eWxlUG9wb3Zlcl07Ci0g ICAgICAgIFtxbFByZXZpZXdMaW5rSXRlbSBzZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICB9IGVsc2UK LSAgICAgICAgcHJldmlld0xpbmtJdGVtID0gW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV07Ci0K ICAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcmVhZGluZ0xpc3RJdGVtID0gW3NlbGYgX2NyZWF0 ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnQWRkTGlua1RvU2FmYXJp UmVhZGluZ0xpc3RdOwogCi0gICAgcmV0dXJuIEBbIG9wZW5MaW5rSXRlbS5nZXQoKSwgc2hvdWxk VXNlU3RhbmRhcmRRdWlja0xvb2tQcmV2aWV3ID8gcWxQcmV2aWV3TGlua0l0ZW0uZ2V0KCkgOiBw cmV2aWV3TGlua0l0ZW0uZ2V0KCksIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCByZWFkaW5n TGlzdEl0ZW0uZ2V0KCkgXTsKKyAgICByZXR1cm4gQFsgb3BlbkxpbmtJdGVtLmdldCgpLCBbTlNN ZW51SXRlbSBzZXBhcmF0b3JJdGVtXSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRp bmdMaXN0SXRlbS5nZXQoKSBdOwogfQogCiAjcHJhZ21hIG1hcmsgbWFpbHRvOiBhbmQgdGVsOiBM aW5rIGFjdGlvbnMKQEAgLTcyMSwyNiArNzA0LDYgQEAgc3RhdGljIERpY3Rpb25hcnlQb3B1cElu Zm8gcGVyZm9ybURpY3Rpb25hcnlMb29rdXBGb3JSYW5nZShGcmFtZSogZnJhbWUsIFJhbmdlJgog ICAgIHJldHVybiBfd2ViVmlldy53aW5kb3c7CiB9CiAKLSNwcmFnbWEgbWFyayBRTFByZXZpZXdN ZW51SXRlbURlbGVnYXRlIGltcGxlbWVudGF0aW9uCi0KLS0gKE5TVmlldyAqKW1lbnVJdGVtOihO U01lbnVJdGVtICopbWVudUl0ZW0gdmlld0F0U2NyZWVuUG9pbnQ6KE5TUG9pbnQpc2NyZWVuUG9p bnQKLXsKLSAgICByZXR1cm4gX3dlYlZpZXc7Ci19Ci0KLS0gKGlkPFFMUHJldmlld0l0ZW0+KW1l bnVJdGVtOihOU01lbnVJdGVtICopbWVudUl0ZW0gcHJldmlld0l0ZW1BdFBvaW50OihOU1BvaW50 KXBvaW50Ci17Ci0gICAgaWYgKCFfd2ViVmlldykKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAg IHJldHVybiBfaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKTsKLX0KLQotLSAoTlNSZWN0 RWRnZSltZW51SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtIHByZWZlcnJlZEVkZ2VGb3JQb2lu dDooTlNQb2ludClwb2ludAotewotICAgIHJldHVybiBOU01heFlFZGdlOwotfQotCiAjcHJhZ21h IG1hcmsgTWVudSBJdGVtcwogCiAtIChSZXRhaW5QdHI8TlNNZW51SXRlbT4pX2NyZWF0ZUFjdGlv bk1lbnVJdGVtRm9yVGFnOih1aW50MzJfdCl0YWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKaW5kZXggODBiYzk2 ZGM2NGFhMWU1MWVkZDdkNGEyZmY1MThmMzY5M2NhODMzNC4uNTdlMjkzOTgyNjgwNmE0NWU5OWEy ODViZTMxMTM4NmU3OTVjMzVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKQEAgLTM3LDkgKzM3LDEwIEBA CiAgICAgV2ViVmlldyAqX3dlYlZpZXc7CiAgICAgV2ViSW1tZWRpYXRlQWN0aW9uVHlwZSBfdHlw ZTsKICAgICBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0IF9oaXRUZXN0UmVzdWx0OworICAgIE5TSW1t ZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKl9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVy OwogfQogCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWV3OihXZWJWaWV3ICopd2ViVmll dzsKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aFdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHJl Y29nbml6ZXI6KE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilpbW1lZGlhdGVB Y3Rpb25SZWNvZ25pemVyOwogLSAodm9pZCl3ZWJWaWV3Q2xvc2VkOwogCiBAZW5kCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRy b2xsZXIubW0KaW5kZXggOTM2ZWRmNDliMmJhZGZiODgzMTI3NGI1MmRhZjE4ODU4MTkwNGE2Ny4u ODg4ZmI5YWRkNWM5YTE0MmMyZDE2Mzc1ZTgwNDk1NTQ4ZDFlYmRlZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxl ci5tbQpAQCAtMzQsMjAgKzM0LDI5IEBACiAjaW1wb3J0ICJXZWJWaWV3SW50ZXJuYWwuaCIKICNp bXBvcnQgPFdlYkNvcmUvRXZlbnRIYW5kbGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+ CisjaW1wb3J0IDxXZWJDb3JlL05TTWVudVNQSS5oPgorI2ltcG9ydCA8V2ViQ29yZS9Tb2Z0TGlu a2luZy5oPgogI2ltcG9ydCA8b2JqYy9vYmpjLWNsYXNzLmg+CiAjaW1wb3J0IDxvYmpjL29iamMu aD4KIAorU09GVF9MSU5LX0ZSQU1FV09SS19JTl9VTUJSRUxMQShRdWFydHosIFF1aWNrTG9va1VJ KQorU09GVF9MSU5LX0NMQVNTKFF1aWNrTG9va1VJLCBRTFByZXZpZXdNZW51SXRlbSkKKworQGlu dGVyZmFjZSBXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyICgpIDxRTFByZXZpZXdNZW51SXRl bURlbGVnYXRlPgorQGVuZAorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGltcGxlbWVu dGF0aW9uIFdlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIKIAotLSAoaW5zdGFuY2V0eXBlKWlu aXRXaXRoV2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0 aFdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHJlY29nbml6ZXI6KE5TSW1tZWRpYXRlQWN0aW9u R2VzdHVyZVJlY29nbml6ZXIgKilpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyCiB7CiAgICAgaWYg KCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICBfd2Vi VmlldyA9IHdlYlZpZXc7CiAgICAgX3R5cGUgPSBXZWJJbW1lZGlhdGVBY3Rpb25Ob25lOworICAg IF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyID0gaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcjsK IAogICAgIHJldHVybiBzZWxmOwogfQpAQCAtNTUsNiArNjQsNyBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIC0gKHZvaWQpd2ViVmlld0Nsb3NlZAogewogICAgIF93ZWJWaWV3ID0gbmlsOwor ICAgIF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyID0gbmlsOwogfQogCiAtICh2b2lkKV9jbGVh ckltbWVkaWF0ZUFjdGlvblN0YXRlCkBAIC03NywxNyArODcsMTggQEAgdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAgICAgaWYgKCFfd2ViVmlldykKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYg KGltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIudmlldyAhPSBfd2ViVmlldykKKyAgICBpZiAoaW1t ZWRpYXRlQWN0aW9uUmVjb2duaXplciAhPSBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcikKICAg ICAgICAgcmV0dXJuOwogCiAgICAgV2ViSFRNTFZpZXcgKmRvY3VtZW50VmlldyA9IFtbW193ZWJW aWV3IF9zZWxlY3RlZE9yTWFpbkZyYW1lXSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld107CiAgICAg TlNQb2ludCBsb2NhdGlvbkluRG9jdW1lbnRWaWV3ID0gW2ltbWVkaWF0ZUFjdGlvblJlY29nbml6 ZXIgbG9jYXRpb25JblZpZXc6ZG9jdW1lbnRWaWV3XTsKICAgICBbc2VsZiBwZXJmb3JtSGl0VGVz dEF0UG9pbnQ6bG9jYXRpb25JbkRvY3VtZW50Vmlld107CisgICAgW3NlbGYgX3VwZGF0ZUltbWVk aWF0ZUFjdGlvbkl0ZW1dOwogfQogCiAtICh2b2lkKWltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXJX aWxsQmVnaW5BbmltYXRpb246KE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilp bW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyCiB7Ci0gICAgaWYgKGltbWVkaWF0ZUFjdGlvblJlY29n bml6ZXIudmlldyAhPSBfd2ViVmlldykKKyAgICBpZiAoaW1tZWRpYXRlQWN0aW9uUmVjb2duaXpl ciAhPSBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcikKICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciB0aGUgdHlwZXMgb2YgZnVuY3Rpb25hbGl0eSBwcm92 aWRlZCBpbiBBY3Rpb24gbWVudSdzIG1lbnVOZWVkc1VwZGF0ZS4KQEAgLTk1LDcgKzEwNiw3IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiAtICh2b2lkKWltbWVkaWF0ZUFjdGlvblJlY29n bml6ZXJEaWRDYW5jZWxBbmltYXRpb246KE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6 ZXIgKilpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyCiB7Ci0gICAgaWYgKGltbWVkaWF0ZUFjdGlv blJlY29nbml6ZXIudmlldyAhPSBfd2ViVmlldykKKyAgICBpZiAoaW1tZWRpYXRlQWN0aW9uUmVj b2duaXplciAhPSBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcikKICAgICAgICAgcmV0dXJuOwog CiAgICAgW3NlbGYgX2NsZWFySW1tZWRpYXRlQWN0aW9uU3RhdGVdOwpAQCAtMTAzLDcgKzExNCw3 IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiAtICh2b2lkKWltbWVkaWF0ZUFjdGlvblJl Y29nbml6ZXJEaWRDb21wbGV0ZUFuaW1hdGlvbjooTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVj b2duaXplciAqKWltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIKIHsKLSAgICBpZiAoaW1tZWRpYXRl QWN0aW9uUmVjb2duaXplci52aWV3ICE9IF93ZWJWaWV3KQorICAgIGlmIChpbW1lZGlhdGVBY3Rp b25SZWNvZ25pemVyICE9IF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyKQogICAgICAgICByZXR1 cm47CiAKICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHRoZSB0eXBlcyBvZiBmdW5jdGlv bmFsaXR5IHByb3ZpZGVkIGluIEFjdGlvbiBtZW51J3Mgd2lsbE9wZW5NZW51LgpAQCAtMTEzLDcg KzEyNCw0MCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogLSAodm9pZClfdXBkYXRlSW1t ZWRpYXRlQWN0aW9uSXRlbQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuIEluc3BlY3QgX2hp dFRlc3RSZXN1bHQgdG8gZGV0ZXJtaW5lIGlmIHRoZXJlIGlzIGFuIGltbWVkaWF0ZSBhY3Rpb24g dG8gdGFrZS4KKyAgICBfdHlwZSA9IFdlYkltbWVkaWF0ZUFjdGlvbk5vbmU7CisgICAgX2ltbWVk aWF0ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IG5pbDsKKworICAgIE5T VVJMICp1cmwgPSBfaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKTsKKyAgICBOU1N0cmlu ZyAqYWJzb2x1dGVVUkxTdHJpbmcgPSBbdXJsIGFic29sdXRlU3RyaW5nXTsKKyAgICBpZiAodXJs ICYmIFdlYkNvcmU6OnByb3RvY29sSXNJbkhUVFBGYW1pbHkoYWJzb2x1dGVVUkxTdHJpbmcpKSB7 CisgICAgICAgIF90eXBlID0gV2ViSW1tZWRpYXRlQWN0aW9uTGlua1ByZXZpZXc7CisKKyAgICAg ICAgUmV0YWluUHRyPFFMUHJldmlld01lbnVJdGVtPiBxbFByZXZpZXdMaW5rSXRlbSA9IFtOU01l bnVJdGVtIHN0YW5kYXJkUXVpY2tMb29rTWVudUl0ZW1dOworICAgICAgICBbcWxQcmV2aWV3TGlu a0l0ZW0gc2V0UHJldmlld1N0eWxlOlFMUHJldmlld1N0eWxlUG9wb3Zlcl07CisgICAgICAgIFtx bFByZXZpZXdMaW5rSXRlbSBzZXREZWxlZ2F0ZTpzZWxmXTsKKyAgICAgICAgX2ltbWVkaWF0ZUFj dGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IChpZDxOU0ltbWVkaWF0ZUFjdGlv bkFuaW1hdGlvbkNvbnRyb2xsZXI+KXFsUHJldmlld0xpbmtJdGVtLmdldCgpOworICAgICAgICBy ZXR1cm47CisgICAgfQorfQorCisjcHJhZ21hIG1hcmsgUUxQcmV2aWV3TWVudUl0ZW1EZWxlZ2F0 ZSBpbXBsZW1lbnRhdGlvbgorCistIChOU1ZpZXcgKiltZW51SXRlbTooTlNNZW51SXRlbSAqKW1l bnVJdGVtIHZpZXdBdFNjcmVlblBvaW50OihOU1BvaW50KXNjcmVlblBvaW50Cit7CisgICAgcmV0 dXJuIF93ZWJWaWV3OworfQorCistIChpZDxRTFByZXZpZXdJdGVtPiltZW51SXRlbTooTlNNZW51 SXRlbSAqKW1lbnVJdGVtIHByZXZpZXdJdGVtQXRQb2ludDooTlNQb2ludClwb2ludAoreworICAg IGlmICghX3dlYlZpZXcpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICByZXR1cm4gX2hpdFRl c3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCk7Cit9CisKKy0gKE5TUmVjdEVkZ2UpbWVudUl0ZW06 KE5TTWVudUl0ZW0gKiltZW51SXRlbSBwcmVmZXJyZWRFZGdlRm9yUG9pbnQ6KE5TUG9pbnQpcG9p bnQKK3sKKyAgICByZXR1cm4gTlNNYXhZRWRnZTsKIH0KIAogQGVuZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCmluZGV4IDg3NTEwOWYxMDRm MmJlODEwN2YyYTA3MzFkNGFkNmZjMjUwYWMwMDIuLjk1ZTNkMjgwZmFiMTdhODhmYWVlOTA5NjVj MGE0MGFlZjhlOTMxYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi VUlEZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJ RGVsZWdhdGVQcml2YXRlLmgKQEAgLTE0Niw2ICsxNDYsNyBAQCB0eXBlZGVmIGVudW0gewogCiB0 eXBlZGVmIGVudW0gewogICAgIFdlYkltbWVkaWF0ZUFjdGlvbk5vbmUgPSAwLAorICAgIFdlYklt bWVkaWF0ZUFjdGlvbkxpbmtQcmV2aWV3CiB9IFdlYkltbWVkaWF0ZUFjdGlvblR5cGU7CiAKIC8v IE1lc3NhZ2UgU291cmNlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCA0 MDlkZjQ5OTkyM2IyMWZmZmU4Mzc3MGU2ZGMwNTFjODBmMTYyNzQxLi4wYjFjNmFkNTYxMWU0NzMx YmNlYTlmZmFjYTQwMjVkZTczNmQ0ZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCkBAIC04OTUsNyArODk1LDcgQEAgc3RhdGljIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUdhbWVw YWRQcm92aWRlcklmTmVjZXNzYXJ5KCkKIAogICAgIGlmIChDbGFzcyBnZXN0dXJlQ2xhc3MgPSBO U0NsYXNzRnJvbVN0cmluZyhAIk5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIiKSkg ewogICAgICAgICBSZXRhaW5QdHI8TlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplcj4g cmVjb2duaXplciA9IGFkb3B0TlMoWyhOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVy ICopW2dlc3R1cmVDbGFzcyBhbGxvY10gaW5pdFdpdGhUYXJnZXQ6bmlsIGFjdGlvbjpOVUxMXSk7 Ci0gICAgICAgIF9wcml2YXRlLT5pbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyID0gW1tXZWJJbW1l ZGlhdGVBY3Rpb25Db250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdlYlZpZXc6c2VsZl07CisgICAg ICAgIF9wcml2YXRlLT5pbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyID0gW1tXZWJJbW1lZGlhdGVB Y3Rpb25Db250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdlYlZpZXc6c2VsZiByZWNvZ25pemVyOnJl Y29nbml6ZXIuZ2V0KCldOwogICAgICAgICBbcmVjb2duaXplciBzZXREZWxlZ2F0ZTpfcHJpdmF0 ZS0+aW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlcl07CiAgICAgICAgIFtzZWxmIGFkZEdlc3R1cmVS ZWNvZ25pemVyOnJlY29nbml6ZXIuZ2V0KCldOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCmlu ZGV4IDYxZDE4OGVmMzFjMmVkYTViZDE1OWVlNGE1YzQyNzBhOWVkNTUxMzIuLmM4YjQxYWJhNGE2 ZTJhNzZiNGMxZGNmZmFjYTA5ZGNmMzc5NTVjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaApAQCAt NDQsNyArNDQsNiBAQCBlbnVtIGNsYXNzIEltbWVkaWF0ZUFjdGlvblN0YXRlIHsKIH07CiB9CiAK LUBjbGFzcyBOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyOwogQGNsYXNzIFdLUGFn ZVByZXZpZXdWaWV3Q29udHJvbGxlcjsKIEBjbGFzcyBXS1ZpZXc7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIubW0KaW5kZXggMGE2Y2I3MGQ0YjE5ZWUwNjhlMjMyZGI2NWZkZGIxMTQ2NzdkNTczZi4uOWU1 NGZjNTU3NDIyMDkzNTg5YjBkZDkzNzY1YTMzZjdjZjY4ZDM3NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW0KKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIubW0KQEAgLTc3LDYgKzc3LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKICAgICBfcGFn ZSA9IG51bGxwdHI7CiAgICAgX3drVmlldyA9IG5pbDsKICAgICBfaGl0VGVzdFJlc3VsdCA9IEFj dGlvbk1lbnVIaXRUZXN0UmVzdWx0KCk7CisgICAgX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIg PSBuaWw7CiB9CiAKIC0gKHZvaWQpX2NsZWFySW1tZWRpYXRlQWN0aW9uU3RhdGUK