143425 2015-04-05 15:28:34 -0700 FrameView code uses page() without null checking 2015-04-05 20:30:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin ap bdakin commit-queue kling sam oldest_to_newest 1082952 0 darin 2015-04-05 15:28:34 -0700 FrameView code uses page() without null checking 1082953 1 250170 darin 2015-04-05 15:36:23 -0700 Created attachment 250170 Patch 1082962 2 250174 darin 2015-04-05 16:38:11 -0700 Created attachment 250174 Patch 1083018 3 darin 2015-04-05 19:41:53 -0700 rdar://problem/18920601 1083030 4 250174 commit-queue 2015-04-05 20:30:00 -0700 Comment on attachment 250174 Patch Clearing flags on attachment: 250174 Committed r182374: <http://trac.webkit.org/changeset/182374> 1083031 5 commit-queue 2015-04-05 20:30:04 -0700 All reviewed patches have been landed. Closing bug. 250170 2015-04-05 15:36:23 -0700 2015-04-05 16:38:05 -0700 Patch bug-143425-20150405153535.patch text/plain 8709 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI5MzY3ZDE3ZDNiNGM1 MGIyNjUzZTMyY2I0NWE0MzNiN2VhM2ZkZi4uMzQ2NTA1YzY2NzUzNjU1NTZjM2EzODZkMmY3NThi MTRlMzAwMjg0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE1LTA0LTA1ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGcmFtZVZpZXcgY29kZSB1c2Vz IHBhZ2UoKSB3aXRob3V0IG51bGwgY2hlY2tpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzQyNQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xODky MDYwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo aWxlIHdlIGRvbid0IGhhdmUgdGVzdHMgdGhhdCBjb3ZlciB0aGlzLCB3ZSBhcmUgc2VlaW5nIGNy YXNoZXMgY29taW5nIGluCisgICAgICAgIHRoYXQgaW5kaWNhdGUgdGhlIHNob3VsZEVuYWJsZVNw ZWN1bGF0aXZlVGlsaW5nRHVyaW5nTG9hZGluZyBmdW5jdGlvbiBpcworICAgICAgICBiZWluZyBj YWxsZWQgd2hlbiB0aGUgcGFnZSBpcyBudWxsLiBUaGlzIHBhdGNoIGFkZHMgbnVsbCBjaGVja3Mg dG8gYWxsIHRoZQorICAgICAgICBwbGFjZXMgaW4gRnJhbWVWaWV3IHRoYXQgdXNlIHBhZ2UoKSB3 aXRob3V0IGRvaW5nIG51bGwgY2hlY2tpbmcuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6IElmIHBhZ2UgaXMgbnVs bCwgZG9uJ3QgdHJ5IHRvIGRvIHRoZQorICAgICAgICBhdXRvLXNpemluZyBsb2dpYyB0aGF0IGlu dm9sdmVzIHRoZSB0ZXh0QXV0b3NpemluZ1dpZHRoIHZhbHVlIGZyb20gdGhlIHBhZ2UuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KTogR2V0 IHNldHRpbmdzIGZyb20gdGhlCisgICAgICAgIGZyYW1lIHJhdGhlciB0aGFuIHRoZSBwYWdlIHRv IGF2b2lkIHBvc3NpYmxlIG51bGwtZGVyZWZlcmVuY2UuCisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCk6IENoZWNrIHRoZSBwYWdlIGZvciBudWxsIHdo ZW4KKyAgICAgICAgZ2V0dGluZyB0aGUgZXZlbnQgdGhyb3R0bGluZyBkZWxheS4KKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcpOiBDaGVjayB0 aGUgcGFnZSBmb3IgbnVsbCwKKyAgICAgICAgYW5kIHJldHVybiBlYXJseSBpZiBpdCBpcyBudWxs LgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU3BlY3VsYXRpdmVUaWxpbmdEdXJpbmdM b2FkaW5nKTogQ2hlY2sgdGhlIHBhZ2UgZm9yCisgICAgICAgIG51bGwsIGFuZCByZXR1cm4gZmFs c2UgaWYgaXQgaXMgbnVsbC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGVyZm9ybVBv c3RMYXlvdXRUYXNrcyk6IEd1YXJkIHRoZSBjb2RlIHRoYXQgY2FsbHMKKyAgICAgICAgZGlkTGF5 b3V0IG9uIHRoZSBwYWdlIGNsaWVudCBieSBhIGNoZWNrIGlmIHRoZSBwYWdlIGlzIG51bGwuCisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnBhZ2luYXRpb24pOiBEb24ndCBjYWxsIFBhZ2U6 OnBhZ2luYXRpb24gb24gYSBudWxsCisgICAgICAgIHBhZ2UgaGVyZS4KKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rvcik6IFVzZSBhIHNjYWxlIGZh Y3RvciBvZiAxCisgICAgICAgIGlmIHRoZSBwYWdlIGlzIG51bGwuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OnNldFZpc2libGVTY3JvbGxlclRodW1iUmVjdCk6IERvbid0IGNhbGwgdGhy b3VnaCB0bworICAgICAgICB0aGUgcGFnZSBjbGllbnQgaWYgdGhlIHBhZ2UgaXMgbnVsbC4KKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcik6 IENoZWNrIHRoZSBwYWdlIGZvciBudWxsCisgICAgICAgIGJlZm9yZSBhc2tpbmcgaXQgZm9yIHRo ZSBzY3JvbGxpbmcgY29vcmRpbmF0b3IuCisKIDIwMTUtMDQtMDUgIEd5dXlvdW5nIEtpbSAgPGd5 dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBVc2UgY29uc3RhbnRzIG9mIHNxbGl0 ZTMgZGlyZWN0bHkgZm9yIHN0YXR1cyBvZiBTUUwgcmVzdWx0IGluIHdlYmRhdGFiYXNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMDZmOWJlZDdlZjUwNjExMWE5MDlhNmJiNzk0Zjhk NTEyZjIyM2IxNi4uZTQ4ZDRjYjAxZjZkODMzMWU2MzMzNjJhMWU5ZGQzNmRjNzc5OGE2NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMTMxMywxMyArMTMxMywxNCBAQCB2b2lkIEZy YW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogCiAgICAgICAgIHJvb3QtPmxheW91 dCgpOwogI2lmIEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQotICAgICAgICBmbG9hdCBtaW5a b29tRm9udFNpemUgPSBmcmFtZSgpLnNldHRpbmdzKCkubWluaW11bVpvb21Gb250U2l6ZSgpOwot ICAgICAgICBmbG9hdCB2aXNXaWR0aCA9IGZyYW1lKCkucGFnZSgpLT50ZXh0QXV0b3NpemluZ1dp ZHRoKCk7Ci0gICAgICAgIGlmIChtaW5ab29tRm9udFNpemUgJiYgdmlzV2lkdGggJiYgIXJvb3Qt PnZpZXcoKS5wcmludGluZygpKSB7Ci0gICAgICAgICAgICByb290LT5hZGp1c3RDb21wdXRlZEZv bnRTaXplc09uQmxvY2tzKG1pblpvb21Gb250U2l6ZSwgdmlzV2lkdGgpOyAgICAKLSAgICAgICAg ICAgIGJvb2wgbmVlZHNMYXlvdXQgPSByb290LT5uZWVkc0xheW91dCgpOwotICAgICAgICAgICAg aWYgKG5lZWRzTGF5b3V0KQotICAgICAgICAgICAgICAgIHJvb3QtPmxheW91dCgpOworICAgICAg ICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpKSB7CisgICAgICAgICAgICBmbG9hdCBt aW5pbXVtWm9vbUZvbnRTaXplID0gZnJhbWUoKS5zZXR0aW5ncygpLm1pbmltdW1ab29tRm9udFNp emUoKTsKKyAgICAgICAgICAgIGZsb2F0IHRleHRBdXRvc2l6aW5nV2lkdGggPSBwYWdlLT50ZXh0 QXV0b3NpemluZ1dpZHRoKCk7CisgICAgICAgICAgICBpZiAobWluaW11bVpvb21Gb250U2l6ZSAm JiB0ZXh0QXV0b3NpemluZ1dpZHRoICYmICFyb290LT52aWV3KCkucHJpbnRpbmcoKSkgeworICAg ICAgICAgICAgICAgIHJvb3QtPmFkanVzdENvbXB1dGVkRm9udFNpemVzT25CbG9ja3MobWluaW11 bVpvb21Gb250U2l6ZSwgdGV4dEF1dG9zaXppbmdXaWR0aCk7CisgICAgICAgICAgICAgICAgaWYg KHJvb3QtPm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAgICAgIHJvb3QtPmxheW91dCgp OworICAgICAgICAgICAgfQogICAgICAgICB9CiAjZW5kaWYKICNpZiBFTkFCTEUoVEVYVF9BVVRP U0laSU5HKQpAQCAtMjA4NSw3ICsyMDg2LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnNldEZpeGVkVmlz aWJsZUNvbnRlbnRSZWN0KGNvbnN0IEludFJlY3QmIHZpc2libGVDb250ZW50UmVjdCkKICAgICBT Y3JvbGxWaWV3OjpzZXRGaXhlZFZpc2libGVDb250ZW50UmVjdCh2aXNpYmxlQ29udGVudFJlY3Qp OwogICAgIGlmIChvZmZzZXQgIT0gc2Nyb2xsT2Zmc2V0KCkpIHsKICAgICAgICAgdXBkYXRlTGF5 ZXJQb3NpdGlvbnNBZnRlclNjcm9sbGluZygpOwotICAgICAgICBpZiAoZnJhbWUoKS5wYWdlKCkt PnNldHRpbmdzKCkuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVk KCkpCisgICAgICAgIGlmIChmcmFtZSgpLnNldHRpbmdzKCkuYWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0ZvckZpeGVkUG9zaXRpb25FbmFibGVkKCkpCiAgICAgICAgICAgICB1cGRhdGVDb21wb3NpdGlu Z0xheWVyc0FmdGVyU2Nyb2xsaW5nKCk7CiAgICAgICAgIEludFBvaW50IG5ld1Bvc2l0aW9uID0g c2Nyb2xsUG9zaXRpb24oKTsKICAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS5zZXRDdXJyZW50UG9z aXRpb24oc2Nyb2xsUG9zaXRpb24oKSk7CkBAIC0yMTI0LDcgKzIxMjUsOCBAQCB2b2lkIEZyYW1l Vmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXRJbXBsKGNvbnN0IElu dFBvaW50JiBvbGRQbwogCiB2b2lkIEZyYW1lVmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkKGNv bnN0IEludFBvaW50JiBvbGRQb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIG5ld1Bvc2l0aW9uKQog ewotICAgIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMgdGhyb3R0bGluZ0RlbGF5ID0gZnJhbWUo KS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLmV2ZW50VGhyb3R0bGluZ0RlbGF5KCk7CisgICAg UGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpOworICAgIGF1dG8gdGhyb3R0bGluZ0RlbGF5ID0g cGFnZSA/IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmV2ZW50VGhyb3R0bGluZ0RlbGF5KCkgOiBz dGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjp6ZXJvKCk7CiAKICAgICBpZiAodGhyb3R0bGluZ0Rl bGF5ID09IHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Onplcm8oKSkgewogICAgICAgICBtX2Rl bGF5ZWRTY3JvbGxFdmVudFRpbWVyLnN0b3AoKTsKQEAgLTIzODYsMTMgKzIzODgsMTYgQEAgdm9p ZCBGcmFtZVZpZXc6OmxvYWRQcm9ncmVzc2luZ1N0YXR1c0NoYW5nZWQoKQogCiB2b2lkIEZyYW1l Vmlldzo6dXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKQogeworICAgIFBhZ2UqIHBhZ2UgPSBm cmFtZSgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIEFT U0VSVChmcmFtZSgpLmlzTWFpbkZyYW1lKCkpOwotICAgIGF1dG8mIHBhZ2UgPSAqZnJhbWUoKS5w YWdlKCk7CiAKICAgICBMYXllckZsdXNoVGhyb3R0bGVTdGF0ZTo6RmxhZ3MgZmxhZ3MgPSBkZXRl cm1pbmVMYXllckZsdXNoVGhyb3R0bGVTdGF0ZShwYWdlKTsKIAogICAgIC8vIFNlZSBpZiB0aGUg Y2xpZW50IGlzIGhhbmRsaW5nIHRocm90dGxpbmcuCi0gICAgaWYgKHBhZ2UuY2hyb21lKCkuY2xp ZW50KCkuYWRqdXN0TGF5ZXJGbHVzaFRocm90dGxpbmcoZmxhZ3MpKQorICAgIGlmIChwYWdlLT5j aHJvbWUoKS5jbGllbnQoKS5hZGp1c3RMYXllckZsdXNoVGhyb3R0bGluZyhmbGFncykpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZS5nZXQoKTsgZnJh bWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5nZXQoKSkpIHsK QEAgLTI0MTcsNyArMjQyMiw4IEBAIHZvaWQgRnJhbWVWaWV3OjphZGp1c3RUaWxlZEJhY2tpbmdD b3ZlcmFnZSgpCiAKIHN0YXRpYyBib29sIHNob3VsZEVuYWJsZVNwZWN1bGF0aXZlVGlsaW5nRHVy aW5nTG9hZGluZyhjb25zdCBGcmFtZVZpZXcmIHZpZXcpCiB7Ci0gICAgcmV0dXJuIHZpZXcuaXNW aXN1YWxseU5vbkVtcHR5KCkgJiYgIXZpZXcuZnJhbWUoKS5wYWdlKCktPnByb2dyZXNzKCkuaXNN YWluTG9hZFByb2dyZXNzaW5nKCk7CisgICAgUGFnZSogcGFnZSA9IHZpZXcuZnJhbWUoKS5wYWdl KCk7CisgICAgcmV0dXJuIHBhZ2UgJiYgdmlldy5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSAmJiAhcGFn ZS0+cHJvZ3Jlc3MoKS5pc01haW5Mb2FkUHJvZ3Jlc3NpbmcoKTsKIH0KIAogdm9pZCBGcmFtZVZp ZXc6OmVuYWJsZVNwZWN1bGF0aXZlVGlsaW5nSWZOZWVkZWQoKQpAQCAtMjk1MSw4ICsyOTU3LDEw IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtUG9zdExheW91dFRhc2tzKCkKICAgICAvLyBPbmx5 IHNlbmQgbGF5b3V0LXJlbGF0ZWQgZGVsZWdhdGUgY2FsbGJhY2tzIHN5bmNocm9ub3VzbHkgZm9y IHRoZSBtYWluIGZyYW1lIHRvCiAgICAgLy8gYXZvaWQgcmUtZW50ZXJpbmcgbGF5b3V0IGZvciB0 aGUgbWFpbiBmcmFtZSB3aGlsZSBkZWxpdmVyaW5nIGEgbGF5b3V0LXJlbGF0ZWQgZGVsZWdhdGUK ICAgICAvLyBjYWxsYmFjayBmb3IgYSBzdWJmcmFtZS4KLSAgICBpZiAoZnJhbWUoKS5pc01haW5G cmFtZSgpKQotICAgICAgICBmcmFtZSgpLnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkuZGlkTGF5 b3V0KCk7CisgICAgaWYgKGZyYW1lKCkuaXNNYWluRnJhbWUoKSkgeworICAgICAgICBpZiAoUGFn ZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpKQorICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xp ZW50KCkuZGlkTGF5b3V0KCk7CisgICAgfQogI2VuZGlmCiAKICNpZiBFTkFCTEUoRk9OVF9MT0FE X0VWRU5UUykKQEAgLTMyNDcsOCArMzI1NSwxMCBAQCBjb25zdCBQYWdpbmF0aW9uJiBGcmFtZVZp ZXc6OnBhZ2luYXRpb24oKSBjb25zdAogICAgIGlmIChtX3BhZ2luYXRpb24gIT0gUGFnaW5hdGlv bigpKQogICAgICAgICByZXR1cm4gbV9wYWdpbmF0aW9uOwogCi0gICAgaWYgKGZyYW1lKCkuaXNN YWluRnJhbWUoKSkKLSAgICAgICAgcmV0dXJuIGZyYW1lKCkucGFnZSgpLT5wYWdpbmF0aW9uKCk7 CisgICAgaWYgKGZyYW1lKCkuaXNNYWluRnJhbWUoKSkgeworICAgICAgICBpZiAoUGFnZSogcGFn ZSA9IGZyYW1lKCkucGFnZSgpKQorICAgICAgICAgICAgcmV0dXJuIHBhZ2UtPnBhZ2luYXRpb24o KTsKKyAgICB9CiAKICAgICByZXR1cm4gbV9wYWdpbmF0aW9uOwogfQpAQCAtMzM5Niw3ICszNDA2 LDExIEBAIGZsb2F0IEZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3RvcigpIGNvbnN0 CiAgICAgaWYgKCFmcmFtZSgpLmlzTWFpbkZyYW1lKCkgfHwgIWZyYW1lKCkuc2V0dGluZ3MoKS5k ZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQogICAgICAgICByZXR1cm4gMTsKIAotICAgIHJldHVybiBm cmFtZSgpLnBhZ2UoKS0+cGFnZVNjYWxlRmFjdG9yKCk7CisgICAgUGFnZSogcGFnZSA9IGZyYW1l KCkucGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIDE7CisKKyAgICByZXR1 cm4gcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpzZXRWaXNp YmxlU2Nyb2xsZXJUaHVtYlJlY3QoY29uc3QgSW50UmVjdCYgc2Nyb2xsZXJUaHVtYikKQEAgLTM0 MDQsNyArMzQxOCwxMSBAQCB2b2lkIEZyYW1lVmlldzo6c2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJS ZWN0KGNvbnN0IEludFJlY3QmIHNjcm9sbGVyVGh1bWIpCiAgICAgaWYgKCFmcmFtZSgpLmlzTWFp bkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGZyYW1lKCkucGFnZSgpLT5jaHJvbWUo KS5jbGllbnQoKS5ub3RpZnlTY3JvbGxlclRodW1iSXNWaXNpYmxlSW5SZWN0KHNjcm9sbGVyVGh1 bWIpOworICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisg ICAgICAgIHJldHVybjsKKworICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLm5vdGlmeVNjcm9s bGVyVGh1bWJJc1Zpc2libGVJblJlY3Qoc2Nyb2xsZXJUaHVtYik7CiB9CiAKIFNjcm9sbGFibGVB cmVhKiBGcmFtZVZpZXc6OmVuY2xvc2luZ1Njcm9sbGFibGVBcmVhKCkgY29uc3QKQEAgLTM1MDIs NyArMzUyMCw4IEBAIHZvaWQgRnJhbWVWaWV3OjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoU2Nyb2xs YmFyU3R5bGUgbmV3U3R5bGUsIGJvb2wgZm9yY2VVcGRhdGUpCiAgICAgaWYgKCFmcmFtZSgpLmlz TWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGZyYW1lKCkucGFnZSgpLT5jaHJv bWUoKS5jbGllbnQoKS5yZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKG5ld1N0eWxl KTsKKyAgICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpKQorICAgICAgICBwYWdlLT5j aHJvbWUoKS5jbGllbnQoKS5yZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKG5ld1N0 eWxlKTsKIAogICAgIFNjcm9sbFZpZXc6OnNjcm9sbGJhclN0eWxlQ2hhbmdlZChuZXdTdHlsZSwg Zm9yY2VVcGRhdGUpOwogfQpAQCAtNDY2Niw4ICs0Njg1LDEwIEBAIHZvaWQgRnJhbWVWaWV3Ojpz ZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9yIHBpbm5pbmcpCiB7 CiAgICAgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IgPSBwaW5uaW5nOwogICAgIAotICAgIGlmIChT Y3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBmcmFtZSgpLnBhZ2Uo KS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkKLSAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3It PnNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcihwaW5uaW5nKTsKKyAgICBpZiAoUGFnZSogcGFnZSA9 IGZyYW1lKCkucGFnZSgpKSB7CisgICAgICAgIGlmIChhdXRvKiBzY3JvbGxpbmdDb29yZGluYXRv ciA9IHBhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpCisgICAgICAgICAgICBzY3JvbGxpbmdD b29yZGluYXRvci0+c2V0U2Nyb2xsUGlubmluZ0JlaGF2aW9yKHBpbm5pbmcpOworICAgIH0KICAg ICAKICAgICB1cGRhdGVTY3JvbGxiYXJzKHNjcm9sbE9mZnNldCgpKTsKIH0K 250174 2015-04-05 16:38:11 -0700 2015-04-05 20:30:00 -0700 Patch bug-143425-20150405163723.patch text/plain 8794 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI5MzY3ZDE3ZDNiNGM1 MGIyNjUzZTMyY2I0NWE0MzNiN2VhM2ZkZi4uMzQ2NTA1YzY2NzUzNjU1NTZjM2EzODZkMmY3NThi MTRlMzAwMjg0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE1LTA0LTA1ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGcmFtZVZpZXcgY29kZSB1c2Vz IHBhZ2UoKSB3aXRob3V0IG51bGwgY2hlY2tpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzQyNQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xODky MDYwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo aWxlIHdlIGRvbid0IGhhdmUgdGVzdHMgdGhhdCBjb3ZlciB0aGlzLCB3ZSBhcmUgc2VlaW5nIGNy YXNoZXMgY29taW5nIGluCisgICAgICAgIHRoYXQgaW5kaWNhdGUgdGhlIHNob3VsZEVuYWJsZVNw ZWN1bGF0aXZlVGlsaW5nRHVyaW5nTG9hZGluZyBmdW5jdGlvbiBpcworICAgICAgICBiZWluZyBj YWxsZWQgd2hlbiB0aGUgcGFnZSBpcyBudWxsLiBUaGlzIHBhdGNoIGFkZHMgbnVsbCBjaGVja3Mg dG8gYWxsIHRoZQorICAgICAgICBwbGFjZXMgaW4gRnJhbWVWaWV3IHRoYXQgdXNlIHBhZ2UoKSB3 aXRob3V0IGRvaW5nIG51bGwgY2hlY2tpbmcuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6IElmIHBhZ2UgaXMgbnVs bCwgZG9uJ3QgdHJ5IHRvIGRvIHRoZQorICAgICAgICBhdXRvLXNpemluZyBsb2dpYyB0aGF0IGlu dm9sdmVzIHRoZSB0ZXh0QXV0b3NpemluZ1dpZHRoIHZhbHVlIGZyb20gdGhlIHBhZ2UuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KTogR2V0 IHNldHRpbmdzIGZyb20gdGhlCisgICAgICAgIGZyYW1lIHJhdGhlciB0aGFuIHRoZSBwYWdlIHRv IGF2b2lkIHBvc3NpYmxlIG51bGwtZGVyZWZlcmVuY2UuCisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCk6IENoZWNrIHRoZSBwYWdlIGZvciBudWxsIHdo ZW4KKyAgICAgICAgZ2V0dGluZyB0aGUgZXZlbnQgdGhyb3R0bGluZyBkZWxheS4KKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcpOiBDaGVjayB0 aGUgcGFnZSBmb3IgbnVsbCwKKyAgICAgICAgYW5kIHJldHVybiBlYXJseSBpZiBpdCBpcyBudWxs LgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU3BlY3VsYXRpdmVUaWxpbmdEdXJpbmdM b2FkaW5nKTogQ2hlY2sgdGhlIHBhZ2UgZm9yCisgICAgICAgIG51bGwsIGFuZCByZXR1cm4gZmFs c2UgaWYgaXQgaXMgbnVsbC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGVyZm9ybVBv c3RMYXlvdXRUYXNrcyk6IEd1YXJkIHRoZSBjb2RlIHRoYXQgY2FsbHMKKyAgICAgICAgZGlkTGF5 b3V0IG9uIHRoZSBwYWdlIGNsaWVudCBieSBhIGNoZWNrIGlmIHRoZSBwYWdlIGlzIG51bGwuCisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnBhZ2luYXRpb24pOiBEb24ndCBjYWxsIFBhZ2U6 OnBhZ2luYXRpb24gb24gYSBudWxsCisgICAgICAgIHBhZ2UgaGVyZS4KKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rvcik6IFVzZSBhIHNjYWxlIGZh Y3RvciBvZiAxCisgICAgICAgIGlmIHRoZSBwYWdlIGlzIG51bGwuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OnNldFZpc2libGVTY3JvbGxlclRodW1iUmVjdCk6IERvbid0IGNhbGwgdGhy b3VnaCB0bworICAgICAgICB0aGUgcGFnZSBjbGllbnQgaWYgdGhlIHBhZ2UgaXMgbnVsbC4KKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcik6 IENoZWNrIHRoZSBwYWdlIGZvciBudWxsCisgICAgICAgIGJlZm9yZSBhc2tpbmcgaXQgZm9yIHRo ZSBzY3JvbGxpbmcgY29vcmRpbmF0b3IuCisKIDIwMTUtMDQtMDUgIEd5dXlvdW5nIEtpbSAgPGd5 dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBVc2UgY29uc3RhbnRzIG9mIHNxbGl0 ZTMgZGlyZWN0bHkgZm9yIHN0YXR1cyBvZiBTUUwgcmVzdWx0IGluIHdlYmRhdGFiYXNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMDZmOWJlZDdlZjUwNjExMWE5MDlhNmJiNzk0Zjhk NTEyZjIyM2IxNi4uZWIxN2EyODMyODU0Y2FjYTczYTQ5NTY1ZGE3YmE3ZjJmMTczNjY1MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMTMxMywxMyArMTMxMywxNCBAQCB2b2lkIEZy YW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogCiAgICAgICAgIHJvb3QtPmxheW91 dCgpOwogI2lmIEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQotICAgICAgICBmbG9hdCBtaW5a b29tRm9udFNpemUgPSBmcmFtZSgpLnNldHRpbmdzKCkubWluaW11bVpvb21Gb250U2l6ZSgpOwot ICAgICAgICBmbG9hdCB2aXNXaWR0aCA9IGZyYW1lKCkucGFnZSgpLT50ZXh0QXV0b3NpemluZ1dp ZHRoKCk7Ci0gICAgICAgIGlmIChtaW5ab29tRm9udFNpemUgJiYgdmlzV2lkdGggJiYgIXJvb3Qt PnZpZXcoKS5wcmludGluZygpKSB7Ci0gICAgICAgICAgICByb290LT5hZGp1c3RDb21wdXRlZEZv bnRTaXplc09uQmxvY2tzKG1pblpvb21Gb250U2l6ZSwgdmlzV2lkdGgpOyAgICAKLSAgICAgICAg ICAgIGJvb2wgbmVlZHNMYXlvdXQgPSByb290LT5uZWVkc0xheW91dCgpOwotICAgICAgICAgICAg aWYgKG5lZWRzTGF5b3V0KQotICAgICAgICAgICAgICAgIHJvb3QtPmxheW91dCgpOworICAgICAg ICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpKSB7CisgICAgICAgICAgICBmbG9hdCBt aW5pbXVtWm9vbUZvbnRTaXplID0gZnJhbWUoKS5zZXR0aW5ncygpLm1pbmltdW1ab29tRm9udFNp emUoKTsKKyAgICAgICAgICAgIGZsb2F0IHRleHRBdXRvc2l6aW5nV2lkdGggPSBwYWdlLT50ZXh0 QXV0b3NpemluZ1dpZHRoKCk7CisgICAgICAgICAgICBpZiAobWluaW11bVpvb21Gb250U2l6ZSAm JiB0ZXh0QXV0b3NpemluZ1dpZHRoICYmICFyb290LT52aWV3KCkucHJpbnRpbmcoKSkgeworICAg ICAgICAgICAgICAgIHJvb3QtPmFkanVzdENvbXB1dGVkRm9udFNpemVzT25CbG9ja3MobWluaW11 bVpvb21Gb250U2l6ZSwgdGV4dEF1dG9zaXppbmdXaWR0aCk7CisgICAgICAgICAgICAgICAgaWYg KHJvb3QtPm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAgICAgIHJvb3QtPmxheW91dCgp OworICAgICAgICAgICAgfQogICAgICAgICB9CiAjZW5kaWYKICNpZiBFTkFCTEUoVEVYVF9BVVRP U0laSU5HKQpAQCAtMjA4NSw3ICsyMDg2LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnNldEZpeGVkVmlz aWJsZUNvbnRlbnRSZWN0KGNvbnN0IEludFJlY3QmIHZpc2libGVDb250ZW50UmVjdCkKICAgICBT Y3JvbGxWaWV3OjpzZXRGaXhlZFZpc2libGVDb250ZW50UmVjdCh2aXNpYmxlQ29udGVudFJlY3Qp OwogICAgIGlmIChvZmZzZXQgIT0gc2Nyb2xsT2Zmc2V0KCkpIHsKICAgICAgICAgdXBkYXRlTGF5 ZXJQb3NpdGlvbnNBZnRlclNjcm9sbGluZygpOwotICAgICAgICBpZiAoZnJhbWUoKS5wYWdlKCkt PnNldHRpbmdzKCkuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVk KCkpCisgICAgICAgIGlmIChmcmFtZSgpLnNldHRpbmdzKCkuYWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0ZvckZpeGVkUG9zaXRpb25FbmFibGVkKCkpCiAgICAgICAgICAgICB1cGRhdGVDb21wb3NpdGlu Z0xheWVyc0FmdGVyU2Nyb2xsaW5nKCk7CiAgICAgICAgIEludFBvaW50IG5ld1Bvc2l0aW9uID0g c2Nyb2xsUG9zaXRpb24oKTsKICAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS5zZXRDdXJyZW50UG9z aXRpb24oc2Nyb2xsUG9zaXRpb24oKSk7CkBAIC0yMTI0LDcgKzIxMjUsOCBAQCB2b2lkIEZyYW1l Vmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXRJbXBsKGNvbnN0IElu dFBvaW50JiBvbGRQbwogCiB2b2lkIEZyYW1lVmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkKGNv bnN0IEludFBvaW50JiBvbGRQb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIG5ld1Bvc2l0aW9uKQog ewotICAgIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMgdGhyb3R0bGluZ0RlbGF5ID0gZnJhbWUo KS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLmV2ZW50VGhyb3R0bGluZ0RlbGF5KCk7CisgICAg UGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpOworICAgIGF1dG8gdGhyb3R0bGluZ0RlbGF5ID0g cGFnZSA/IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmV2ZW50VGhyb3R0bGluZ0RlbGF5KCkgOiBz dGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjp6ZXJvKCk7CiAKICAgICBpZiAodGhyb3R0bGluZ0Rl bGF5ID09IHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Onplcm8oKSkgewogICAgICAgICBtX2Rl bGF5ZWRTY3JvbGxFdmVudFRpbWVyLnN0b3AoKTsKQEAgLTIzODYsMTMgKzIzODgsMTYgQEAgdm9p ZCBGcmFtZVZpZXc6OmxvYWRQcm9ncmVzc2luZ1N0YXR1c0NoYW5nZWQoKQogCiB2b2lkIEZyYW1l Vmlldzo6dXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKQogeworICAgIFBhZ2UqIHBhZ2UgPSBm cmFtZSgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIEFT U0VSVChmcmFtZSgpLmlzTWFpbkZyYW1lKCkpOwotICAgIGF1dG8mIHBhZ2UgPSAqZnJhbWUoKS5w YWdlKCk7CiAKLSAgICBMYXllckZsdXNoVGhyb3R0bGVTdGF0ZTo6RmxhZ3MgZmxhZ3MgPSBkZXRl cm1pbmVMYXllckZsdXNoVGhyb3R0bGVTdGF0ZShwYWdlKTsKKyAgICBMYXllckZsdXNoVGhyb3R0 bGVTdGF0ZTo6RmxhZ3MgZmxhZ3MgPSBkZXRlcm1pbmVMYXllckZsdXNoVGhyb3R0bGVTdGF0ZSgq cGFnZSk7CiAKICAgICAvLyBTZWUgaWYgdGhlIGNsaWVudCBpcyBoYW5kbGluZyB0aHJvdHRsaW5n LgotICAgIGlmIChwYWdlLmNocm9tZSgpLmNsaWVudCgpLmFkanVzdExheWVyRmx1c2hUaHJvdHRs aW5nKGZsYWdzKSkKKyAgICBpZiAocGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuYWRqdXN0TGF5ZXJG bHVzaFRocm90dGxpbmcoZmxhZ3MpKQogICAgICAgICByZXR1cm47CiAKICAgICBmb3IgKEZyYW1l KiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJh dmVyc2VOZXh0KG1fZnJhbWUuZ2V0KCkpKSB7CkBAIC0yNDE3LDcgKzI0MjIsOCBAQCB2b2lkIEZy YW1lVmlldzo6YWRqdXN0VGlsZWRCYWNraW5nQ292ZXJhZ2UoKQogCiBzdGF0aWMgYm9vbCBzaG91 bGRFbmFibGVTcGVjdWxhdGl2ZVRpbGluZ0R1cmluZ0xvYWRpbmcoY29uc3QgRnJhbWVWaWV3JiB2 aWV3KQogewotICAgIHJldHVybiB2aWV3LmlzVmlzdWFsbHlOb25FbXB0eSgpICYmICF2aWV3LmZy YW1lKCkucGFnZSgpLT5wcm9ncmVzcygpLmlzTWFpbkxvYWRQcm9ncmVzc2luZygpOworICAgIFBh Z2UqIHBhZ2UgPSB2aWV3LmZyYW1lKCkucGFnZSgpOworICAgIHJldHVybiBwYWdlICYmIHZpZXcu aXNWaXN1YWxseU5vbkVtcHR5KCkgJiYgIXBhZ2UtPnByb2dyZXNzKCkuaXNNYWluTG9hZFByb2dy ZXNzaW5nKCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjplbmFibGVTcGVjdWxhdGl2ZVRpbGluZ0lm TmVlZGVkKCkKQEAgLTI5NTEsOCArMjk1NywxMCBAQCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVBv c3RMYXlvdXRUYXNrcygpCiAgICAgLy8gT25seSBzZW5kIGxheW91dC1yZWxhdGVkIGRlbGVnYXRl IGNhbGxiYWNrcyBzeW5jaHJvbm91c2x5IGZvciB0aGUgbWFpbiBmcmFtZSB0bwogICAgIC8vIGF2 b2lkIHJlLWVudGVyaW5nIGxheW91dCBmb3IgdGhlIG1haW4gZnJhbWUgd2hpbGUgZGVsaXZlcmlu ZyBhIGxheW91dC1yZWxhdGVkIGRlbGVnYXRlCiAgICAgLy8gY2FsbGJhY2sgZm9yIGEgc3ViZnJh bWUuCi0gICAgaWYgKGZyYW1lKCkuaXNNYWluRnJhbWUoKSkKLSAgICAgICAgZnJhbWUoKS5wYWdl KCktPmNocm9tZSgpLmNsaWVudCgpLmRpZExheW91dCgpOworICAgIGlmIChmcmFtZSgpLmlzTWFp bkZyYW1lKCkpIHsKKyAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKSkKKyAg ICAgICAgICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmRpZExheW91dCgpOworICAgIH0KICNl bmRpZgogCiAjaWYgRU5BQkxFKEZPTlRfTE9BRF9FVkVOVFMpCkBAIC0zMjQ3LDggKzMyNTUsMTAg QEAgY29uc3QgUGFnaW5hdGlvbiYgRnJhbWVWaWV3OjpwYWdpbmF0aW9uKCkgY29uc3QKICAgICBp ZiAobV9wYWdpbmF0aW9uICE9IFBhZ2luYXRpb24oKSkKICAgICAgICAgcmV0dXJuIG1fcGFnaW5h dGlvbjsKIAotICAgIGlmIChmcmFtZSgpLmlzTWFpbkZyYW1lKCkpCi0gICAgICAgIHJldHVybiBm cmFtZSgpLnBhZ2UoKS0+cGFnaW5hdGlvbigpOworICAgIGlmIChmcmFtZSgpLmlzTWFpbkZyYW1l KCkpIHsKKyAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKSkKKyAgICAgICAg ICAgIHJldHVybiBwYWdlLT5wYWdpbmF0aW9uKCk7CisgICAgfQogCiAgICAgcmV0dXJuIG1fcGFn aW5hdGlvbjsKIH0KQEAgLTMzOTYsNyArMzQwNiwxMSBAQCBmbG9hdCBGcmFtZVZpZXc6OnZpc2li bGVDb250ZW50U2NhbGVGYWN0b3IoKSBjb25zdAogICAgIGlmICghZnJhbWUoKS5pc01haW5GcmFt ZSgpIHx8ICFmcmFtZSgpLnNldHRpbmdzKCkuZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKICAgICAg ICAgcmV0dXJuIDE7CiAKLSAgICByZXR1cm4gZnJhbWUoKS5wYWdlKCktPnBhZ2VTY2FsZUZhY3Rv cigpOworICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisg ICAgICAgIHJldHVybiAxOworCisgICAgcmV0dXJuIHBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpOwog fQogCiB2b2lkIEZyYW1lVmlldzo6c2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0KGNvbnN0IElu dFJlY3QmIHNjcm9sbGVyVGh1bWIpCkBAIC0zNDA0LDcgKzM0MTgsMTEgQEAgdm9pZCBGcmFtZVZp ZXc6OnNldFZpc2libGVTY3JvbGxlclRodW1iUmVjdChjb25zdCBJbnRSZWN0JiBzY3JvbGxlclRo dW1iKQogICAgIGlmICghZnJhbWUoKS5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBmcmFtZSgpLnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkubm90aWZ5U2Nyb2xsZXJUaHVt YklzVmlzaWJsZUluUmVjdChzY3JvbGxlclRodW1iKTsKKyAgICBQYWdlKiBwYWdlID0gZnJhbWUo KS5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBwYWdlLT5j aHJvbWUoKS5jbGllbnQoKS5ub3RpZnlTY3JvbGxlclRodW1iSXNWaXNpYmxlSW5SZWN0KHNjcm9s bGVyVGh1bWIpOwogfQogCiBTY3JvbGxhYmxlQXJlYSogRnJhbWVWaWV3OjplbmNsb3NpbmdTY3Jv bGxhYmxlQXJlYSgpIGNvbnN0CkBAIC0zNTAyLDcgKzM1MjAsOCBAQCB2b2lkIEZyYW1lVmlldzo6 c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKFNjcm9sbGJhclN0eWxlIG5ld1N0eWxlLCBib29sIGZvcmNl VXBkYXRlKQogICAgIGlmICghZnJhbWUoKS5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBmcmFtZSgpLnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkucmVjb21tZW5kZWRTY3Jv bGxiYXJTdHlsZURpZENoYW5nZShuZXdTdHlsZSk7CisgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFt ZSgpLnBhZ2UoKSkKKyAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkucmVjb21tZW5kZWRT Y3JvbGxiYXJTdHlsZURpZENoYW5nZShuZXdTdHlsZSk7CiAKICAgICBTY3JvbGxWaWV3OjpzY3Jv bGxiYXJTdHlsZUNoYW5nZWQobmV3U3R5bGUsIGZvcmNlVXBkYXRlKTsKIH0KQEAgLTQ2NjYsOCAr NDY4NSwxMCBAQCB2b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsUGlubmluZ0JlaGF2aW9yKFNjcm9s bFBpbm5pbmdCZWhhdmlvciBwaW5uaW5nKQogewogICAgIG1fc2Nyb2xsUGlubmluZ0JlaGF2aW9y ID0gcGlubmluZzsKICAgICAKLSAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yID0gZnJhbWUoKS5wYWdlKCktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpCi0g ICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IocGlu bmluZyk7CisgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKSkgeworICAgICAgICBp ZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBwYWdlLT5zY3JvbGxpbmdDb29yZGluYXRv cigpKQorICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldFNjcm9sbFBpbm5pbmdC ZWhhdmlvcihwaW5uaW5nKTsKKyAgICB9CiAgICAgCiAgICAgdXBkYXRlU2Nyb2xsYmFycyhzY3Jv bGxPZmZzZXQoKSk7CiB9Cg==