92521 2012-07-27 11:21:43 -0700 Show the unavailable plug-in indicator for Java applets as well 2012-07-27 12:30:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca japhet jochen webkit.review.bot oldest_to_newest 680850 0 andersca 2012-07-27 11:21:43 -0700 Show the unavailable plug-in indicator for Java applets as well 680861 1 154995 andersca 2012-07-27 11:30:05 -0700 Created attachment 154995 Patch 680961 2 andersca 2012-07-27 12:30:33 -0700 Committed r123907: <http://trac.webkit.org/changeset/123907> 154995 2012-07-27 11:30:05 -0700 2012-07-27 11:31:26 -0700 Patch bug-92521-20120727112954.patch text/plain 13116 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQwODM0ZTZkNmQzMTk1 YTc0N2YyYWQwZDVjNDMxOWQzMDJmZjRkOC4uMjkyNTZmZDMzYWQyMTFkNmE3YTVhMzQ3NTQxYzk3 YTE5ZTgxNzFlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdyB0aGUgdW5h dmFpbGFibGUgcGx1Zy1pbiBpbmRpY2F0b3IgZm9yIEphdmEgYXBwbGV0cyBhcyB3ZWxsCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjUyMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdyB0aGF0IDxhcHBs ZXQ+IGJlaGF2ZXMgbW9yZSBsaWtlIDxlbWJlZD4gYW5kIDxvYmplY3Q+LCBtYWtlIHN1cmUgdGhh dCB3ZSBzaG93IHRoZSB1bmF2YWlsYWJsZSBwbHVnLWluIGluZGljYXRvcgorICAgICAgICBhbmQg Y2FsbCB0aGUgY29ycmVjdCBlcnJvciBjYWxsYmFja3MgaWYgd2UgZmFpbCB0byBpbnN0YW50aWF0 ZSB0aGUgcGx1Zy1pbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICBFeHBvcnQgYSBzeW1ib2wgbmVlZGVkIGJ5IFdl YktpdDIuCisKKyAgICAgICAgKiBodG1sL0hUTUxBcHBsZXRFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxBcHBsZXRFbGVtZW50OjpIVE1MQXBwbGV0RWxlbWVudCk6CisgICAgICAg IFNldCB0aGUgY29ycmVjdCBzZXJ2aWNlIHR5cGUuCisKKyAgICAgICAgKiBsb2FkZXIvU3ViZnJh bWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3ViZnJhbWVMb2FkZXI6OmNyZWF0ZUph dmFBcHBsZXRXaWRnZXQpOgorICAgICAgICBFbmFibGUgdGhlIHVuYXZhaWxhYmxlIHBsdWctaW4g aW5kaWNhdG9yIGlmIHdlIGZhaWwgdG8gY3JlYXRlIHRoZSBqYXZhIGFwcGxldCB3aWRnZXQuCisK IDIwMTItMDctMjYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBIVE1MQXBwbGV0RWxlbWVudCBzaG91bGQgaW5oZXJpdCBmcm9tIEhUTUxQbHVnSW5JbWFn ZUVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBjNjhiZGVhMDQ3NjIyMzdlOWJlN2I3ZGFlYmEw OTYzMGI3MjhjYjQ4Li4wOTAwOTc0ZTQ1ZTFkYmI5ZDYxZmFlYWU3ZGQ4OWUwYjIyN2E4OWIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDctMjcgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBTaG93IHRoZSB1bmF2YWlsYWJs ZSBwbHVnLWluIGluZGljYXRvciBmb3IgSmF2YSBhcHBsZXRzIGFzIHdlbGwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTIxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hlY2sgaWYgdGhlIEphdmEgcGx1 Zy1pbiBpcyBibG9ja2VkIGJlZm9yZSB0cnlpbmcgdG8gaW5zdGFudGlhdGUgaXQuCisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKwogMjAxMi0wNy0y NSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc2V0dGlu ZyB0byBlbmFibGUgYW5kIGRpc2FibGUgZGlhZ25vc3RpYyBsb2dnaW5nLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDU2OWRkNzVkYmNhMTU4ZjE3NzFkZmFkMDA4YTViZmE1OGI5ODdlMTUuLjgxYzAzNTA5M2M4YmQz YjQ3ODUyYTBlMTQ2YzdlY2I5YzYzNjNlYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAor MjAxMi0wNy0yNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFNob3cgdGhlIHVuYXZhaWxhYmxlIHBsdWctaW4gaW5kaWNhdG9yIGZvciBKYXZhIGFwcGxl dHMgYXMgd2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTI1MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRpdGlvbmFsIGluZm9ybWF0aW9uIG9mIHRoZSBjaGFuZ2Ugc3VjaCBhcyBhcHByb2FjaCwg cmF0aW9uYWxlLiBQbGVhc2UgYWRkIHBlci1mdW5jdGlvbiBkZXNjcmlwdGlvbnMgYmVsb3cgKE9P UFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50Ojp1bmF2YWlsYWJsZVBs dWdpbkJ1dHRvbkNsaWNrZWQpOgorICAgICAgICBUaGlzIGNhbiBub3cgYmUgY2FsbGVkIG9uIGFw cGxldCBlbGVtZW50cyBhcyB3ZWxsLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l TG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KToKKyAgICAgICAgR2V0IHRoZSBN SU1FIHR5cGUgZnJvbSB0aGUgYXBwbGV0IGVsZW1lbnQuCisKIDIwMTItMDctMjYgIFplbm8gQWxi aXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBRdCBidWlsZGZp eCBhZnRlciByMTIzNzg2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCAxNjU4YTQzMmUxZDljMjIw MGIzODhiN2EyMjA3YmM2NzE4ZWI4ZDFlLi43ZDJjMmNjMDdkNDcwODNlNzkxNGU2YTU1YzgzNGU1 MWRhYWU3MzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtOTk3LDYgKzk5Nyw3IEBAIF9fWk43 V2ViQ29yZTlIVE1MTmFtZXM4aHJlZkF0dHJFCiBfX1pON1dlYkNvcmU5SFRNTE5hbWVzOGlucHV0 VGFnRQogX19aTjdXZWJDb3JlOUhUTUxOYW1lczhuYW1lQXR0ckUKIF9fWk43V2ViQ29yZTlIVE1M TmFtZXM4dmlkZW9UYWdFCitfX1pON1dlYkNvcmU5SFRNTE5hbWVzOWFwcGxldFRhZ0UKIF9fWk43 V2ViQ29yZTlIVE1MTmFtZXM5aWZyYW1lVGFnRQogX19aTjdXZWJDb3JlOUhUTUxOYW1lczlvYmpl Y3RUYWdFCiBfX1pON1dlYkNvcmU5SFRNTE5hbWVzOXNjcmlwdFRhZ0UKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFwcGxldEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKaW5kZXggYzEzZTczODIxZDljMjIwMWZkOWJlNTFm NWVlNDFlMzllNjQwNmFlYy4uNTJkNjRiZGI4OTM5ZTFhMzc3YmNjNWU1ODVlNjA1NGI5ZTJmOTUw ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKQEAgLTQyLDYg KzQyLDggQEAgSFRNTEFwcGxldEVsZW1lbnQ6OkhUTUxBcHBsZXRFbGVtZW50KGNvbnN0IFF1YWxp ZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50KiBkb2MKICAgICA6IEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQodGFnTmFtZSwgZG9jdW1lbnQsIGNyZWF0ZWRCeVBhcnNlciwgU2hvdWxkTm90UHJlZmVy UGx1Z0luc0ZvckltYWdlcykKIHsKICAgICBBU1NFUlQoaGFzVGFnTmFtZShhcHBsZXRUYWcpKTsK KworICAgIG1fc2VydmljZVR5cGUgPSAiYXBwbGljYXRpb24veC1qYXZhLWFwcGxldCI7CiB9CiAK IFBhc3NSZWZQdHI8SFRNTEFwcGxldEVsZW1lbnQ+IEhUTUxBcHBsZXRFbGVtZW50OjpjcmVhdGUo Y29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIGNy ZWF0ZWRCeVBhcnNlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFt ZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmlu ZGV4IDI4MDkwOGEyMmQzMmZjMzUyOTU5MzRlYmE0YzYyZGZhMWRiY2U5ZDguLjY4NDdiNDIwY2Q2 YWM2MTM3Yjc3OTQ3ZDEyM2M4YmY3MTIyOGZjYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1 YmZyYW1lTG9hZGVyLmNwcApAQCAtMjI5LDggKzIyOSwxNCBAQCBQYXNzUmVmUHRyPFdpZGdldD4g U3ViZnJhbWVMb2FkZXI6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYgc2l6 ZSwgSAogICAgIFJlZlB0cjxXaWRnZXQ+IHdpZGdldDsKICAgICBpZiAoYWxsb3dQbHVnaW5zKEFi b3V0VG9JbnN0YW50aWF0ZVBsdWdpbikpCiAgICAgICAgIHdpZGdldCA9IG1fZnJhbWUtPmxvYWRl cigpLT5jbGllbnQoKS0+Y3JlYXRlSmF2YUFwcGxldFdpZGdldChzaXplLCBlbGVtZW50LCBiYXNl VVJMLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcyk7Ci0gICAgaWYgKCF3aWRnZXQpCisKKyAgICBp ZiAoIXdpZGdldCkgeworICAgICAgICBSZW5kZXJFbWJlZGRlZE9iamVjdCogcmVuZGVyZXIgPSBl bGVtZW50LT5yZW5kZXJFbWJlZGRlZE9iamVjdCgpOworCisgICAgICAgIGlmICghcmVuZGVyZXIt PnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSkKKyAgICAgICAgICAgIHJlbmRlcmVy LT5zZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1 Z2luTWlzc2luZyk7CiAgICAgICAgIHJldHVybiAwOworICAgIH0KIAogICAgIG1fY29udGFpbnNQ bHVnaW5zID0gdHJ1ZTsKICAgICByZXR1cm4gd2lkZ2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0gYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRleCA2 MzY0NDIwZWJmZDNhNzVlNWViODI0ZmY2MzVjNjBlMjIwNDgyNWYxLi42ZDAxN2FmYWMwNDg5MDM3 ZGQzN2U0MzNjOWVkZjllY2NhNzcxMmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtMTc1OSw0NyAr MTc1OSw1NSBAQCBQYXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0 ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYgcwogCiAgICAgV2ViQmFzZVBsdWdpblBh Y2thZ2UgKnBsdWdpblBhY2thZ2UgPSBbd2ViVmlldyBfcGx1Z2luRm9yTUlNRVR5cGU6TUlNRVR5 cGVdOwogCisgICAgaW50IGVycm9yQ29kZSA9IFdlYktpdEVycm9ySmF2YVVuYXZhaWxhYmxlOwor CiAgICAgaWYgKHBsdWdpblBhY2thZ2UpIHsKLSAgICAgICAgaWYgKFtwbHVnaW5QYWNrYWdlIGlz S2luZE9mQ2xhc3M6W1dlYlBsdWdpblBhY2thZ2UgY2xhc3NdXSkgewotICAgICAgICAgICAgLy8g Rm9yIHNvbWUgcmVhc29uLCB0aGUgSmF2YSBwbHVnLWluIHJlcXVpcmVzIHRoYXQgd2UgcGFzcyB0 aGUgZGltZW5zaW9uIG9mIHRoZSBwbHVnLWluIGFzIGF0dHJpYnV0ZXMuCi0gICAgICAgICAgICBO U011dGFibGVBcnJheSAqbmFtZXMgPSBraXQocGFyYW1OYW1lcyk7Ci0gICAgICAgICAgICBOU011 dGFibGVBcnJheSAqdmFsdWVzID0ga2l0KHBhcmFtVmFsdWVzKTsKLSAgICAgICAgICAgIGlmIChw YXJhbWV0ZXJWYWx1ZShwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgIndpZHRoIikuaXNOdWxsKCkp IHsKLSAgICAgICAgICAgICAgICBbbmFtZXMgYWRkT2JqZWN0OkAid2lkdGgiXTsKLSAgICAgICAg ICAgICAgICBbdmFsdWVzIGFkZE9iamVjdDpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVk Iiwgc2l6ZS53aWR0aCgpXV07CisgICAgICAgIGlmICghV0tTaG91bGRCbG9ja1BsdWdpbihbcGx1 Z2luUGFja2FnZSBidW5kbGVJZGVudGlmaWVyXSwgW3BsdWdpblBhY2thZ2UgYnVuZGxlVmVyc2lv bl0pKSB7CisgICAgICAgICAgICBpZiAoW3BsdWdpblBhY2thZ2UgaXNLaW5kT2ZDbGFzczpbV2Vi UGx1Z2luUGFja2FnZSBjbGFzc11dKSB7CisgICAgICAgICAgICAgICAgLy8gRm9yIHNvbWUgcmVh c29uLCB0aGUgSmF2YSBwbHVnLWluIHJlcXVpcmVzIHRoYXQgd2UgcGFzcyB0aGUgZGltZW5zaW9u IG9mIHRoZSBwbHVnLWluIGFzIGF0dHJpYnV0ZXMuCisgICAgICAgICAgICAgICAgTlNNdXRhYmxl QXJyYXkgKm5hbWVzID0ga2l0KHBhcmFtTmFtZXMpOworICAgICAgICAgICAgICAgIE5TTXV0YWJs ZUFycmF5ICp2YWx1ZXMgPSBraXQocGFyYW1WYWx1ZXMpOworICAgICAgICAgICAgICAgIGlmIChw YXJhbWV0ZXJWYWx1ZShwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgIndpZHRoIikuaXNOdWxsKCkp IHsKKyAgICAgICAgICAgICAgICAgICAgW25hbWVzIGFkZE9iamVjdDpAIndpZHRoIl07CisgICAg ICAgICAgICAgICAgICAgIFt2YWx1ZXMgYWRkT2JqZWN0OltOU1N0cmluZyBzdHJpbmdXaXRoRm9y bWF0OkAiJWQiLCBzaXplLndpZHRoKCldXTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgaWYgKHBhcmFtZXRlclZhbHVlKHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCAiaGVpZ2h0 IikuaXNOdWxsKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgW25hbWVzIGFkZE9iamVjdDpAImhl aWdodCJdOworICAgICAgICAgICAgICAgICAgICBbdmFsdWVzIGFkZE9iamVjdDpbTlNTdHJpbmcg c3RyaW5nV2l0aEZvcm1hdDpAIiVkIiwgc2l6ZS5oZWlnaHQoKV1dOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICB2aWV3ID0gcGx1Z2luVmlldyhtX3dlYkZyYW1lLmdldCgpLCAo V2ViUGx1Z2luUGFja2FnZSAqKXBsdWdpblBhY2thZ2UsIG5hbWVzLCB2YWx1ZXMsIGJhc2VVUkws IGtpdChlbGVtZW50KSwgTk8pOworICAgICAgICAgICAgICAgIGlmICh2aWV3KQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBsdWdpbldpZGdldCh2aWV3KSk7CiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICBpZiAocGFyYW1ldGVyVmFsdWUocGFyYW1OYW1lcywgcGFy YW1WYWx1ZXMsICJoZWlnaHQiKS5pc051bGwoKSkgewotICAgICAgICAgICAgICAgIFtuYW1lcyBh ZGRPYmplY3Q6QCJoZWlnaHQiXTsKLSAgICAgICAgICAgICAgICBbdmFsdWVzIGFkZE9iamVjdDpb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVkIiwgc2l6ZS5oZWlnaHQoKV1dOworICAgICNp ZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKKyAgICAgICAgICAgIGVsc2UgaWYgKFtwbHVn aW5QYWNrYWdlIGlzS2luZE9mQ2xhc3M6W1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSBjbGFzc11d KSB7CisgICAgICAgICAgICAgICAgdmlldyA9IFtbW05FVFNDQVBFX1BMVUdJTl9WSUVXIGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdo dCgpKQorICAgICAgICAgICAgICAgICAgICBwbHVnaW5QYWNrYWdlOihXZWJOZXRzY2FwZVBsdWdp blBhY2thZ2UgKilwbHVnaW5QYWNrYWdlCisgICAgICAgICAgICAgICAgICAgIFVSTDpuaWwKKyAg ICAgICAgICAgICAgICAgICAgYmFzZVVSTDpiYXNlVVJMCisgICAgICAgICAgICAgICAgICAgIE1J TUVUeXBlOk1JTUVUeXBlCisgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZUtleXM6a2l0KHBh cmFtTmFtZXMpCisgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZVZhbHVlczpraXQocGFyYW1W YWx1ZXMpCisgICAgICAgICAgICAgICAgICAgIGxvYWRNYW51YWxseTpOTworICAgICAgICAgICAg ICAgICAgICBlbGVtZW50OmVsZW1lbnRdIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgICAgICAgICBp ZiAodmlldykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBOZXRzY2Fw ZVBsdWdpbldpZGdldChzdGF0aWNfY2FzdDxXZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3ICo+KHZp ZXcpKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdmlldyA9IHBsdWdpblZpZXco bV93ZWJGcmFtZS5nZXQoKSwgKFdlYlBsdWdpblBhY2thZ2UgKilwbHVnaW5QYWNrYWdlLCBuYW1l cywgdmFsdWVzLCBiYXNlVVJMLCBraXQoZWxlbWVudCksIE5PKTsKLSAgICAgICAgICAgIGlmICh2 aWV3KQotICAgICAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUGx1Z2luV2lkZ2V0KHZp ZXcpKTsKLSAgICAgICAgfSAKLSNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKLSAgICAg ICAgZWxzZSBpZiAoW3BsdWdpblBhY2thZ2UgaXNLaW5kT2ZDbGFzczpbV2ViTmV0c2NhcGVQbHVn aW5QYWNrYWdlIGNsYXNzXV0pIHsKLSAgICAgICAgICAgIHZpZXcgPSBbW1tORVRTQ0FQRV9QTFVH SU5fVklFVyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIHNpemUud2lkdGgo KSwgc2l6ZS5oZWlnaHQoKSkKLSAgICAgICAgICAgICAgICBwbHVnaW5QYWNrYWdlOihXZWJOZXRz Y2FwZVBsdWdpblBhY2thZ2UgKilwbHVnaW5QYWNrYWdlCi0gICAgICAgICAgICAgICAgVVJMOm5p bAotICAgICAgICAgICAgICAgIGJhc2VVUkw6YmFzZVVSTAotICAgICAgICAgICAgICAgIE1JTUVU eXBlOk1JTUVUeXBlCi0gICAgICAgICAgICAgICAgYXR0cmlidXRlS2V5czpraXQocGFyYW1OYW1l cykKLSAgICAgICAgICAgICAgICBhdHRyaWJ1dGVWYWx1ZXM6a2l0KHBhcmFtVmFsdWVzKQotICAg ICAgICAgICAgICAgIGxvYWRNYW51YWxseTpOTwotICAgICAgICAgICAgICAgIGVsZW1lbnQ6ZWxl bWVudF0gYXV0b3JlbGVhc2VdOwotICAgICAgICAgICAgaWYgKHZpZXcpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBOZXRzY2FwZVBsdWdpbldpZGdldChzdGF0aWNfY2FzdDxX ZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3ICo+KHZpZXcpKSk7CisgICAgI2VuZGlmCiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAg IGVycm9yQ29kZSA9IFdlYktpdEVycm9yQmxvY2tlZFBsdWdJblZlcnNpb247CisgICAgICAgICAg ICBpZiAoZWxlbWVudC0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVjdCgpKQorICAgICAgICAg ICAgICAgIHRvUmVuZGVyRW1iZWRkZWRPYmplY3QoZWxlbWVudC0+cmVuZGVyZXIoKSktPnNldFBs dWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpJbnNlY3VyZVBs dWdpblZlcnNpb24pOwogICAgICAgICB9Ci0jZW5kaWYKICAgICB9CiAKICAgICBpZiAoIXZpZXcp IHsKICAgICAgICAgV2ViUmVzb3VyY2VEZWxlZ2F0ZUltcGxlbWVudGF0aW9uQ2FjaGUqIGltcGxl bWVudGF0aW9ucyA9IFdlYlZpZXdHZXRSZXNvdXJjZUxvYWREZWxlZ2F0ZUltcGxlbWVudGF0aW9u cyhnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpKTsKICAgICAgICAgaWYgKGltcGxlbWVudGF0 aW9ucy0+cGx1Z0luRmFpbGVkV2l0aEVycm9yRnVuYykgewogICAgICAgICAgICAgTlNTdHJpbmcg KnBsdWdpbk5hbWUgPSBwbHVnaW5QYWNrYWdlID8gKE5TU3RyaW5nICopW3BsdWdpblBhY2thZ2Ug cGx1Z2luSW5mb10ubmFtZSA6IG5pbDsKLSAgICAgICAgICAgIE5TRXJyb3IgKmVycm9yID0gW1tO U0Vycm9yIGFsbG9jXSBfaW5pdFdpdGhQbHVnaW5FcnJvckNvZGU6V2ViS2l0RXJyb3JKYXZhVW5h dmFpbGFibGUgY29udGVudFVSTDpuaWwgcGx1Z2luUGFnZVVSTDpuaWwgcGx1Z2luTmFtZTpwbHVn aW5OYW1lIE1JTUVUeXBlOk1JTUVUeXBlXTsKKyAgICAgICAgICAgIE5TRXJyb3IgKmVycm9yID0g W1tOU0Vycm9yIGFsbG9jXSBfaW5pdFdpdGhQbHVnaW5FcnJvckNvZGU6ZXJyb3JDb2RlIGNvbnRl bnRVUkw6bmlsIHBsdWdpblBhZ2VVUkw6bmlsIHBsdWdpbk5hbWU6cGx1Z2luTmFtZSBNSU1FVHlw ZTpNSU1FVHlwZV07CiAgICAgICAgICAgICBDYWxsUmVzb3VyY2VMb2FkRGVsZWdhdGUoaW1wbGVt ZW50YXRpb25zLT5wbHVnSW5GYWlsZWRXaXRoRXJyb3JGdW5jLCBbbV93ZWJGcmFtZS5nZXQoKSB3 ZWJWaWV3XSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBAc2VsZWN0b3Io d2ViVmlldzpwbHVnSW5GYWlsZWRXaXRoRXJyb3I6ZGF0YVNvdXJjZTopLCBlcnJvciwgW21fd2Vi RnJhbWUuZ2V0KCkgX2RhdGFTb3VyY2VdKTsKICAgICAgICAgICAgIFtlcnJvciByZWxlYXNlXTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCBmNGM0YWRmOGZmNTRkOTkxYjE3ZTIwN2Q0MWVh YjUxYTE2MjgzMGNhLi5kMTBhOTZlNTFmODgyOTU3ODg0ODI1ODQ2YzY4NTM1OTg0YzgzNmEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC00ODMsNyArNDgzLDcgQEAgYm9vbCBXZWJDaHJv bWVDbGllbnQ6OnNob3VsZFVuYXZhaWxhYmxlUGx1Z2luTWVzc2FnZUJlQnV0dG9uKFJlbmRlckVt YmVkZGVkT2JqZWMKICAgICAKIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojp1bmF2YWlsYWJsZVBsdWdp bkJ1dHRvbkNsaWNrZWQoRWxlbWVudCogZWxlbWVudCwgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBs dWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKSBjb25z dAogewotICAgIEFTU0VSVChlbGVtZW50LT5oYXNUYWdOYW1lKG9iamVjdFRhZykgfHwgZWxlbWVu dC0+aGFzVGFnTmFtZShlbWJlZFRhZykpOworICAgIEFTU0VSVChlbGVtZW50LT5oYXNUYWdOYW1l KG9iamVjdFRhZykgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShlbWJlZFRhZykgfHwgZWxlbWVudC0+ aGFzVGFnTmFtZShhcHBsZXRUYWcpKTsKICAgICBBU1NFUlQocGx1Z2luVW5hdmFpbGFiaWxpdHlS ZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3NpbmcgfHwgcGx1Z2luVW5h dmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6Okluc2VjdXJlUGx1Z2lu VmVyc2lvbik7CiAKICAgICBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50KiBwbHVnaW5FbGVtZW50ID0g c3RhdGljX2Nhc3Q8SFRNTFBsdWdJbkltYWdlRWxlbWVudCo+KGVsZW1lbnQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAzZmQyOTlkZDM2ZDljZDM5NjJjZGMyMjg0NmI5 ZmIxOTY2NDZiZTM0Li5mYmI4MjQ5NzRmZDViZDY0MWQwMzdiZjlmNTQxZTE3MzU5MTExZjE0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTM2NCwxMSArMTM2NCwxMCBA QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpyZWRpcmVjdERhdGFUb1BsdWdpbihXaWRnZXQq IHBsdWdpbldpZGdldCkKIAogUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50 OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUmIHBsdWdpblNpemUsIEhUTUxB cHBsZXRFbGVtZW50KiBhcHBsZXRFbGVtZW50LCBjb25zdCBLVVJMJiBiYXNlVVJMLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFs dWVzKQogewotICAgIGNvbnN0IFN0cmluZyBtaW1lVHlwZSA9ICJhcHBsaWNhdGlvbi94LWphdmEt YXBwbGV0IjsKLSAgICBSZWZQdHI8V2lkZ2V0PiBwbHVnaW4gPSBjcmVhdGVQbHVnaW4ocGx1Z2lu U2l6ZSwgYXBwbGV0RWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWlt ZVR5cGUsIGZhbHNlKTsKKyAgICBSZWZQdHI8V2lkZ2V0PiBwbHVnaW4gPSBjcmVhdGVQbHVnaW4o cGx1Z2luU2l6ZSwgYXBwbGV0RWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVl cywgYXBwbGV0RWxlbWVudC0+c2VydmljZVR5cGUoKSwgZmFsc2UpOwogICAgIGlmICghcGx1Z2lu KSB7CiAgICAgICAgIGlmIChXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpKQotICAg ICAgICAgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsVG9J bml0aWFsaXplUGx1Z2luKG1pbWVUeXBlKSk7CisgICAgICAgICAgICB3ZWJQYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oYXBwbGV0RWxl bWVudC0+c2VydmljZVR5cGUoKSkpOwogICAgIH0KICAgICByZXR1cm4gcGx1Z2luLnJlbGVhc2Uo KTsKIH0K