121685 2013-09-20 08:17:33 -0700 Simplify the ShapeOutsideInfo and ShapeInfo interfaces 2013-09-20 10:14:57 -0700 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 931350 0 bjonesbe 2013-09-20 08:17:33 -0700 Simplify the ShapeOutsideInfo and ShapeInfo interfaces 931355 1 212169 bjonesbe 2013-09-20 08:22:43 -0700 Created attachment 212169 Patch 931432 2 212169 commit-queue 2013-09-20 10:14:55 -0700 Comment on attachment 212169 Patch Clearing flags on attachment: 212169 Committed r156176: <http://trac.webkit.org/changeset/156176> 931433 3 commit-queue 2013-09-20 10:14:57 -0700 All reviewed patches have been landed. Closing bug. 212169 2013-09-20 08:22:43 -0700 2013-09-20 10:14:55 -0700 Patch bug-121685-20130920082254.patch text/plain 14638 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmU4MmRmZmJjMzU3ZTM2 YjBjNTFjNzQyMTkzNzMxOWZhZTdiZmNlYS4uNzc0MTJkNDNjODhlZDEwODExNzAyZGUwNWQzODlm YmM2YTk0NDY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA5LTIwICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IHRoZSBT aGFwZU91dHNpZGVJbmZvIGFuZCBTaGFwZUluZm8gaW50ZXJmYWNlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNjg1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aCB0aGUgY3JlYXRpb24gU2hhcGVJ bmZvOjpjb21wdXRlU2VnbWVudHNGb3JMaW5lLCBpdCBiZWNhbWUgcG9zc2libGUgdG8KKyAgICAg ICAgc2ltcGxpZnkgdGhlIFNoYXBlSW5mbyBjbGFzc2VzLiBTaGFwZU91dHNpZGVJbmZvIGhhcyBu byBuZWVkIHRvIHNhdmUgdGhlCisgICAgICAgIHNlZ21lbnRzLCBhbmQgbm93IHRoYXQgc2VnbWVu dCBjcmVhdGlvbiBpcyBpbiBpdHMgb3duIG1ldGhvZCwgaXQgZG9lc24ndCBoYXZlCisgICAgICAg IHRvIHNhdmUgdGhlIHNlZ21lbnRzIGFueW1vcmUuIFRoaXMgYWxzbyBzaW1wbGlmaWVzIHRoZSBw dWJsaWMgaW50ZXJmYWNlIG9mCisgICAgICAgIFNoYXBlT3V0c2lkZUluZm8sIGFzIGl0IG9ubHkg aGFzIG9uZSBtZXRob2QgdG8gZG8gdGhlIGNvbXB1dGF0aW9uLgorCisgICAgICAgIEFsc28sIHRo ZSBtZXRob2RzIGluIFNoYXBlT3V0c2lkZUluZm8gaGF2ZSBiZWVuIHJlbmFtZWQgdG8gcmVmbGVj dCB0aGUgZmFjdAorICAgICAgICB0aGF0IFNoYXBlT3V0c2lkZUluZm8gaXNuJ3QgcmVhbGx5IGlu dGVyZXN0ZWQgaW4gc2VnbWVudHMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBuZXcgYmVo YXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZsb2F0aW5nT2JqZWN0czo6bG9naWNhbExlZnRPZmZzZXQpOgorICAgICAg ICAoV2ViQ29yZTo6RmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsUmlnaHRPZmZzZXQpOgorICAgICAg ICAqIHJlbmRlcmluZy9MaW5lV2lkdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGluZVdpZHRo OjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQpOgorICAgICAgICAqIHJl bmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVz L1NoYXBlSW5mby5oOgorICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZv Lmg6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXBlT3V0c2lkZUluZm86OnVwZGF0ZURlbHRhc0ZvckNvbnRhaW5p bmdCbG9ja0xpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5m by5oOgorCiAyMDEzLTA5LTE5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgU1ZHUHJvcGVydHlJbmZvLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvRmxvYXRpbmdPYmplY3RzLmNwcAppbmRleCAwMmM4MjczYzI3MjlkZDA3OGE3NzQyNDNhYTk3 ODFjNWNlMGQyZThhLi5hM2Y4MjA4YWFhMzNkNjgyYTg2ZGRmMGU2NGViZjQxZjRmOGNjNjhjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcApAQCAtMjg4 LDggKzI4OCw4IEBAIExheW91dFVuaXQgRmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsTGVmdE9mZnNl dChMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBMYXlvdXRVbml0CiAgICAgY29uc3QgRmxvYXRpbmdP YmplY3QqIG91dGVybW9zdEZsb2F0ID0gYWRhcHRlci5vdXRlcm1vc3RGbG9hdCgpOwogICAgIGlm IChvZmZzZXRNb2RlID09IFNoYXBlT3V0c2lkZUZsb2F0U2hhcGVPZmZzZXQgJiYgb3V0ZXJtb3N0 RmxvYXQpIHsKICAgICAgICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IG91 dGVybW9zdEZsb2F0LT5yZW5kZXJlcigpLT5zaGFwZU91dHNpZGVJbmZvKCkpIHsKLSAgICAgICAg ICAgIHNoYXBlT3V0c2lkZS0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZSht X3JlbmRlcmVyLCBvdXRlcm1vc3RGbG9hdCwgbG9naWNhbFRvcCwgbG9naWNhbEhlaWdodCk7Ci0g ICAgICAgICAgICBvZmZzZXQgKz0gc2hhcGVPdXRzaWRlLT5yaWdodFNlZ21lbnRNYXJnaW5Cb3hE ZWx0YSgpOworICAgICAgICAgICAgc2hhcGVPdXRzaWRlLT51cGRhdGVEZWx0YXNGb3JDb250YWlu aW5nQmxvY2tMaW5lKG1fcmVuZGVyZXIsIG91dGVybW9zdEZsb2F0LCBsb2dpY2FsVG9wLCBsb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIG9mZnNldCArPSBzaGFwZU91dHNpZGUtPnJpZ2h0TWFy Z2luQm94RGVsdGEoKTsKICAgICAgICAgfQogICAgIH0KICNlbmRpZgpAQCAtMzE0LDggKzMxNCw4 IEBAIExheW91dFVuaXQgRmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsUmlnaHRPZmZzZXQoTGF5b3V0 VW5pdCBmaXhlZE9mZnNldCwgTGF5b3V0VW5pCiAgICAgY29uc3QgRmxvYXRpbmdPYmplY3QqIG91 dGVybW9zdEZsb2F0ID0gYWRhcHRlci5vdXRlcm1vc3RGbG9hdCgpOwogICAgIGlmIChvZmZzZXRN b2RlID09IFNoYXBlT3V0c2lkZUZsb2F0U2hhcGVPZmZzZXQgJiYgb3V0ZXJtb3N0RmxvYXQpIHsK ICAgICAgICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IG91dGVybW9zdEZs b2F0LT5yZW5kZXJlcigpLT5zaGFwZU91dHNpZGVJbmZvKCkpIHsKLSAgICAgICAgICAgIHNoYXBl T3V0c2lkZS0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShtX3JlbmRlcmVy LCBvdXRlcm1vc3RGbG9hdCwgbG9naWNhbFRvcCwgbG9naWNhbEhlaWdodCk7Ci0gICAgICAgICAg ICBvZmZzZXQgKz0gc2hhcGVPdXRzaWRlLT5sZWZ0U2VnbWVudE1hcmdpbkJveERlbHRhKCk7Cisg ICAgICAgICAgICBzaGFwZU91dHNpZGUtPnVwZGF0ZURlbHRhc0ZvckNvbnRhaW5pbmdCbG9ja0xp bmUobV9yZW5kZXJlciwgb3V0ZXJtb3N0RmxvYXQsIGxvZ2ljYWxUb3AsIGxvZ2ljYWxIZWlnaHQp OworICAgICAgICAgICAgb2Zmc2V0ICs9IHNoYXBlT3V0c2lkZS0+bGVmdE1hcmdpbkJveERlbHRh KCk7CiAgICAgICAgIH0KICAgICB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MaW5lV2lkdGguY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVX aWR0aC5jcHAKaW5kZXggODNkYzUzNDM4YzIyMzI2NjNkMGU2YWRmNjE0NTEzZjJjNTZhNzFhNy4u YjM5NmUwNGM5MzYxZDllZmQwNThhMDFjZWNmYjE1OTdkYWE4ZjZhMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xpbmVXaWR0aC5jcHAKQEAgLTEwNywyMyArMTA3LDIzIEBAIHZvaWQgTGluZVdp ZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQoRmxvYXRpbmdPYmpl Y3QqIG5ld0Zsb2F0CiAgICAgICAgIGlmIChwcmV2aW91c0Zsb2F0ICE9IG5ld0Zsb2F0ICYmIHBy ZXZpb3VzRmxvYXQtPnR5cGUoKSA9PSBuZXdGbG9hdC0+dHlwZSgpKSB7CiAgICAgICAgICAgICBw cmV2aW91c1NoYXBlT3V0c2lkZUluZm8gPSBwcmV2aW91c0Zsb2F0LT5yZW5kZXJlcigpLT5zaGFw ZU91dHNpZGVJbmZvKCk7CiAgICAgICAgICAgICBpZiAocHJldmlvdXNTaGFwZU91dHNpZGVJbmZv KQotICAgICAgICAgICAgICAgIHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mby0+Y29tcHV0ZVNlZ21l bnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZSgmbV9ibG9jaywgcHJldmlvdXNGbG9hdCwgbV9ibG9j ay5sb2dpY2FsSGVpZ2h0KCksIGxvZ2ljYWxIZWlnaHRGb3JMaW5lKCZtX2Jsb2NrLCBtX2lzRmly c3RMaW5lKSk7CisgICAgICAgICAgICAgICAgcHJldmlvdXNTaGFwZU91dHNpZGVJbmZvLT51cGRh dGVEZWx0YXNGb3JDb250YWluaW5nQmxvY2tMaW5lKCZtX2Jsb2NrLCBwcmV2aW91c0Zsb2F0LCBt X2Jsb2NrLmxvZ2ljYWxIZWlnaHQoKSwgbG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1f aXNGaXJzdExpbmUpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQogCiAg ICAgU2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlSW5mbyA9IG5ld0Zsb2F0LT5yZW5kZXJl cigpLT5zaGFwZU91dHNpZGVJbmZvKCk7CiAgICAgaWYgKHNoYXBlT3V0c2lkZUluZm8pCi0gICAg ICAgIHNoYXBlT3V0c2lkZUluZm8tPmNvbXB1dGVTZWdtZW50c0ZvckNvbnRhaW5pbmdCbG9ja0xp bmUoJm1fYmxvY2ssIG5ld0Zsb2F0LCBtX2Jsb2NrLmxvZ2ljYWxIZWlnaHQoKSwgbG9naWNhbEhl aWdodEZvckxpbmUoJm1fYmxvY2ssIG1faXNGaXJzdExpbmUpKTsKKyAgICAgICAgc2hhcGVPdXRz aWRlSW5mby0+dXBkYXRlRGVsdGFzRm9yQ29udGFpbmluZ0Jsb2NrTGluZSgmbV9ibG9jaywgbmV3 RmxvYXQsIG1fYmxvY2subG9naWNhbEhlaWdodCgpLCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSgmbV9i bG9jaywgbV9pc0ZpcnN0TGluZSkpOwogI2VuZGlmCiAKICAgICBpZiAobmV3RmxvYXQtPnR5cGUo KSA9PSBGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KSB7CiAgICAgICAgIGZsb2F0IG5ld0xlZnQg PSBuZXdGbG9hdC0+bG9naWNhbFJpZ2h0KG1fYmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSk7CiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCiAgICAgICAgIGlmIChwcmV2aW91c1NoYXBlT3V0 c2lkZUluZm8pCi0gICAgICAgICAgICBuZXdMZWZ0IC09IHByZXZpb3VzU2hhcGVPdXRzaWRlSW5m by0+cmlnaHRTZWdtZW50TWFyZ2luQm94RGVsdGEoKTsKKyAgICAgICAgICAgIG5ld0xlZnQgLT0g cHJldmlvdXNTaGFwZU91dHNpZGVJbmZvLT5yaWdodE1hcmdpbkJveERlbHRhKCk7CiAgICAgICAg IGlmIChzaGFwZU91dHNpZGVJbmZvKQotICAgICAgICAgICAgbmV3TGVmdCArPSBzaGFwZU91dHNp ZGVJbmZvLT5yaWdodFNlZ21lbnRNYXJnaW5Cb3hEZWx0YSgpOworICAgICAgICAgICAgbmV3TGVm dCArPSBzaGFwZU91dHNpZGVJbmZvLT5yaWdodE1hcmdpbkJveERlbHRhKCk7CiAjZW5kaWYKIAog ICAgICAgICBpZiAoc2hvdWxkSW5kZW50VGV4dCgpICYmIG1fYmxvY2suc3R5bGUoKS0+aXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpKQpAQCAtMTMzLDkgKzEzMyw5IEBAIHZvaWQgTGluZVdpZHRoOjpz aHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQoRmxvYXRpbmdPYmplY3QqIG5l d0Zsb2F0CiAgICAgICAgIGZsb2F0IG5ld1JpZ2h0ID0gbmV3RmxvYXQtPmxvZ2ljYWxMZWZ0KG1f YmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSk7CiAjaWYgRU5BQkxFKENTU19TSEFQRVMp CiAgICAgICAgIGlmIChwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8pCi0gICAgICAgICAgICBuZXdS aWdodCAtPSBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8tPmxlZnRTZWdtZW50TWFyZ2luQm94RGVs dGEoKTsKKyAgICAgICAgICAgIG5ld1JpZ2h0IC09IHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mby0+ bGVmdE1hcmdpbkJveERlbHRhKCk7CiAgICAgICAgIGlmIChzaGFwZU91dHNpZGVJbmZvKQotICAg ICAgICAgICAgbmV3UmlnaHQgKz0gc2hhcGVPdXRzaWRlSW5mby0+bGVmdFNlZ21lbnRNYXJnaW5C b3hEZWx0YSgpOworICAgICAgICAgICAgbmV3UmlnaHQgKz0gc2hhcGVPdXRzaWRlSW5mby0+bGVm dE1hcmdpbkJveERlbHRhKCk7CiAjZW5kaWYKIAogICAgICAgICBpZiAoc2hvdWxkSW5kZW50VGV4 dCgpICYmICFtX2Jsb2NrLnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcAppbmRleCBlN2JiNTU0 MGViYTkxMWM4ODM0Njg3MTE4OTY0NzI4ZmQ3YmEzMzZhLi4yYTE0YjhhNmU4YTIwNWYwYTU0MTNk YzljMDM3OWNjOGZlNWIzMjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c2hhcGVzL1NoYXBlSW5mby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9TaGFwZUluZm8uY3BwCkBAIC04NCwyMCArODQsNiBAQCBTZWdtZW50TGlzdCBTaGFwZUluZm88 UmVuZGVyVHlwZT46OmNvbXB1dGVTZWdtZW50c0ZvckxpbmUoTGF5b3V0VW5pdCBsaW5lVG9wLCBM YQogICAgIHJldHVybiBzZWdtZW50czsKIH0KIAotdGVtcGxhdGU8Y2xhc3MgUmVuZGVyVHlwZT4K LWJvb2wgU2hhcGVJbmZvPFJlbmRlclR5cGU+Ojp1cGRhdGVTZWdtZW50c0ZvckxpbmUoTGF5b3V0 VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVIZWlnaHQpCi17Ci0gICAgQVNTRVJUKGxpbmVI ZWlnaHQgPj0gMCk7Ci0gICAgbV9zaGFwZUxpbmVUb3AgPSBsaW5lVG9wIC0gbG9naWNhbFRvcE9m ZnNldCgpOwotICAgIG1fbGluZUhlaWdodCA9IGxpbmVIZWlnaHQ7Ci0gICAgbV9zZWdtZW50cy5j bGVhcigpOwotCi0gICAgaWYgKGxpbmVPdmVybGFwc1NoYXBlQm91bmRzKCkpCi0gICAgICAgIG1f c2VnbWVudHMgPSBjb21wdXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AsIGxpbmVIZWlnaHQpOwot Ci0gICAgcmV0dXJuIG1fc2VnbWVudHMuc2l6ZSgpOwotfQotCiB0ZW1wbGF0ZSBjbGFzcyBTaGFw ZUluZm88UmVuZGVyQmxvY2s+OwogdGVtcGxhdGUgY2xhc3MgU2hhcGVJbmZvPFJlbmRlckJveD47 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5m by5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uaAppbmRleCAw OTEzMDNjZmZmY2RlMGY4NzJkNDlmMzk4M2VjMzhmNDdjMzM4OWRmLi41YjgzZTI3OGE2NThmNTY0 YmUzNDUwMTRjODZjZTQ3MWM3NTg0NzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVJbmZvLmgKQEAgLTg0LDggKzg0LDYgQEAgcHVibGljOgogICAgIH0KIAogICAg IFNlZ21lbnRMaXN0IGNvbXB1dGVTZWdtZW50c0ZvckxpbmUoTGF5b3V0VW5pdCBsaW5lVG9wLCBM YXlvdXRVbml0IGxpbmVIZWlnaHQpIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCB1cGRhdGVTZWdt ZW50c0ZvckxpbmUoTGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVIZWlnaHQpOwot ICAgIHZvaWQgY2xlYXJTZWdtZW50cygpIHsgbV9zZWdtZW50cy5jbGVhcigpOyB9CiAKICAgICBM YXlvdXRVbml0IHNoYXBlTG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIGNvbXB1dGVkU2hhcGVM b2dpY2FsQm91bmRpbmdCb3goKS55KCkgKyBsb2dpY2FsVG9wT2Zmc2V0KCk7IH0KICAgICBMYXlv dXRVbml0IHNoYXBlTG9naWNhbEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIGNvbXB1dGVkU2hhcGVM b2dpY2FsQm91bmRpbmdCb3goKS5tYXhZKCkgKyBsb2dpY2FsVG9wT2Zmc2V0KCk7IH0KQEAgLTEx OSw3ICsxMTcsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICBMYXlvdXRVbml0IG1fc2hhcGVMaW5lVG9w OwogICAgIExheW91dFVuaXQgbV9saW5lSGVpZ2h0OwotICAgIFNlZ21lbnRMaXN0IG1fc2VnbWVu dHM7CiAKICAgICBjb25zdCBSZW5kZXJUeXBlKiBtX3JlbmRlcmVyOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluc2lkZUluZm8uaAppbmRleCA5YWIzNTNj NjZmZTdmZWFlMGE1ZTY3OTg2OGY1NjFhMzY1M2IxYWMwLi40ODc0MjY1YWJkNzEyNzM2ZjZhMTRl OTc1MWJmMTk1MjNmMzRhY2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c2hhcGVzL1NoYXBlSW5zaWRlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVJbnNpZGVJbmZvLmgKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogICAgIGJv b2wgdXBkYXRlU2VnbWVudHNGb3JMaW5lKExheW91dFNpemUgbGluZU9mZnNldCwgTGF5b3V0VW5p dCBsaW5lSGVpZ2h0KQogICAgIHsKICAgICAgICAgbV9zZWdtZW50UmFuZ2VzLmNsZWFyKCk7Ci0g ICAgICAgIGJvb2wgcmVzdWx0ID0gU2hhcGVJbmZvPFJlbmRlckJsb2NrPjo6dXBkYXRlU2VnbWVu dHNGb3JMaW5lKGxpbmVPZmZzZXQuaGVpZ2h0KCksIGxpbmVIZWlnaHQpOworICAgICAgICBib29s IHJlc3VsdCA9IHVwZGF0ZVNlZ21lbnRzRm9yTGluZShsaW5lT2Zmc2V0LmhlaWdodCgpLCBsaW5l SGVpZ2h0KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3NlZ21lbnRzLnNpemUo KTsgaSsrKSB7CiAgICAgICAgICAgICBtX3NlZ21lbnRzW2ldLmxvZ2ljYWxMZWZ0IC09IGxpbmVP ZmZzZXQud2lkdGgoKTsKICAgICAgICAgICAgIG1fc2VnbWVudHNbaV0ubG9naWNhbFJpZ2h0IC09 IGxpbmVPZmZzZXQud2lkdGgoKTsKQEAgLTc5LDEwICs3OSwxOCBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0gICAgdmlydHVhbCBib29sIHVwZGF0ZVNlZ21lbnRz Rm9yTGluZShMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUhlaWdodCkgT1ZFUlJJ REUKKyAgICBib29sIHVwZGF0ZVNlZ21lbnRzRm9yTGluZShMYXlvdXRVbml0IGxpbmVUb3AsIExh eW91dFVuaXQgbGluZUhlaWdodCkKICAgICB7CisgICAgICAgIEFTU0VSVChsaW5lSGVpZ2h0ID49 IDApOworICAgICAgICBtX3NoYXBlTGluZVRvcCA9IGxpbmVUb3AgLSBsb2dpY2FsVG9wT2Zmc2V0 KCk7CisgICAgICAgIG1fbGluZUhlaWdodCA9IGxpbmVIZWlnaHQ7CisgICAgICAgIG1fc2VnbWVu dHMuY2xlYXIoKTsKICAgICAgICAgbV9zZWdtZW50UmFuZ2VzLmNsZWFyKCk7Ci0gICAgICAgIHJl dHVybiBTaGFwZUluZm88UmVuZGVyQmxvY2s+Ojp1cGRhdGVTZWdtZW50c0ZvckxpbmUobGluZVRv cCwgbGluZUhlaWdodCk7CisKKyAgICAgICAgaWYgKGxpbmVPdmVybGFwc1NoYXBlQm91bmRzKCkp CisgICAgICAgICAgICBtX3NlZ21lbnRzID0gY29tcHV0ZVNlZ21lbnRzRm9yTGluZShsaW5lVG9w LCBsaW5lSGVpZ2h0KTsKKworICAgICAgICByZXR1cm4gbV9zZWdtZW50cy5zaXplKCk7CiAgICAg fQogCiAgICAgYm9vbCBoYXNTZWdtZW50cygpIGNvbnN0CkBAIC0xMDMsNiArMTExLDcgQEAgcHVi bGljOgogICAgICAgICBBU1NFUlQobV9zZWdtZW50UmFuZ2VzLnNpemUoKSA8IG1fc2VnbWVudHMu c2l6ZSgpKTsKICAgICAgICAgcmV0dXJuICZtX3NlZ21lbnRzW21fc2VnbWVudFJhbmdlcy5zaXpl KCldOwogICAgIH0KKyAgICB2b2lkIGNsZWFyU2VnbWVudHMoKSB7IG1fc2VnbWVudHMuY2xlYXIo KTsgfQogICAgIGJvb2wgYWRqdXN0TG9naWNhbExpbmVUb3AoZmxvYXQgbWluU2VnbWVudFdpZHRo KTsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVGaXJzdEZpdFBvc2l0aW9uRm9yRmxvYXQoY29uc3Qg TGF5b3V0U2l6ZSkgY29uc3Q7CiAKQEAgLTEzMSw2ICsxNDAsNyBAQCBwcml2YXRlOgogCiAgICAg U2VnbWVudFJhbmdlTGlzdCBtX3NlZ21lbnRSYW5nZXM7CiAgICAgYm9vbCBtX25lZWRzTGF5b3V0 OjE7CisgICAgU2VnbWVudExpc3QgbV9zZWdtZW50czsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCmluZGV4IDlm ZjBhM2NjNzJlODNjODU3OTdiNDQ3MDEyYWVjZWRjMjE4ODM3ODQuLjA3NzkyMGEyZGFhZjEyYjMz M2M3MzRkYWQ0ZTQzZmYzZTcyNzRlYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmNwcApAQCAtNTQsMjcgKzU0LDI4IEBAIGJv b2wgU2hhcGVPdXRzaWRlSW5mbzo6aXNFbmFibGVkRm9yKGNvbnN0IFJlbmRlckJveCogYm94KQog ICAgIH0KIH0KIAotYm9vbCBTaGFwZU91dHNpZGVJbmZvOjpjb21wdXRlU2VnbWVudHNGb3JDb250 YWluaW5nQmxvY2tMaW5lKGNvbnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2ssIGNvbnN0 IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCwgTGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlv dXRVbml0IGxpbmVIZWlnaHQpCit2b2lkIFNoYXBlT3V0c2lkZUluZm86OnVwZGF0ZURlbHRhc0Zv ckNvbnRhaW5pbmdCbG9ja0xpbmUoY29uc3QgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaywg Y29uc3QgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0LCBMYXlvdXRVbml0IGxpbmVUb3As IExheW91dFVuaXQgbGluZUhlaWdodCkKIHsKICAgICBMYXlvdXRVbml0IHNoYXBlVG9wID0gZmxv YXRpbmdPYmplY3QtPmxvZ2ljYWxUb3AoY29udGFpbmluZ0Jsb2NrLT5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpKSArIHN0ZDo6bWF4KExheW91dFVuaXQoKSwgY29udGFpbmluZ0Jsb2NrLT5tYXJn aW5CZWZvcmVGb3JDaGlsZChtX3JlbmRlcmVyKSk7CiAgICAgTGF5b3V0VW5pdCBsaW5lVG9wSW5T aGFwZUNvb3JkaW5hdGVzID0gbGluZVRvcCAtIHNoYXBlVG9wICsgbG9naWNhbFRvcE9mZnNldCgp OwotICAgIHJldHVybiB1cGRhdGVTZWdtZW50c0ZvckxpbmUobGluZVRvcEluU2hhcGVDb29yZGlu YXRlcywgbGluZUhlaWdodCk7Ci19CiAKLWJvb2wgU2hhcGVPdXRzaWRlSW5mbzo6dXBkYXRlU2Vn bWVudHNGb3JMaW5lKExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KQot ewotICAgIGlmIChzaGFwZVNpemVEaXJ0eSgpIHx8IG1fbGluZVRvcCAhPSBsaW5lVG9wIHx8IG1f bGluZUhlaWdodCAhPSBsaW5lSGVpZ2h0KSB7Ci0gICAgICAgIGlmIChTaGFwZUluZm88UmVuZGVy Qm94Pjo6dXBkYXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AsIGxpbmVIZWlnaHQpKSB7Ci0gICAg ICAgICAgICBtX2xlZnRTZWdtZW50TWFyZ2luQm94RGVsdGEgPSBtX3NlZ21lbnRzWzBdLmxvZ2lj YWxMZWZ0ICsgbV9yZW5kZXJlci0+bWFyZ2luU3RhcnQoKTsKLSAgICAgICAgICAgIG1fcmlnaHRT ZWdtZW50TWFyZ2luQm94RGVsdGEgPSBtX3NlZ21lbnRzW21fc2VnbWVudHMuc2l6ZSgpLTFdLmxv Z2ljYWxSaWdodCAtIG1fcmVuZGVyZXItPmxvZ2ljYWxXaWR0aCgpIC0gbV9yZW5kZXJlci0+bWFy Z2luRW5kKCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBtX2xlZnRTZWdtZW50TWFy Z2luQm94RGVsdGEgPSBtX3JlbmRlcmVyLT5sb2dpY2FsV2lkdGgoKSArIG1fcmVuZGVyZXItPm1h cmdpblN0YXJ0KCk7Ci0gICAgICAgICAgICBtX3JpZ2h0U2VnbWVudE1hcmdpbkJveERlbHRhID0g LW1fcmVuZGVyZXItPmxvZ2ljYWxXaWR0aCgpIC0gbV9yZW5kZXJlci0+bWFyZ2luRW5kKCk7Cisg ICAgaWYgKHNoYXBlU2l6ZURpcnR5KCkgfHwgbV9saW5lVG9wICE9IGxpbmVUb3BJblNoYXBlQ29v cmRpbmF0ZXMgfHwgbV9saW5lSGVpZ2h0ICE9IGxpbmVIZWlnaHQpIHsKKyAgICAgICAgbV9saW5l VG9wID0gbGluZVRvcEluU2hhcGVDb29yZGluYXRlczsKKyAgICAgICAgbV9zaGFwZUxpbmVUb3Ag PSBsaW5lVG9wSW5TaGFwZUNvb3JkaW5hdGVzIC0gbG9naWNhbFRvcE9mZnNldCgpOworICAgICAg ICBtX2xpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0OworCisgICAgICAgIGlmIChsaW5lT3ZlcmxhcHNT aGFwZUJvdW5kcygpKSB7CisgICAgICAgICAgICBTZWdtZW50TGlzdCBzZWdtZW50cyA9IGNvbXB1 dGVTZWdtZW50c0ZvckxpbmUobGluZVRvcEluU2hhcGVDb29yZGluYXRlcywgbGluZUhlaWdodCk7 CisgICAgICAgICAgICBpZiAoc2VnbWVudHMuc2l6ZSgpKSB7CisgICAgICAgICAgICAgICAgbV9s ZWZ0TWFyZ2luQm94RGVsdGEgPSBzZWdtZW50c1swXS5sb2dpY2FsTGVmdCArIG1fcmVuZGVyZXIt Pm1hcmdpblN0YXJ0KCk7CisgICAgICAgICAgICAgICAgbV9yaWdodE1hcmdpbkJveERlbHRhID0g c2VnbWVudHNbc2VnbWVudHMuc2l6ZSgpLTFdLmxvZ2ljYWxSaWdodCAtIG1fcmVuZGVyZXItPmxv Z2ljYWxXaWR0aCgpIC0gbV9yZW5kZXJlci0+bWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIG1fbGluZVRvcCA9IGxp bmVUb3A7Ci0gICAgfQogCi0gICAgcmV0dXJuIG1fc2VnbWVudHMuc2l6ZSgpOworICAgICAgICBt X2xlZnRNYXJnaW5Cb3hEZWx0YSA9IG1fcmVuZGVyZXItPmxvZ2ljYWxXaWR0aCgpICsgbV9yZW5k ZXJlci0+bWFyZ2luU3RhcnQoKTsKKyAgICAgICAgbV9yaWdodE1hcmdpbkJveERlbHRhID0gLW1f cmVuZGVyZXItPmxvZ2ljYWxXaWR0aCgpIC0gbV9yZW5kZXJlci0+bWFyZ2luRW5kKCk7CisgICAg fQogfQogCiBTaGFwZVZhbHVlKiBTaGFwZU91dHNpZGVJbmZvOjpzaGFwZVZhbHVlKCkgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRl SW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZv LmgKaW5kZXggMzRmZTdhNmQ0ZGU5NWI3Y2YxNWY5NDUxZTgyMmY4MDY1ZTcwODdiNi4uNmEzOWZh N2M0OTgyMjM5ZGNiNjA5ZDllNDA3NzI2N2I0ZTg3ZjMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKQEAgLTQzLDExICs0Mywx MCBAQCBjbGFzcyBGbG9hdGluZ09iamVjdDsKIAogY2xhc3MgU2hhcGVPdXRzaWRlSW5mbyBGSU5B TCA6IHB1YmxpYyBTaGFwZUluZm88UmVuZGVyQm94PiwgcHVibGljIE1hcHBlZEluZm88UmVuZGVy Qm94LCBTaGFwZU91dHNpZGVJbmZvPiB7CiBwdWJsaWM6Ci0gICAgTGF5b3V0VW5pdCBsZWZ0U2Vn bWVudE1hcmdpbkJveERlbHRhKCkgY29uc3QgeyByZXR1cm4gbV9sZWZ0U2VnbWVudE1hcmdpbkJv eERlbHRhOyB9Ci0gICAgTGF5b3V0VW5pdCByaWdodFNlZ21lbnRNYXJnaW5Cb3hEZWx0YSgpIGNv bnN0IHsgcmV0dXJuIG1fcmlnaHRTZWdtZW50TWFyZ2luQm94RGVsdGE7IH0KKyAgICBMYXlvdXRV bml0IGxlZnRNYXJnaW5Cb3hEZWx0YSgpIGNvbnN0IHsgcmV0dXJuIG1fbGVmdE1hcmdpbkJveERl bHRhOyB9CisgICAgTGF5b3V0VW5pdCByaWdodE1hcmdpbkJveERlbHRhKCkgY29uc3QgeyByZXR1 cm4gbV9yaWdodE1hcmdpbkJveERlbHRhOyB9CiAKLSAgICBib29sIGNvbXB1dGVTZWdtZW50c0Zv ckNvbnRhaW5pbmdCbG9ja0xpbmUoY29uc3QgUmVuZGVyQmxvY2sqLCBjb25zdCBGbG9hdGluZ09i amVjdCosIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KTsKLSAgICB2 aXJ0dWFsIGJvb2wgdXBkYXRlU2VnbWVudHNGb3JMaW5lKExheW91dFVuaXQgbGluZVRvcCwgTGF5 b3V0VW5pdCBsaW5lSGVpZ2h0KSBPVkVSUklERTsKKyAgICB2b2lkIHVwZGF0ZURlbHRhc0ZvckNv bnRhaW5pbmdCbG9ja0xpbmUoY29uc3QgUmVuZGVyQmxvY2sqLCBjb25zdCBGbG9hdGluZ09iamVj dCosIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KTsKIAogICAgIHN0 YXRpYyBQYXNzT3duUHRyPFNoYXBlT3V0c2lkZUluZm8+IGNyZWF0ZUluZm8oY29uc3QgUmVuZGVy Qm94KiByZW5kZXJlcikgeyByZXR1cm4gYWRvcHRQdHIobmV3IFNoYXBlT3V0c2lkZUluZm8ocmVu ZGVyZXIpKTsgfQogICAgIHN0YXRpYyBib29sIGlzRW5hYmxlZEZvcihjb25zdCBSZW5kZXJCb3gq KTsKQEAgLTY5LDggKzY4LDggQEAgcHJvdGVjdGVkOgogcHJpdmF0ZToKICAgICBTaGFwZU91dHNp ZGVJbmZvKGNvbnN0IFJlbmRlckJveCogcmVuZGVyZXIpIDogU2hhcGVJbmZvPFJlbmRlckJveD4o cmVuZGVyZXIpIHsgfQogCi0gICAgTGF5b3V0VW5pdCBtX2xlZnRTZWdtZW50TWFyZ2luQm94RGVs dGE7Ci0gICAgTGF5b3V0VW5pdCBtX3JpZ2h0U2VnbWVudE1hcmdpbkJveERlbHRhOworICAgIExh eW91dFVuaXQgbV9sZWZ0TWFyZ2luQm94RGVsdGE7CisgICAgTGF5b3V0VW5pdCBtX3JpZ2h0TWFy Z2luQm94RGVsdGE7CiAgICAgTGF5b3V0VW5pdCBtX2xpbmVUb3A7CiB9OwogCg==