123897 2013-11-06 08:53:50 -0800 Rename region line offset methods 2013-11-06 12:47:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 947718 0 bjonesbe 2013-11-06 08:53:50 -0800 Rename region line offset methods 947722 1 216181 bjonesbe 2013-11-06 08:56:45 -0800 Created attachment 216181 Patch 947852 2 216181 commit-queue 2013-11-06 12:47:48 -0800 Comment on attachment 216181 Patch Clearing flags on attachment: 216181 Committed r158777: <http://trac.webkit.org/changeset/158777> 947853 3 commit-queue 2013-11-06 12:47:49 -0800 All reviewed patches have been landed. Closing bug. 216181 2013-11-06 08:56:45 -0800 2013-11-06 12:47:47 -0800 Patch bug-123897-20131106085644.patch text/plain 9788 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2E5NmRlN2NkMzkzMTU4 MTY1YTFmZGQ4YjIzZDViZmM3MDE3ZmE5OS4uODI1ZjNjNWNkMmU0YmE2ZmE0OGIyY2MxNDg4MmU2 ZDJlZjI5MTE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTExLTA2ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFJlbmFtZSByZWdpb24g bGluZSBvZmZzZXQgbWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIzODk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQmVjYXVzZSBvZiB0aGUgbGFyZ2UgbnVtYmVyIG9mIG92ZXJsb2FkcyBvbiB0 aGUgbGluZSBvZmZzZXQgbWV0aG9kcywKKyAgICAgICAgaXQgaXMgdmVyeSBoYXJkIHRvIHJlYWQg Y29kZSB1c2luZyB0aGVtLCB3aGljaCBhbHNvIG1ha2VzIGl0IGhhcmRlciB0bworICAgICAgICBt b3ZlIHRoZW0gb3V0IG9mIFJlbmRlckJsb2NrLiBUaGlzIHBhdGNoIHJlbmFtZXMgdGhlIG1ldGhv ZHMgdGhhdCB0YWtlCisgICAgICAgIGEgcmVnaW9uIGFzIGFuIGFyZ3VtZW50IHRvIG1ha2UgaXQg Y2xlYXJlciB3aGVuIGxvb2tpbmcgYXQgdGhlIGNvZGUKKyAgICAgICAgaG93IHRoZSBkaWZmZXIg ZnJvbSB0aGUgb25lcyB0aGF0IGRvbid0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVo YXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlU3RhcnRQb3NpdGlvbkRlbHRhRm9y Q2hpbGRBdm9pZGluZ0Zsb2F0cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YXZhaWxhYmxlTG9naWNhbFdpZHRoRm9y TGluZUluUmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsb2dpY2FsUmln aHRPZmZzZXRGb3JMaW5lSW5SZWdpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZUluUmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpzdGFydE9mZnNldEZvckxpbmVJblJlZ2lvbik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6ZW5kT2Zmc2V0Rm9yTGluZUluUmVnaW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJsb2NrOjphdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 c2hyaW5rTG9naWNhbFdpZHRoVG9Bdm9pZEZsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0F2YWlsYWJsZUxpbmVXaWR0aEluUmVnaW9uKToKKwogMjAx My0xMS0wNiAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCwgc3R5bGUoKSByZXR1cm4gdHlwZSBpcyBub3cgYSBy ZWZlcmVuY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA0 MzgwMGVkZWNkYjc1ODk3NDU4ZTM5YjYxN2M0MGExY2QyMWQ0ZjU2Li4zYjQxNTYxMGZlMGFiOGI4 OGI2Mjg2MTlkY2U4MTUyNzM5MTdmYWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKQEAgLTE4MDIsNyArMTgwMiw3IEBAIExheW91dFVuaXQgUmVuZGVyQmxvY2s6 OmNvbXB1dGVTdGFydFBvc2l0aW9uRGVsdGFGb3JDaGlsZEF2b2lkaW5nRmxvYXRzKGNvbnN0IFJl CiAgICAgaWYgKHJlZ2lvbikKICAgICAgICAgYmxvY2tPZmZzZXQgPSBtYXgoYmxvY2tPZmZzZXQs IGJsb2NrT2Zmc2V0ICsgKHJlZ2lvbi0+bG9naWNhbFRvcEZvckZsb3dUaHJlYWRDb250ZW50KCkg LSBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKCkpKTsKIAotICAgIExheW91dFVuaXQg c3RhcnRPZmYgPSBzdGFydE9mZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIGZhbHNlLCByZWdpb24s IGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChjaGlsZCkpOworICAgIExheW91dFVuaXQgc3RhcnRPZmYg PSBzdGFydE9mZnNldEZvckxpbmVJblJlZ2lvbihibG9ja09mZnNldCwgZmFsc2UsIHJlZ2lvbiwg bG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxkKSk7CiAKICAgICBpZiAoc3R5bGUoKS50ZXh0QWxp Z24oKSAhPSBXRUJLSVRfQ0VOVEVSICYmICFjaGlsZC5zdHlsZSgpLm1hcmdpblN0YXJ0VXNpbmco JnN0eWxlKCkpLmlzQXV0bygpKSB7CiAgICAgICAgIGlmIChjaGlsZE1hcmdpblN0YXJ0IDwgMCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggYjRiZjZkODZlYjM3ZjAw OWZkYzFlMzE5OWE2MGM0MGFmYzQwZmYyZC4uNWY4ZGU4N2JjYjhlMjcxMjI4OTk2NGRhYjQzZGQ1 MjU5MDBjZTNiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTE1 NywzMyArMTU3LDMzIEBAIHB1YmxpYzoKIAogICAgIC8vIFZlcnNpb25zIHRoYXQgY2FuIGNvbXB1 dGUgbGluZSBvZmZzZXRzIHdpdGggdGhlIHJlZ2lvbiBhbmQgcGFnZSBvZmZzZXQgcGFzc2VkIGlu LiBVc2VkIGZvciBzcGVlZCB0byBhdm9pZCBoYXZpbmcgdG8KICAgICAvLyBjb21wdXRlIHRoZSBy ZWdpb24gYWxsIG92ZXIgYWdhaW4gd2hlbiB5b3UgYWxyZWFkeSBrbm93IGl0LgotICAgIExheW91 dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGluZShMYXlvdXRVbml0IHBvc2l0aW9uLCBi b29sIHNob3VsZEluZGVudFRleHQsIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBMYXlvdXRVbml0IGxv Z2ljYWxIZWlnaHQgPSAwKSBjb25zdAorICAgIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdp ZHRoRm9yTGluZUluUmVnaW9uKExheW91dFVuaXQgcG9zaXRpb24sIGJvb2wgc2hvdWxkSW5kZW50 VGV4dCwgUmVuZGVyUmVnaW9uKiByZWdpb24sIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDAp IGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgbG9n aWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShwb3NpdGlvbiwgc2hvdWxkSW5kZW50VGV4dCwgcmVnaW9u LCBsb2dpY2FsSGVpZ2h0KQotICAgICAgICAgICAgLSBsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUo cG9zaXRpb24sIHNob3VsZEluZGVudFRleHQsIHJlZ2lvbiwgbG9naWNhbEhlaWdodCkpOworICAg ICAgICByZXR1cm4gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgbG9naWNhbFJpZ2h0T2Zmc2V0Rm9y TGluZUluUmVnaW9uKHBvc2l0aW9uLCBzaG91bGRJbmRlbnRUZXh0LCByZWdpb24sIGxvZ2ljYWxI ZWlnaHQpCisgICAgICAgICAgICAtIGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZUluUmVnaW9uKHBv c2l0aW9uLCBzaG91bGRJbmRlbnRUZXh0LCByZWdpb24sIGxvZ2ljYWxIZWlnaHQpKTsKICAgICB9 Ci0gICAgTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgcG9z aXRpb24sIGJvb2wgc2hvdWxkSW5kZW50VGV4dCwgUmVuZGVyUmVnaW9uKiByZWdpb24sIExheW91 dFVuaXQgbG9naWNhbEhlaWdodCA9IDApIGNvbnN0IAorICAgIExheW91dFVuaXQgbG9naWNhbFJp Z2h0T2Zmc2V0Rm9yTGluZUluUmVnaW9uKExheW91dFVuaXQgcG9zaXRpb24sIGJvb2wgc2hvdWxk SW5kZW50VGV4dCwgUmVuZGVyUmVnaW9uKiByZWdpb24sIExheW91dFVuaXQgbG9naWNhbEhlaWdo dCA9IDApIGNvbnN0IAogICAgIHsKICAgICAgICAgcmV0dXJuIGxvZ2ljYWxSaWdodE9mZnNldEZv ckxpbmUocG9zaXRpb24sIGxvZ2ljYWxSaWdodE9mZnNldEZvckNvbnRlbnQocmVnaW9uKSwgc2hv dWxkSW5kZW50VGV4dCwgMCwgbG9naWNhbEhlaWdodCk7CiAgICAgfQotICAgIExheW91dFVuaXQg bG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgcG9zaXRpb24sIGJvb2wgc2hvdWxk SW5kZW50VGV4dCwgUmVuZGVyUmVnaW9uKiByZWdpb24sIExheW91dFVuaXQgbG9naWNhbEhlaWdo dCA9IDApIGNvbnN0IAorICAgIExheW91dFVuaXQgbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lSW5S ZWdpb24oTGF5b3V0VW5pdCBwb3NpdGlvbiwgYm9vbCBzaG91bGRJbmRlbnRUZXh0LCBSZW5kZXJS ZWdpb24qIHJlZ2lvbiwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gMCkgY29uc3QgCiAgICAg ewogICAgICAgICByZXR1cm4gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBsb2dp Y2FsTGVmdE9mZnNldEZvckNvbnRlbnQocmVnaW9uKSwgc2hvdWxkSW5kZW50VGV4dCwgMCwgbG9n aWNhbEhlaWdodCk7CiAgICAgfQotICAgIExheW91dFVuaXQgc3RhcnRPZmZzZXRGb3JMaW5lKExh eW91dFVuaXQgcG9zaXRpb24sIGJvb2wgc2hvdWxkSW5kZW50VGV4dCwgUmVuZGVyUmVnaW9uKiBy ZWdpb24sIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDApIGNvbnN0CisgICAgTGF5b3V0VW5p dCBzdGFydE9mZnNldEZvckxpbmVJblJlZ2lvbihMYXlvdXRVbml0IHBvc2l0aW9uLCBib29sIHNo b3VsZEluZGVudFRleHQsIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBMYXlvdXRVbml0IGxvZ2ljYWxI ZWlnaHQgPSAwKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIHN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpID8gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBzaG91 bGRJbmRlbnRUZXh0LCByZWdpb24sIGxvZ2ljYWxIZWlnaHQpCi0gICAgICAgICAgICA6IGxvZ2lj YWxXaWR0aCgpIC0gbG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShwb3NpdGlvbiwgc2hvdWxkSW5k ZW50VGV4dCwgcmVnaW9uLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgcmV0dXJuIHN0eWxlKCku aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lSW5SZWdp b24ocG9zaXRpb24sIHNob3VsZEluZGVudFRleHQsIHJlZ2lvbiwgbG9naWNhbEhlaWdodCkKKyAg ICAgICAgICAgIDogbG9naWNhbFdpZHRoKCkgLSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lSW5S ZWdpb24ocG9zaXRpb24sIHNob3VsZEluZGVudFRleHQsIHJlZ2lvbiwgbG9naWNhbEhlaWdodCk7 CiAgICAgfQotICAgIExheW91dFVuaXQgZW5kT2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0IHBvc2l0 aW9uLCBib29sIHNob3VsZEluZGVudFRleHQsIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQgPSAwKSBjb25zdAorICAgIExheW91dFVuaXQgZW5kT2Zmc2V0Rm9y TGluZUluUmVnaW9uKExheW91dFVuaXQgcG9zaXRpb24sIGJvb2wgc2hvdWxkSW5kZW50VGV4dCwg UmVuZGVyUmVnaW9uKiByZWdpb24sIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDApIGNvbnN0 CiAgICAgewotICAgICAgICByZXR1cm4gIXN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigp ID8gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBzaG91bGRJbmRlbnRUZXh0LCBy ZWdpb24sIGxvZ2ljYWxIZWlnaHQpCi0gICAgICAgICAgICA6IGxvZ2ljYWxXaWR0aCgpIC0gbG9n aWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShwb3NpdGlvbiwgc2hvdWxkSW5kZW50VGV4dCwgcmVnaW9u LCBsb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgcmV0dXJuICFzdHlsZSgpLmlzTGVmdFRvUmlnaHRE aXJlY3Rpb24oKSA/IGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZUluUmVnaW9uKHBvc2l0aW9uLCBz aG91bGRJbmRlbnRUZXh0LCByZWdpb24sIGxvZ2ljYWxIZWlnaHQpCisgICAgICAgICAgICA6IGxv Z2ljYWxXaWR0aCgpIC0gbG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZUluUmVnaW9uKHBvc2l0aW9u LCBzaG91bGRJbmRlbnRUZXh0LCByZWdpb24sIGxvZ2ljYWxIZWlnaHQpOwogICAgIH0KIAogICAg IExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGluZShMYXlvdXRVbml0IHBvc2l0 aW9uLCBib29sIHNob3VsZEluZGVudFRleHQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDAp IGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGlu ZShwb3NpdGlvbiwgc2hvdWxkSW5kZW50VGV4dCwgcmVnaW9uQXRCbG9ja09mZnNldChwb3NpdGlv biksIGxvZ2ljYWxIZWlnaHQpOworICAgICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbFdpZHRo Rm9yTGluZUluUmVnaW9uKHBvc2l0aW9uLCBzaG91bGRJbmRlbnRUZXh0LCByZWdpb25BdEJsb2Nr T2Zmc2V0KHBvc2l0aW9uKSwgbG9naWNhbEhlaWdodCk7CiAgICAgfQogICAgIExheW91dFVuaXQg bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0IHBvc2l0aW9uLCBib29sIHNob3Vs ZEluZGVudFRleHQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDApIGNvbnN0IAogICAgIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggOGJhOWVhZTdlN2IwMzEz YTYyNzYxODIxZTNlMzNiYjlmMzIzNTZlMy4uOGUyZmQxOTJiZmEyZmY2YzM0ZDcxMjU0MTM4NWQ2 MDc3Y2RhYThmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTE2 OTIsNyArMTY5Miw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpzaHJpbmtMb2dpY2FsV2lkdGhU b0F2b2lkRmxvYXRzKExheW91dFVuaXQgY2hpbGRNYXJnaW5TdGFyCiAgICAgICAgIGNvbnRhaW5p bmdCbG9ja1JlZ2lvbiA9IGNiLT5jbGFtcFRvU3RhcnRBbmRFbmRSZWdpb25zKHJlZ2lvbik7CiAg ICAgfQogCi0gICAgTGF5b3V0VW5pdCByZXN1bHQgPSBjYi0+YXZhaWxhYmxlTG9naWNhbFdpZHRo Rm9yTGluZShsb2dpY2FsVG9wUG9zaXRpb24sIGZhbHNlLCBjb250YWluaW5nQmxvY2tSZWdpb24p IC0gY2hpbGRNYXJnaW5TdGFydCAtIGNoaWxkTWFyZ2luRW5kOworICAgIExheW91dFVuaXQgcmVz dWx0ID0gY2ItPmF2YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckxpbmVJblJlZ2lvbihsb2dpY2FsVG9w UG9zaXRpb24sIGZhbHNlLCBjb250YWluaW5nQmxvY2tSZWdpb24pIC0gY2hpbGRNYXJnaW5TdGFy dCAtIGNoaWxkTWFyZ2luRW5kOwogCiAgICAgLy8gV2UgbmVlZCB0byBzZWUgaWYgbWFyZ2lucyBv biBlaXRoZXIgdGhlIHN0YXJ0IHNpZGUgb3IgdGhlIGVuZCBzaWRlIGNhbiBjb250YWluIHRoZSBm bG9hdHMgaW4gcXVlc3Rpb24uIElmIHRoZXkgY2FuLAogICAgIC8vIHRoZW4ganVzdCB1c2luZyB0 aGUgbGluZSB3aWR0aCBpcyBpbmFjY3VyYXRlLiBJbiB0aGUgY2FzZSB3aGVyZSBhIGZsb2F0IGNv bXBsZXRlbHkgZml0cywgd2UgZG9uJ3QgbmVlZCB0byB1c2UgdGhlIGxpbmUKQEAgLTE3MDIsNyAr MTcwMiw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpzaHJpbmtMb2dpY2FsV2lkdGhUb0F2b2lk RmxvYXRzKExheW91dFVuaXQgY2hpbGRNYXJnaW5TdGFyCiAgICAgaWYgKGNoaWxkTWFyZ2luU3Rh cnQgPiAwKSB7CiAgICAgICAgIExheW91dFVuaXQgc3RhcnRDb250ZW50U2lkZSA9IGNiLT5zdGFy dE9mZnNldEZvckNvbnRlbnQoY29udGFpbmluZ0Jsb2NrUmVnaW9uKTsKICAgICAgICAgTGF5b3V0 VW5pdCBzdGFydENvbnRlbnRTaWRlV2l0aE1hcmdpbiA9IHN0YXJ0Q29udGVudFNpZGUgKyBjaGls ZE1hcmdpblN0YXJ0OwotICAgICAgICBMYXlvdXRVbml0IHN0YXJ0T2Zmc2V0ID0gY2ItPnN0YXJ0 T2Zmc2V0Rm9yTGluZShsb2dpY2FsVG9wUG9zaXRpb24sIGZhbHNlLCBjb250YWluaW5nQmxvY2tS ZWdpb24pOworICAgICAgICBMYXlvdXRVbml0IHN0YXJ0T2Zmc2V0ID0gY2ItPnN0YXJ0T2Zmc2V0 Rm9yTGluZUluUmVnaW9uKGxvZ2ljYWxUb3BQb3NpdGlvbiwgZmFsc2UsIGNvbnRhaW5pbmdCbG9j a1JlZ2lvbik7CiAgICAgICAgIGlmIChzdGFydE9mZnNldCA+IHN0YXJ0Q29udGVudFNpZGVXaXRo TWFyZ2luKQogICAgICAgICAgICAgcmVzdWx0ICs9IGNoaWxkTWFyZ2luU3RhcnQ7CiAgICAgICAg IGVsc2UKQEAgLTE3MTIsNyArMTcxMiw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpzaHJpbmtM b2dpY2FsV2lkdGhUb0F2b2lkRmxvYXRzKExheW91dFVuaXQgY2hpbGRNYXJnaW5TdGFyCiAgICAg aWYgKGNoaWxkTWFyZ2luRW5kID4gMCkgewogICAgICAgICBMYXlvdXRVbml0IGVuZENvbnRlbnRT aWRlID0gY2ItPmVuZE9mZnNldEZvckNvbnRlbnQoY29udGFpbmluZ0Jsb2NrUmVnaW9uKTsKICAg ICAgICAgTGF5b3V0VW5pdCBlbmRDb250ZW50U2lkZVdpdGhNYXJnaW4gPSBlbmRDb250ZW50U2lk ZSArIGNoaWxkTWFyZ2luRW5kOwotICAgICAgICBMYXlvdXRVbml0IGVuZE9mZnNldCA9IGNiLT5l bmRPZmZzZXRGb3JMaW5lKGxvZ2ljYWxUb3BQb3NpdGlvbiwgZmFsc2UsIGNvbnRhaW5pbmdCbG9j a1JlZ2lvbik7CisgICAgICAgIExheW91dFVuaXQgZW5kT2Zmc2V0ID0gY2ItPmVuZE9mZnNldEZv ckxpbmVJblJlZ2lvbihsb2dpY2FsVG9wUG9zaXRpb24sIGZhbHNlLCBjb250YWluaW5nQmxvY2tS ZWdpb24pOwogICAgICAgICBpZiAoZW5kT2Zmc2V0ID4gZW5kQ29udGVudFNpZGVXaXRoTWFyZ2lu KQogICAgICAgICAgICAgcmVzdWx0ICs9IGNoaWxkTWFyZ2luRW5kOwogICAgICAgICBlbHNlCkBA IC0xNzY2LDcgKzE3NjYsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2Nr QXZhaWxhYmxlTGluZVdpZHRoSW5SZWdpb24oUmVuZGVyUmVnaW9uKiByZQogICAgICAgICBsb2dp Y2FsVG9wUG9zaXRpb24gPSBtYXgobG9naWNhbFRvcFBvc2l0aW9uLCBsb2dpY2FsVG9wUG9zaXRp b24gKyBvZmZzZXRGcm9tTG9naWNhbFRvcE9mUmVnaW9uKTsKICAgICAgICAgY29udGFpbmluZ0Js b2NrUmVnaW9uID0gY2ItPmNsYW1wVG9TdGFydEFuZEVuZFJlZ2lvbnMocmVnaW9uKTsKICAgICB9 Ci0gICAgcmV0dXJuIGNiLT5hdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGxvZ2ljYWxUb3BQ b3NpdGlvbiwgZmFsc2UsIGNvbnRhaW5pbmdCbG9ja1JlZ2lvbiwgYXZhaWxhYmxlTG9naWNhbEhl aWdodChJbmNsdWRlTWFyZ2luQm9yZGVyUGFkZGluZykpOworICAgIHJldHVybiBjYi0+YXZhaWxh YmxlTG9naWNhbFdpZHRoRm9yTGluZUluUmVnaW9uKGxvZ2ljYWxUb3BQb3NpdGlvbiwgZmFsc2Us IGNvbnRhaW5pbmdCbG9ja1JlZ2lvbiwgYXZhaWxhYmxlTG9naWNhbEhlaWdodChJbmNsdWRlTWFy Z2luQm9yZGVyUGFkZGluZykpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6cGVycGVuZGlj dWxhckNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQoKSBjb25zdAo=