98552 2012-10-05 13:41:27 -0700 Deprecated flexboxes subtract scrollbar width/height twice 2012-10-05 14:12:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan eric tony webkit.review.bot oldest_to_newest 735927 0 ojan 2012-10-05 13:41:27 -0700 Deprecated flexboxes subtract scrollbar width/height twice 735933 1 167376 ojan 2012-10-05 13:47:29 -0700 Created attachment 167376 Patch 735944 2 167376 tony 2012-10-05 14:05:49 -0700 Comment on attachment 167376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167376&action=review Can you file a new bug about switching the methods back to borderboxes? > Source/WebCore/ChangeLog:10 > + RenderDepricatedFlexbox subtracts the scrollbar. Depricated -> Deprecated 735946 3 ojan 2012-10-05 14:12:02 -0700 Committed r130549: <http://trac.webkit.org/changeset/130549> 167376 2012-10-05 13:47:29 -0700 2012-10-05 14:05:48 -0700 Patch bug-98552-20121005134636.patch text/plain 13209 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA3YWM1NzM5NWRmNmVk NzgxNGFmYTkzMWQ3YjIyOGY0YTgyNjRjZS4uY2U5Mzg3ZDBkMmVhYTg5Y2I4NmRjOWM3NjU3YTUz MDQyNGUxMjVlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTEwLTA1ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRGVwcmVjYXRlZCBmbGV4Ym94 ZXMgc3VidHJhY3Qgc2Nyb2xsYmFyIHdpZHRoL2hlaWdodCB0d2ljZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg1NTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgcmVncmVzc2lvbiBmcm9t IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzExOTUwNy4KKyAgICAgICAgVGhlIHBy b2JsZW0gaXMgdGhhdCBjb250ZW50SGVpZ2h0IHN1YnRyYWN0cyB0aGUgc2Nyb2xsYmFyIGFuZAor ICAgICAgICBSZW5kZXJEZXByaWNhdGVkRmxleGJveCBzdWJ0cmFjdHMgdGhlIHNjcm9sbGJhci4K KworICAgICAgICAtTWFrZSBpdCBzbyB0aGF0IHdlIG9ubHkgYWNjZXNzIG92ZXJyaWRlIHNpemVz IGlmIG9uZSBoYXMgYmVlbiBzZXQuCisgICAgICAgIEkgdGhpbmsgdGhpcyBtYWtlcyB0aGUgY2Fs bGluZyBjb2RlIG1vcmUgY2xlYXIuCisgICAgICAgIC1JZiB3ZSBkb24ndCBoYXZlIG9uZSBzZXQs IGdyYWIgdGhlIGhlaWdodC93aWR0aCAtIGJvcmRlckFuZFBhZGRpbmcuCisgICAgICAgIC1BZGQg YSBGSVhNRSB0byBjaGFuZ2UgdGhpcyBhbGwgYmFjayB0byBiZWluZyBib3JkZXJib3ggc2l6ZXMu CisgICAgICAgIFRoZXJlJ3Mgc29tZXRoaW5nIHRyaWNrIHdpdGggbWFraW5nIHRhYmxlIHBhZGRp bmcvYm9yZGVyIHdvcmsgcmlnaHQgZm9yIHRoYXQKKyAgICAgICAgdGhvdWdoIChub3RlZCBpbiB0 aGUgb3JpZ2luYWwgcGF0Y2gpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmxleGJveC9mbGV4aW5n LW92ZXJmbG93LXNjcm9sbC1pdGVtLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpvdmVycmlkZUxvZ2ljYWxDb250 ZW50V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpvdmVycmlkZUxvZ2ljYWxD b250ZW50SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YXZhaWxhYmxlTG9n aWNhbEhlaWdodFVzaW5nKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAg ICAgIChSZW5kZXJCb3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxl eGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudFdpZHRoRm9yQ2hpbGQpOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50SGVpZ2h0Rm9yQ2hp bGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlv dXRIb3Jpem9udGFsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4 aWJsZUJveDo6bGF5b3V0VmVydGljYWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94OjphbGxvd2VkQ2hpbGRGbGV4KToKKwogMjAxMi0xMC0wNSAgVGFi IEF0a2lucyAgPGphY2thbG1hZ2VAZ21haWwuY29tPgogCiAgICAgICAgIDxtYXJxdWVlPiBlbGVt ZW50IGZvcmNlcyBpdHNlbGYgdG8gYmUgYXQgbGVhc3QgMWVtIGhpZ2gsIHJlZ2FyZGxlc3Mgb2Yg J2hlaWdodCcgZGVjbGFyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK aW5kZXggY2M2YWZiYmU3YWUxYzZjY2I2OWIwYWRkYzYwMWQ1ZDRlMjE0MzA1Zi4uMDlmNTU1OTBm ZTAwZjU4ZTg4Y2UwNTUwYjg0MTQ4MmExOTIyOGUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKQEAgLTcwOCwxNCArNzA4LDE0IEBAIHZvaWQgUmVuZGVyQm94OjpjbGVh ck92ZXJyaWRlU2l6ZSgpCiAKIExheW91dFVuaXQgUmVuZGVyQm94OjpvdmVycmlkZUxvZ2ljYWxD b250ZW50V2lkdGgoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJs eSBiZSByZXR1cm5pbmcgY29udGVudExvZ2ljYWxXaWR0aCBpbnN0ZWFkIG9mIGNvbnRlbnRXaWR0 aC4KLSAgICByZXR1cm4gaGFzT3ZlcnJpZGVXaWR0aCgpID8gZ092ZXJyaWRlV2lkdGhNYXAtPmdl dCh0aGlzKSA6IGNvbnRlbnRXaWR0aCgpOworICAgIEFTU0VSVChoYXNPdmVycmlkZVdpZHRoKCkp OworICAgIHJldHVybiBnT3ZlcnJpZGVXaWR0aE1hcC0+Z2V0KHRoaXMpOwogfQogCiBMYXlvdXRV bml0IFJlbmRlckJveDo6b3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpIGNvbnN0CiB7Ci0g ICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHJldHVybmluZyBjb250ZW50TG9n aWNhbEhlaWdodCBpbnN0ZWFkIG9mIGNvbnRlbnRIZWlnaHQuCi0gICAgcmV0dXJuIGhhc092ZXJy aWRlSGVpZ2h0KCkgPyBnT3ZlcnJpZGVIZWlnaHRNYXAtPmdldCh0aGlzKSA6IGNvbnRlbnRIZWln aHQoKTsKKyAgICBBU1NFUlQoaGFzT3ZlcnJpZGVIZWlnaHQoKSk7CisgICAgcmV0dXJuIGdPdmVy cmlkZUhlaWdodE1hcC0+Z2V0KHRoaXMpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6YWRq dXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKExheW91dFVuaXQgd2lkdGgpIGNv bnN0CkBAIC0yMzQxLDggKzIzNDEsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmF2YWlsYWJs ZUxvZ2ljYWxIZWlnaHRVc2luZyhjb25zdCBMZW5ndGgmIGgpIGNvbnN0CiAgICAgLy8gV2UgbmVl ZCB0byBzdG9wIGhlcmUsIHNpbmNlIHdlIGRvbid0IHdhbnQgdG8gaW5jcmVhc2UgdGhlIGhlaWdo dCBvZiB0aGUgdGFibGUKICAgICAvLyBhcnRpZmljaWFsbHkuICBXZSdyZSBnb2luZyB0byByZWx5 IG9uIHRoaXMgY2VsbCBnZXR0aW5nIGV4cGFuZGVkIHRvIHNvbWUgbmV3CiAgICAgLy8gaGVpZ2h0 LCBhbmQgdGhlbiB3aGVuIHdlIGxheSBvdXQgYWdhaW4gd2UnbGwgdXNlIHRoZSBjYWxjdWxhdGlv biBiZWxvdy4KLSAgICBpZiAoaXNUYWJsZUNlbGwoKSAmJiAoaC5pc0F1dG8oKSB8fCBoLmlzUGVy Y2VudCgpKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsK KyAgICBpZiAoaXNUYWJsZUNlbGwoKSAmJiAoaC5pc0F1dG8oKSB8fCBoLmlzUGVyY2VudCgpKSkg eworICAgICAgICBpZiAoaGFzT3ZlcnJpZGVIZWlnaHQoKSkKKyAgICAgICAgICAgIHJldHVybiBv dmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCk7CisgICAgICAgIHJldHVybiBsb2dpY2FsSGVp Z2h0KCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOworICAgIH0KIAogICAgIGlm IChoLmlzUGVyY2VudCgpICYmIGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKSB7CiAgICAgICAgIC8v IEZJWE1FOiBUaGlzIGlzIHdyb25nIGlmIHRoZSBjb250YWluaW5nQmxvY2sgaGFzIGEgcGVycGVu ZGljdWxhciB3cml0aW5nIG1vZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5k ZXggMWVhNGY0NDI5OGYyODEwODljZTY5YTY0MTkxY2EzNTYwODM0YmRjZi4uZjY1Y2Q3MTI5OTU3 ZTU4MGVhNWQ3NjZmNDk3NWIyYzMzZmYzOTEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaApAQCAtMjg5LDYgKzI4OSwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBMYXlvdXRV bml0IG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgTGF5b3V0 VW5pdCBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBjb25zdDsKIAorICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgcmVuYW1lIHRoZXNlIGJhY2sgdG8gb3ZlcnJpZGVMb2dpY2FsSGVpZ2h0L1dpZHRo IGFuZCBoYXZlIHRoZW0gc3RvcmUKKyAgICAvLyB0aGUgYm9yZGVyLWJveCBoZWlnaHQvd2lkdGgg bGlrZSB0aGUgcmVndWxhciBoZWlnaHQvd2lkdGggYWNjZXNzb3JzIG9uIFJlbmRlckJveC4KKyAg ICAvLyBSaWdodCBub3csIHRoZXNlIGFyZSBkaWZmZXJlbnQgdGhhbiBjb250ZW50SGVpZ2h0L2Nv bnRlbnRXaWR0aCBiZWNhdXNlIHRoZXkgc3RpbGwKKyAgICAvLyBpbmNsdWRlIHRoZSBzY3JvbGxi YXIgaGVpZ2h0L3dpZHRoLgogICAgIExheW91dFVuaXQgb3ZlcnJpZGVMb2dpY2FsQ29udGVudFdp ZHRoKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBvdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0 KCkgY29uc3Q7CiAgICAgYm9vbCBoYXNPdmVycmlkZUhlaWdodCgpIGNvbnN0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 LmNwcAppbmRleCA4ZjcxNTFhNDdlMDg4ZDZiNDYzMjNiZjljN2Y0YzgzMjc3ZTJjOGI5Li4wNWFl Y2FlMDM0NWMxOWU4ZTM1ODFlYTViODVkYzc2ZTNmZTgwMTRmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcApA QCAtMTUxLDYgKzE1MSwyMCBAQCBzdGF0aWMgYm9vbCBjaGlsZERvZXNOb3RBZmZlY3RXaWR0aE9y RmxleGluZyhSZW5kZXJPYmplY3QqIGNoaWxkKQogICAgIHJldHVybiBjaGlsZC0+aXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkgfHwgY2hpbGQtPnN0eWxlKCktPnZpc2liaWxpdHkoKSA9PSBDT0xMQVBT RTsKIH0KIAorc3RhdGljIExheW91dFVuaXQgY29udGVudFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94 KiBjaGlsZCkKK3sKKyAgICBpZiAoY2hpbGQtPmhhc092ZXJyaWRlV2lkdGgoKSkKKyAgICAgICAg cmV0dXJuIGNoaWxkLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKTsKKyAgICByZXR1cm4g Y2hpbGQtPmxvZ2ljYWxXaWR0aCgpIC0gY2hpbGQtPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lk dGgoKTsKK30KKworc3RhdGljIExheW91dFVuaXQgY29udGVudEhlaWdodEZvckNoaWxkKFJlbmRl ckJveCogY2hpbGQpCit7CisgICAgaWYgKGNoaWxkLT5oYXNPdmVycmlkZUhlaWdodCgpKQorICAg ICAgICByZXR1cm4gY2hpbGQtPm92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsKKyAgICBy ZXR1cm4gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSAtIGNoaWxkLT5ib3JkZXJBbmRQYWRkaW5nTG9n aWNhbEhlaWdodCgpOworfQorCiB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6c3R5 bGVXaWxsQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogbmV3 U3R5bGUpCiB7CiAgICAgUmVuZGVyU3R5bGUqIG9sZFN0eWxlID0gc3R5bGUoKTsKQEAgLTUzOCw3 ICs1NTIsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpv bnRhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoYWxsb3dlZENoaWxkRmxleChjaGlsZCwgZXhwYW5kaW5nLCBpKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIExheW91dFVuaXQgc3BhY2VBZGQgPSBMYXlvdXRVbml0KHNwYWNlQXZh aWxhYmxlVGhpc1Bhc3MgKiAoY2hpbGQtPnN0eWxlKCktPmJveEZsZXgoKSAvIHRvdGFsRmxleCkp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzcGFjZUFkZCkgewotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudFdp ZHRoKGNoaWxkLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSArIHNwYWNlQWRkKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlTG9naWNhbENv bnRlbnRXaWR0aChjb250ZW50V2lkdGhGb3JDaGlsZChjaGlsZCkgKyBzcGFjZUFkZCk7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsZXhpbmdDaGlsZHJlbiA9IHRydWU7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTU1NSw3ICs1NjksNyBAQCB2b2lkIFJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29sIHJlbGF5b3V0 Q2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IHNwYWNlQWRkID0g Z3JvdXBSZW1haW5pbmdTcGFjZSA+IDAgPyAxIDogLTE7CiAgICAgICAgICAgICAgICAgICAgICAg ICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGlsZCAmJiBncm91 cFJlbWFpbmluZ1NwYWNlOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChhbGxvd2VkQ2hpbGRGbGV4KGNoaWxkLCBleHBhbmRpbmcsIGkp KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUxv Z2ljYWxDb250ZW50V2lkdGgoY2hpbGQtPm92ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgpICsg c3BhY2VBZGQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3Zl cnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKGNvbnRlbnRXaWR0aEZvckNoaWxkKGNoaWxkKSArIHNw YWNlQWRkKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxleGluZ0NoaWxkcmVu ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVsYXlvdXRDaGlsZHJl biA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbWFpbmluZ1NwYWNl IC09IHNwYWNlQWRkOwpAQCAtNzg5LDcgKzgwMyw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZs ZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoYWxsb3dlZENoaWxkRmxleChjaGlsZCwgZXhwYW5kaW5n LCBpKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgc3BhY2VBZGQg PSBzdGF0aWNfY2FzdDxMYXlvdXRVbml0PihzcGFjZUF2YWlsYWJsZVRoaXNQYXNzICogKGNoaWxk LT5zdHlsZSgpLT5ib3hGbGV4KCkgLyB0b3RhbEZsZXgpKTsKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoc3BhY2VBZGQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2hpbGQtPnNldE92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoY2hpbGQtPm92ZXJyaWRlTG9n aWNhbENvbnRlbnRIZWlnaHQoKSArIHNwYWNlQWRkKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoY29udGVudEhl aWdodEZvckNoaWxkKGNoaWxkKSArIHNwYWNlQWRkKTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZmxleGluZ0NoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfQpAQCAtODA2LDcgKzgyMCw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxl Qm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAg ICAgICAgICAgICAgICBMYXlvdXRVbml0IHNwYWNlQWRkID0gZ3JvdXBSZW1haW5pbmdTcGFjZSA+ IDAgPyAxIDogLTE7CiAgICAgICAgICAgICAgICAgICAgICAgICBmb3IgKFJlbmRlckJveCogY2hp bGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGlsZCAmJiBncm91cFJlbWFpbmluZ1NwYWNlOyBjaGls ZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChh bGxvd2VkQ2hpbGRGbGV4KGNoaWxkLCBleHBhbmRpbmcsIGkpKSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KGNo aWxkLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkgKyBzcGFjZUFkZCk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50 SGVpZ2h0KGNvbnRlbnRIZWlnaHRGb3JDaGlsZChjaGlsZCkgKyBzcGFjZUFkZCk7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGZsZXhpbmdDaGlsZHJlbiA9IHRydWU7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZW1haW5pbmdTcGFjZSAtPSBzcGFjZUFkZDsKQEAg LTEwMTksNyArMTAzMyw3IEBAIExheW91dFVuaXQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 OjphbGxvd2VkQ2hpbGRGbGV4KFJlbmRlckJveCogY2hpbGQsIGJvb2wKICAgICAgICAgaWYgKGlz SG9yaXpvbnRhbCgpKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogRm9yIG5vdyBqdXN0IGhhbmRs ZSBmaXhlZCB2YWx1ZXMuCiAgICAgICAgICAgICBMYXlvdXRVbml0IG1heFdpZHRoID0gTUFYX0xB WU9VVF9VTklUOwotICAgICAgICAgICAgTGF5b3V0VW5pdCB3aWR0aCA9IGNoaWxkLT5vdmVycmlk ZUxvZ2ljYWxDb250ZW50V2lkdGgoKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgd2lkdGggPSBj b250ZW50V2lkdGhGb3JDaGlsZChjaGlsZCk7CiAgICAgICAgICAgICBpZiAoIWNoaWxkLT5zdHls ZSgpLT5tYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgY2hpbGQtPnN0eWxlKCktPm1heFdpZHRo KCkuaXNGaXhlZCgpKQogICAgICAgICAgICAgICAgIG1heFdpZHRoID0gY2hpbGQtPnN0eWxlKCkt Pm1heFdpZHRoKCkudmFsdWUoKTsKICAgICAgICAgICAgIGVsc2UgaWYgKGNoaWxkLT5zdHlsZSgp LT5tYXhXaWR0aCgpLnR5cGUoKSA9PSBJbnRyaW5zaWMpCkBAIC0xMDMyLDcgKzEwNDYsNyBAQCBM YXlvdXRVbml0IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YWxsb3dlZENoaWxkRmxleChS ZW5kZXJCb3gqIGNoaWxkLCBib29sCiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBG SVhNRTogRm9yIG5vdyBqdXN0IGhhbmRsZSBmaXhlZCB2YWx1ZXMuCiAgICAgICAgICAgICBMYXlv dXRVbml0IG1heEhlaWdodCA9IE1BWF9MQVlPVVRfVU5JVDsKLSAgICAgICAgICAgIExheW91dFVu aXQgaGVpZ2h0ID0gY2hpbGQtPm92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsKKyAgICAg ICAgICAgIExheW91dFVuaXQgaGVpZ2h0ID0gY29udGVudEhlaWdodEZvckNoaWxkKGNoaWxkKTsK ICAgICAgICAgICAgIGlmICghY2hpbGQtPnN0eWxlKCktPm1heEhlaWdodCgpLmlzVW5kZWZpbmVk KCkgJiYgY2hpbGQtPnN0eWxlKCktPm1heEhlaWdodCgpLmlzRml4ZWQoKSkKICAgICAgICAgICAg ICAgICBtYXhIZWlnaHQgPSBjaGlsZC0+c3R5bGUoKS0+bWF4SGVpZ2h0KCkudmFsdWUoKTsKICAg ICAgICAgICAgIGlmIChtYXhIZWlnaHQgPT0gTUFYX0xBWU9VVF9VTklUKQpAQCAtMTA0NCw3ICsx MDU4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFsbG93ZWRD aGlsZEZsZXgoUmVuZGVyQm94KiBjaGlsZCwgYm9vbAogICAgIC8vIEZJWE1FOiBGb3Igbm93IGp1 c3QgaGFuZGxlIGZpeGVkIHZhbHVlcy4KICAgICBpZiAoaXNIb3Jpem9udGFsKCkpIHsKICAgICAg ICAgTGF5b3V0VW5pdCBtaW5XaWR0aCA9IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgo KTsKLSAgICAgICAgTGF5b3V0VW5pdCB3aWR0aCA9IGNoaWxkLT5vdmVycmlkZUxvZ2ljYWxDb250 ZW50V2lkdGgoKTsKKyAgICAgICAgTGF5b3V0VW5pdCB3aWR0aCA9IGNvbnRlbnRXaWR0aEZvckNo aWxkKGNoaWxkKTsKICAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLT5taW5XaWR0aCgpLmlzRml4 ZWQoKSkKICAgICAgICAgICAgIG1pbldpZHRoID0gY2hpbGQtPnN0eWxlKCktPm1pbldpZHRoKCku dmFsdWUoKTsKICAgICAgICAgZWxzZSBpZiAoY2hpbGQtPnN0eWxlKCktPm1pbldpZHRoKCkudHlw ZSgpID09IEludHJpbnNpYykKQEAgLTEwNjAsNyArMTA3NCw3IEBAIExheW91dFVuaXQgUmVuZGVy RGVwcmVjYXRlZEZsZXhpYmxlQm94OjphbGxvd2VkQ2hpbGRGbGV4KFJlbmRlckJveCogY2hpbGQs IGJvb2wKICAgICAgICAgTGVuZ3RoIG1pbkhlaWdodCA9IGNoaWxkLT5zdHlsZSgpLT5taW5IZWln aHQoKTsKICAgICAgICAgaWYgKG1pbkhlaWdodC5pc0ZpeGVkKCkgfHwgbWluSGVpZ2h0LmlzQXV0 bygpKSB7CiAgICAgICAgICAgICBMYXlvdXRVbml0IG1pbkhlaWdodCA9IGNoaWxkLT5zdHlsZSgp LT5taW5IZWlnaHQoKS52YWx1ZSgpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBj aGlsZC0+b3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOworICAgICAgICAgICAgTGF5b3V0 VW5pdCBoZWlnaHQgPSBjb250ZW50SGVpZ2h0Rm9yQ2hpbGQoY2hpbGQpOwogICAgICAgICAgICAg TGF5b3V0VW5pdCBhbGxvd2VkU2hyaW5rYWdlID0gbWluPExheW91dFVuaXQ+KDAsIG1pbkhlaWdo dCAtIGhlaWdodCk7CiAgICAgICAgICAgICByZXR1cm4gYWxsb3dlZFNocmlua2FnZTsKICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDZmN2VjYWExZDgzN2M3NmY3NmJhZTdlMTllN2FjNzU3NjM5OWMwZGQuLjU1 ZDU3NWY3YWUxMjI1MzhkMjhiNmQ4ZGZlMTNmMjgwODU4MDA1OTEgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxMi0xMC0wNSAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIERlcHJlY2F0ZWQgZmxleGJveGVzIHN1YnRyYWN0IHNjcm9sbGJhciB3aWR0aC9oZWlnaHQg dHdpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4 NTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBm YXN0L2ZsZXhib3gvZmxleGluZy1vdmVyZmxvdy1zY3JvbGwtaXRlbS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9mbGV4aW5nLW92ZXJmbG93LXNjcm9sbC1pdGVt Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTEwLTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgogCiAgICAgICAgIENocm9taXVtIGFuZCBNYWMgcmViYXNlbGluZXMgYWZ0ZXIgcjEzMDUz Mi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9mbGV4aW5nLW92ZXJmbG93 LXNjcm9sbC1pdGVtLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9mbGV4 aW5nLW92ZXJmbG93LXNjcm9sbC1pdGVtLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOGUwMzUy NTE1NWMxYmQyY2Q2NDg1ZGUyMzVlZGI0MmQ1NGFmYTFmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ZsZXhpbmctb3ZlcmZsb3ctc2Nyb2xsLWl0ZW0tZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorUEFTUworUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9mbGV4Ym94L2ZsZXhpbmctb3ZlcmZsb3ctc2Nyb2xsLWl0ZW0uaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvZmxleGJveC9mbGV4aW5nLW92ZXJmbG93LXNjcm9sbC1pdGVtLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMDFhZjkyZjliYTUzZDRhODI1ODllNDhhZmY0ZDNkZGJhOTk3ZTRjNwotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9mbGV4aW5nLW92ZXJmbG93LXNj cm9sbC1pdGVtLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8ZGl2IGlk PSJmbGV4Ym94IiBzdHlsZT0iZGlzcGxheTogLXdlYmtpdC1ib3g7IGhlaWdodDogMTAwcHg7IHdp ZHRoOiAyMDBweDsiPgorICAgIDxkaXYgc3R5bGU9Im92ZXJmbG93OiBzY3JvbGw7IC13ZWJraXQt Ym94LWZsZXg6IDE7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPTIwMCBkYXRhLWV4cGVjdGVkLWhlaWdo dD0xMDA+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBpZD0iZmxleGJveCIgc3R5bGU9ImRpc3BsYXk6 IC13ZWJraXQtYm94OyBoZWlnaHQ6IDEwMHB4OyB3aWR0aDogMjAwcHg7IC13ZWJraXQtYm94LW9y aWVudDogdmVydGljYWw7Ij4KKyAgICA8ZGl2IHN0eWxlPSJvdmVyZmxvdzogc2Nyb2xsOyAtd2Vi a2l0LWJveC1mbGV4OiAxOyIgZGF0YS1leHBlY3RlZC13aWR0aD0yMDAgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9MTAwPjwvZGl2PgorPC9kaXY+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMv Y2hlY2stbGF5b3V0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5u ZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitjaGVja0xheW91dCgnI2ZsZXhib3gn KTsKKzwvc2NyaXB0PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK