81513 2012-03-19 08:51:00 -0700 Relative-height block SVG root not layed out on container height change 2012-03-19 17:37:51 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fmalita fmalita webkit.review.bot zimmermann oldest_to_newest 581834 0 fmalita 2012-03-19 08:51:00 -0700 https://bugs.webkit.org/show_bug.cgi?id=79490 missed a couple of explicit style()->logical{Min,Max,}Height tests in RenderView::layout() & RenderBlock::layoutBlockChildren(). These prevent relative-height block SVG elements from being resized on container height changes. Clicking the green rect in the attached test resizes the containing <div> vertically, but the SVG root element is not re-adjusted. 581836 1 132589 fmalita 2012-03-19 08:52:52 -0700 Created attachment 132589 The SVG element doesn't get adjusted on container height change. 581848 2 132593 fmalita 2012-03-19 09:12:23 -0700 Created attachment 132593 Patch 581866 3 132593 zimmermann 2012-03-19 09:31:25 -0700 Comment on attachment 132593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132593&action=review r=me, with some small nitpicks: > Source/WebCore/rendering/RenderBox.cpp:4032 > + RenderStyle* s = style(); You don't need to introduce style() local vars, its inlined. > Source/WebCore/rendering/RenderBox.cpp:4040 > + RenderStyle* s = style(); Ditto. > Source/WebCore/rendering/RenderView.cpp:120 > + // FIXME: can RenderView have non-RenderBox children to justify keeping the explicit style checks below? Can you try this, running regression tests with this fixed, and see if something changes? Ideally before you land this, even if I set r+ :-) > Source/WebCore/rendering/svg/RenderSVGRoot.cpp:428 > + return svg->intrinsicWidth(SVGSVGElement::IgnoreCSSProperties).isPercent() || RenderSVGRoot::hasRelativeLogicalHeight(); I'd leave this as-is to save a virtual function call. 582173 4 132655 fmalita 2012-03-19 13:44:14 -0700 Created attachment 132655 Patch updated patch 582210 5 fmalita 2012-03-19 14:02:26 -0700 (In reply to comment #3) > > Source/WebCore/rendering/RenderBox.cpp:4032 > > + RenderStyle* s = style(); > > You don't need to introduce style() local vars, its inlined. Done. > > Source/WebCore/rendering/RenderBox.cpp:4040 > > + RenderStyle* s = style(); > > Ditto. Done. > > Source/WebCore/rendering/RenderView.cpp:120 > > + // FIXME: can RenderView have non-RenderBox children to justify keeping the explicit style checks below? > > Can you try this, running regression tests with this fixed, and see if something changes? Ideally before you land this, even if I set r+ :-) Tried it (assuming child->isBox() == true), and it doesn't seem to introduce any regressions. But then I found this snippet in FrameView::embeddedContentBox() which seems to indicate that it's still possible for RenderView to have non-RenderBox children: RenderView* root = rootRenderer(this); if (!root) return 0; RenderObject* rootChild = root->firstChild(); if (!rootChild || !rootChild->isBox()) return 0; So the isBox() check is probably warranted and I will leave it in unless you think otherwise. > > Source/WebCore/rendering/svg/RenderSVGRoot.cpp:428 > > + return svg->intrinsicWidth(SVGSVGElement::IgnoreCSSProperties).isPercent() || RenderSVGRoot::hasRelativeLogicalHeight(); > > I'd leave this as-is to save a virtual function call. Hmm, I don't think that it would trigger a virtual dispatch because it's class-qualified. Nevertheless, it's probably not be worth the extra call so I've reverted it. 582330 6 132655 krit 2012-03-19 15:33:06 -0700 Comment on attachment 132655 Patch Looks good for me. Since Niko already gave r+ and the concerns seems to be addressed (correct me if I am wrong), r=me from me as well. 582524 7 132655 webkit.review.bot 2012-03-19 17:37:47 -0700 Comment on attachment 132655 Patch Clearing flags on attachment: 132655 Committed r111279: <http://trac.webkit.org/changeset/111279> 582525 8 webkit.review.bot 2012-03-19 17:37:51 -0700 All reviewed patches have been landed. Closing bug. 132589 2012-03-19 08:52:52 -0700 2012-03-19 08:52:52 -0700 The SVG element doesn't get adjusted on container height change. block-relative-svg-resize.html text/html 608 fmalita PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICA8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9y ZXBhaW50L3Jlc291cmNlcy9yZXBhaW50LmpzIj48L3NjcmlwdD4KICA8c2NyaXB0PgogICAgZnVu Y3Rpb24gcmVwYWludFRlc3QoKSB7CiAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVz aXplLXRhcmdldCcpLnN0eWxlLmhlaWdodCA9ICc1MCUnOwogICAgfQogIDwvc2NyaXB0Pgo8L2hl YWQ+Cgo8Ym9keSBzdHlsZT0ibWFyZ2luOjA7Ij4KICA8ZGl2IGlkPSJyZXNpemUtdGFyZ2V0IiBz dHlsZT0icG9zaXRpb246YWJzb2x1dGU7IHdpZHRoOjEwMCU7IGhlaWdodDoxMDAlOyBiYWNrZ3Jv dW5kLWNvbG9yOnllbGxvdzsiPgogICAgPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAw MC9zdmciIHdpZHRoPSI1MCUiIGhlaWdodD0iMTAwJSIgdmlld2JveD0iMCAwIDgwMCA2MDAiIHN0 eWxlPSJkaXNwbGF5OiBibG9jazsiIG9uY2xpY2s9InJlcGFpbnRUZXN0KCk7Ij4KICAgICAgPHJl Y3QgaWQ9InRlaC1yZWN0IiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJncmVlbiIv PgogICAgPC9zdmc+CiAgPC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 132593 2012-03-19 09:12:23 -0700 2012-03-19 13:44:10 -0700 Patch bug-81513-20120319121221.patch text/plain 10250 fmalita U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc5ZWY5ZDhhYTVjY2E3 NzQ3ZTM2NWJjYjlhMWJkZWJhM2FmNmE3NC4uNWFiYzU5ODM5OTBkODIyYTY5YjU0MTM4N2JjZDll N2UwNWI4MzQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAzLTE5ICBGbG9y aW4gTWFsaXRhICA8Zm1hbGl0YUBnb29nbGUuY29tPgorCisgICAgICAgIFJlbGF0aXZlLWhlaWdo dCBibG9jayBTVkcgcm9vdCBub3QgbGF5ZWQgb3V0IG9uIGNvbnRhaW5lciBoZWlnaHQgY2hhbmdl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUxMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RzOiBz dmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLWV4cGVjdGVkLmh0bWwKKyAgICAgICAg ICAgICAgIHN2Zy9jdXN0b20vc3ZnLXBlcmNlbnQtc2NhbGUtYmxvY2suaHRtbAorCisgICAgICAg IEEgY291cGxlIG9mIHBsYWNlcyBzdGlsbCBoYXZlIHN0eWxlKCktPmxvZ2ljYWx7TWluLE1heCx9 SGVpZ2h0IHBlcmNlbnQgY2hlY2tzLAorICAgICAgICB3aGljaCBkbyBub3Qgd29yayBmb3IgU1ZH IGVsZW1lbnRzLiBUaGlzIHBhdGNoIGFkZHMgYSB2aXJ0dWFsIGhhc1JlbGF0aXZlTG9naWNhbEhl aWdodCgpCisgICAgICAgIFJlbmRlckJveCBtZXRob2QgdG8gcmVwbGFjZSB0aGUgZXhwbGljaXQg c3R5bGUgY2hlY2tzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0NoaWxkcmVuKToKKyAgICAg ICAgVXNlIHZpcnR1YWwgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgaW5zdGVhZCBvZiBsb2dp Y2FsIGhlaWdodCBzdHlsZSBjaGVja3MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aGFzUmVsYXRpdmVEaW1lbnNpb25z KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNS ZWxhdGl2ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoK KyAgICAgICAgKFJlbmRlckJveCk6CisgICAgICAgIEFkZCB2aXJ0dWFsIGhhc1JlbGF0aXZlTG9n aWNhbEhlaWdodCgpIGFuZCB1cGRhdGUgaGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgdG8gYXZvaWQg Y29kZSBkdXBsaWNhdGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OmxheW91dCk6CisgICAgICAgIFVzZSB2aXJ0 dWFsIGhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIGluc3RlYWQgb2YgbG9naWNhbCBoZWlnaHQg c3R5bGUgY2hlY2tzLCBpZiBwb3NzaWJsZS4KKworICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSb290OjpoYXNSZWxh dGl2ZURpbWVuc2lvbnMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTVkdSb290OjpoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5oOgorICAgICAgICAoUmVuZGVyU1ZHUm9vdCk6CisgICAg ICAgIEFkZCBoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQoKSBvdmVycmlkZS4KKwogMjAxMi0wMy0x OSAgSGlyb25vcmkgQm9ubyAgPGhib25vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgYSBj b3B5IGNvbnN0cnVjdG9yIHRvIENvbGxhcHNlZEJvcmRlclZhbHVlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCBkMTQ1NjkxMTA1ZDZlNWMxYzgxN2JmMzRlY2Vj NzBiMmMyMTNlZmFjLi5jYTJiNTM5ZWRiOTVlYTE3MzZhZGFhMjFiNjcyN2MwOTVjNDkyMGM0IDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIyNTMsOCArMjI1 Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGRyZW4oYm9vbCByZWxheW91 dENoaWxkcmVuLCBMYXlvdXRVbml0JiBtYXhGbG9hCiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBs YXlvdXQgY2hpbGRyZW4gaWYgdGhleSBuZWVkIGl0LgogICAgICAgICAvLyBGSVhNRTogVGVjaG5p Y2FsbHkgcGVyY2VudGFnZSBoZWlnaHQgb2JqZWN0cyBvbmx5IG5lZWQgYSByZWxheW91dCBpZiB0 aGVpciBwZXJjZW50YWdlIGlzbid0IGdvaW5nIHRvIGJlIHR1cm5lZCBpbnRvCiAgICAgICAgIC8v IGFuIGF1dG8gdmFsdWUuICBBZGQgYSBtZXRob2QgdG8gZGV0ZXJtaW5lIHRoaXMsIHNvIHRoYXQg d2UgY2FuIGF2b2lkIHRoZSByZWxheW91dC4KLSAgICAgICAgUmVuZGVyU3R5bGUqIGNoaWxkU3R5 bGUgPSBjaGlsZC0+c3R5bGUoKTsKLSAgICAgICAgaWYgKHJlbGF5b3V0Q2hpbGRyZW4gfHwgKChj aGlsZFN0eWxlLT5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkgfHwgY2hpbGRTdHlsZS0+bG9n aWNhbE1pbkhlaWdodCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkU3R5bGUtPmxvZ2ljYWxNYXhIZWln aHQoKS5pc1BlcmNlbnQoKSkgJiYgIWlzUmVuZGVyVmlldygpKSkKKyAgICAgICAgaWYgKHJlbGF5 b3V0Q2hpbGRyZW4gfHwgKGNoaWxkLT5oYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQoKSAmJiAhaXNS ZW5kZXJWaWV3KCkpKQogICAgICAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1 ZSwgZmFsc2UpOwogCiAgICAgICAgIC8vIElmIHJlbGF5b3V0Q2hpbGRyZW4gaXMgc2V0IGFuZCB0 aGUgY2hpbGQgaGFzIHBlcmNlbnRhZ2UgcGFkZGluZyBvciBhbiBlbWJlZGRlZCBjb250ZW50IGJv eCwgd2UgYWxzbyBuZWVkIHRvIGludmFsaWRhdGUgdGhlIGNoaWxkcyBwcmVmIHdpZHRocy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggYWIyYTQ0OWQyMTk0MWY4ZDQy MDFlNTg4ZmQ4ODM3MTkyZWU4ZjQwOS4uNzA4YmY4NjgzNTIyOWYxM2FmNjQ5YzQ1MDQ1MTgwNDc3 ZGUxOTRjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQwMjks OSArNDAyOSwxNyBAQCBMYXlvdXRTaXplIFJlbmRlckJveDo6dG9wTGVmdExvY2F0aW9uT2Zmc2V0 KCkgY29uc3QKIAogYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIHN0eWxlKCktPmhlaWdodCgpLmlzUGVyY2VudCgpIHx8IHN0eWxlKCkt PndpZHRoKCkuaXNQZXJjZW50KCkKLSAgICAgICAgICAgIHx8IHN0eWxlKCktPm1heEhlaWdodCgp LmlzUGVyY2VudCgpIHx8IHN0eWxlKCktPm1heFdpZHRoKCkuaXNQZXJjZW50KCkKLSAgICAgICAg ICAgIHx8IHN0eWxlKCktPm1pbkhlaWdodCgpLmlzUGVyY2VudCgpIHx8IHN0eWxlKCktPm1pbldp ZHRoKCkuaXNQZXJjZW50KCk7CisgICAgUmVuZGVyU3R5bGUqIHMgPSBzdHlsZSgpOworCisgICAg cmV0dXJuIHMtPmxvZ2ljYWxXaWR0aCgpLmlzUGVyY2VudCgpIHx8IHMtPmxvZ2ljYWxNaW5XaWR0 aCgpLmlzUGVyY2VudCgpIHx8IHMtPmxvZ2ljYWxNYXhXaWR0aCgpLmlzUGVyY2VudCgpCisgICAg ICAgICAgICB8fCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpOworfQorCiti b29sIFJlbmRlckJveDo6aGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgY29uc3QKK3sKKyAgICBS ZW5kZXJTdHlsZSogcyA9IHN0eWxlKCk7CisKKyAgICByZXR1cm4gcy0+bG9naWNhbEhlaWdodCgp LmlzUGVyY2VudCgpIHx8IHMtPmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBzLT5s b2dpY2FsTWF4SGVpZ2h0KCkuaXNQZXJjZW50KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCAwYWYzZjZkNjBmMDViZDYz MzNlNmVjYWJhMjQ5ZTI1M2ViZTc1YzQyLi5kNmU2ODBmMjExYjIzMDc0NGVkNDNkZWNkNDMxMWMx MGFmMTFiNDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC00NjEsNiAr NDYxLDcgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJDYWNoZWRTaXplRm9yT3ZlcmZsb3dDbGlw KCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3Q7Cisg ICAgdmlydHVhbCBib29sIGhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIGNvbnN0OwogCiAgICAg Ym9vbCBoYXNIb3Jpem9udGFsTGF5b3V0T3ZlcmZsb3coKSBjb25zdAogICAgIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAppbmRleCBjZDM4OTNhNTU1ZDYwZjFhYjg5ZjI2 MTYzZTcwZTQyN2EyNThkY2E0Li5kODU0MWQ5NzhjNGMyMTUzYzA1ZWViNWNjZDU2ODVlZTBkYzY3 NjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC0xMTcsNyAr MTE3LDkgQEAgdm9pZCBSZW5kZXJWaWV3OjpsYXlvdXQoKQogICAgIGlmIChyZWxheW91dENoaWxk cmVuKSB7CiAgICAgICAgIHNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOwogICAgICAg ICBmb3IgKFJlbmRlck9iamVjdCogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9 IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCkt PmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbE1p bkhlaWdodCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0 KCkuaXNQZXJjZW50KCkpCisgICAgICAgICAgICAvLyBGSVhNRTogY2FuIFJlbmRlclZpZXcgaGF2 ZSBub24tUmVuZGVyQm94IGNoaWxkcmVuIHRvIGp1c3RpZnkga2VlcGluZyB0aGUgZXhwbGljaXQg c3R5bGUgY2hlY2tzIGJlbG93PworICAgICAgICAgICAgaWYgKChjaGlsZC0+aXNCb3goKSAmJiB0 b1JlbmRlckJveChjaGlsZCktPmhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpKQorICAgICAgICAg ICAgICAgIHx8IGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkgfHwg Y2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+ c3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpLmlzUGVyY2VudCgpKQogICAgICAgICAgICAgICAg IGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIGZhbHNlKTsKICAgICAgICAgfQogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9v dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCmlu ZGV4IDk3MWRmNDIzYjcyYzU0YTJhMDA1OWFlMDUwZTVlMGY2MWY1MjhmOGEuLmNkZWE2NjMzZjkw OTQxMDQwZmMyZGFkZGJhNWEyY2JhODVkNDdhNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcApAQCAtNDI1LDcgKzQyNSwxNSBAQCBib29sIFJl bmRlclNWR1Jvb3Q6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiAgICAgU1ZHU1ZHRWxl bWVudCogc3ZnID0gc3RhdGljX2Nhc3Q8U1ZHU1ZHRWxlbWVudCo+KG5vZGUoKSk7CiAgICAgQVNT RVJUKHN2Zyk7CiAKLSAgICByZXR1cm4gc3ZnLT5pbnRyaW5zaWNIZWlnaHQoU1ZHU1ZHRWxlbWVu dDo6SWdub3JlQ1NTUHJvcGVydGllcykuaXNQZXJjZW50KCkgfHwgc3ZnLT5pbnRyaW5zaWNXaWR0 aChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9wZXJ0aWVzKS5pc1BlcmNlbnQoKTsKKyAgICBy ZXR1cm4gc3ZnLT5pbnRyaW5zaWNXaWR0aChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9wZXJ0 aWVzKS5pc1BlcmNlbnQoKSB8fCBSZW5kZXJTVkdSb290OjpoYXNSZWxhdGl2ZUxvZ2ljYWxIZWln aHQoKTsKK30KKworYm9vbCBSZW5kZXJTVkdSb290OjpoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQo KSBjb25zdAoreworICAgIFNWR1NWR0VsZW1lbnQqIHN2ZyA9IHN0YXRpY19jYXN0PFNWR1NWR0Vs ZW1lbnQqPihub2RlKCkpOworICAgIEFTU0VSVChzdmcpOworCisgICAgcmV0dXJuIHN2Zy0+aW50 cmluc2ljSGVpZ2h0KFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMpLmlzUGVyY2Vu dCgpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jvb3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9v dC5oCmluZGV4IGFkYzE4ODRlNGE2MjQxOWY3N2FmZjdiMGI0YTY4MmM3ZTE5NmE0ZjQuLmEyMzdm NGRkYzExMTU2NTE1NjY4ZDk5OTg0M2YxZjY5Yzk0OGFhMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldENvbnRhaW5lclNpemUoY29uc3QgSW50U2l6ZSYgY29udGFpbmVyU2l6ZSkg eyBtX2NvbnRhaW5lclNpemUgPSBjb250YWluZXJTaXplOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wg aGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3Q7CisgICAgdmlydHVhbCBib29sIGhhc1JlbGF0 aXZlTG9naWNhbEhlaWdodCgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgUmVuZGVy T2JqZWN0Q2hpbGRMaXN0KiB2aXJ0dWFsQ2hpbGRyZW4oKSB7IHJldHVybiBjaGlsZHJlbigpOyB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNjlmNDI0MTVlYzEyNmJlN2UyNzk3MjJkMzc5MjY1ODQ0MzdjM2NjNS4uMmMwMjkw NDk1MTQ4NjU3NzQ5NmYyZjZmODlmNWMxYjhlZjIyYzIyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDEyLTAzLTE5ICBGbG9yaW4gTWFsaXRhICA8Zm1hbGl0YUBnb29nbGUuY29tPgorCisgICAg ICAgIFJlbGF0aXZlLWhlaWdodCBibG9jayBTVkcgcm9vdCBub3QgbGF5ZWQgb3V0IG9uIGNvbnRh aW5lciBoZWlnaHQgY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MTUxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogc3ZnL2N1c3RvbS9zdmctcGVyY2VudC1zY2FsZS1ibG9jay1leHBlY3RlZC5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBzdmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2Nr Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTAzLTE5ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRkaW5nIHNsb3cgdG8gZnVsbC1zY3JlZW4t cmVzdHJpY3Rpb25zLmh0bWwgb24gV0lOLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3ZnL2N1 c3RvbS9zdmctcGVyY2VudC1zY2FsZS1ibG9jay1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv c3ZnL2N1c3RvbS9zdmctcGVyY2VudC1zY2FsZS1ibG9jay1leHBlY3RlZC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmI5YjViNmU3NGMyOWU0MTkxODgwYWNhYzFjMjM5OGRkYjM1MTdhNTIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9zdmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLWV4 cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorICA8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9yZXBhaW50L3Jlc291cmNlcy9yZXBhaW50 LmpzIj48L3NjcmlwdD4KKyAgPHNjcmlwdD4KKyAgICBmdW5jdGlvbiByZXBhaW50VGVzdCgpCisg ICAgeworICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc2l6ZS10YXJnZXQnKS5zdHls ZS5oZWlnaHQgPSAnMjAwcHgnOworICAgIH0KKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxib2R5 IHN0eWxlPSJtYXJnaW46IDA7IHBhZGRpbmc6IDA7IG92ZXJmbG93OiBoaWRkZW47IiBvbmxvYWQ9 InJ1blJlcGFpbnRUZXN0KCkiPgorICA8ZGl2IGlkPSJyZXNpemUtdGFyZ2V0IiBzdHlsZT0id2lk dGg6IDQwMHB4OyBoZWlnaHQ6IDQwMHB4OyBwb3NpdGlvbjogYWJzb2x1dGU7Ij48L2Rpdj4gIAor ICA8ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IHBvc2l0aW9uOiBhYnNv bHV0ZTsgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N2Zy9jdXN0b20vc3ZnLXBlcmNlbnQtc2NhbGUtYmxv Y2suaHRtbCBiL0xheW91dFRlc3RzL3N2Zy9jdXN0b20vc3ZnLXBlcmNlbnQtc2NhbGUtYmxvY2su aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5kMGUyMjA3Y2E0ODkxMmI1ZTAzNGZjMDQ5NDcxYWQ1YmRlZDFjMThl Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9zdmctcGVyY2VudC1z Y2FsZS1ibG9jay5odG1sCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+ Cis8aGVhZD4KKyAgPHRpdGxlPlRlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03OTQ5MDwvdGl0bGU+CisgIDxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L3JlcGFp bnQvcmVzb3VyY2VzL3JlcGFpbnQuanMiPjwvc2NyaXB0PgorICA8c2NyaXB0PgorICAgIGZ1bmN0 aW9uIHJlcGFpbnRUZXN0KCkKKyAgICB7CisgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn cmVzaXplLXRhcmdldCcpLnN0eWxlLmhlaWdodCA9ICcyMDBweCc7CisgICAgfQorICA8L3Njcmlw dD4KKzwvaGVhZD4KKworPGJvZHkgc3R5bGU9Im1hcmdpbjogMDsgcGFkZGluZzogMDsgb3ZlcmZs b3c6IGhpZGRlbjsiIG9ubG9hZD0icnVuUmVwYWludFRlc3QoKSI+CisgIDxkaXYgaWQ9InJlc2l6 ZS10YXJnZXQiIHN0eWxlPSJ3aWR0aDogNDAwcHg7IGhlaWdodDogNDAwcHg7IHBvc2l0aW9uOiBh YnNvbHV0ZTsiPgorICAgIDwhLS0gQWZ0ZXIgdmVydGljYWwgd2luZG93IHJlc2l6aW5nLCB0aGlz IFNWRyBlbGVtZW50IHNob3VsZCBub3QgYmUgdmlzaWJsZSAtLT4KKyAgICA8c3ZnIHdpZHRoPSIy NSUiIGhlaWdodD0iNTAlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHN0eWxl PSJkaXNwbGF5OiBibG9jazsiPgorICAgICAgPHJlY3QgZmlsbD0icmVkIiB3aWR0aD0iMTAwJSIg aGVpZ2h0PSIxMDAlIj48L3JlY3Q+CisgICAgPC9zdmc+CisgIDwvZGl2PgorCisgIDxkaXYgc3R5 bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgcG9zaXRpb246IGFic29sdXRlOyBiYWNr Z3JvdW5kLWNvbG9yOiBncmVlbjsiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 132655 2012-03-19 13:44:14 -0700 2012-03-19 17:37:47 -0700 Patch bug-81513-20120319164413.patch text/plain 9415 fmalita U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc5ZWY5ZDhhYTVjY2E3 NzQ3ZTM2NWJjYjlhMWJkZWJhM2FmNmE3NC4uNzIxNmI2OWMzYzFlNThhNGY3MWI1MmU2ODQ1Yjg2 ZTA4MTQxNzhiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTE5ICBGbG9y aW4gTWFsaXRhICA8Zm1hbGl0YUBnb29nbGUuY29tPgorCisgICAgICAgIFJlbGF0aXZlLWhlaWdo dCBibG9jayBTVkcgcm9vdCBub3QgbGF5ZWQgb3V0IG9uIGNvbnRhaW5lciBoZWlnaHQgY2hhbmdl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUxMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RzOiBz dmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLWV4cGVjdGVkLmh0bWwKKyAgICAgICAg ICAgICAgIHN2Zy9jdXN0b20vc3ZnLXBlcmNlbnQtc2NhbGUtYmxvY2suaHRtbAorCisgICAgICAg IEEgY291cGxlIG9mIHBsYWNlcyBzdGlsbCBoYXZlIHN0eWxlKCktPmxvZ2ljYWx7TWluLE1heCx9 SGVpZ2h0IHBlcmNlbnQgY2hlY2tzLAorICAgICAgICB3aGljaCBkbyBub3Qgd29yayBmb3IgU1ZH IGVsZW1lbnRzLiBUaGlzIHBhdGNoIGFkZHMgYSB2aXJ0dWFsIGhhc1JlbGF0aXZlTG9naWNhbEhl aWdodCgpCisgICAgICAgIFJlbmRlckJveCBtZXRob2QgdG8gcmVwbGFjZSB0aGUgZXhwbGljaXQg c3R5bGUgY2hlY2tzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0NoaWxkcmVuKToKKyAgICAg ICAgVXNlIHZpcnR1YWwgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgaW5zdGVhZCBvZiBsb2dp Y2FsIGhlaWdodCBzdHlsZSBjaGVja3MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aGFzUmVsYXRpdmVMb2dpY2FsSGVp Z2h0KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKyAgICAgICAgKFJlbmRlckJveCk6CisgICAgICAgIEFkZCB2aXJ0dWFsIGhhc1JlbGF0aXZl TG9naWNhbEhlaWdodCgpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6bGF5b3V0KToKKyAgICAgICAgVXNlIHZpcnR1 YWwgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgaW5zdGVhZCBvZiBsb2dpY2FsIGhlaWdodCBz dHlsZSBjaGVja3MsIGlmIHBvc3NpYmxlLgorCisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSb290LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jvb3Q6Omhhc1JlbGF0 aXZlTG9naWNhbEhlaWdodCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jvb3QuaDoKKyAgICAgICAgKFJlbmRlclNWR1Jvb3QpOgorICAgICAg ICBBZGQgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgb3ZlcnJpZGUuCisKIDIwMTItMDMtMTkg IEhpcm9ub3JpIEJvbm8gIDxoYm9ub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGEgY29w eSBjb25zdHJ1Y3RvciB0byBDb2xsYXBzZWRCb3JkZXJWYWx1ZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggZDE0NTY5MTEwNWQ2ZTVjMWM4MTdiZjM0ZWNlYzcw YjJjMjEzZWZhYy4uY2EyYjUzOWVkYjk1ZWExNzM2YWRhYTIxYjY3MjdjMDk1YzQ5MjBjNCAxMDA3 NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yMjUzLDggKzIyNTMs NyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0NoaWxkcmVuKGJvb2wgcmVsYXlvdXRD aGlsZHJlbiwgTGF5b3V0VW5pdCYgbWF4RmxvYQogICAgICAgICAvLyBNYWtlIHN1cmUgd2UgbGF5 b3V0IGNoaWxkcmVuIGlmIHRoZXkgbmVlZCBpdC4KICAgICAgICAgLy8gRklYTUU6IFRlY2huaWNh bGx5IHBlcmNlbnRhZ2UgaGVpZ2h0IG9iamVjdHMgb25seSBuZWVkIGEgcmVsYXlvdXQgaWYgdGhl aXIgcGVyY2VudGFnZSBpc24ndCBnb2luZyB0byBiZSB0dXJuZWQgaW50bwogICAgICAgICAvLyBh biBhdXRvIHZhbHVlLiAgQWRkIGEgbWV0aG9kIHRvIGRldGVybWluZSB0aGlzLCBzbyB0aGF0IHdl IGNhbiBhdm9pZCB0aGUgcmVsYXlvdXQuCi0gICAgICAgIFJlbmRlclN0eWxlKiBjaGlsZFN0eWxl ID0gY2hpbGQtPnN0eWxlKCk7Ci0gICAgICAgIGlmIChyZWxheW91dENoaWxkcmVuIHx8ICgoY2hp bGRTdHlsZS0+bG9naWNhbEhlaWdodCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkU3R5bGUtPmxvZ2lj YWxNaW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZFN0eWxlLT5sb2dpY2FsTWF4SGVpZ2h0 KCkuaXNQZXJjZW50KCkpICYmICFpc1JlbmRlclZpZXcoKSkpCisgICAgICAgIGlmIChyZWxheW91 dENoaWxkcmVuIHx8IChjaGlsZC0+aGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgJiYgIWlzUmVu ZGVyVmlldygpKSkKICAgICAgICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUs IGZhbHNlKTsKIAogICAgICAgICAvLyBJZiByZWxheW91dENoaWxkcmVuIGlzIHNldCBhbmQgdGhl IGNoaWxkIGhhcyBwZXJjZW50YWdlIHBhZGRpbmcgb3IgYW4gZW1iZWRkZWQgY29udGVudCBib3gs IHdlIGFsc28gbmVlZCB0byBpbnZhbGlkYXRlIHRoZSBjaGlsZHMgcHJlZiB3aWR0aHMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGFiMmE0NDlkMjE5NDFmOGQ0MjAx ZTU4OGZkODgzNzE5MmVlOGY0MDkuLjFmYjU3M2I0NGM5NTNhYzM4M2ZiZTBmNzE2ZDYyZmZkNjVh YzJhOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MDM0LDQg KzQwMzQsMTEgQEAgYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0 CiAgICAgICAgICAgICB8fCBzdHlsZSgpLT5taW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBzdHls ZSgpLT5taW5XaWR0aCgpLmlzUGVyY2VudCgpOwogfQogCitib29sIFJlbmRlckJveDo6aGFzUmVs YXRpdmVMb2dpY2FsSGVpZ2h0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3R5bGUoKS0+bG9naWNh bEhlaWdodCgpLmlzUGVyY2VudCgpCisgICAgICAgICAgICB8fCBzdHlsZSgpLT5sb2dpY2FsTWlu SGVpZ2h0KCkuaXNQZXJjZW50KCkKKyAgICAgICAgICAgIHx8IHN0eWxlKCktPmxvZ2ljYWxNYXhI ZWlnaHQoKS5pc1BlcmNlbnQoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDBhZjNmNmQ2MGYwNWJkNjMzM2U2ZWNhYmEy NDllMjUzZWJlNzVjNDIuLmQ2ZTY4MGYyMTFiMjMwNzQ0ZWQ0M2RlY2Q0MzExYzEwYWYxMWI0NWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQ2MSw2ICs0NjEsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBjbGVhckNhY2hlZFNpemVGb3JPdmVyZmxvd0NsaXAoKTsKIAogICAg IHZpcnR1YWwgYm9vbCBoYXNSZWxhdGl2ZURpbWVuc2lvbnMoKSBjb25zdDsKKyAgICB2aXJ0dWFs IGJvb2wgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CiAKICAgICBib29sIGhhc0hv cml6b250YWxMYXlvdXRPdmVyZmxvdygpIGNvbnN0CiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclZpZXcuY3BwCmluZGV4IGNkMzg5M2E1NTVkNjBmMWFiODlmMjYxNjNlNzBlNDI3 YTI1OGRjYTQuLjMzMzk2ZDZkNWY2NDUwNjU2YzljOTBmYmM1MmQ3ZjQ1M2NjMGU1NTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTExNyw3ICsxMTcsMTAgQEAg dm9pZCBSZW5kZXJWaWV3OjpsYXlvdXQoKQogICAgIGlmIChyZWxheW91dENoaWxkcmVuKSB7CiAg ICAgICAgIHNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOwogICAgICAgICBmb3IgKFJl bmRlck9iamVjdCogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5u ZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxI ZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbE1pbkhlaWdodCgp LmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNQZXJj ZW50KCkpCisgICAgICAgICAgICBpZiAoKGNoaWxkLT5pc0JveCgpICYmIHRvUmVuZGVyQm94KGNo aWxkKS0+aGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgICAgIHx8 IGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkKKyAgICAgICAgICAg ICAgICAgICAgfHwgY2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1BlcmNlbnQo KQorICAgICAgICAgICAgICAgICAgICB8fCBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbE1heEhlaWdo dCgpLmlzUGVyY2VudCgpKQogICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5 b3V0KHRydWUsIGZhbHNlKTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCmluZGV4IDk3MWRmNDIzYjcyYzU0YTJhMDA1 OWFlMDUwZTVlMGY2MWY1MjhmOGEuLjNkYjNiMGE1NDA3ZDEyYjQ4M2VmMWNjZGY2ZmUyNGVjZjdl M2U2ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Um9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290 LmNwcApAQCAtNDI4LDYgKzQyOCwxNCBAQCBib29sIFJlbmRlclNWR1Jvb3Q6Omhhc1JlbGF0aXZl RGltZW5zaW9ucygpIGNvbnN0CiAgICAgcmV0dXJuIHN2Zy0+aW50cmluc2ljSGVpZ2h0KFNWR1NW R0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMpLmlzUGVyY2VudCgpIHx8IHN2Zy0+aW50cmlu c2ljV2lkdGgoU1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcykuaXNQZXJjZW50KCk7 CiB9CiAKK2Jvb2wgUmVuZGVyU1ZHUm9vdDo6aGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgY29u c3QKK3sKKyAgICBTVkdTVkdFbGVtZW50KiBzdmcgPSBzdGF0aWNfY2FzdDxTVkdTVkdFbGVtZW50 Kj4obm9kZSgpKTsKKyAgICBBU1NFUlQoc3ZnKTsKKworICAgIHJldHVybiBzdmctPmludHJpbnNp Y0hlaWdodChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9wZXJ0aWVzKS5pc1BlcmNlbnQoKTsK K30KKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKFNWRykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSb290LmgKaW5kZXggYWRjMTg4NGU0YTYyNDE5Zjc3YWZmN2IwYjRh NjgyYzdlMTk2YTRmNC4uYTIzN2Y0ZGRjMTExNTY1MTU2NjhkOTk5ODQzZjFmNjljOTQ4YWEyNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmgKQEAgLTU0 LDYgKzU0LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGFpbmVyU2l6ZShjb25zdCBJbnRT aXplJiBjb250YWluZXJTaXplKSB7IG1fY29udGFpbmVyU2l6ZSA9IGNvbnRhaW5lclNpemU7IH0K IAogICAgIHZpcnR1YWwgYm9vbCBoYXNSZWxhdGl2ZURpbWVuc2lvbnMoKSBjb25zdDsKKyAgICB2 aXJ0dWFsIGJvb2wgaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CiAKIHByaXZhdGU6 CiAgICAgdmlydHVhbCBSZW5kZXJPYmplY3RDaGlsZExpc3QqIHZpcnR1YWxDaGlsZHJlbigpIHsg cmV0dXJuIGNoaWxkcmVuKCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2OWY0MjQxNWVjMTI2YmU3ZTI3OTcyMmQzNzky NjU4NDQzN2MzY2M1Li4yYzAyOTA0OTUxNDg2NTc3NDk2ZjJmNmY4OWY1YzFiOGVmMjJjMjJhIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDMtMTkgIEZsb3JpbiBNYWxpdGEgIDxmbWFsaXRh QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVsYXRpdmUtaGVpZ2h0IGJsb2NrIFNWRyByb290IG5v dCBsYXllZCBvdXQgb24gY29udGFpbmVyIGhlaWdodCBjaGFuZ2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNTEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNj YWxlLWJsb2NrLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHN2Zy9jdXN0b20vc3Zn LXBlcmNlbnQtc2NhbGUtYmxvY2suaHRtbDogQWRkZWQuCisKIDIwMTItMDMtMTkgIEtlaXNoaSBI YXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBBZGRpbmcg c2xvdyB0byBmdWxsLXNjcmVlbi1yZXN0cmljdGlvbnMuaHRtbCBvbiBXSU4uCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9zdmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLWV4cGVjdGVk Lmh0bWwgYi9MYXlvdXRUZXN0cy9zdmcvY3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjliNWI2ZTc0YzI5ZTQxOTE4ODBhY2FjMWMyMzk4ZGRi MzUxN2E1MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N2Zy9jdXN0b20vc3ZnLXBl cmNlbnQtc2NhbGUtYmxvY2stZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE3IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgIDxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L3JlcGFp bnQvcmVzb3VyY2VzL3JlcGFpbnQuanMiPjwvc2NyaXB0PgorICA8c2NyaXB0PgorICAgIGZ1bmN0 aW9uIHJlcGFpbnRUZXN0KCkKKyAgICB7CisgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn cmVzaXplLXRhcmdldCcpLnN0eWxlLmhlaWdodCA9ICcyMDBweCc7CisgICAgfQorICA8L3Njcmlw dD4KKzwvaGVhZD4KKworPGJvZHkgc3R5bGU9Im1hcmdpbjogMDsgcGFkZGluZzogMDsgb3ZlcmZs b3c6IGhpZGRlbjsiIG9ubG9hZD0icnVuUmVwYWludFRlc3QoKSI+CisgIDxkaXYgaWQ9InJlc2l6 ZS10YXJnZXQiIHN0eWxlPSJ3aWR0aDogNDAwcHg7IGhlaWdodDogNDAwcHg7IHBvc2l0aW9uOiBh YnNvbHV0ZTsiPjwvZGl2PiAgCisgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0OiAx MDBweDsgcG9zaXRpb246IGFic29sdXRlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsiPjwvZGl2 PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9z dmctcGVyY2VudC1zY2FsZS1ibG9jay5odG1sIGIvTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9zdmct cGVyY2VudC1zY2FsZS1ibG9jay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQwZTIyMDdjYTQ4OTEyYjVlMDM0 ZmMwNDk0NzFhZDViZGVkMWMxOGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9zdmcv Y3VzdG9tL3N2Zy1wZXJjZW50LXNjYWxlLWJsb2NrLmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICA8dGl0bGU+VGVzdCBmb3IgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5NDkwPC90aXRsZT4KKyAgPHNjcmlwdCBz cmM9Ii4uLy4uL2Zhc3QvcmVwYWludC9yZXNvdXJjZXMvcmVwYWludC5qcyI+PC9zY3JpcHQ+Cisg IDxzY3JpcHQ+CisgICAgZnVuY3Rpb24gcmVwYWludFRlc3QoKQorICAgIHsKKyAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdyZXNpemUtdGFyZ2V0Jykuc3R5bGUuaGVpZ2h0ID0gJzIwMHB4 JzsKKyAgICB9CisgIDwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBzdHlsZT0ibWFyZ2luOiAw OyBwYWRkaW5nOiAwOyBvdmVyZmxvdzogaGlkZGVuOyIgb25sb2FkPSJydW5SZXBhaW50VGVzdCgp Ij4KKyAgPGRpdiBpZD0icmVzaXplLXRhcmdldCIgc3R5bGU9IndpZHRoOiA0MDBweDsgaGVpZ2h0 OiA0MDBweDsgcG9zaXRpb246IGFic29sdXRlOyI+CisgICAgPCEtLSBBZnRlciB2ZXJ0aWNhbCB3 aW5kb3cgcmVzaXppbmcsIHRoaXMgU1ZHIGVsZW1lbnQgc2hvdWxkIG5vdCBiZSB2aXNpYmxlIC0t PgorICAgIDxzdmcgd2lkdGg9IjI1JSIgaGVpZ2h0PSI1MCUiIHhtbG5zPSJodHRwOi8vd3d3Lncz Lm9yZy8yMDAwL3N2ZyIgc3R5bGU9ImRpc3BsYXk6IGJsb2NrOyI+CisgICAgICA8cmVjdCBmaWxs PSJyZWQiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiPjwvcmVjdD4KKyAgICA8L3N2Zz4KKyAg PC9kaXY+CisKKyAgPGRpdiBzdHlsZT0id2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDEwMHB4OyBwb3Np dGlvbjogYWJzb2x1dGU7IGJhY2tncm91bmQtY29sb3I6IGdyZWVuOyI+PC9kaXY+Cis8L2JvZHk+ Cis8L2h0bWw+Cg==