65208 2011-07-26 14:30:31 -0700 Switch RenderStyle to to new layout types 2011-08-08 13:49:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw webkit.review.bot oldest_to_newest 442530 0 eae 2011-07-26 14:30:31 -0700 Convert RenderStyle to new layout abstraction. 442545 1 102055 eae 2011-07-26 14:46:49 -0700 Created attachment 102055 Patch 443203 2 102199 eae 2011-07-27 15:40:40 -0700 Created attachment 102199 Patch 448045 3 102199 eric 2011-08-08 09:34:02 -0700 Comment on attachment 102199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102199&action=review Seems reasonable. > Source/WebCore/rendering/style/RenderStyle.cpp:798 > +static RoundedRect::Radii calcRadiiFor(const BorderData& border, LayoutUnit width, LayoutUnit height) Should this be a layoutsize/layoutpoint? 448202 4 103280 eae 2011-08-08 13:09:38 -0700 Created attachment 103280 Patch for landing 448246 5 103280 webkit.review.bot 2011-08-08 13:49:47 -0700 Comment on attachment 103280 Patch for landing Clearing flags on attachment: 103280 Committed r92631: <http://trac.webkit.org/changeset/92631> 448247 6 webkit.review.bot 2011-08-08 13:49:52 -0700 All reviewed patches have been landed. Closing bug. 102055 2011-07-26 14:46:49 -0700 2011-07-27 15:40:37 -0700 Patch bug-65208-20110726144648.patch text/plain 9526 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNzgzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDctMjYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJTdHlsZSB0 byB0byBuZXcgbGF5b3V0IHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTIwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6YWRkU2hhZG93T3ZlcmZsb3cpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YXBwbHlUcmFuc2Zvcm0p OgorICAgICAgICAoV2ViQ29yZTo6Y2FsY1JhZGlpRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TaGFkb3dEYXRh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0RhdGE6OmFkanVzdFJlY3RGb3JTaGFkb3cp OgorCiAyMDExLTA3LTI2ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA3NzgKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiA5MTc2MSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MjE3LDE3ICszMjE3LDE3IEBAIGJvb2wgUmVuZGVyQm94Ojphdm9pZHNGbG9hdHMoKSBjb25zdAog CiB2b2lkIFJlbmRlckJveDo6YWRkU2hhZG93T3ZlcmZsb3coKQogewotICAgIGludCBzaGFkb3dM ZWZ0OwotICAgIGludCBzaGFkb3dSaWdodDsKLSAgICBpbnQgc2hhZG93VG9wOwotICAgIGludCBz aGFkb3dCb3R0b207CisgICAgTGF5b3V0VW5pdCBzaGFkb3dMZWZ0OworICAgIExheW91dFVuaXQg c2hhZG93UmlnaHQ7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dUb3A7CisgICAgTGF5b3V0VW5pdCBz aGFkb3dCb3R0b207CiAgICAgc3R5bGUoKS0+Z2V0Qm94U2hhZG93RXh0ZW50KHNoYWRvd1RvcCwg c2hhZG93UmlnaHQsIHNoYWRvd0JvdHRvbSwgc2hhZG93TGVmdCk7Ci0gICAgSW50UmVjdCBib3Jk ZXJCb3ggPSBib3JkZXJCb3hSZWN0KCk7Ci0gICAgaW50IG92ZXJmbG93TGVmdCA9IGJvcmRlckJv eC54KCkgKyBzaGFkb3dMZWZ0OwotICAgIGludCBvdmVyZmxvd1JpZ2h0ID0gYm9yZGVyQm94Lm1h eFgoKSArIHNoYWRvd1JpZ2h0OwotICAgIGludCBvdmVyZmxvd1RvcCA9IGJvcmRlckJveC55KCkg KyBzaGFkb3dUb3A7Ci0gICAgaW50IG92ZXJmbG93Qm90dG9tID0gYm9yZGVyQm94Lm1heFkoKSAr IHNoYWRvd0JvdHRvbTsKLSAgICBhZGRWaXN1YWxPdmVyZmxvdyhJbnRSZWN0KG92ZXJmbG93TGVm dCwgb3ZlcmZsb3dUb3AsIG92ZXJmbG93UmlnaHQgLSBvdmVyZmxvd0xlZnQsIG92ZXJmbG93Qm90 dG9tIC0gb3ZlcmZsb3dUb3ApKTsKKyAgICBMYXlvdXRSZWN0IGJvcmRlckJveCA9IGJvcmRlckJv eFJlY3QoKTsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93TGVmdCA9IGJvcmRlckJveC54KCkgKyBz aGFkb3dMZWZ0OworICAgIExheW91dFVuaXQgb3ZlcmZsb3dSaWdodCA9IGJvcmRlckJveC5tYXhY KCkgKyBzaGFkb3dSaWdodDsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93VG9wID0gYm9yZGVyQm94 LnkoKSArIHNoYWRvd1RvcDsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93Qm90dG9tID0gYm9yZGVy Qm94Lm1heFkoKSArIHNoYWRvd0JvdHRvbTsKKyAgICBhZGRWaXN1YWxPdmVyZmxvdyhMYXlvdXRS ZWN0KG92ZXJmbG93TGVmdCwgb3ZlcmZsb3dUb3AsIG92ZXJmbG93UmlnaHQgLSBvdmVyZmxvd0xl ZnQsIG92ZXJmbG93Qm90dG9tIC0gb3ZlcmZsb3dUb3ApKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6 OmFkZE92ZXJmbG93RnJvbUNoaWxkKFJlbmRlckJveCogY2hpbGQsIGNvbnN0IExheW91dFNpemUm IGRlbHRhKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuY3BwCShyZXZpc2lvbiA5MTc2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyMyw3ICs3MjMsNyBAQCB2 b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50KFF1b3RlVHlwZSBxCiAgICAgcmFyZU5vbkluaGVy aXRlZERhdGEuYWNjZXNzKCktPm1fY29udGVudCA9IENvbnRlbnREYXRhOjpjcmVhdGUocXVvdGUp OwogfQogCi12b2lkIFJlbmRlclN0eWxlOjphcHBseVRyYW5zZm9ybShUcmFuc2Zvcm1hdGlvbk1h dHJpeCYgdHJhbnNmb3JtLCBjb25zdCBJbnRTaXplJiBib3JkZXJCb3hTaXplLCBBcHBseVRyYW5z Zm9ybU9yaWdpbiBhcHBseU9yaWdpbikgY29uc3QKK3ZvaWQgUmVuZGVyU3R5bGU6OmFwcGx5VHJh bnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IExheW91dFNpemUm IGJvcmRlckJveFNpemUsIEFwcGx5VHJhbnNmb3JtT3JpZ2luIGFwcGx5T3JpZ2luKSBjb25zdAog ewogICAgIC8vIHRyYW5zZm9ybS1vcmlnaW4gYnJhY2tldHMgdGhlIHRyYW5zZm9ybSB3aXRoIHRy YW5zbGF0ZSBvcGVyYXRpb25zLgogICAgIC8vIE9wdGltaXplIGZvciB0aGUgY2FzZSB3aGVyZSB0 aGUgb25seSB0cmFuc2Zvcm0gaXMgYSB0cmFuc2xhdGlvbiwgc2luY2UgdGhlIHRyYW5zZm9ybS1v cmlnaW4gaXMgaXJyZWxldmFudApAQCAtNzk1LDcgKzc5NSw3IEBAIHZvaWQgUmVuZGVyU3R5bGU6 OnNldEJveFNoYWRvdyhQYXNzT3duUHQKICAgICByYXJlRGF0YS0+bV9ib3hTaGFkb3cgPSBzaGFk b3dEYXRhOwogfQogCi1zdGF0aWMgUm91bmRlZFJlY3Q6OlJhZGlpIGNhbGNSYWRpaUZvcihjb25z dCBCb3JkZXJEYXRhJiBib3JkZXIsIGludCB3aWR0aCwgaW50IGhlaWdodCkKK3N0YXRpYyBSb3Vu ZGVkUmVjdDo6UmFkaWkgY2FsY1JhZGlpRm9yKGNvbnN0IEJvcmRlckRhdGEmIGJvcmRlciwgTGF5 b3V0VW5pdCB3aWR0aCwgTGF5b3V0VW5pdCBoZWlnaHQpCiB7CiAgICAgcmV0dXJuIFJvdW5kZWRS ZWN0OjpSYWRpaSgKICAgICAgICAgTGF5b3V0U2l6ZShib3JkZXIudG9wTGVmdCgpLndpZHRoKCku Y2FsY1ZhbHVlKHdpZHRoKSwgCkBAIC04NDAsNyArODQwLDcgQEAgc3RhdGljIGZsb2F0IGNhbGND b25zdHJhaW50U2NhbGVGb3IoY29ucwogICAgIHJldHVybiBmYWN0b3I7CiB9CiAKLVJvdW5kZWRS ZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVyRm9yKGNvbnN0IEludFJlY3QmIGJvcmRl clJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSkgY29uc3QKK1JvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVy Rm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0 RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QKIHsKICAgICBSb3VuZGVk UmVjdCByb3VuZGVkUmVjdChib3JkZXJSZWN0KTsKICAgICBpZiAoaGFzQm9yZGVyUmFkaXVzKCkp IHsKQEAgLTg1MSwyNSArODUxLDI1IEBAIFJvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3Vu ZGVkQm9yZGUKICAgICByZXR1cm4gcm91bmRlZFJlY3Q7CiB9CiAKLVJvdW5kZWRSZWN0IFJlbmRl clN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVj dCwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlKSBjb25zdAorUm91bmRlZFJlY3QgUmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRl ckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpIGNvbnN0CiB7CiAgICAgYm9vbCBo b3Jpem9udGFsID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKIAotICAgIGludCBsZWZ0V2lk dGggPSAoIWhvcml6b250YWwgfHwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSkgPyBib3JkZXJMZWZ0 V2lkdGgoKSA6IDA7Ci0gICAgaW50IHJpZ2h0V2lkdGggPSAoIWhvcml6b250YWwgfHwgaW5jbHVk ZUxvZ2ljYWxSaWdodEVkZ2UpID8gYm9yZGVyUmlnaHRXaWR0aCgpIDogMDsKLSAgICBpbnQgdG9w V2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbExlZnRFZGdlKSA/IGJvcmRlclRv cFdpZHRoKCkgOiAwOwotICAgIGludCBib3R0b21XaWR0aCA9IChob3Jpem9udGFsIHx8IGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlKSA/IGJvcmRlckJvdHRvbVdpZHRoKCkgOiAwOworICAgIExheW91 dFVuaXQgbGVmdFdpZHRoID0gKCFob3Jpem9udGFsIHx8IGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2Up ID8gYm9yZGVyTGVmdFdpZHRoKCkgOiAwOworICAgIExheW91dFVuaXQgcmlnaHRXaWR0aCA9ICgh aG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgPyBib3JkZXJSaWdodFdpZHRo KCkgOiAwOworICAgIExheW91dFVuaXQgdG9wV2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRl TG9naWNhbExlZnRFZGdlKSA/IGJvcmRlclRvcFdpZHRoKCkgOiAwOworICAgIExheW91dFVuaXQg Ym90dG9tV2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgPyBi b3JkZXJCb3R0b21XaWR0aCgpIDogMDsKIAogICAgIHJldHVybiBnZXRSb3VuZGVkSW5uZXJCb3Jk ZXJGb3IoYm9yZGVyUmVjdCwgdG9wV2lkdGgsIGJvdHRvbVdpZHRoLCBsZWZ0V2lkdGgsIHJpZ2h0 V2lkdGgsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsK IH0KIAotUm91bmRlZFJlY3QgUmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihj b25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LAotICAgIGludCB0b3BXaWR0aCwgaW50IGJvdHRvbVdp ZHRoLCBpbnQgbGVmdFdpZHRoLCBpbnQgcmlnaHRXaWR0aCwgYm9vbCBpbmNsdWRlTG9naWNhbExl ZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSBjb25zdAorUm91bmRlZFJlY3Qg UmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBi b3JkZXJSZWN0LAorICAgIExheW91dFVuaXQgdG9wV2lkdGgsIExheW91dFVuaXQgYm90dG9tV2lk dGgsIExheW91dFVuaXQgbGVmdFdpZHRoLCBMYXlvdXRVbml0IHJpZ2h0V2lkdGgsIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QK IHsKLSAgICBJbnRSZWN0IGlubmVyUmVjdChib3JkZXJSZWN0LngoKSArIGxlZnRXaWR0aCwgCi0g ICAgICAgICAgICBib3JkZXJSZWN0LnkoKSArIHRvcFdpZHRoLCAKLSAgICAgICAgICAgIGJvcmRl clJlY3Qud2lkdGgoKSAtIGxlZnRXaWR0aCAtIHJpZ2h0V2lkdGgsIAotICAgICAgICAgICAgYm9y ZGVyUmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90dG9tV2lkdGgpOworICAgIExheW91dFJl Y3QgaW5uZXJSZWN0KGJvcmRlclJlY3QueCgpICsgbGVmdFdpZHRoLCAKKyAgICAgICAgICAgICAg IGJvcmRlclJlY3QueSgpICsgdG9wV2lkdGgsIAorICAgICAgICAgICAgICAgYm9yZGVyUmVjdC53 aWR0aCgpIC0gbGVmdFdpZHRoIC0gcmlnaHRXaWR0aCwgCisgICAgICAgICAgICAgICBib3JkZXJS ZWN0LmhlaWdodCgpIC0gdG9wV2lkdGggLSBib3R0b21XaWR0aCk7CiAKICAgICBSb3VuZGVkUmVj dCByb3VuZGVkUmVjdChpbm5lclJlY3QpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gOTE3NjEpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzQy LDcgKzc0Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0 eSgpIGNvbnN0IHsgcmV0dXJuIGhhc1RyYW5zZm9ybSgpIHx8IHByZXNlcnZlczNEKCkgfHwgaGFz UGVyc3BlY3RpdmUoKTsgfQogCiAgICAgZW51bSBBcHBseVRyYW5zZm9ybU9yaWdpbiB7IEluY2x1 ZGVUcmFuc2Zvcm1PcmlnaW4sIEV4Y2x1ZGVUcmFuc2Zvcm1PcmlnaW4gfTsKLSAgICB2b2lkIGFw cGx5VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgY29uc3QgSW50U2l6ZSYgYm9yZGVy Qm94U2l6ZSwgQXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBJbmNsdWRlVHJhbnNmb3JtT3JpZ2luKSBj b25zdDsKKyAgICB2b2lkIGFwcGx5VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgY29u c3QgTGF5b3V0U2l6ZSYgYm9yZGVyQm94U2l6ZSwgQXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBJbmNs dWRlVHJhbnNmb3JtT3JpZ2luKSBjb25zdDsKICAgICB2b2lkIHNldFBhZ2VTY2FsZVRyYW5zZm9y bShmbG9hdCk7CiAKICAgICBib29sIGhhc01hc2soKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5o ZXJpdGVkRGF0YS0+bV9tYXNrLmhhc0ltYWdlKCkgfHwgcmFyZU5vbkluaGVyaXRlZERhdGEtPm1f bWFza0JveEltYWdlLmhhc0ltYWdlKCk7IH0KQEAgLTg4MSwxMSArODgxLDExIEBAIHB1YmxpYzoK ICAgICAgICAgc2V0Qm9yZGVyUmFkaXVzKExlbmd0aFNpemUoTGVuZ3RoKHMud2lkdGgoKSwgRml4 ZWQpLCBMZW5ndGgocy5oZWlnaHQoKSwgRml4ZWQpKSk7CiAgICAgfQogICAgIAotICAgIFJvdW5k ZWRSZWN0IGdldFJvdW5kZWRCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwgYm9v bCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZSA9IHRydWUpIGNvbnN0OwotICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRl ckZvcihjb25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVk Z2UgPSB0cnVlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7Cisg ICAgUm91bmRlZFJlY3QgZ2V0Um91bmRlZEJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3Jk ZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVM b2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CisgICAgUm91bmRlZFJlY3QgZ2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVk ZUxvZ2ljYWxMZWZ0RWRnZSA9IHRydWUsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgPSB0 cnVlKSBjb25zdDsKIAotICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihj b25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LAotICAgICAgICBpbnQgdG9wV2lkdGgsIGludCBib3R0 b21XaWR0aCwgaW50IGxlZnRXaWR0aCwgaW50IHJpZ2h0V2lkdGgsIGJvb2wgaW5jbHVkZUxvZ2lj YWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3Q7CisgICAgUm91 bmRlZFJlY3QgZ2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRl clJlY3QsCisgICAgICAgIExheW91dFVuaXQgdG9wV2lkdGgsIExheW91dFVuaXQgYm90dG9tV2lk dGgsIExheW91dFVuaXQgbGVmdFdpZHRoLCBMYXlvdXRVbml0IHJpZ2h0V2lkdGgsIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3Q7 CiAKICAgICB2b2lkIHNldEJvcmRlckxlZnRXaWR0aCh1bnNpZ25lZCBzaG9ydCB2KSB7IFNFVF9W QVIoc3Vycm91bmQsIGJvcmRlci5tX2xlZnQubV93aWR0aCwgdikgfQogICAgIHZvaWQgc2V0Qm9y ZGVyTGVmdFN0eWxlKEVCb3JkZXJTdHlsZSB2KSB7IFNFVF9WQVIoc3Vycm91bmQsIGJvcmRlci5t X2xlZnQubV9zdHlsZSwgdikgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1NoYWRvd0RhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9TaGFkb3dEYXRhLmNwcAkocmV2aXNpb24gOTE3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvU2hhZG93RGF0YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDEwICs3 MCwxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY2FsY3VsYXRlU2hhZG93RXh0ZW50CiAKIHZvaWQg U2hhZG93RGF0YTo6YWRqdXN0UmVjdEZvclNoYWRvdyhJbnRSZWN0JiByZWN0LCBpbnQgYWRkaXRp b25hbE91dGxpbmVTaXplKSBjb25zdAogewotICAgIGludCBzaGFkb3dMZWZ0ID0gMDsKLSAgICBp bnQgc2hhZG93UmlnaHQgPSAwOwotICAgIGludCBzaGFkb3dUb3AgPSAwOwotICAgIGludCBzaGFk b3dCb3R0b20gPSAwOworICAgIExheW91dFVuaXQgc2hhZG93TGVmdCA9IDA7CisgICAgTGF5b3V0 VW5pdCBzaGFkb3dSaWdodCA9IDA7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dUb3AgPSAwOworICAg IExheW91dFVuaXQgc2hhZG93Qm90dG9tID0gMDsKICAgICBjYWxjdWxhdGVTaGFkb3dFeHRlbnQo dGhpcywgYWRkaXRpb25hbE91dGxpbmVTaXplLCBzaGFkb3dMZWZ0LCBzaGFkb3dSaWdodCwgc2hh ZG93VG9wLCBzaGFkb3dCb3R0b20pOwogCiAgICAgcmVjdC5tb3ZlKHNoYWRvd0xlZnQsIHNoYWRv d1RvcCk7Cg== 102199 2011-07-27 15:40:40 -0700 2011-08-08 13:09:35 -0700 Patch bug-65208-20110727154039.patch text/plain 9526 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNzgzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDctMjYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJTdHlsZSB0 byB0byBuZXcgbGF5b3V0IHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTIwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6YWRkU2hhZG93T3ZlcmZsb3cpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YXBwbHlUcmFuc2Zvcm0p OgorICAgICAgICAoV2ViQ29yZTo6Y2FsY1JhZGlpRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TaGFkb3dEYXRh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0RhdGE6OmFkanVzdFJlY3RGb3JTaGFkb3cp OgorCiAyMDExLTA3LTI2ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA3NzgKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiA5MTc2MSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MjE3LDE3ICszMjE3LDE3IEBAIGJvb2wgUmVuZGVyQm94Ojphdm9pZHNGbG9hdHMoKSBjb25zdAog CiB2b2lkIFJlbmRlckJveDo6YWRkU2hhZG93T3ZlcmZsb3coKQogewotICAgIGludCBzaGFkb3dM ZWZ0OwotICAgIGludCBzaGFkb3dSaWdodDsKLSAgICBpbnQgc2hhZG93VG9wOwotICAgIGludCBz aGFkb3dCb3R0b207CisgICAgTGF5b3V0VW5pdCBzaGFkb3dMZWZ0OworICAgIExheW91dFVuaXQg c2hhZG93UmlnaHQ7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dUb3A7CisgICAgTGF5b3V0VW5pdCBz aGFkb3dCb3R0b207CiAgICAgc3R5bGUoKS0+Z2V0Qm94U2hhZG93RXh0ZW50KHNoYWRvd1RvcCwg c2hhZG93UmlnaHQsIHNoYWRvd0JvdHRvbSwgc2hhZG93TGVmdCk7Ci0gICAgSW50UmVjdCBib3Jk ZXJCb3ggPSBib3JkZXJCb3hSZWN0KCk7Ci0gICAgaW50IG92ZXJmbG93TGVmdCA9IGJvcmRlckJv eC54KCkgKyBzaGFkb3dMZWZ0OwotICAgIGludCBvdmVyZmxvd1JpZ2h0ID0gYm9yZGVyQm94Lm1h eFgoKSArIHNoYWRvd1JpZ2h0OwotICAgIGludCBvdmVyZmxvd1RvcCA9IGJvcmRlckJveC55KCkg KyBzaGFkb3dUb3A7Ci0gICAgaW50IG92ZXJmbG93Qm90dG9tID0gYm9yZGVyQm94Lm1heFkoKSAr IHNoYWRvd0JvdHRvbTsKLSAgICBhZGRWaXN1YWxPdmVyZmxvdyhJbnRSZWN0KG92ZXJmbG93TGVm dCwgb3ZlcmZsb3dUb3AsIG92ZXJmbG93UmlnaHQgLSBvdmVyZmxvd0xlZnQsIG92ZXJmbG93Qm90 dG9tIC0gb3ZlcmZsb3dUb3ApKTsKKyAgICBMYXlvdXRSZWN0IGJvcmRlckJveCA9IGJvcmRlckJv eFJlY3QoKTsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93TGVmdCA9IGJvcmRlckJveC54KCkgKyBz aGFkb3dMZWZ0OworICAgIExheW91dFVuaXQgb3ZlcmZsb3dSaWdodCA9IGJvcmRlckJveC5tYXhY KCkgKyBzaGFkb3dSaWdodDsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93VG9wID0gYm9yZGVyQm94 LnkoKSArIHNoYWRvd1RvcDsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93Qm90dG9tID0gYm9yZGVy Qm94Lm1heFkoKSArIHNoYWRvd0JvdHRvbTsKKyAgICBhZGRWaXN1YWxPdmVyZmxvdyhMYXlvdXRS ZWN0KG92ZXJmbG93TGVmdCwgb3ZlcmZsb3dUb3AsIG92ZXJmbG93UmlnaHQgLSBvdmVyZmxvd0xl ZnQsIG92ZXJmbG93Qm90dG9tIC0gb3ZlcmZsb3dUb3ApKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6 OmFkZE92ZXJmbG93RnJvbUNoaWxkKFJlbmRlckJveCogY2hpbGQsIGNvbnN0IExheW91dFNpemUm IGRlbHRhKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuY3BwCShyZXZpc2lvbiA5MTc2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyMyw3ICs3MjMsNyBAQCB2 b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50KFF1b3RlVHlwZSBxCiAgICAgcmFyZU5vbkluaGVy aXRlZERhdGEuYWNjZXNzKCktPm1fY29udGVudCA9IENvbnRlbnREYXRhOjpjcmVhdGUocXVvdGUp OwogfQogCi12b2lkIFJlbmRlclN0eWxlOjphcHBseVRyYW5zZm9ybShUcmFuc2Zvcm1hdGlvbk1h dHJpeCYgdHJhbnNmb3JtLCBjb25zdCBJbnRTaXplJiBib3JkZXJCb3hTaXplLCBBcHBseVRyYW5z Zm9ybU9yaWdpbiBhcHBseU9yaWdpbikgY29uc3QKK3ZvaWQgUmVuZGVyU3R5bGU6OmFwcGx5VHJh bnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IExheW91dFNpemUm IGJvcmRlckJveFNpemUsIEFwcGx5VHJhbnNmb3JtT3JpZ2luIGFwcGx5T3JpZ2luKSBjb25zdAog ewogICAgIC8vIHRyYW5zZm9ybS1vcmlnaW4gYnJhY2tldHMgdGhlIHRyYW5zZm9ybSB3aXRoIHRy YW5zbGF0ZSBvcGVyYXRpb25zLgogICAgIC8vIE9wdGltaXplIGZvciB0aGUgY2FzZSB3aGVyZSB0 aGUgb25seSB0cmFuc2Zvcm0gaXMgYSB0cmFuc2xhdGlvbiwgc2luY2UgdGhlIHRyYW5zZm9ybS1v cmlnaW4gaXMgaXJyZWxldmFudApAQCAtNzk1LDcgKzc5NSw3IEBAIHZvaWQgUmVuZGVyU3R5bGU6 OnNldEJveFNoYWRvdyhQYXNzT3duUHQKICAgICByYXJlRGF0YS0+bV9ib3hTaGFkb3cgPSBzaGFk b3dEYXRhOwogfQogCi1zdGF0aWMgUm91bmRlZFJlY3Q6OlJhZGlpIGNhbGNSYWRpaUZvcihjb25z dCBCb3JkZXJEYXRhJiBib3JkZXIsIGludCB3aWR0aCwgaW50IGhlaWdodCkKK3N0YXRpYyBSb3Vu ZGVkUmVjdDo6UmFkaWkgY2FsY1JhZGlpRm9yKGNvbnN0IEJvcmRlckRhdGEmIGJvcmRlciwgTGF5 b3V0VW5pdCB3aWR0aCwgTGF5b3V0VW5pdCBoZWlnaHQpCiB7CiAgICAgcmV0dXJuIFJvdW5kZWRS ZWN0OjpSYWRpaSgKICAgICAgICAgTGF5b3V0U2l6ZShib3JkZXIudG9wTGVmdCgpLndpZHRoKCku Y2FsY1ZhbHVlKHdpZHRoKSwgCkBAIC04NDAsNyArODQwLDcgQEAgc3RhdGljIGZsb2F0IGNhbGND b25zdHJhaW50U2NhbGVGb3IoY29ucwogICAgIHJldHVybiBmYWN0b3I7CiB9CiAKLVJvdW5kZWRS ZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVyRm9yKGNvbnN0IEludFJlY3QmIGJvcmRl clJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSkgY29uc3QKK1JvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGVy Rm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0 RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QKIHsKICAgICBSb3VuZGVk UmVjdCByb3VuZGVkUmVjdChib3JkZXJSZWN0KTsKICAgICBpZiAoaGFzQm9yZGVyUmFkaXVzKCkp IHsKQEAgLTg1MSwyNSArODUxLDI1IEBAIFJvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3Vu ZGVkQm9yZGUKICAgICByZXR1cm4gcm91bmRlZFJlY3Q7CiB9CiAKLVJvdW5kZWRSZWN0IFJlbmRl clN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVj dCwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlKSBjb25zdAorUm91bmRlZFJlY3QgUmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRl ckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpIGNvbnN0CiB7CiAgICAgYm9vbCBo b3Jpem9udGFsID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKIAotICAgIGludCBsZWZ0V2lk dGggPSAoIWhvcml6b250YWwgfHwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSkgPyBib3JkZXJMZWZ0 V2lkdGgoKSA6IDA7Ci0gICAgaW50IHJpZ2h0V2lkdGggPSAoIWhvcml6b250YWwgfHwgaW5jbHVk ZUxvZ2ljYWxSaWdodEVkZ2UpID8gYm9yZGVyUmlnaHRXaWR0aCgpIDogMDsKLSAgICBpbnQgdG9w V2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbExlZnRFZGdlKSA/IGJvcmRlclRv cFdpZHRoKCkgOiAwOwotICAgIGludCBib3R0b21XaWR0aCA9IChob3Jpem9udGFsIHx8IGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlKSA/IGJvcmRlckJvdHRvbVdpZHRoKCkgOiAwOworICAgIExheW91 dFVuaXQgbGVmdFdpZHRoID0gKCFob3Jpem9udGFsIHx8IGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2Up ID8gYm9yZGVyTGVmdFdpZHRoKCkgOiAwOworICAgIExheW91dFVuaXQgcmlnaHRXaWR0aCA9ICgh aG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgPyBib3JkZXJSaWdodFdpZHRo KCkgOiAwOworICAgIExheW91dFVuaXQgdG9wV2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRl TG9naWNhbExlZnRFZGdlKSA/IGJvcmRlclRvcFdpZHRoKCkgOiAwOworICAgIExheW91dFVuaXQg Ym90dG9tV2lkdGggPSAoaG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgPyBi b3JkZXJCb3R0b21XaWR0aCgpIDogMDsKIAogICAgIHJldHVybiBnZXRSb3VuZGVkSW5uZXJCb3Jk ZXJGb3IoYm9yZGVyUmVjdCwgdG9wV2lkdGgsIGJvdHRvbVdpZHRoLCBsZWZ0V2lkdGgsIHJpZ2h0 V2lkdGgsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsK IH0KIAotUm91bmRlZFJlY3QgUmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihj b25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LAotICAgIGludCB0b3BXaWR0aCwgaW50IGJvdHRvbVdp ZHRoLCBpbnQgbGVmdFdpZHRoLCBpbnQgcmlnaHRXaWR0aCwgYm9vbCBpbmNsdWRlTG9naWNhbExl ZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSBjb25zdAorUm91bmRlZFJlY3Qg UmVuZGVyU3R5bGU6OmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBi b3JkZXJSZWN0LAorICAgIExheW91dFVuaXQgdG9wV2lkdGgsIExheW91dFVuaXQgYm90dG9tV2lk dGgsIExheW91dFVuaXQgbGVmdFdpZHRoLCBMYXlvdXRVbml0IHJpZ2h0V2lkdGgsIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QK IHsKLSAgICBJbnRSZWN0IGlubmVyUmVjdChib3JkZXJSZWN0LngoKSArIGxlZnRXaWR0aCwgCi0g ICAgICAgICAgICBib3JkZXJSZWN0LnkoKSArIHRvcFdpZHRoLCAKLSAgICAgICAgICAgIGJvcmRl clJlY3Qud2lkdGgoKSAtIGxlZnRXaWR0aCAtIHJpZ2h0V2lkdGgsIAotICAgICAgICAgICAgYm9y ZGVyUmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90dG9tV2lkdGgpOworICAgIExheW91dFJl Y3QgaW5uZXJSZWN0KGJvcmRlclJlY3QueCgpICsgbGVmdFdpZHRoLCAKKyAgICAgICAgICAgICAg IGJvcmRlclJlY3QueSgpICsgdG9wV2lkdGgsIAorICAgICAgICAgICAgICAgYm9yZGVyUmVjdC53 aWR0aCgpIC0gbGVmdFdpZHRoIC0gcmlnaHRXaWR0aCwgCisgICAgICAgICAgICAgICBib3JkZXJS ZWN0LmhlaWdodCgpIC0gdG9wV2lkdGggLSBib3R0b21XaWR0aCk7CiAKICAgICBSb3VuZGVkUmVj dCByb3VuZGVkUmVjdChpbm5lclJlY3QpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gOTE3NjEpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzQy LDcgKzc0Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0 eSgpIGNvbnN0IHsgcmV0dXJuIGhhc1RyYW5zZm9ybSgpIHx8IHByZXNlcnZlczNEKCkgfHwgaGFz UGVyc3BlY3RpdmUoKTsgfQogCiAgICAgZW51bSBBcHBseVRyYW5zZm9ybU9yaWdpbiB7IEluY2x1 ZGVUcmFuc2Zvcm1PcmlnaW4sIEV4Y2x1ZGVUcmFuc2Zvcm1PcmlnaW4gfTsKLSAgICB2b2lkIGFw cGx5VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgY29uc3QgSW50U2l6ZSYgYm9yZGVy Qm94U2l6ZSwgQXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBJbmNsdWRlVHJhbnNmb3JtT3JpZ2luKSBj b25zdDsKKyAgICB2b2lkIGFwcGx5VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgY29u c3QgTGF5b3V0U2l6ZSYgYm9yZGVyQm94U2l6ZSwgQXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBJbmNs dWRlVHJhbnNmb3JtT3JpZ2luKSBjb25zdDsKICAgICB2b2lkIHNldFBhZ2VTY2FsZVRyYW5zZm9y bShmbG9hdCk7CiAKICAgICBib29sIGhhc01hc2soKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5o ZXJpdGVkRGF0YS0+bV9tYXNrLmhhc0ltYWdlKCkgfHwgcmFyZU5vbkluaGVyaXRlZERhdGEtPm1f bWFza0JveEltYWdlLmhhc0ltYWdlKCk7IH0KQEAgLTg4MSwxMSArODgxLDExIEBAIHB1YmxpYzoK ICAgICAgICAgc2V0Qm9yZGVyUmFkaXVzKExlbmd0aFNpemUoTGVuZ3RoKHMud2lkdGgoKSwgRml4 ZWQpLCBMZW5ndGgocy5oZWlnaHQoKSwgRml4ZWQpKSk7CiAgICAgfQogICAgIAotICAgIFJvdW5k ZWRSZWN0IGdldFJvdW5kZWRCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwgYm9v bCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZSA9IHRydWUpIGNvbnN0OwotICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRl ckZvcihjb25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVk Z2UgPSB0cnVlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7Cisg ICAgUm91bmRlZFJlY3QgZ2V0Um91bmRlZEJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3Jk ZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVM b2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CisgICAgUm91bmRlZFJlY3QgZ2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVk ZUxvZ2ljYWxMZWZ0RWRnZSA9IHRydWUsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgPSB0 cnVlKSBjb25zdDsKIAotICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihj b25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LAotICAgICAgICBpbnQgdG9wV2lkdGgsIGludCBib3R0 b21XaWR0aCwgaW50IGxlZnRXaWR0aCwgaW50IHJpZ2h0V2lkdGgsIGJvb2wgaW5jbHVkZUxvZ2lj YWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3Q7CisgICAgUm91 bmRlZFJlY3QgZ2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGNvbnN0IExheW91dFJlY3QmIGJvcmRl clJlY3QsCisgICAgICAgIExheW91dFVuaXQgdG9wV2lkdGgsIExheW91dFVuaXQgYm90dG9tV2lk dGgsIExheW91dFVuaXQgbGVmdFdpZHRoLCBMYXlvdXRVbml0IHJpZ2h0V2lkdGgsIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3Q7 CiAKICAgICB2b2lkIHNldEJvcmRlckxlZnRXaWR0aCh1bnNpZ25lZCBzaG9ydCB2KSB7IFNFVF9W QVIoc3Vycm91bmQsIGJvcmRlci5tX2xlZnQubV93aWR0aCwgdikgfQogICAgIHZvaWQgc2V0Qm9y ZGVyTGVmdFN0eWxlKEVCb3JkZXJTdHlsZSB2KSB7IFNFVF9WQVIoc3Vycm91bmQsIGJvcmRlci5t X2xlZnQubV9zdHlsZSwgdikgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1NoYWRvd0RhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9TaGFkb3dEYXRhLmNwcAkocmV2aXNpb24gOTE3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvU2hhZG93RGF0YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDEwICs3 MCwxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY2FsY3VsYXRlU2hhZG93RXh0ZW50CiAKIHZvaWQg U2hhZG93RGF0YTo6YWRqdXN0UmVjdEZvclNoYWRvdyhJbnRSZWN0JiByZWN0LCBpbnQgYWRkaXRp b25hbE91dGxpbmVTaXplKSBjb25zdAogewotICAgIGludCBzaGFkb3dMZWZ0ID0gMDsKLSAgICBp bnQgc2hhZG93UmlnaHQgPSAwOwotICAgIGludCBzaGFkb3dUb3AgPSAwOwotICAgIGludCBzaGFk b3dCb3R0b20gPSAwOworICAgIExheW91dFVuaXQgc2hhZG93TGVmdCA9IDA7CisgICAgTGF5b3V0 VW5pdCBzaGFkb3dSaWdodCA9IDA7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dUb3AgPSAwOworICAg IExheW91dFVuaXQgc2hhZG93Qm90dG9tID0gMDsKICAgICBjYWxjdWxhdGVTaGFkb3dFeHRlbnQo dGhpcywgYWRkaXRpb25hbE91dGxpbmVTaXplLCBzaGFkb3dMZWZ0LCBzaGFkb3dSaWdodCwgc2hh ZG93VG9wLCBzaGFkb3dCb3R0b20pOwogCiAgICAgcmVjdC5tb3ZlKHNoYWRvd0xlZnQsIHNoYWRv d1RvcCk7Cg== 103280 2011-08-08 13:09:38 -0700 2011-08-08 13:49:47 -0700 Patch for landing bug-65208-20110808130937.patch text/plain 11027 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNjIwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDgtMDggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJTdHlsZSB0 byB0byBuZXcgbGF5b3V0IHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTIwOAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 YWRkU2hhZG93T3ZlcmZsb3cpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YXBwbHlUcmFuc2Zvcm0pOgor ICAgICAgICAoV2ViQ29yZTo6Y2FsY1JhZGlpRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpnZXRSb3VuZGVkQm9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TaGFkb3dEYXRhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0RhdGE6OmFkanVzdFJlY3RGb3JTaGFkb3cpOgor CiAyMDExLTA4LTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IFJlbW92ZSByZWR1bmRhbnQgaW5saW5lIHN0eWxlcyBmcm9tIHRoZSBwYXN0ZWQgY29udGVudHMg bW9yZSBhZ2dyZXNzaXZlbHkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCShyZXZpc2lvbiA5MjYyMCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjE5LDE3ICszMjE5LDE3IEBAIGJvb2wgUmVuZGVy Qm94Ojphdm9pZHNGbG9hdHMoKSBjb25zdAogCiB2b2lkIFJlbmRlckJveDo6YWRkU2hhZG93T3Zl cmZsb3coKQogewotICAgIGludCBzaGFkb3dMZWZ0OwotICAgIGludCBzaGFkb3dSaWdodDsKLSAg ICBpbnQgc2hhZG93VG9wOwotICAgIGludCBzaGFkb3dCb3R0b207CisgICAgTGF5b3V0VW5pdCBz aGFkb3dMZWZ0OworICAgIExheW91dFVuaXQgc2hhZG93UmlnaHQ7CisgICAgTGF5b3V0VW5pdCBz aGFkb3dUb3A7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dCb3R0b207CiAgICAgc3R5bGUoKS0+Z2V0 Qm94U2hhZG93RXh0ZW50KHNoYWRvd1RvcCwgc2hhZG93UmlnaHQsIHNoYWRvd0JvdHRvbSwgc2hh ZG93TGVmdCk7Ci0gICAgSW50UmVjdCBib3JkZXJCb3ggPSBib3JkZXJCb3hSZWN0KCk7Ci0gICAg aW50IG92ZXJmbG93TGVmdCA9IGJvcmRlckJveC54KCkgKyBzaGFkb3dMZWZ0OwotICAgIGludCBv dmVyZmxvd1JpZ2h0ID0gYm9yZGVyQm94Lm1heFgoKSArIHNoYWRvd1JpZ2h0OwotICAgIGludCBv dmVyZmxvd1RvcCA9IGJvcmRlckJveC55KCkgKyBzaGFkb3dUb3A7Ci0gICAgaW50IG92ZXJmbG93 Qm90dG9tID0gYm9yZGVyQm94Lm1heFkoKSArIHNoYWRvd0JvdHRvbTsKLSAgICBhZGRWaXN1YWxP dmVyZmxvdyhJbnRSZWN0KG92ZXJmbG93TGVmdCwgb3ZlcmZsb3dUb3AsIG92ZXJmbG93UmlnaHQg LSBvdmVyZmxvd0xlZnQsIG92ZXJmbG93Qm90dG9tIC0gb3ZlcmZsb3dUb3ApKTsKKyAgICBMYXlv dXRSZWN0IGJvcmRlckJveCA9IGJvcmRlckJveFJlY3QoKTsKKyAgICBMYXlvdXRVbml0IG92ZXJm bG93TGVmdCA9IGJvcmRlckJveC54KCkgKyBzaGFkb3dMZWZ0OworICAgIExheW91dFVuaXQgb3Zl cmZsb3dSaWdodCA9IGJvcmRlckJveC5tYXhYKCkgKyBzaGFkb3dSaWdodDsKKyAgICBMYXlvdXRV bml0IG92ZXJmbG93VG9wID0gYm9yZGVyQm94LnkoKSArIHNoYWRvd1RvcDsKKyAgICBMYXlvdXRV bml0IG92ZXJmbG93Qm90dG9tID0gYm9yZGVyQm94Lm1heFkoKSArIHNoYWRvd0JvdHRvbTsKKyAg ICBhZGRWaXN1YWxPdmVyZmxvdyhMYXlvdXRSZWN0KG92ZXJmbG93TGVmdCwgb3ZlcmZsb3dUb3As IG92ZXJmbG93UmlnaHQgLSBvdmVyZmxvd0xlZnQsIG92ZXJmbG93Qm90dG9tIC0gb3ZlcmZsb3dU b3ApKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmFkZE92ZXJmbG93RnJvbUNoaWxkKFJlbmRlckJv eCogY2hpbGQsIGNvbnN0IExheW91dFNpemUmIGRlbHRhKQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCShyZXZpc2lvbiA5MjYyMCkKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTcyMSw3ICs3MjEsNyBAQCB2b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50KFF1 b3RlVHlwZSBxCiAgICAgcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fY29udGVudCA9 IENvbnRlbnREYXRhOjpjcmVhdGUocXVvdGUpOwogfQogCi12b2lkIFJlbmRlclN0eWxlOjphcHBs eVRyYW5zZm9ybShUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdCBJbnRTaXpl JiBib3JkZXJCb3hTaXplLCBBcHBseVRyYW5zZm9ybU9yaWdpbiBhcHBseU9yaWdpbikgY29uc3QK K3ZvaWQgUmVuZGVyU3R5bGU6OmFwcGx5VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0 cmFuc2Zvcm0sIGNvbnN0IExheW91dFNpemUmIGJvcmRlckJveFNpemUsIEFwcGx5VHJhbnNmb3Jt T3JpZ2luIGFwcGx5T3JpZ2luKSBjb25zdAogewogICAgIC8vIHRyYW5zZm9ybS1vcmlnaW4gYnJh Y2tldHMgdGhlIHRyYW5zZm9ybSB3aXRoIHRyYW5zbGF0ZSBvcGVyYXRpb25zLgogICAgIC8vIE9w dGltaXplIGZvciB0aGUgY2FzZSB3aGVyZSB0aGUgb25seSB0cmFuc2Zvcm0gaXMgYSB0cmFuc2xh dGlvbiwgc2luY2UgdGhlIHRyYW5zZm9ybS1vcmlnaW4gaXMgaXJyZWxldmFudApAQCAtNzkzLDE3 ICs3OTMsMTcgQEAgdm9pZCBSZW5kZXJTdHlsZTo6c2V0Qm94U2hhZG93KFBhc3NPd25QdAogICAg IHJhcmVEYXRhLT5tX2JveFNoYWRvdyA9IHNoYWRvd0RhdGE7CiB9CiAKLXN0YXRpYyBSb3VuZGVk UmVjdDo6UmFkaWkgY2FsY1JhZGlpRm9yKGNvbnN0IEJvcmRlckRhdGEmIGJvcmRlciwgaW50IHdp ZHRoLCBpbnQgaGVpZ2h0KQorc3RhdGljIFJvdW5kZWRSZWN0OjpSYWRpaSBjYWxjUmFkaWlGb3Io Y29uc3QgQm9yZGVyRGF0YSYgYm9yZGVyLCBMYXlvdXRTaXplIHNpemUpCiB7CiAgICAgcmV0dXJu IFJvdW5kZWRSZWN0OjpSYWRpaSgKLSAgICAgICAgTGF5b3V0U2l6ZShib3JkZXIudG9wTGVmdCgp LndpZHRoKCkuY2FsY1ZhbHVlKHdpZHRoKSwgCi0gICAgICAgICAgICAgICAgICAgYm9yZGVyLnRv cExlZnQoKS5oZWlnaHQoKS5jYWxjVmFsdWUoaGVpZ2h0KSksCi0gICAgICAgIExheW91dFNpemUo Ym9yZGVyLnRvcFJpZ2h0KCkud2lkdGgoKS5jYWxjVmFsdWUod2lkdGgpLAotICAgICAgICAgICAg ICAgICAgIGJvcmRlci50b3BSaWdodCgpLmhlaWdodCgpLmNhbGNWYWx1ZShoZWlnaHQpKSwKLSAg ICAgICAgTGF5b3V0U2l6ZShib3JkZXIuYm90dG9tTGVmdCgpLndpZHRoKCkuY2FsY1ZhbHVlKHdp ZHRoKSwgCi0gICAgICAgICAgICAgICAgICAgYm9yZGVyLmJvdHRvbUxlZnQoKS5oZWlnaHQoKS5j YWxjVmFsdWUoaGVpZ2h0KSksCi0gICAgICAgIExheW91dFNpemUoYm9yZGVyLmJvdHRvbVJpZ2h0 KCkud2lkdGgoKS5jYWxjVmFsdWUod2lkdGgpLCAKLSAgICAgICAgICAgICAgICAgICBib3JkZXIu Ym90dG9tUmlnaHQoKS5oZWlnaHQoKS5jYWxjVmFsdWUoaGVpZ2h0KSkpOworICAgICAgICBMYXlv dXRTaXplKGJvcmRlci50b3BMZWZ0KCkud2lkdGgoKS5jYWxjVmFsdWUoc2l6ZS53aWR0aCgpKSwg CisgICAgICAgICAgICAgICAgICAgYm9yZGVyLnRvcExlZnQoKS5oZWlnaHQoKS5jYWxjVmFsdWUo c2l6ZS5oZWlnaHQoKSkpLAorICAgICAgICBMYXlvdXRTaXplKGJvcmRlci50b3BSaWdodCgpLndp ZHRoKCkuY2FsY1ZhbHVlKHNpemUud2lkdGgoKSksCisgICAgICAgICAgICAgICAgICAgYm9yZGVy LnRvcFJpZ2h0KCkuaGVpZ2h0KCkuY2FsY1ZhbHVlKHNpemUuaGVpZ2h0KCkpKSwKKyAgICAgICAg TGF5b3V0U2l6ZShib3JkZXIuYm90dG9tTGVmdCgpLndpZHRoKCkuY2FsY1ZhbHVlKHNpemUud2lk dGgoKSksIAorICAgICAgICAgICAgICAgICAgIGJvcmRlci5ib3R0b21MZWZ0KCkuaGVpZ2h0KCku Y2FsY1ZhbHVlKHNpemUuaGVpZ2h0KCkpKSwKKyAgICAgICAgTGF5b3V0U2l6ZShib3JkZXIuYm90 dG9tUmlnaHQoKS53aWR0aCgpLmNhbGNWYWx1ZShzaXplLndpZHRoKCkpLCAKKyAgICAgICAgICAg ICAgICAgICBib3JkZXIuYm90dG9tUmlnaHQoKS5oZWlnaHQoKS5jYWxjVmFsdWUoc2l6ZS5oZWln aHQoKSkpKTsKIH0KIAogc3RhdGljIGZsb2F0IGNhbGNDb25zdHJhaW50U2NhbGVGb3IoY29uc3Qg SW50UmVjdCYgcmVjdCwgY29uc3QgUm91bmRlZFJlY3Q6OlJhZGlpJiByYWRpaSkKQEAgLTgzOCwz NiArODM4LDM2IEBAIHN0YXRpYyBmbG9hdCBjYWxjQ29uc3RyYWludFNjYWxlRm9yKGNvbnMKICAg ICByZXR1cm4gZmFjdG9yOwogfQogCi1Sb3VuZGVkUmVjdCBSZW5kZXJTdHlsZTo6Z2V0Um91bmRl ZEJvcmRlckZvcihjb25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpIGNvbnN0CitSb3VuZGVkUmVj dCBSZW5kZXJTdHlsZTo6Z2V0Um91bmRlZEJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3Jk ZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxS aWdodEVkZ2UpIGNvbnN0CiB7CiAgICAgUm91bmRlZFJlY3Qgcm91bmRlZFJlY3QoYm9yZGVyUmVj dCk7CiAgICAgaWYgKGhhc0JvcmRlclJhZGl1cygpKSB7Ci0gICAgICAgIFJvdW5kZWRSZWN0OjpS YWRpaSByYWRpaSA9IGNhbGNSYWRpaUZvcihzdXJyb3VuZC0+Ym9yZGVyLCBib3JkZXJSZWN0Lndp ZHRoKCksIGJvcmRlclJlY3QuaGVpZ2h0KCkpOworICAgICAgICBSb3VuZGVkUmVjdDo6UmFkaWkg cmFkaWkgPSBjYWxjUmFkaWlGb3Ioc3Vycm91bmQtPmJvcmRlciwgYm9yZGVyUmVjdC5zaXplKCkp OwogICAgICAgICByYWRpaS5zY2FsZShjYWxjQ29uc3RyYWludFNjYWxlRm9yKGJvcmRlclJlY3Qs IHJhZGlpKSk7CiAgICAgICAgIHJvdW5kZWRSZWN0LmluY2x1ZGVMb2dpY2FsRWRnZXMocmFkaWks IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCksIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlKTsKICAgICB9CiAgICAgcmV0dXJuIHJvdW5kZWRSZWN0OwogfQog Ci1Sb3VuZGVkUmVjdCBSZW5kZXJTdHlsZTo6Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGNvbnN0 IEludFJlY3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QKK1JvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpn ZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgYm9v bCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSBj b25zdAogewogICAgIGJvb2wgaG9yaXpvbnRhbCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7 CiAKLSAgICBpbnQgbGVmdFdpZHRoID0gKCFob3Jpem9udGFsIHx8IGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UpID8gYm9yZGVyTGVmdFdpZHRoKCkgOiAwOwotICAgIGludCByaWdodFdpZHRoID0gKCFo b3Jpem9udGFsIHx8IGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSA/IGJvcmRlclJpZ2h0V2lkdGgo KSA6IDA7Ci0gICAgaW50IHRvcFdpZHRoID0gKGhvcml6b250YWwgfHwgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSkgPyBib3JkZXJUb3BXaWR0aCgpIDogMDsKLSAgICBpbnQgYm90dG9tV2lkdGggPSAo aG9yaXpvbnRhbCB8fCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgPyBib3JkZXJCb3R0b21XaWR0 aCgpIDogMDsKKyAgICBMYXlvdXRVbml0IGxlZnRXaWR0aCA9ICghaG9yaXpvbnRhbCB8fCBpbmNs dWRlTG9naWNhbExlZnRFZGdlKSA/IGJvcmRlckxlZnRXaWR0aCgpIDogMDsKKyAgICBMYXlvdXRV bml0IHJpZ2h0V2lkdGggPSAoIWhvcml6b250YWwgfHwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2Up ID8gYm9yZGVyUmlnaHRXaWR0aCgpIDogMDsKKyAgICBMYXlvdXRVbml0IHRvcFdpZHRoID0gKGhv cml6b250YWwgfHwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSkgPyBib3JkZXJUb3BXaWR0aCgpIDog MDsKKyAgICBMYXlvdXRVbml0IGJvdHRvbVdpZHRoID0gKGhvcml6b250YWwgfHwgaW5jbHVkZUxv Z2ljYWxSaWdodEVkZ2UpID8gYm9yZGVyQm90dG9tV2lkdGgoKSA6IDA7CiAKICAgICByZXR1cm4g Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsIHRvcFdpZHRoLCBib3R0b21XaWR0 aCwgbGVmdFdpZHRoLCByaWdodFdpZHRoLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRl TG9naWNhbFJpZ2h0RWRnZSk7CiB9CiAKLVJvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3Vu ZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwKLSAgICBpbnQgdG9w V2lkdGgsIGludCBib3R0b21XaWR0aCwgaW50IGxlZnRXaWR0aCwgaW50IHJpZ2h0V2lkdGgsIGJv b2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkg Y29uc3QKK1JvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3Io Y29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwKKyAgICBMYXlvdXRVbml0IHRvcFdpZHRoLCBM YXlvdXRVbml0IGJvdHRvbVdpZHRoLCBMYXlvdXRVbml0IGxlZnRXaWR0aCwgTGF5b3V0VW5pdCBy aWdodFdpZHRoLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2lj YWxSaWdodEVkZ2UpIGNvbnN0CiB7Ci0gICAgSW50UmVjdCBpbm5lclJlY3QoYm9yZGVyUmVjdC54 KCkgKyBsZWZ0V2lkdGgsIAotICAgICAgICAgICAgYm9yZGVyUmVjdC55KCkgKyB0b3BXaWR0aCwg Ci0gICAgICAgICAgICBib3JkZXJSZWN0LndpZHRoKCkgLSBsZWZ0V2lkdGggLSByaWdodFdpZHRo LCAKLSAgICAgICAgICAgIGJvcmRlclJlY3QuaGVpZ2h0KCkgLSB0b3BXaWR0aCAtIGJvdHRvbVdp ZHRoKTsKKyAgICBMYXlvdXRSZWN0IGlubmVyUmVjdChib3JkZXJSZWN0LngoKSArIGxlZnRXaWR0 aCwgCisgICAgICAgICAgICAgICBib3JkZXJSZWN0LnkoKSArIHRvcFdpZHRoLCAKKyAgICAgICAg ICAgICAgIGJvcmRlclJlY3Qud2lkdGgoKSAtIGxlZnRXaWR0aCAtIHJpZ2h0V2lkdGgsIAorICAg ICAgICAgICAgICAgYm9yZGVyUmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90dG9tV2lkdGgp OwogCiAgICAgUm91bmRlZFJlY3Qgcm91bmRlZFJlY3QoaW5uZXJSZWN0KTsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDky NjIwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdv cmtpbmcgY29weSkKQEAgLTc0Miw3ICs3NDIsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNUcmFu c2Zvcm1SZWxhdGVkUHJvcGVydHkoKSBjb25zdCB7IHJldHVybiBoYXNUcmFuc2Zvcm0oKSB8fCBw cmVzZXJ2ZXMzRCgpIHx8IGhhc1BlcnNwZWN0aXZlKCk7IH0KIAogICAgIGVudW0gQXBwbHlUcmFu c2Zvcm1PcmlnaW4geyBJbmNsdWRlVHJhbnNmb3JtT3JpZ2luLCBFeGNsdWRlVHJhbnNmb3JtT3Jp Z2luIH07Ci0gICAgdm9pZCBhcHBseVRyYW5zZm9ybShUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsIGNv bnN0IEludFNpemUmIGJvcmRlckJveFNpemUsIEFwcGx5VHJhbnNmb3JtT3JpZ2luID0gSW5jbHVk ZVRyYW5zZm9ybU9yaWdpbikgY29uc3Q7CisgICAgdm9pZCBhcHBseVRyYW5zZm9ybShUcmFuc2Zv cm1hdGlvbk1hdHJpeCYsIGNvbnN0IExheW91dFNpemUmIGJvcmRlckJveFNpemUsIEFwcGx5VHJh bnNmb3JtT3JpZ2luID0gSW5jbHVkZVRyYW5zZm9ybU9yaWdpbikgY29uc3Q7CiAgICAgdm9pZCBz ZXRQYWdlU2NhbGVUcmFuc2Zvcm0oZmxvYXQpOwogCiAgICAgYm9vbCBoYXNNYXNrKCkgY29uc3Qg eyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbWFzay5oYXNJbWFnZSgpIHx8IHJhcmVO b25Jbmhlcml0ZWREYXRhLT5tX21hc2tCb3hJbWFnZS5oYXNJbWFnZSgpOyB9CkBAIC04ODEsMTEg Kzg4MSwxMSBAQCBwdWJsaWM6CiAgICAgICAgIHNldEJvcmRlclJhZGl1cyhMZW5ndGhTaXplKExl bmd0aChzLndpZHRoKCksIEZpeGVkKSwgTGVuZ3RoKHMuaGVpZ2h0KCksIEZpeGVkKSkpOwogICAg IH0KICAgICAKLSAgICBSb3VuZGVkUmVjdCBnZXRSb3VuZGVkQm9yZGVyRm9yKGNvbnN0IEludFJl Y3QmIGJvcmRlclJlY3QsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSA9IHRydWUsIGJvb2wg aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgPSB0cnVlKSBjb25zdDsKLSAgICBSb3VuZGVkUmVjdCBn ZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwgYm9vbCBp bmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRn ZSA9IHRydWUpIGNvbnN0OworICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRCb3JkZXJGb3IoY29u c3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0g dHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpIGNvbnN0OworICAgIFJv dW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBib3Jk ZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVM b2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CiAKLSAgICBSb3VuZGVkUmVjdCBnZXRSb3Vu ZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwKLSAgICAgICAgaW50 IHRvcFdpZHRoLCBpbnQgYm90dG9tV2lkdGgsIGludCBsZWZ0V2lkdGgsIGludCByaWdodFdpZHRo LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVk Z2UpIGNvbnN0OworICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25z dCBMYXlvdXRSZWN0JiBib3JkZXJSZWN0LAorICAgICAgICBMYXlvdXRVbml0IHRvcFdpZHRoLCBM YXlvdXRVbml0IGJvdHRvbVdpZHRoLCBMYXlvdXRVbml0IGxlZnRXaWR0aCwgTGF5b3V0VW5pdCBy aWdodFdpZHRoLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2lj YWxSaWdodEVkZ2UpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRCb3JkZXJMZWZ0V2lkdGgodW5zaWdu ZWQgc2hvcnQgdikgeyBTRVRfVkFSKHN1cnJvdW5kLCBib3JkZXIubV9sZWZ0Lm1fd2lkdGgsIHYp IH0KICAgICB2b2lkIHNldEJvcmRlckxlZnRTdHlsZShFQm9yZGVyU3R5bGUgdikgeyBTRVRfVkFS KHN1cnJvdW5kLCBib3JkZXIubV9sZWZ0Lm1fc3R5bGUsIHYpIH0KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TaGFkb3dEYXRhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU2hhZG93RGF0YS5jcHAJKHJldmlzaW9uIDkyNjIwKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1NoYWRvd0RhdGEuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03MCwxMCArNzAsMTAgQEAgc3RhdGljIGlubGluZSB2b2lkIGNhbGN1bGF0ZVNo YWRvd0V4dGVudAogCiB2b2lkIFNoYWRvd0RhdGE6OmFkanVzdFJlY3RGb3JTaGFkb3coSW50UmVj dCYgcmVjdCwgaW50IGFkZGl0aW9uYWxPdXRsaW5lU2l6ZSkgY29uc3QKIHsKLSAgICBpbnQgc2hh ZG93TGVmdCA9IDA7Ci0gICAgaW50IHNoYWRvd1JpZ2h0ID0gMDsKLSAgICBpbnQgc2hhZG93VG9w ID0gMDsKLSAgICBpbnQgc2hhZG93Qm90dG9tID0gMDsKKyAgICBMYXlvdXRVbml0IHNoYWRvd0xl ZnQgPSAwOworICAgIExheW91dFVuaXQgc2hhZG93UmlnaHQgPSAwOworICAgIExheW91dFVuaXQg c2hhZG93VG9wID0gMDsKKyAgICBMYXlvdXRVbml0IHNoYWRvd0JvdHRvbSA9IDA7CiAgICAgY2Fs Y3VsYXRlU2hhZG93RXh0ZW50KHRoaXMsIGFkZGl0aW9uYWxPdXRsaW5lU2l6ZSwgc2hhZG93TGVm dCwgc2hhZG93UmlnaHQsIHNoYWRvd1RvcCwgc2hhZG93Qm90dG9tKTsKIAogICAgIHJlY3QubW92 ZShzaGFkb3dMZWZ0LCBzaGFkb3dUb3ApOwo=