79526 2012-02-24 13:22:17 -0800 Incorrect handling of sizes in "em" when first-line changes font size 2012-03-15 17:58:38 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bzbarsky gracek abarth dglazkov mitz tomz webkit.review.bot oldest_to_newest 564581 0 128791 bzbarsky 2012-02-24 13:22:17 -0800 Created attachment 128791 Testcase See attached testcase. Presto and Gecko get this right; the left border of the <span> should be 10px wide. Trident seems to get is half-wrong: it leaves 100px of space but paints a 10px border. WebKit just gets this wrong. 564583 1 128792 bzbarsky 2012-02-24 13:23:32 -0800 Created attachment 128792 Testcase without the typo 570836 2 130159 gracek 2012-03-05 10:51:43 -0800 Created attachment 130159 proposed fix for 79626 571905 3 webkit.review.bot 2012-03-06 09:19:45 -0800 Attachment 130159 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/rendering/InlineFlowBox.cpp..." exit_code: 1 Source/WebCore/rendering/RenderBoxModelObject.cpp:2556: Should have a space between // and comment [whitespace/comments] [4] Source/WebCore/rendering/RenderBoxModelObject.h:196: The parameter name "style" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 571928 4 130159 webkit.review.bot 2012-03-06 09:53:14 -0800 Comment on attachment 130159 proposed fix for 79626 Attachment 130159 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11833438 572141 5 130441 gracek 2012-03-06 14:06:54 -0800 Created attachment 130441 Patch 573287 6 130441 eric 2012-03-07 15:15:05 -0800 Comment on attachment 130441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130441&action=review > Source/WebCore/ChangeLog:11 > + When pseudo class first-line changes the font size, the "em" unit is handled incorrectly as the element's original > + size (the size of the rest of the paragraph) rather than the font-size of the first-line of the element. This was > + corrected by checking if the InlineFlowBox was the first line using the existing InlineFlowBox::isFirstLineStyle() > + function. You should include commentary here on how this does or does not match other browsers behavior, and what the CSS spec says on the topic. > Source/WebCore/rendering/RenderBoxModelObject.cpp:2586 > + getBorderEdgeInfo(edges, this->style()); Why this->style() here? I don't se a "style" local to conflict. 573353 7 130721 gracek 2012-03-07 16:31:36 -0800 Created attachment 130721 Patch 575193 8 130721 eric 2012-03-09 13:56:32 -0800 Comment on attachment 130721 Patch r=me. 578806 9 130721 tomz 2012-03-14 14:55:39 -0700 Comment on attachment 130721 Patch cq+ 578848 10 130721 webkit.review.bot 2012-03-14 15:24:52 -0700 Comment on attachment 130721 Patch Clearing flags on attachment: 130721 Committed r110769: <http://trac.webkit.org/changeset/110769> 578849 11 webkit.review.bot 2012-03-14 15:25:01 -0700 All reviewed patches have been landed. Closing bug. 578908 12 abarth 2012-03-14 16:29:26 -0700 This patch appears to require image baselines but was landed without any. 579974 13 gracek 2012-03-15 17:58:38 -0700 (In reply to comment #12) > This patch appears to require image baselines but was landed without any. I didn't think it required a pixel test because, in the expected render dump, the actual location of RenderText that the border appears to the left of must be exactly (360,0) after the patch is applied. > RenderText {#text} at (360,0) size 50x10 > text run at (360,0) width 50: "this," Before the patch, it would be (450,0). ...Though, I suppose this only verifies that the word "this" has been shifted over the appropriate amount of space for the border. Theoretically the border painting could be completely wrong and the location would still be correct. 128791 2012-02-24 13:22:17 -0800 2012-02-24 13:23:55 -0800 Testcase bar.html text/html 219 bzbarsky PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KICBwIHsgZm9udC1zaXplOiAxMDBweDsgfQogIHA6OmZp cnN0LWxpbmUgewogICAgZm9udC1zaXplOiAxMHB4OwogICAgc3BhbiB7IGJvcmRlci1sZWZ0OiBz b2xpZCAxZW0gYmxhY2s7IH0KICB9Cjwvc3R5bGU+CjxwPkknbSBhIHNob3J0IHBhcmFncmFwaC4g IDxzcGFuPkkgb25seTxicj4KaGF2ZSBhIGZldyBsaW5lcy48L3NwYW4+PC9wPiAK 128792 2012-02-24 13:23:32 -0800 2012-02-24 13:23:32 -0800 Testcase without the typo bar.html text/html 217 bzbarsky PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KICBwIHsgZm9udC1zaXplOiAxMDBweDsgfQogIHA6OmZp cnN0LWxpbmUgewogICAgZm9udC1zaXplOiAxMHB4OwogIH0KICBzcGFuIHsgYm9yZGVyLWxlZnQ6 IHNvbGlkIDFlbSBibGFjazsgfQo8L3N0eWxlPgo8cD5JJ20gYSBzaG9ydCBwYXJhZ3JhcGguICA8 c3Bhbj5JIG9ubHk8YnI+CmhhdmUgYSBmZXcgbGluZXMuPC9zcGFuPjwvcD4gCg== 130159 2012-03-05 10:51:43 -0800 2012-03-06 14:06:46 -0800 proposed fix for 79626 0001-proposed-fix-for-79526.patch text/plain 6285 gracek RnJvbSAyNWFhNjRjMjliNjk2N2I1N2E5NzdiYjBmNjY1OWQ5ZWZkMjI5ZGJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmFjZSBLdSA8Z3JhY2VrQGNvZGVhdXJvcmEub3JnPgpEYXRl OiBNb24sIDUgTWFyIDIwMTIgMTA6NDk6NTMgLTA4MDAKU3ViamVjdDogW1BBVENIXSBwcm9wb3Nl ZCBmaXggZm9yIDc5NTI2CgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93 Qm94LmNwcCAgICAgICAgfCAgICA0ICsrLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVGbG93Qm94LmggICAgICAgICAgfCAgICA0ICsrLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAgfCAgIDEwICsrKysrLS0tLS0KIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oICAgfCAgICAyICstCiA0IGZpbGVz IGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAppbmRleCBmNzk5YTFhLi44Mjg4MjJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCkBAIC0xMjMxLDcg KzEyMzEsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50Qm94RGVjb3JhdGlvbnMoUGFpbnRJ bmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JgogICAgICAgICAgICAgLy8gVGhlIHNp bXBsZSBjYXNlIGlzIHdoZXJlIHdlIGVpdGhlciBoYXZlIG5vIGJvcmRlciBpbWFnZSBvciB3ZSBh cmUgdGhlIG9ubHkgYm94IGZvciB0aGlzIG9iamVjdC4gIEluIHRob3NlCiAgICAgICAgICAgICAv LyBjYXNlcyBvbmx5IGEgc2luZ2xlIGNhbGwgdG8gZHJhdyBpcyByZXF1aXJlZC4KICAgICAgICAg ICAgIGlmICghaGFzQm9yZGVySW1hZ2UgfHwgKCFwcmV2TGluZUJveCgpICYmICFuZXh0TGluZUJv eCgpKSkKLSAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRlcihwYWlu dEluZm8sIHBhaW50UmVjdCwgcmVuZGVyZXIoKS0+c3R5bGUoKSwgQmFja2dyb3VuZEJsZWVkTm9u ZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSgpKTsK KyAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRlcihwYWludEluZm8s IHBhaW50UmVjdCwgcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKSwgQmFja2dy b3VuZEJsZWVkTm9uZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpLCBpbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSgpKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIC8vIFdlIGhh dmUgYSBib3JkZXIgaW1hZ2UgdGhhdCBzcGFucyBtdWx0aXBsZSBsaW5lcy4KICAgICAgICAgICAg ICAgICAvLyBXZSBuZWVkIHRvIGFkanVzdCB0eCBhbmQgdHkgYnkgdGhlIHdpZHRoIG9mIGFsbCBw cmV2aW91cyBsaW5lcy4KQEAgLTEyNTUsNyArMTI1NSw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6 cGFpbnRCb3hEZWNvcmF0aW9ucyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9p bnQmCiAgICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IGNsaXBSZWN0Rm9yTmlu ZVBpZWNlSW1hZ2VTdHJpcCh0aGlzLCBib3JkZXJJbWFnZSwgcGFpbnRSZWN0KTsKICAgICAgICAg ICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmNvbnRleHQpOwog ICAgICAgICAgICAgICAgIGNvbnRleHQtPmNsaXAoY2xpcFJlY3QpOwotICAgICAgICAgICAgICAg IGJveE1vZGVsT2JqZWN0KCktPnBhaW50Qm9yZGVyKHBhaW50SW5mbywgTGF5b3V0UmVjdChzdHJp cFgsIHN0cmlwWSwgc3RyaXBXaWR0aCwgc3RyaXBIZWlnaHQpLCByZW5kZXJlcigpLT5zdHlsZSgp KTsKKyAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRlcihwYWludElu Zm8sIExheW91dFJlY3Qoc3RyaXBYLCBzdHJpcFksIHN0cmlwV2lkdGgsIHN0cmlwSGVpZ2h0KSwg cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaApp bmRleCA1MDBkZTdlLi4wMGFkNTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lRmxvd0JveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVG bG93Qm94LmgKQEAgLTEzNywxMyArMTM3LDEzIEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIGlm ICghaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAg ICAgIHJldHVybiBpc0hvcml6b250YWwoKSA/IHJlbmRlcmVyKCktPnN0eWxlKCktPmJvcmRlckxl ZnRXaWR0aCgpIDogcmVuZGVyZXIoKS0+c3R5bGUoKS0+Ym9yZGVyVG9wV2lkdGgoKTsKKyAgICAg ICAgcmV0dXJuIGlzSG9yaXpvbnRhbCgpID8gcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVT dHlsZSgpKS0+Ym9yZGVyTGVmdFdpZHRoKCkgOiByZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGlu ZVN0eWxlKCkpLT5ib3JkZXJUb3BXaWR0aCgpOwogICAgIH0KICAgICBpbnQgYm9yZGVyTG9naWNh bFJpZ2h0KCkgY29uc3QKICAgICB7CiAgICAgICAgIGlmICghaW5jbHVkZUxvZ2ljYWxSaWdodEVk Z2UoKSkKICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFs KCkgPyByZW5kZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJSaWdodFdpZHRoKCkgOiByZW5kZXJlcigp LT5zdHlsZSgpLT5ib3JkZXJCb3R0b21XaWR0aCgpOworICAgICAgICByZXR1cm4gaXNIb3Jpem9u dGFsKCkgPyByZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5ib3JkZXJSaWdo dFdpZHRoKCkgOiByZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5ib3JkZXJC b3R0b21XaWR0aCgpOwogICAgIH0KICAgICBpbnQgcGFkZGluZ0xvZ2ljYWxMZWZ0KCkgY29uc3QK ICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2Jq ZWN0LmNwcAppbmRleCBlM2FiMzIxLi4wMTk0M2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKQEAgLTE3NDIsNyArMTc0Miw3IEBA IHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYg aW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgcmV0dXJuOwogCiAgICAgQm9yZGVyRWRn ZSBlZGdlc1s0XTsKLSAgICBnZXRCb3JkZXJFZGdlSW5mbyhlZGdlcywgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOworICAgIGdldEJvcmRlckVkZ2VJbmZv KGVkZ2VzLCBzdHlsZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdo dEVkZ2UpOwogCiAgICAgUm91bmRlZFJlY3Qgb3V0ZXJCb3JkZXIgPSBzdHlsZS0+Z2V0Um91bmRl ZEJvcmRlckZvcihyZWN0LCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSk7CiAgICAgUm91bmRlZFJlY3QgaW5uZXJCb3JkZXIgPSBzdHlsZS0+Z2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKHJlY3QsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dp Y2FsUmlnaHRFZGdlKTsKQEAgLTI1NDcsOSArMjU0Nyw5IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxP YmplY3Q6OmNsaXBCb3JkZXJTaWRlRm9yQ29tcGxleElubmVyUGF0aChHcmFwaGljc0NvbnRleHQq IGdyCiAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwT3V0Um91bmRlZFJlY3QoY2FsY3VsYXRlQWRq dXN0ZWRJbm5lckJvcmRlcihpbm5lckJvcmRlciwgc2lkZSkpOwogfQogCi12b2lkIFJlbmRlckJv eE1vZGVsT2JqZWN0OjpnZXRCb3JkZXJFZGdlSW5mbyhCb3JkZXJFZGdlIGVkZ2VzW10sIGJvb2wg aW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29u c3QKK3ZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmdldEJvcmRlckVkZ2VJbmZvKEJvcmRlckVk Z2UgZWRnZXNbXSwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBib29sIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpIGNvbnN0CiB7Ci0gICAgY29u c3QgUmVuZGVyU3R5bGUqIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKKyAgICAvL2NvbnN0IFJlbmRl clN0eWxlKiBzdHlsZSA9IHRoaXMtPnN0eWxlKCk7CiAgICAgYm9vbCBob3Jpem9udGFsID0gc3R5 bGUtPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAKICAgICBlZGdlc1tCU1RvcF0gPSBCb3Jk ZXJFZGdlKHN0eWxlLT5ib3JkZXJUb3BXaWR0aCgpLApAQCAtMjU4MCw3ICsyNTgwLDcgQEAgdm9p ZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Z2V0Qm9yZGVyRWRnZUluZm8oQm9yZGVyRWRnZSBlZGdl c1tdLCBib29sIGluY2x1ZGVMb2cKIGJvb2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmJvcmRlck9i c2N1cmVzQmFja2dyb3VuZEVkZ2UoY29uc3QgRmxvYXRTaXplJiBjb250ZXh0U2NhbGUpIGNvbnN0 CiB7CiAgICAgQm9yZGVyRWRnZSBlZGdlc1s0XTsKLSAgICBnZXRCb3JkZXJFZGdlSW5mbyhlZGdl cyk7CisgICAgZ2V0Qm9yZGVyRWRnZUluZm8oZWRnZXMsIHRoaXMtPnN0eWxlKCkpOwogCiAgICAg Zm9yIChpbnQgaSA9IEJTVG9wOyBpIDw9IEJTTGVmdDsgKytpKSB7CiAgICAgICAgIGNvbnN0IEJv cmRlckVkZ2UmIGN1cnJFZGdlID0gZWRnZXNbaV07CkBAIC0yNjAzLDcgKzI2MDMsNyBAQCBib29s IFJlbmRlckJveE1vZGVsT2JqZWN0Ojpib3JkZXJPYnNjdXJlc0JhY2tncm91bmQoKSBjb25zdAog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBCb3JkZXJFZGdlIGVkZ2VzWzRdOwotICAgIGdl dEJvcmRlckVkZ2VJbmZvKGVkZ2VzKTsKKyAgICBnZXRCb3JkZXJFZGdlSW5mbyhlZGdlcywgc3R5 bGUoKSk7CiAKICAgICBmb3IgKGludCBpID0gQlNUb3A7IGkgPD0gQlNMZWZ0OyArK2kpIHsKICAg ICAgICAgY29uc3QgQm9yZGVyRWRnZSYgY3VyckVkZ2UgPSBlZGdlc1tpXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKaW5kZXggZGNlNjhkNi4u YTc5ZDM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1v ZGVsT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVs T2JqZWN0LmgKQEAgLTE5MSw3ICsxOTEsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgfTsKIAogICAgIHZv aWQgY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkoY29uc3QgRmlsbExheWVyKiwgY29u c3QgTGF5b3V0UmVjdCYgcGFpbnRSZWN0LCBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSYpOwotICAg IHZvaWQgZ2V0Qm9yZGVyRWRnZUluZm8oY2xhc3MgQm9yZGVyRWRnZVtdLCBib29sIGluY2x1ZGVM b2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1 ZSkgY29uc3Q7CisgICAgdm9pZCBnZXRCb3JkZXJFZGdlSW5mbyhjbGFzcyBCb3JkZXJFZGdlW10s IGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0g dHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpIGNvbnN0OwogICAgIGJv b2wgYm9yZGVyT2JzY3VyZXNCYWNrZ3JvdW5kRWRnZShjb25zdCBGbG9hdFNpemUmIGNvbnRleHRT Y2FsZSkgY29uc3Q7CiAgICAgYm9vbCBib3JkZXJPYnNjdXJlc0JhY2tncm91bmQoKSBjb25zdDsK IAotLSAKMS43LjguMwoK 130441 2012-03-06 14:06:54 -0800 2012-03-07 16:31:32 -0800 Patch bug-79526-20120306140651.patch text/plain 10943 gracek U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QxZDlhOWMyY2MzNGEy YzFjM2M2ZTJhY2NhYjE0OGZjOGNmNDc5NS4uNGNjODEyYWE5MzE0NDdiZDhhYmZhZmY5MGQ1MTMz MTdiZmZjMDI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAzLTA2ICBHcmFj ZSBLdSAgPGdyYWNla0Bjb2RlYXVyb3JhLm9yZz4KKworICAgICAgICBJbmNvcnJlY3QgaGFuZGxp bmcgb2Ygc2l6ZXMgaW4gImVtIiB3aGVuIGZpcnN0LWxpbmUgY2hhbmdlcyBmb250IHNpemUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5NTI2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBwc2V1ZG8g Y2xhc3MgZmlyc3QtbGluZSBjaGFuZ2VzIHRoZSBmb250IHNpemUsIHRoZSAiZW0iIHVuaXQgaXMg aGFuZGxlZCBpbmNvcnJlY3RseSBhcyB0aGUgZWxlbWVudCdzIG9yaWdpbmFsCisgICAgICAgIHNp emUgKHRoZSBzaXplIG9mIHRoZSByZXN0IG9mIHRoZSBwYXJhZ3JhcGgpIHJhdGhlciB0aGFuIHRo ZSBmb250LXNpemUgb2YgdGhlIGZpcnN0LWxpbmUgb2YgdGhlIGVsZW1lbnQuIFRoaXMgd2FzCisg ICAgICAgIGNvcnJlY3RlZCBieSBjaGVja2luZyBpZiB0aGUgSW5saW5lRmxvd0JveCB3YXMgdGhl IGZpcnN0IGxpbmUgdXNpbmcgdGhlIGV4aXN0aW5nIElubGluZUZsb3dCb3g6OmlzRmlyc3RMaW5l U3R5bGUoKQorICAgICAgICBmdW5jdGlvbi4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9wc2V1 ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGguaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL0lu bGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6cGFpbnRC b3hEZWNvcmF0aW9ucyk6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaDoKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6OmJvcmRlckxvZ2ljYWxMZWZ0KToKKyAgICAg ICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6OmJvcmRlckxvZ2ljYWxSaWdodCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3hNb2RlbE9iamVjdDo6Z2V0Qm9yZGVyRWRnZUluZm8pOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmJvcmRlck9ic2N1cmVzQmFja2dyb3VuZEVkZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmJvcmRlck9ic2N1cmVzQmFj a2dyb3VuZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0Lmg6Cisg ICAgICAgIChSZW5kZXJCb3hNb2RlbE9iamVjdCk6CisKIDIwMTItMDMtMDYgIEhhbnMgV2VubmJv cmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTcGVlY2ggSmF2YVNjcmlwdCBBUEk6 IGFkZCBTcGVlY2hSZWNvZ25pdGlvbkVycm9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAKaW5kZXggZjc5OWExYWUxOWRkYjFiNGU0ZGQ3N2Y5MzdjOGNhMDRiMzFi Y2Y3Yi4uODI4ODIyYjFkZjIyNDgzNzRhNTllMTlkOGZiMzQ4Y2YyNjBjMDA5MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcApAQCAtMTIzMSw3ICsxMjMxLDcg QEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwYWludEJveERlY29yYXRpb25zKFBhaW50SW5mbyYgcGFp bnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYKICAgICAgICAgICAgIC8vIFRoZSBzaW1wbGUgY2Fz ZSBpcyB3aGVyZSB3ZSBlaXRoZXIgaGF2ZSBubyBib3JkZXIgaW1hZ2Ugb3Igd2UgYXJlIHRoZSBv bmx5IGJveCBmb3IgdGhpcyBvYmplY3QuICBJbiB0aG9zZQogICAgICAgICAgICAgLy8gY2FzZXMg b25seSBhIHNpbmdsZSBjYWxsIHRvIGRyYXcgaXMgcmVxdWlyZWQuCiAgICAgICAgICAgICBpZiAo IWhhc0JvcmRlckltYWdlIHx8ICghcHJldkxpbmVCb3goKSAmJiAhbmV4dExpbmVCb3goKSkpCi0g ICAgICAgICAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3JkZXIocGFpbnRJbmZvLCBw YWludFJlY3QsIHJlbmRlcmVyKCktPnN0eWxlKCksIEJhY2tncm91bmRCbGVlZE5vbmUsIGluY2x1 ZGVMb2dpY2FsTGVmdEVkZ2UoKSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoKSk7CisgICAgICAg ICAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3JkZXIocGFpbnRJbmZvLCBwYWludFJl Y3QsIHJlbmRlcmVyKCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSksIEJhY2tncm91bmRCbGVl ZE5vbmUsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UoKSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2Uo KSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBXZSBoYXZlIGEgYm9y ZGVyIGltYWdlIHRoYXQgc3BhbnMgbXVsdGlwbGUgbGluZXMuCiAgICAgICAgICAgICAgICAgLy8g V2UgbmVlZCB0byBhZGp1c3QgdHggYW5kIHR5IGJ5IHRoZSB3aWR0aCBvZiBhbGwgcHJldmlvdXMg bGluZXMuCkBAIC0xMjU1LDcgKzEyNTUsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50Qm94 RGVjb3JhdGlvbnMoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JgogICAg ICAgICAgICAgICAgIExheW91dFJlY3QgY2xpcFJlY3QgPSBjbGlwUmVjdEZvck5pbmVQaWVjZUlt YWdlU3RyaXAodGhpcywgYm9yZGVySW1hZ2UsIHBhaW50UmVjdCk7CiAgICAgICAgICAgICAgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKICAgICAgICAg ICAgICAgICBjb250ZXh0LT5jbGlwKGNsaXBSZWN0KTsKLSAgICAgICAgICAgICAgICBib3hNb2Rl bE9iamVjdCgpLT5wYWludEJvcmRlcihwYWludEluZm8sIExheW91dFJlY3Qoc3RyaXBYLCBzdHJp cFksIHN0cmlwV2lkdGgsIHN0cmlwSGVpZ2h0KSwgcmVuZGVyZXIoKS0+c3R5bGUoKSk7CisgICAg ICAgICAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3JkZXIocGFpbnRJbmZvLCBMYXlv dXRSZWN0KHN0cmlwWCwgc3RyaXBZLCBzdHJpcFdpZHRoLCBzdHJpcEhlaWdodCksIHJlbmRlcmVy KCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dC b3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgKaW5kZXggNTAw ZGU3ZWQ5MGM1NWU1ZWFhZTA4NDI5MzFmMjQ2M2VhYTkwOTk0NC4uMDBhZDUwZDk1ZDdhNDA1ZTZk NTcyZTM3MWE0ZmM1NDM1OWJiOGY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0lubGluZUZsb3dCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l Rmxvd0JveC5oCkBAIC0xMzcsMTMgKzEzNywxMyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBp ZiAoIWluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UoKSkKICAgICAgICAgICAgIHJldHVybiAwOwotICAg ICAgICByZXR1cm4gaXNIb3Jpem9udGFsKCkgPyByZW5kZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJM ZWZ0V2lkdGgoKSA6IHJlbmRlcmVyKCktPnN0eWxlKCktPmJvcmRlclRvcFdpZHRoKCk7CisgICAg ICAgIHJldHVybiBpc0hvcml6b250YWwoKSA/IHJlbmRlcmVyKCktPnN0eWxlKGlzRmlyc3RMaW5l U3R5bGUoKSktPmJvcmRlckxlZnRXaWR0aCgpIDogcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExp bmVTdHlsZSgpKS0+Ym9yZGVyVG9wV2lkdGgoKTsKICAgICB9CiAgICAgaW50IGJvcmRlckxvZ2lj YWxSaWdodCgpIGNvbnN0CiAgICAgewogICAgICAgICBpZiAoIWluY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlKCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgcmV0dXJuIGlzSG9yaXpvbnRh bCgpID8gcmVuZGVyZXIoKS0+c3R5bGUoKS0+Ym9yZGVyUmlnaHRXaWR0aCgpIDogcmVuZGVyZXIo KS0+c3R5bGUoKS0+Ym9yZGVyQm90dG9tV2lkdGgoKTsKKyAgICAgICAgcmV0dXJuIGlzSG9yaXpv bnRhbCgpID8gcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Ym9yZGVyUmln aHRXaWR0aCgpIDogcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Ym9yZGVy Qm90dG9tV2lkdGgoKTsKICAgICB9CiAgICAgaW50IHBhZGRpbmdMb2dpY2FsTGVmdCgpIGNvbnN0 CiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1v ZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHAKaW5kZXggODMzMGNkOWViNDBlN2E1ZDQ2MTcxNzIzODQwMzA2YzNmOTI4ZmE2Ny4u MGU0OTdhZjAwOWMzZjg0NmE3Y2MyNDQyOTFjMDJkYTY5NWNjOTU2ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0xNzQ2LDcg KzE3NDYsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcihjb25zdCBQ YWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAgICAgICAgIHJldHVybjsKIAogICAg IEJvcmRlckVkZ2UgZWRnZXNbNF07Ci0gICAgZ2V0Qm9yZGVyRWRnZUluZm8oZWRnZXMsIGluY2x1 ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKKyAgICBnZXRCb3Jk ZXJFZGdlSW5mbyhlZGdlcywgc3R5bGUsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVM b2dpY2FsUmlnaHRFZGdlKTsKIAogICAgIFJvdW5kZWRSZWN0IG91dGVyQm9yZGVyID0gc3R5bGUt PmdldFJvdW5kZWRCb3JkZXJGb3IocmVjdCwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVk ZUxvZ2ljYWxSaWdodEVkZ2UpOwogICAgIFJvdW5kZWRSZWN0IGlubmVyQm9yZGVyID0gc3R5bGUt PmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihyZWN0LCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CkBAIC0yNTUxLDkgKzI1NTEsOCBAQCB2b2lkIFJlbmRl ckJveE1vZGVsT2JqZWN0OjpjbGlwQm9yZGVyU2lkZUZvckNvbXBsZXhJbm5lclBhdGgoR3JhcGhp Y3NDb250ZXh0KiBncgogICAgIGdyYXBoaWNzQ29udGV4dC0+Y2xpcE91dFJvdW5kZWRSZWN0KGNh bGN1bGF0ZUFkanVzdGVkSW5uZXJCb3JkZXIoaW5uZXJCb3JkZXIsIHNpZGUpKTsKIH0KIAotdm9p ZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Z2V0Qm9yZGVyRWRnZUluZm8oQm9yZGVyRWRnZSBlZGdl c1tdLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdo dEVkZ2UpIGNvbnN0Cit2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpnZXRCb3JkZXJFZGdlSW5m byhCb3JkZXJFZGdlIGVkZ2VzW10sIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgYm9vbCBpbmNs dWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSBjb25zdAog ewotICAgIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSA9IHRoaXMtPnN0eWxlKCk7CiAgICAgYm9v bCBob3Jpem9udGFsID0gc3R5bGUtPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAKICAgICBl ZGdlc1tCU1RvcF0gPSBCb3JkZXJFZGdlKHN0eWxlLT5ib3JkZXJUb3BXaWR0aCgpLApAQCAtMjU4 NCw3ICsyNTgzLDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Z2V0Qm9yZGVyRWRnZUlu Zm8oQm9yZGVyRWRnZSBlZGdlc1tdLCBib29sIGluY2x1ZGVMb2cKIGJvb2wgUmVuZGVyQm94TW9k ZWxPYmplY3Q6OmJvcmRlck9ic2N1cmVzQmFja2dyb3VuZEVkZ2UoY29uc3QgRmxvYXRTaXplJiBj b250ZXh0U2NhbGUpIGNvbnN0CiB7CiAgICAgQm9yZGVyRWRnZSBlZGdlc1s0XTsKLSAgICBnZXRC b3JkZXJFZGdlSW5mbyhlZGdlcyk7CisgICAgZ2V0Qm9yZGVyRWRnZUluZm8oZWRnZXMsIHRoaXMt PnN0eWxlKCkpOwogCiAgICAgZm9yIChpbnQgaSA9IEJTVG9wOyBpIDw9IEJTTGVmdDsgKytpKSB7 CiAgICAgICAgIGNvbnN0IEJvcmRlckVkZ2UmIGN1cnJFZGdlID0gZWRnZXNbaV07CkBAIC0yNjA3 LDcgKzI2MDYsNyBAQCBib29sIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpib3JkZXJPYnNjdXJlc0Jh Y2tncm91bmQoKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBCb3JkZXJFZGdl IGVkZ2VzWzRdOwotICAgIGdldEJvcmRlckVkZ2VJbmZvKGVkZ2VzKTsKKyAgICBnZXRCb3JkZXJF ZGdlSW5mbyhlZGdlcywgc3R5bGUoKSk7CiAKICAgICBmb3IgKGludCBpID0gQlNUb3A7IGkgPD0g QlNMZWZ0OyArK2kpIHsKICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSYgY3VyckVkZ2UgPSBlZGdl c1tpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmgKaW5kZXggNzAyODJjMzY2NDEzNzk5MTJkZjMxZGM0MzI0NzQyYzlmYzNlODIzOC4uODE4OTUy ODNhMmU0MTNiY2QyZGI1NWIwNDU5OTZhYTk2ZDZiOTgxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKQEAgLTE5Myw3ICsxOTMsNyBAQCBw cm90ZWN0ZWQ6CiAgICAgfTsKIAogICAgIHZvaWQgY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2Vv bWV0cnkoY29uc3QgRmlsbExheWVyKiwgY29uc3QgTGF5b3V0UmVjdCYgcGFpbnRSZWN0LCBCYWNr Z3JvdW5kSW1hZ2VHZW9tZXRyeSYpOwotICAgIHZvaWQgZ2V0Qm9yZGVyRWRnZUluZm8oY2xhc3Mg Qm9yZGVyRWRnZVtdLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGlu Y2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CisgICAgdm9pZCBnZXRCb3JkZXJF ZGdlSW5mbyhjbGFzcyBCb3JkZXJFZGdlW10sIGNvbnN0IFJlbmRlclN0eWxlKiwgYm9vbCBpbmNs dWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9 IHRydWUpIGNvbnN0OwogICAgIGJvb2wgYm9yZGVyT2JzY3VyZXNCYWNrZ3JvdW5kRWRnZShjb25z dCBGbG9hdFNpemUmIGNvbnRleHRTY2FsZSkgY29uc3Q7CiAgICAgYm9vbCBib3JkZXJPYnNjdXJl c0JhY2tncm91bmQoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDk1NjgwYTIyNGJjNmNhMzhjZjA4MDc0Mzlj MjFjYTRjYTM2YmZjMGUuLmYzYmMyOTkwYzczZjdjMDAzN2JkMDI4Zjc0ZWE1OTFjZmM2MWQ2NWQg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wMy0wNiAgR3JhY2UgS3UgIDxncmFjZWtAY29k ZWF1cm9yYS5vcmc+CisKKyAgICAgICAgSW5jb3JyZWN0IGhhbmRsaW5nIG9mIHNpemVzIGluICJl bSIgd2hlbiBmaXJzdC1saW5lIGNoYW5nZXMgZm9udCBzaXplCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrcyB0aGF0IHRoZSB3aWR0aCBvZiB0aGUg bGVmdC1ib3JkZXIgb2YgdGhlIHNwYW4gaXMgMTBweCByYXRoZXIgdGhhbiAxMDBweC4KKworICAg ICAgICAqIGZhc3QvY3NzL3BzZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0aC5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGgtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKworCiAyMDEyLTAzLTA2ICBIYW5zIFdlbm5ib3JnICA8aGFuc0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgU3BlZWNoIEphdmFTY3JpcHQgQVBJOiBhZGQgU3BlZWNo UmVjb2duaXRpb25FcnJvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvcHNldWRv LWZpcnN0LWxpbmUtYm9yZGVyLXdpZHRoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL3BzZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0aC1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uZTc2OWY2NWIyZTk1YTI2MGQyNDg4MjUxZWQ2ODY1ZWI4ZWJiZWUzYgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3BzZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0 aC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyMiBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBz aXplIDgwMHg0NTIKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDQ1Mgor ICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDM0NAorICAgICAgUmVuZGVy QmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSA3ODR4MzQKKyAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLDApIHNpemUgMTQ0eDE3CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lk dGggMTQ0OiAiVGVzdCBmb3IgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0F9IGF0ICgwLDApIHNp emUgNzM2eDM0IFtjb2xvcj0jMDAwMEVFXQorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMTQ0LDApIHNpemUgNzM2eDM0CisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTQ0LDApIHdp ZHRoIDU5MjogImh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT8iCisgICAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggMTI4OiAiaWQ9Nzk1MjYiCisgICAgICBSZW5k ZXJCbG9jayB7UH0gYXQgKDAsMTM0KSBzaXplIDc4NHgyMTAKKyAgICAgICAgUmVuZGVyVGV4dCB7 I3RleHR9IGF0ICgwLDApIHNpemUgMzUweDEwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkg d2lkdGggMzUwOiAiQSBncmVlbiAxMHB4IGJvcmRlciBvbiB0aGUgbGVmdCBvZiAiCisgICAgICAg IFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSA1MDB4MjEwIFtib3JkZXI6ICgxMDBw eCBzb2xpZCAjMDA4MDAwKV0KKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDM2MCww KSBzaXplIDUweDEwCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzYwLDApIHdpZHRoIDUwOiAi dGhpcywiCisgICAgICAgICAgUmVuZGVyQlIge0JSfSBhdCAoNDEwLDApIHNpemUgMHgxMAorICAg ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwxMCkgc2l6ZSA1MDB4MjAwCisgICAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwxMCkgd2lkdGggNDAwOiAiaXMgYSIKKyAgICAgICAgICAgIHRl eHQgcnVuIGF0ICgwLDExMCkgd2lkdGggNTAwOiAicGFzcy4iCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGguaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvY3NzL3BzZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0aC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLmYwODA5NjQ0YTRkMDk3MGQ5YzAxMDZhNWFhMmUyZGIzYjBiY2M2ZmQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXIt d2lkdGguaHRtbApAQCAtMCwwICsxLDI1IEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1sPgorPGhl YWQ+CisgICAgPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0 bWw7IGNoYXJzZXQ9VVRGLTgiPgorICAgIDxzdHlsZT4KKyAgICAgICAgYm9keSB7CisgICAgICAg ICAgICBmb250LWZhbWlseTogYWhlbTsKKyAgICAgICAgfQorICAgICAgICBwIHsKKyAgICAgICAg ICAgIGZvbnQtc2l6ZTogMTAwcHg7CisgICAgICAgIH0KKyAgICAgICAgcDo6Zmlyc3QtbGluZSB7 CisgICAgICAgICAgICBmb250LXNpemU6IDEwcHg7CisgICAgICAgIH0KKyAgICAgICAgc3BhbiB7 CisgICAgICAgICAgICBib3JkZXItbGVmdDogc29saWQgMWVtIGdyZWVuOworICAgICAgICB9Cisg ICAgPC9zdHlsZT4KKzwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGRpdj5UZXN0IGZvciA8 YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk1MjYiPmh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyNjwvYT48L2Rpdj4KKyAg ICAgICAgPHA+QSBncmVlbiAxMHB4IGJvcmRlciBvbiB0aGUgbGVmdCBvZiA8c3Bhbj50aGlzLDxi cj4KKyAgICAgICAgaXMgYSBwYXNzLjwvc3Bhbj48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 130721 2012-03-07 16:31:36 -0800 2012-03-14 15:24:52 -0700 Patch bug-79526-20120307163135.patch text/plain 11801 gracek U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjU2ZTE2ZDM4ZjVmOTY4 NzM5ZTgxNzJlNDZmMjg3NjQ1ZTYxNDUxMC4uNGRkZmUwMThiMWQyY2EwNWEwODFiYmY2MjUwZjhj ZjFhYzJkZGQxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTA3ICBHcmFj ZSBLdSAgPGdyYWNla0Bjb2RlYXVyb3JhLm9yZz4KKworICAgICAgICBJbmNvcnJlY3QgaGFuZGxp bmcgb2Ygc2l6ZXMgaW4gImVtIiB3aGVuIGZpcnN0LWxpbmUgY2hhbmdlcyBmb250IHNpemUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5NTI2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhIGZpcnN0 LWxpbmUgcHNldWRvIGNsYXNzIGNoYW5nZXMgdGhlIGZvbnQgc2l6ZSwgdGhlICJlbSIgdW5pdCBp cyBoYW5kbGVkIGluY29ycmVjdGx5LgorICAgICAgICBJdCB1c2VzIHRoZSBwYXJhZ3JhcGgncyBv cmlnaW5hbCBmb250IHNpemUgKHRoZSBzaXplIG9mIHRoZSByZXN0IG9mIHRoZSBwYXJhZ3JhcGgp IHJhdGhlciB0aGFuCisgICAgICAgIHRoZSBmb250LXNpemUgb2YgdGhlIGZpcnN0LWxpbmUgb2Yg dGhlIHBhcmFncmFwaC4KKworICAgICAgICBUaGlzIHdhcyBjb3JyZWN0ZWQgYnkgY2hlY2tpbmcg aWYgdGhlIElubGluZUZsb3dCb3ggd2FzIHRoZSBmaXJzdCBsaW5lIHVzaW5nIHRoZSBleGlzdGlu ZworICAgICAgICBJbmxpbmVGbG93Qm94Ojppc0ZpcnN0TGluZVN0eWxlKCkgZnVuY3Rpb24uIFRo ZSBjb3JyZWN0ZWQgYmVoYXZpb3VyIG1hdGNoZXMgR2Vja28gYW5kIFByZXN0by4KKyAgICAgICAg VHJpZGVudCBzZWVtcyB0byBnZXQgaXQgaGFsZi13cm9uZyBpbiB0aGUgdXNlIGNhc2Ugd2UgYXJl IHRlc3RpbmcsIHBhaW50aW5nIHRoZSBjb3JyZWN0IHdpZHRoIGZvcgorICAgICAgICB0aGUgYm9y ZGVyIGJ1dCBsZWF2aW5nIHRoZSB3cm9uZyBhbW91bnQgb2Ygc3BhY2UuCisKKyAgICAgICAgVGhl IENTUyBzcGVjaWZpY2F0aW9uIGRvYyBhdCB0aGUgdGltZSBvZiB0aGlzIHBhdGNoIHNwZWNpZmll cyB0aGF0ICc6Zmlyc3QtbGluZScgc2hvdWxkIG9ubHkgc3VwcG9ydAorICAgICAgICBjZXJ0YWlu IHByb3BlcnRpZXMsIHRob3VnaCBVQXMgbWF5IGNob29zZSB0byBhcHBseSBtb3JlIHByb3BlcnRp ZXMuIEZ1cnRoZXJtb3JlLCB0aGUgc3BlYyBkb2VzIG5vdAorICAgICAgICBkZWZpbmUgdGhlIGV4 YWN0IHJlbmRlcmluZyBvZiBhbGwgY2FzZXMgb2YgJzpmaXJzdC1saW5lJy4gSXQgbm90ZXMgdGhh dCBhIG1vcmUgcHJlY2lzZSBkZWZpbml0aW9uCisgICAgICAgIG1heSBhcHBlYXIgaW4gZnV0dXJl IHJldmlzaW9ucy4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1i b3JkZXItd2lkdGguaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6cGFpbnRCb3hEZWNvcmF0aW9ucyk6 CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZUZsb3dCb3g6OmJvcmRlckxvZ2ljYWxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZUZsb3dCb3g6OmJvcmRlckxvZ2ljYWxSaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVs T2JqZWN0OjpwYWludEJvcmRlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9i amVjdDo6Z2V0Qm9yZGVyRWRnZUluZm8pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9k ZWxPYmplY3Q6OmJvcmRlck9ic2N1cmVzQmFja2dyb3VuZEVkZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmJvcmRlck9ic2N1cmVzQmFja2dyb3VuZCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0Lmg6CisgICAgICAgIChSZW5kZXJC b3hNb2RlbE9iamVjdCk6CisKIDIwMTItMDMtMDYgIFNoYXduIFNpbmdoICA8c2hhd25zaW5naEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBNYWtlIGNvbXBvc2l0ZUFuZFJlYWRi YWNrIGFuZCBkYW1hZ2UgdHJhY2tpbmcgcGxheSBuaWNlbHkgdG9nZXRoZXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAppbmRleCBmNzk5YTFhZTE5ZGRiMWI0ZTRk ZDc3ZjkzN2M4Y2EwNGIzMWJjZjdiLi44Mjg4MjJiMWRmMjI0ODM3NGE1OWUxOWQ4ZmIzNDhjZjI2 MGMwMDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0Jv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCkBA IC0xMjMxLDcgKzEyMzEsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50Qm94RGVjb3JhdGlv bnMoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JgogICAgICAgICAgICAg Ly8gVGhlIHNpbXBsZSBjYXNlIGlzIHdoZXJlIHdlIGVpdGhlciBoYXZlIG5vIGJvcmRlciBpbWFn ZSBvciB3ZSBhcmUgdGhlIG9ubHkgYm94IGZvciB0aGlzIG9iamVjdC4gIEluIHRob3NlCiAgICAg ICAgICAgICAvLyBjYXNlcyBvbmx5IGEgc2luZ2xlIGNhbGwgdG8gZHJhdyBpcyByZXF1aXJlZC4K ICAgICAgICAgICAgIGlmICghaGFzQm9yZGVySW1hZ2UgfHwgKCFwcmV2TGluZUJveCgpICYmICFu ZXh0TGluZUJveCgpKSkKLSAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJv cmRlcihwYWludEluZm8sIHBhaW50UmVjdCwgcmVuZGVyZXIoKS0+c3R5bGUoKSwgQmFja2dyb3Vu ZEJsZWVkTm9uZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpLCBpbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZSgpKTsKKyAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRlcihw YWludEluZm8sIHBhaW50UmVjdCwgcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgp KSwgQmFja2dyb3VuZEJsZWVkTm9uZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpLCBpbmNsdWRl TG9naWNhbFJpZ2h0RWRnZSgpKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAg IC8vIFdlIGhhdmUgYSBib3JkZXIgaW1hZ2UgdGhhdCBzcGFucyBtdWx0aXBsZSBsaW5lcy4KICAg ICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIGFkanVzdCB0eCBhbmQgdHkgYnkgdGhlIHdpZHRo IG9mIGFsbCBwcmV2aW91cyBsaW5lcy4KQEAgLTEyNTUsNyArMTI1NSw3IEBAIHZvaWQgSW5saW5l Rmxvd0JveDo6cGFpbnRCb3hEZWNvcmF0aW9ucyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3Qg TGF5b3V0UG9pbnQmCiAgICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IGNsaXBS ZWN0Rm9yTmluZVBpZWNlSW1hZ2VTdHJpcCh0aGlzLCBib3JkZXJJbWFnZSwgcGFpbnRSZWN0KTsK ICAgICAgICAgICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmNv bnRleHQpOwogICAgICAgICAgICAgICAgIGNvbnRleHQtPmNsaXAoY2xpcFJlY3QpOwotICAgICAg ICAgICAgICAgIGJveE1vZGVsT2JqZWN0KCktPnBhaW50Qm9yZGVyKHBhaW50SW5mbywgTGF5b3V0 UmVjdChzdHJpcFgsIHN0cmlwWSwgc3RyaXBXaWR0aCwgc3RyaXBIZWlnaHQpLCByZW5kZXJlcigp LT5zdHlsZSgpKTsKKyAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRl cihwYWludEluZm8sIExheW91dFJlY3Qoc3RyaXBYLCBzdHJpcFksIHN0cmlwV2lkdGgsIHN0cmlw SGVpZ2h0KSwgcmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSW5saW5lRmxvd0JveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZs b3dCb3guaAppbmRleCA1MDBkZTdlZDkwYzU1ZTVlYWFlMDg0MjkzMWYyNDYzZWFhOTA5OTQ0Li4w MGFkNTBkOTVkN2E0MDVlNmQ1NzJlMzcxYTRmYzU0MzU5YmI4Zjg4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgKQEAgLTEzNywxMyArMTM3LDEzIEBAIHB1YmxpYzoK ICAgICB7CiAgICAgICAgIGlmICghaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpKQogICAgICAgICAg ICAgcmV0dXJuIDA7Ci0gICAgICAgIHJldHVybiBpc0hvcml6b250YWwoKSA/IHJlbmRlcmVyKCkt PnN0eWxlKCktPmJvcmRlckxlZnRXaWR0aCgpIDogcmVuZGVyZXIoKS0+c3R5bGUoKS0+Ym9yZGVy VG9wV2lkdGgoKTsKKyAgICAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbCgpID8gcmVuZGVyZXIoKS0+ c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Ym9yZGVyTGVmdFdpZHRoKCkgOiByZW5kZXJlcigp LT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5ib3JkZXJUb3BXaWR0aCgpOwogICAgIH0KICAg ICBpbnQgYm9yZGVyTG9naWNhbFJpZ2h0KCkgY29uc3QKICAgICB7CiAgICAgICAgIGlmICghaW5j bHVkZUxvZ2ljYWxSaWdodEVkZ2UoKSkKICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBy ZXR1cm4gaXNIb3Jpem9udGFsKCkgPyByZW5kZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJSaWdodFdp ZHRoKCkgOiByZW5kZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJCb3R0b21XaWR0aCgpOworICAgICAg ICByZXR1cm4gaXNIb3Jpem9udGFsKCkgPyByZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0 eWxlKCkpLT5ib3JkZXJSaWdodFdpZHRoKCkgOiByZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGlu ZVN0eWxlKCkpLT5ib3JkZXJCb3R0b21XaWR0aCgpOwogICAgIH0KICAgICBpbnQgcGFkZGluZ0xv Z2ljYWxMZWZ0KCkgY29uc3QKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCA4MzMwY2Q5ZWI0MGU3YTVkNDYxNzE3MjM4 NDAzMDZjM2Y5MjhmYTY3Li5lMTk2Nzc4N2I3YjA4ZDZmNjhlOWRhYzJjMjE4YjI3YWVjNTM0OGFh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVj dC5jcHAKQEAgLTE3NDYsNyArMTc0Niw3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBh aW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAg ICAgcmV0dXJuOwogCiAgICAgQm9yZGVyRWRnZSBlZGdlc1s0XTsKLSAgICBnZXRCb3JkZXJFZGdl SW5mbyhlZGdlcywgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVk Z2UpOworICAgIGdldEJvcmRlckVkZ2VJbmZvKGVkZ2VzLCBzdHlsZSwgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOwogCiAgICAgUm91bmRlZFJlY3Qgb3V0 ZXJCb3JkZXIgPSBzdHlsZS0+Z2V0Um91bmRlZEJvcmRlckZvcihyZWN0LCBpbmNsdWRlTG9naWNh bExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CiAgICAgUm91bmRlZFJlY3QgaW5u ZXJCb3JkZXIgPSBzdHlsZS0+Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKHJlY3QsIGluY2x1ZGVM b2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKQEAgLTI1NTEsOSArMjU1 MSw4IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNsaXBCb3JkZXJTaWRlRm9yQ29tcGxl eElubmVyUGF0aChHcmFwaGljc0NvbnRleHQqIGdyCiAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlw T3V0Um91bmRlZFJlY3QoY2FsY3VsYXRlQWRqdXN0ZWRJbm5lckJvcmRlcihpbm5lckJvcmRlciwg c2lkZSkpOwogfQogCi12b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpnZXRCb3JkZXJFZGdlSW5m byhCb3JkZXJFZGdlIGVkZ2VzW10sIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3QKK3ZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6 OmdldEJvcmRlckVkZ2VJbmZvKEJvcmRlckVkZ2UgZWRnZXNbXSwgY29uc3QgUmVuZGVyU3R5bGUq IHN0eWxlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxS aWdodEVkZ2UpIGNvbnN0CiB7Ci0gICAgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlID0gdGhpcy0+ c3R5bGUoKTsKICAgICBib29sIGhvcml6b250YWwgPSBzdHlsZS0+aXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKTsKIAogICAgIGVkZ2VzW0JTVG9wXSA9IEJvcmRlckVkZ2Uoc3R5bGUtPmJvcmRlclRv cFdpZHRoKCksCkBAIC0yNTg0LDcgKzI1ODMsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0 OjpnZXRCb3JkZXJFZGdlSW5mbyhCb3JkZXJFZGdlIGVkZ2VzW10sIGJvb2wgaW5jbHVkZUxvZwog Ym9vbCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Ym9yZGVyT2JzY3VyZXNCYWNrZ3JvdW5kRWRnZShj b25zdCBGbG9hdFNpemUmIGNvbnRleHRTY2FsZSkgY29uc3QKIHsKICAgICBCb3JkZXJFZGdlIGVk Z2VzWzRdOwotICAgIGdldEJvcmRlckVkZ2VJbmZvKGVkZ2VzKTsKKyAgICBnZXRCb3JkZXJFZGdl SW5mbyhlZGdlcywgc3R5bGUoKSk7CiAKICAgICBmb3IgKGludCBpID0gQlNUb3A7IGkgPD0gQlNM ZWZ0OyArK2kpIHsKICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSYgY3VyckVkZ2UgPSBlZGdlc1tp XTsKQEAgLTI2MDcsNyArMjYwNiw3IEBAIGJvb2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmJvcmRl ck9ic2N1cmVzQmFja2dyb3VuZCgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IEJvcmRlckVkZ2UgZWRnZXNbNF07Ci0gICAgZ2V0Qm9yZGVyRWRnZUluZm8oZWRnZXMpOworICAg IGdldEJvcmRlckVkZ2VJbmZvKGVkZ2VzLCBzdHlsZSgpKTsKIAogICAgIGZvciAoaW50IGkgPSBC U1RvcDsgaSA8PSBCU0xlZnQ7ICsraSkgewogICAgICAgICBjb25zdCBCb3JkZXJFZGdlJiBjdXJy RWRnZSA9IGVkZ2VzW2ldOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 TW9kZWxPYmplY3QuaAppbmRleCA3MDI4MmMzNjY0MTM3OTkxMmRmMzFkYzQzMjQ3NDJjOWZjM2U4 MjM4Li44MTg5NTI4M2EyZTQxM2JjZDJkYjU1YjA0NTk5NmFhOTZkNmI5ODEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaApAQCAtMTkzLDcg KzE5Myw3IEBAIHByb3RlY3RlZDoKICAgICB9OwogCiAgICAgdm9pZCBjYWxjdWxhdGVCYWNrZ3Jv dW5kSW1hZ2VHZW9tZXRyeShjb25zdCBGaWxsTGF5ZXIqLCBjb25zdCBMYXlvdXRSZWN0JiBwYWlu dFJlY3QsIEJhY2tncm91bmRJbWFnZUdlb21ldHJ5Jik7Ci0gICAgdm9pZCBnZXRCb3JkZXJFZGdl SW5mbyhjbGFzcyBCb3JkZXJFZGdlW10sIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSA9IHRy dWUsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgPSB0cnVlKSBjb25zdDsKKyAgICB2b2lk IGdldEJvcmRlckVkZ2VJbmZvKGNsYXNzIEJvcmRlckVkZ2VbXSwgY29uc3QgUmVuZGVyU3R5bGUq LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVMb2dpY2Fs UmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CiAgICAgYm9vbCBib3JkZXJPYnNjdXJlc0JhY2tncm91 bmRFZGdlKGNvbnN0IEZsb2F0U2l6ZSYgY29udGV4dFNjYWxlKSBjb25zdDsKICAgICBib29sIGJv cmRlck9ic2N1cmVzQmFja2dyb3VuZCgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjNlZGUxN2Y2MWUyYTAw NTAyN2Q1ZWE4OTZlZTU3OWQ1ZmNhMjdjNC4uMDI4MTFiZGVkNDUxMGM3YWIzMTlmNTM1MzVmOTdh YzFkNmJiMmYyMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTA3ICBHcmFjZSBLdSAg PGdyYWNla0Bjb2RlYXVyb3JhLm9yZz4gCisKKyAgICAgICAgSW5jb3JyZWN0IGhhbmRsaW5nIG9m IHNpemVzIGluICJlbSIgd2hlbiBmaXJzdC1saW5lIGNoYW5nZXMgZm9udCBzaXplCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyNgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrcyB0aGF0IHRoZSB3 aWR0aCBvZiB0aGUgbGVmdC1ib3JkZXIgb2YgdGhlIHNwYW4gaXMgdGhlIGRlc2lyZWQgMTBweAor ICAgICAgICByYXRoZXIgdGhhbiAxMDBweC4gVGhlIGV4cGVjdCBmaWxlIGlzIHNvbWV3aGF0IG1p c2xlYWRpbmcgc2luY2UgdGhlIGNvbXB1dGVkCisgICAgICAgIGJvcmRlciB3aWR0aCBpcyBzdGls bCBwcmludGVkIGFzIDEwMHB4LiBUaGUgdHJ1ZSB0ZXN0IGlzIGluIHRoZSBwb3NpdGlvbiBvZiB0 aGUKKyAgICAgICAgUmVuZGVyVGV4dCBib3ggYmVzaWRlIHRoZSBsZWZ0LWJvcmRlci4KKworICAg ICAgICAqIGZhc3QvY3NzL3BzZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0aC5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGgtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxMi0wMy0wNiAgTWlobmVhIE92aWRlbmllICA8bWlobmVh QGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTUmVnaW9uc11bQ1NTT01dUmVzdHJpY3QgcGFyc2lu ZyBvZiBuYW1lZCBmbG93IG5hbWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL3Bz ZXVkby1maXJzdC1saW5lLWJvcmRlci13aWR0aC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGgtZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLmU3NjlmNjViMmU5NWEyNjBkMjQ4ODI1MWVkNjg2NWViOGViYmVlM2IKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXIt d2lkdGgtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjIgQEAKK2xheWVyIGF0ICgwLDApIHNpemUg ODAweDYwMAorICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAs MCkgc2l6ZSA4MDB4NDUyCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg0 NTIKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHgzNDQKKyAgICAgIFJl bmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgNzg0eDM0CisgICAgICAgIFJlbmRlclRleHQg eyN0ZXh0fSBhdCAoMCwwKSBzaXplIDE0NHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDAp IHdpZHRoIDE0NDogIlRlc3QgZm9yICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtBfSBhdCAoMCww KSBzaXplIDczNngzNCBbY29sb3I9IzAwMDBFRV0KKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDE0NCwwKSBzaXplIDczNngzNAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDE0NCww KSB3aWR0aCA1OTI6ICJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/IgorICAg ICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDEyODogImlkPTc5NTI2IgorICAgICAg UmVuZGVyQmxvY2sge1B9IGF0ICgwLDEzNCkgc2l6ZSA3ODR4MjEwCisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM1MHgxMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDApIHdpZHRoIDM1MDogIkEgZ3JlZW4gMTBweCBib3JkZXIgb24gdGhlIGxlZnQgb2YgIgorICAg ICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDApIHNpemUgNTAweDIxMCBbYm9yZGVyOiAo MTAwcHggc29saWQgIzAwODAwMCldCisgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgz NjAsMCkgc2l6ZSA1MHgxMAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDM2MCwwKSB3aWR0aCA1 MDogInRoaXMsIgorICAgICAgICAgIFJlbmRlckJSIHtCUn0gYXQgKDQxMCwwKSBzaXplIDB4MTAK KyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMTApIHNpemUgNTAweDIwMAorICAg ICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTApIHdpZHRoIDQwMDogImlzIGEiCisgICAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwxMTApIHdpZHRoIDUwMDogInBhc3MuIgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvcHNldWRvLWZpcnN0LWxpbmUtYm9yZGVyLXdpZHRoLmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGguaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi44NWExMzU4MmU2ODEwOGYyNGYwMWQxNDRlYjliNmVkY2ZjNDkwZTJkCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvcHNldWRvLWZpcnN0LWxpbmUtYm9y ZGVyLXdpZHRoLmh0bWwKQEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4K KzxoZWFkPgorICAgIDxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4 dC9odG1sOyBjaGFyc2V0PVVURi04Ij4KKyAgICA8c3R5bGU+CisgICAgICAgIGJvZHkgeworICAg ICAgICAgICAgZm9udC1mYW1pbHk6IGFoZW07CisgICAgICAgIH0KKyAgICAgICAgcCB7CisgICAg ICAgICAgICBmb250LXNpemU6IDEwMHB4OworICAgICAgICB9CisgICAgICAgIHA6Zmlyc3QtbGlu ZSB7CisgICAgICAgICAgICBmb250LXNpemU6IDEwcHg7CisgICAgICAgIH0KKyAgICAgICAgc3Bh biB7CisgICAgICAgICAgICBib3JkZXItbGVmdDogc29saWQgMWVtIGdyZWVuOworICAgICAgICB9 CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGRpdj5UZXN0IGZv ciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk1MjYi Pmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyNjwvYT48L2Rpdj4K KyAgICAgICAgPHA+QSBncmVlbiAxMHB4IGJvcmRlciBvbiB0aGUgbGVmdCBvZiA8c3Bhbj50aGlz LDxicj4KKyAgICAgICAgaXMgYSBwYXNzLjwvc3Bhbj48L3A+CisgICAgPC9ib2R5PgorPC9odG1s Pgo=