92667 2012-07-30 12:38:09 -0700 REGRESSION: flexbox content-size fails to exclude scrollbar 2012-07-31 17:54:39 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac (Intel) OS X 10.7 RESOLVED FIXED HasReduction, Regression P2 Normal --- 1 sjmiles tony dglazkov eric esprehn ojan sjmiles tony webkit.review.bot oldest_to_newest 682292 0 155340 sjmiles 2012-07-30 12:38:09 -0700 Created attachment 155340 Reduction shows improper sizing of scrollable flexbox DIV The content-size of a DIV marked as display: -webkit-flex looks incorrect when the DIV has scrollbars. Reduction attached. 682294 1 esprehn 2012-07-30 12:43:25 -0700 This is a regression. I tried this in my WebKit nightly and it looked fine at r123765, but then when I updated it was broken. 682299 2 esprehn 2012-07-30 12:49:04 -0700 The only things that seem related are r123909 and r123783. Any ideas Tony? 682371 3 tony 2012-07-30 14:13:35 -0700 I regressed this in r123909. Investigating. 683299 4 155593 tony 2012-07-31 11:35:26 -0700 Created attachment 155593 Patch 683300 5 tony 2012-07-31 11:36:11 -0700 I decided to go with the name computeLogicalClientHeight instead of computePaddingBoxLogicalHeight since the padding box would include the scrollable area. I'm flexible on the name so let me know if you prefer something else. 683330 6 155593 esprehn 2012-07-31 11:50:44 -0700 Comment on attachment 155593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155593&action=review > Source/WebCore/rendering/RenderFlexibleBox.h:87 > + LayoutUnit computeLogicalClientHeight(SizeType, const Length& height); This seems like a generally applicable concept for all block things. Any reason to not put it on RenderBlock? 683344 7 155593 tony 2012-07-31 11:57:03 -0700 Comment on attachment 155593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155593&action=review >> Source/WebCore/rendering/RenderFlexibleBox.h:87 >> + LayoutUnit computeLogicalClientHeight(SizeType, const Length& height); > > This seems like a generally applicable concept for all block things. Any reason to not put it on RenderBlock? It's needed in cases where you need to compute the height, but don't want to compute the final height (because you're not done layout out your children yet). We need this for flexbox (and maybe for grid), but for regular RenderBlock, it wouldn't be useful. The old flexbox code actually just computes the final height multiple times. 683563 8 155593 ojan 2012-07-31 15:54:11 -0700 Comment on attachment 155593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155593&action=review > Source/WebCore/rendering/RenderFlexibleBox.cpp:394 > + return std::max(LayoutUnit(0), computeLogicalClientHeight(MainOrPreferredSize, style()->logicalHeight()) - scrollbarLogicalHeight()); Aren't we subtracting out the scrollbar height twice now? 683581 9 155660 tony 2012-07-31 16:05:25 -0700 Created attachment 155660 Patch 683585 10 155660 tony 2012-07-31 16:05:52 -0700 Comment on attachment 155660 Patch (In reply to comment #8) > (From update of attachment 155593 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155593&action=review > > > Source/WebCore/rendering/RenderFlexibleBox.cpp:394 > > + return std::max(LayoutUnit(0), computeLogicalClientHeight(MainOrPreferredSize, style()->logicalHeight()) - scrollbarLogicalHeight()); > > Aren't we subtracting out the scrollbar height twice now? I'm dumb. Fixed. 683703 11 155660 webkit.review.bot 2012-07-31 17:54:35 -0700 Comment on attachment 155660 Patch Clearing flags on attachment: 155660 Committed r124278: <http://trac.webkit.org/changeset/124278> 683704 12 webkit.review.bot 2012-07-31 17:54:39 -0700 All reviewed patches have been landed. Closing bug. 155340 2012-07-30 12:38:09 -0700 2012-07-30 12:38:09 -0700 Reduction shows improper sizing of scrollable flexbox DIV flexbox-content-size-vs-scrollbar.html text/html 885 sjmiles PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KCTx0aXRsZT48L3RpdGxlPgoJPG1ldGEgaHR0 cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgi PgoJPCEtLSAtLT4KCTxzdHlsZT4KCQlib2R5IHsKCQkJZm9udC1mYW1pbHk6ICdIZWx2ZXRpY2Eg TmV1ZScsICdIZWx2ZXRpY2EnLCBBcmlhbCwgJ29wZW4gc2FucycsIHNhbnMtc2VyaWY7CgkJCWZv bnQtc2l6ZTogMjBweDsKCQl9CgkJLmZsZXhib3ggewoJCQlkaXNwbGF5OiAtd2Via2l0LWZsZXg7 CgkJCS13ZWJraXQtZmxleC1mbG93OiBjb2x1bW47CgkJfQoJCS5vdXRlciB7CgkJCWhlaWdodDog OTZweDsKCQkJYm9yZGVyOiA3cHggc29saWQgbGlnaHRibHVlOwoJCQlvdmVyZmxvdzpzY3JvbGw7 CgkJfQoJCS5pbm5lciB7CgkJCWJveC1zaXppbmc6IGJvcmRlci1ib3g7CgkJCWJvcmRlcjogNXB4 IHNvbGlkIG9yYW5nZTsKCQkJaGVpZ2h0OiAxMDAlOwoJCX0KCTwvc3R5bGU+CjwvaGVhZD4KPGJv ZHk+Cgljb3JyZWN0OiBpbm5lciBib3ggKG9yYW5nZSBib3JkZXIpIGF0IDEwMCUgZml0cyBpbnNp ZGUgc2Nyb2xsYmFyIGFkanVzdGVkIGNvbnRlbnQtYm94IG9mIGl0cyBjb250YWluZXIgKGJsdWUg Ym9yZGVyKQoJPGRpdiBjbGFzcz0ib3V0ZXIiPgoJCTxkaXYgY2xhc3M9ImlubmVyIj48L2Rpdj4K CTwvZGl2PgoJPGJyLz48YnIvPgoJPGI+aW5jb3JyZWN0PC9iPjogd2l0aCAtd2Via2l0LWZsZXgg b24gb3V0ZXIgYm94LCBpbm5lciBib3ggb3ZlcmZsb3dzIGNvbnRlbnQtYm94IG9mIGl0cyBjb250 YWluZXIKCTxkaXYgY2xhc3M9ImZsZXhib3ggb3V0ZXIiPgoJCTxkaXYgY2xhc3M9ImlubmVyIj48 L2Rpdj4KCTwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 155593 2012-07-31 11:35:26 -0700 2012-07-31 16:05:23 -0700 Patch bug-92667-20120731113538.patch text/plain 9095 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk4ZWE4ZWJmMmU4ZDY2 Y2UyMWYxMmY0YTVjNzBhM2NiZDJkMGYyNy4uYzk2YTQxZjQxY2RhMGY3ZmNhYjM1YWJkMWNjMzdl NDU0YTVhMmY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA3LTMxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogZmxleGJv eCBjb250ZW50LXNpemUgZmFpbHMgdG8gZXhjbHVkZSBzY3JvbGxiYXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNjY3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gcjEyMzkwOSwgd2Ugc3dpdGNoZWQg dG8gY29tcHV0aW5nIHRoZSBoZWlnaHQgdXNpbmcgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0 VXNpbmcoKS4KKyAgICAgICAgVW5mb3J0dW5hdGVseSwgdGhpcyBpbmNsdWRlcyB0aGUgc2Nyb2xs YmFyIHdoZW4gd2Ugd2FudCB0aGUgY29udGVudCBoZWlnaHQuIEFkZCBhIGhlbHBlcgorICAgICAg ICBtZXRob2QgZm9yIGNvbXB1dGluZyB0aGUgdmFsdWUgbmVlZGVkIGJ5IGZsZXhib3guCisKKyAg ICAgICAgVGVzdDogY3NzMy9mbGV4Ym94L2NvbnRlbnQtaGVpZ2h0LXdpdGgtc2Nyb2xsYmFycy5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVudCk6IFVz ZSBjb21wdXRlTG9naWNhbENsaWVudEhlaWdodAorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmNvbXB1dGVMb2dpY2FsQ2xpZW50SGVpZ2h0KTogQWRkIG5ldyBtZXRob2QgZm9y IHRha2luZyBzY3JvbGxiYXIgaW50byBjb25zaWRlcmF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBdmFpbGFibGVGcmVlU3BhY2UpOiBVc2UgY29tcHV0 ZUxvZ2ljYWxDbGllbnRIZWlnaHQKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 OjpsaW5lQnJlYWtMZW5ndGgpOiBVc2UgY29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAxMi0wNy0xNyAgQW50b25p byBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja2JlcnJ5XVtGdWxsU2Ny ZWVuXSBIVE1MNSA8dmlkZW8+IGNvbnRyb2xzIGFyZSBzY2FsZWQgZGlmZmVyZW50bHkgZGVwZW5k aW5nIG9uIHRoZSBjdXJyZW50IHdlYnBhZ2Ugc2NhbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDk2MWE5ZjMxZTE1MGI3ODE5YTBiNmJj NjFiODkyNDViODJlM2M0NWMuLjRjNmJjMmEyMjVmN2Y0YjkwMzI3OWRjOWMyOGY5YjlhMzE2NmZh ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cApAQCAtMzkxLDEwICszOTEsMTggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y3Jv c3NBeGlzQ29udGVudEV4dGVudCgpIGNvbnN0CiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94 OjptYWluQXhpc0NvbnRlbnRFeHRlbnQoKQogewogICAgIGlmIChpc0NvbHVtbkZsb3coKSkKLSAg ICAgICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVuaXQoMCksIGNvbXB1dGVDb250ZW50TG9naWNh bEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQo KSkpOworICAgICAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZUxvZ2lj YWxDbGllbnRIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdo dCgpKSAtIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSk7CiAgICAgcmV0dXJuIGNvbnRlbnRMb2dp Y2FsV2lkdGgoKTsKIH0KIAorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUxv Z2ljYWxDbGllbnRIZWlnaHQoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgY29uc3QgTGVuZ3RoJiBoZWln aHQpCit7CisgICAgTGF5b3V0VW5pdCBoZWlnaHRJbmNsdWRpbmdTY3JvbGxiYXIgPSBjb21wdXRl Q29udGVudExvZ2ljYWxIZWlnaHRVc2luZyhoZWlnaHRUeXBlLCBoZWlnaHQpOworICAgIGlmICho ZWlnaHRJbmNsdWRpbmdTY3JvbGxiYXIgPT0gLTEpCisgICAgICAgIHJldHVybiAtMTsKKyAgICBy ZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgaGVpZ2h0SW5jbHVkaW5nU2Nyb2xsYmFyIC0g c2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsKK30KKwogV3JpdGluZ01vZGUgUmVuZGVyRmxleGli bGVCb3g6OnRyYW5zZm9ybWVkV3JpdGluZ01vZGUoKSBjb25zdAogewogICAgIFdyaXRpbmdNb2Rl IG1vZGUgPSBzdHlsZSgpLT53cml0aW5nTW9kZSgpOwpAQCAtNjAyLDExICs2MTAsMTEgQEAgTGF5 b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZShMYXlv dXRVbml0IHByZWZlcnJlZE1haW4KICAgICBlbHNlIGlmIChoYXNPdmVycmlkZUhlaWdodCgpKQog ICAgICAgICBjb250ZW50RXh0ZW50ID0gb3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOwog ICAgIGVsc2UgewotICAgICAgICBMYXlvdXRVbml0IGhlaWdodFJlc3VsdCA9IGNvbXB1dGVDb250 ZW50TG9naWNhbEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2lj YWxIZWlnaHQoKSk7CisgICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVzdWx0ID0gY29tcHV0ZUxv Z2ljYWxDbGllbnRIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhl aWdodCgpKTsKICAgICAgICAgaWYgKGhlaWdodFJlc3VsdCA9PSAtMSkKICAgICAgICAgICAgIGhl aWdodFJlc3VsdCA9IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwotICAgICAgICBMYXlvdXRVbml0 IG1pbkhlaWdodCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0 eWxlKCktPmxvZ2ljYWxNaW5IZWlnaHQoKSk7IC8vIExlYXZlIGFzIC0xIGlmIHVuc2V0LgotICAg ICAgICBMYXlvdXRVbml0IG1heEhlaWdodCA9IHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKS5p c1VuZGVmaW5lZCgpID8gaGVpZ2h0UmVzdWx0IDogY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0 VXNpbmcoTWF4U2l6ZSwgc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpKTsKKyAgICAgICAgTGF5 b3V0VW5pdCBtaW5IZWlnaHQgPSBjb21wdXRlTG9naWNhbENsaWVudEhlaWdodChNaW5TaXplLCBz dHlsZSgpLT5sb2dpY2FsTWluSGVpZ2h0KCkpOyAvLyBMZWF2ZSBhcyAtMSBpZiB1bnNldC4KKyAg ICAgICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQgPSBzdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCku aXNVbmRlZmluZWQoKSA/IGhlaWdodFJlc3VsdCA6IGNvbXB1dGVMb2dpY2FsQ2xpZW50SGVpZ2h0 KE1heFNpemUsIHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKSk7CiAgICAgICAgIGlmIChtYXhI ZWlnaHQgPT0gLTEpCiAgICAgICAgICAgICBtYXhIZWlnaHQgPSBoZWlnaHRSZXN1bHQ7CiAgICAg ICAgIGhlaWdodFJlc3VsdCA9IHN0ZDo6bWluKG1heEhlaWdodCwgaGVpZ2h0UmVzdWx0KTsKQEAg LTc3OSwxMCArNzg3LDEwIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmxpbmVCcmVh a0xlbmd0aCgpCiAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJuIG1haW5B eGlzQ29udGVudEV4dGVudCgpOwogCi0gICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBjb21wdXRlQ29u dGVudExvZ2ljYWxIZWlnaHRVc2luZyhNYWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLT5sb2dp Y2FsSGVpZ2h0KCkpOworICAgIExheW91dFVuaXQgaGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxDbGll bnRIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKTsK ICAgICBpZiAoaGVpZ2h0ID09IC0xKQogICAgICAgICBoZWlnaHQgPSBNQVhfTEFZT1VUX1VOSVQ7 Ci0gICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHRV c2luZyhNYXhTaXplLCBzdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCkpOworICAgIExheW91dFVu aXQgbWF4SGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQoTWF4U2l6ZSwgc3R5bGUo KS0+bG9naWNhbE1heEhlaWdodCgpKTsKICAgICBpZiAobWF4SGVpZ2h0ICE9IC0xKQogICAgICAg ICBoZWlnaHQgPSBzdGQ6Om1pbihoZWlnaHQsIG1heEhlaWdodCk7CiAgICAgcmV0dXJuIGhlaWdo dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXgg MWE5ZWJjOTgyMWEwOGExMmM5YzNiMGNmN2I1ZmUxZTgzZTEzNzk0NS4uMjVjN2NiYjhhODU3YzRj MmVkM2Y5MjhkNzA0NWZkNWI2M2NhYWEzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlv dXRVbml0IG1haW5BeGlzRXh0ZW50KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXND b250ZW50RXh0ZW50KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBtYWluQXhpc0NvbnRlbnRFeHRl bnQoKTsKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsQ2xpZW50SGVpZ2h0KFNpemVUeXBl LCBjb25zdCBMZW5ndGgmIGhlaWdodCk7CiAgICAgV3JpdGluZ01vZGUgdHJhbnNmb3JtZWRXcml0 aW5nTW9kZSgpIGNvbnN0OwogICAgIExheW91dFVuaXQgZmxvd0F3YXJlQm9yZGVyU3RhcnQoKSBj b25zdDsKICAgICBMYXlvdXRVbml0IGZsb3dBd2FyZUJvcmRlckVuZCgpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDYzOGE5OTk4Y2UzMTk5MzEyOWNiMzRkMzY3YTI1MTMwMTM2ODFjNmEuLjFlZGIxNTUzNmQ5ZmZj ZGVkZGM0ZTY3ZGY1OWZhMjQ4M2VlNzc1NmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0w Ny0zMSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T046IGZsZXhib3ggY29udGVudC1zaXplIGZhaWxzIHRvIGV4Y2x1ZGUgc2Nyb2xsYmFyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY2NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb2x1bW4gZmxv dyB0ZXN0IGNhc2VzIHdpdGggc2Nyb2xsYmFycyBmb3JjZWQgb24uCisKKyAgICAgICAgKiBjc3Mz L2ZsZXhib3gvY29udGVudC1oZWlnaHQtd2l0aC1zY3JvbGxiYXJzLWV4cGVjdGVkLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGNzczMvZmxleGJveC9jb250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJh cnMuaHRtbDogQWRkZWQuCisKIDIwMTItMDctMzEgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lA d2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdW1dLMl0gVW5yZXZpZXdlZCBnYXJkZW5pbmcsIGxh c3QgYXR0ZW1wdCB0byBwYWludCB0aGUgV0syIGJvdCBncmVlbiB0b2RheS4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jb250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJhcnMt ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jb250ZW50LWhlaWdodC13 aXRoLXNjcm9sbGJhcnMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ODAwMjhkNjE0ZTE5YmEw NjQ2MDFhYmNhZDg1OTAzZTNiZmI1MmI3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv Y3NzMy9mbGV4Ym94L2NvbnRlbnQtaGVpZ2h0LXdpdGgtc2Nyb2xsYmFycy1leHBlY3RlZC5odG1s CkBAIC0wLDAgKzEsNDYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHls ZT4KKy5vdXRlciB7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICBvdmVyZmxvdzpzY3JvbGw7Cit9 Cisub3V0ZXIgPiBkaXYsIHRkOm50aC1jaGlsZCgxKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjog bGlnaHRncmVlbjsKK30KK3RkOm50aC1jaGlsZCgyKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjog bGlnaHRibHVlOworfQordGFibGUsIHRkIHsKKyAgICBwYWRkaW5nOiAwOworICAgIGJvcmRlci1z cGFjaW5nOiAwOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0cyB0 aGF0IHdoZW4gc2V0dGluZyB0aGUgaGVpZ2h0IG9mIGEgZmxleCBpdGVtIHRvIGEgcGVyY2VudGFn ZQoraGVpZ2h0LCB3ZSB1c2UgdGhlIGNvbnRlbnQgaGVpZ2h0IHdpdGggc2Nyb2xsYmFycy4gVGhl IGNvbnRlbnQgc2hvdWxkIG5vdCBiZQorc2Nyb2xsYWJsZSBpbiBhbnkgb2YgdGhlIHRlc3QgY2Fz ZXMgYmVsb3cuPC9wPgorCis8ZGl2IGNsYXNzPSJvdXRlciI+CisgIDxkaXYgc3R5bGU9ImhlaWdo dDogMTAwJSI+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0ib3V0ZXIiPgorICA8ZGl2IHN0 eWxlPSJoZWlnaHQ6IDEwMCU7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7IGJvcmRlcjogNXB4IHNv bGlkIGdyZWVuIj48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJvdXRlciI+CisgIDxkaXYg c3R5bGU9ImRpc3BsYXk6aW5saW5lLWJsb2NrOyBoZWlnaHQ6IDUwcHg7IHdpZHRoOiA1MCU7Ij48 L2Rpdj48ZGl2CisgICAgICBzdHlsZT0iZGlzcGxheTppbmxpbmUtYmxvY2s7IGhlaWdodDogNTBw eDsgd2lkdGg6IDUwJTsgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlIj48L2Rpdj4KKzwvZGl2 PgorPGRpdiBjbGFzcz0ib3V0ZXIiIHN0eWxlPSJwYWRkaW5nOiAxMHB4OyBoZWlnaHQ6IGF1dG8i PgorICA8dGFibGUgc3R5bGU9Im1hcmdpbjogMDsgcGFkZGluZzogMDsgd2lkdGg6IDEwMCUiPgor ICA8dHI+CisgICAgPHRkIHN0eWxlPSJ3aWR0aDogNTAlOyBoZWlnaHQ6IDUwcHgiPjwvdGQ+Cisg ICAgPHRkIHN0eWxlPSJ3aWR0aDogNTAlOyBoZWlnaHQ6IDUwcHgiPjwvdGQ+CisgIDwvdHI+Cisg IDwvdGFibGU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvY29udGVudC1oZWlnaHQtd2l0aC1zY3JvbGxiYXJzLmh0bWwgYi9MYXlvdXRUZXN0 cy9jc3MzL2ZsZXhib3gvY29udGVudC1oZWlnaHQtd2l0aC1zY3JvbGxiYXJzLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZWYxNTg0Y2M5NzBmNjVhZmY0ZTYwNTY2NzMwYmNiZGM5YWYxZGE2MQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jb250ZW50LWhlaWdodC13aXRoLXNj cm9sbGJhcnMuaHRtbApAQCAtMCwwICsxLDQyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8c3R5bGU+Cisub3V0ZXIgeworICAgIGRpc3BsYXk6IC13ZWJraXQtZmxleDsKKyAg ICAtd2Via2l0LWZsZXgtZmxvdzogY29sdW1uOworICAgIGhlaWdodDogMTAwcHg7CisgICAgb3Zl cmZsb3c6IHNjcm9sbDsKK30KKy5vdXRlciA+IDpudGgtY2hpbGQoMSkgeworICAgIGJhY2tncm91 bmQtY29sb3I6IGxpZ2h0Z3JlZW47Cit9Cisub3V0ZXIgPiA6bnRoLWNoaWxkKDIpIHsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWU7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ Cis8cD5UaGlzIHRlc3RzIHRoYXQgd2hlbiBzZXR0aW5nIHRoZSBoZWlnaHQgb2YgYSBmbGV4IGl0 ZW0gdG8gYSBwZXJjZW50YWdlCitoZWlnaHQsIHdlIHVzZSB0aGUgY29udGVudCBoZWlnaHQgd2l0 aCBzY3JvbGxiYXJzLiBUaGUgY29udGVudCBzaG91bGQgbm90IGJlCitzY3JvbGxhYmxlIGluIGFu eSBvZiB0aGUgdGVzdCBjYXNlcyBiZWxvdy48L3A+CisKKzxkaXYgY2xhc3M9Im91dGVyIj4KKyAg PGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDAlIj48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJv dXRlciI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogMTAwJTsgYm94LXNpemluZzogYm9yZGVyLWJv eDsgYm9yZGVyOiA1cHggc29saWQgZ3JlZW4iPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9 Im91dGVyIiBzdHlsZT0iLXdlYmtpdC1mbGV4LXdyYXA6IHdyYXAiPgorICA8ZGl2IHN0eWxlPSJo ZWlnaHQ6IDUwcHg7IHdpZHRoOiA1MCU7Ij48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1 MHB4OyB3aWR0aDogNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWUiPjwvZGl2PgorPC9k aXY+CisKKzxkaXYgY2xhc3M9Im91dGVyIiBzdHlsZT0iLXdlYmtpdC1mbGV4LXdyYXA6IHdyYXA7 IGhlaWdodDogYXV0bzsgbWF4LWhlaWdodDogMTAwcHg7IHBhZGRpbmc6IDEwcHg7Ij4KKyAgPGRp diBzdHlsZT0iaGVpZ2h0OiA1MHB4OyB3aWR0aDogNTAlOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9 ImhlaWdodDogNTBweDsgd2lkdGg6IDUwJTsgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlIj48 L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 155660 2012-07-31 16:05:25 -0700 2012-07-31 17:54:35 -0700 Patch bug-92667-20120731160538.patch text/plain 9068 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk4ZWE4ZWJmMmU4ZDY2 Y2UyMWYxMmY0YTVjNzBhM2NiZDJkMGYyNy4uYzk2YTQxZjQxY2RhMGY3ZmNhYjM1YWJkMWNjMzdl NDU0YTVhMmY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA3LTMxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogZmxleGJv eCBjb250ZW50LXNpemUgZmFpbHMgdG8gZXhjbHVkZSBzY3JvbGxiYXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNjY3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gcjEyMzkwOSwgd2Ugc3dpdGNoZWQg dG8gY29tcHV0aW5nIHRoZSBoZWlnaHQgdXNpbmcgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0 VXNpbmcoKS4KKyAgICAgICAgVW5mb3J0dW5hdGVseSwgdGhpcyBpbmNsdWRlcyB0aGUgc2Nyb2xs YmFyIHdoZW4gd2Ugd2FudCB0aGUgY29udGVudCBoZWlnaHQuIEFkZCBhIGhlbHBlcgorICAgICAg ICBtZXRob2QgZm9yIGNvbXB1dGluZyB0aGUgdmFsdWUgbmVlZGVkIGJ5IGZsZXhib3guCisKKyAg ICAgICAgVGVzdDogY3NzMy9mbGV4Ym94L2NvbnRlbnQtaGVpZ2h0LXdpdGgtc2Nyb2xsYmFycy5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVudCk6IFVz ZSBjb21wdXRlTG9naWNhbENsaWVudEhlaWdodAorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmNvbXB1dGVMb2dpY2FsQ2xpZW50SGVpZ2h0KTogQWRkIG5ldyBtZXRob2QgZm9y IHRha2luZyBzY3JvbGxiYXIgaW50byBjb25zaWRlcmF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBdmFpbGFibGVGcmVlU3BhY2UpOiBVc2UgY29tcHV0 ZUxvZ2ljYWxDbGllbnRIZWlnaHQKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 OjpsaW5lQnJlYWtMZW5ndGgpOiBVc2UgY29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAxMi0wNy0xNyAgQW50b25p byBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja2JlcnJ5XVtGdWxsU2Ny ZWVuXSBIVE1MNSA8dmlkZW8+IGNvbnRyb2xzIGFyZSBzY2FsZWQgZGlmZmVyZW50bHkgZGVwZW5k aW5nIG9uIHRoZSBjdXJyZW50IHdlYnBhZ2Ugc2NhbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDk2MWE5ZjMxZTE1MGI3ODE5YTBiNmJj NjFiODkyNDViODJlM2M0NWMuLmFkZTAyYTlmYTRjZDM1YzVjNzJkN2U1ZWUxYzJiYjYzZGY2ZjY3 MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cApAQCAtMzkxLDEwICszOTEsMTggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y3Jv c3NBeGlzQ29udGVudEV4dGVudCgpIGNvbnN0CiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94 OjptYWluQXhpc0NvbnRlbnRFeHRlbnQoKQogewogICAgIGlmIChpc0NvbHVtbkZsb3coKSkKLSAg ICAgICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVuaXQoMCksIGNvbXB1dGVDb250ZW50TG9naWNh bEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQo KSkpOworICAgICAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZUxvZ2lj YWxDbGllbnRIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdo dCgpKSk7CiAgICAgcmV0dXJuIGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKIH0KIAorTGF5b3V0VW5p dCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQoU2l6ZVR5cGUg aGVpZ2h0VHlwZSwgY29uc3QgTGVuZ3RoJiBoZWlnaHQpCit7CisgICAgTGF5b3V0VW5pdCBoZWln aHRJbmNsdWRpbmdTY3JvbGxiYXIgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHRVc2luZyho ZWlnaHRUeXBlLCBoZWlnaHQpOworICAgIGlmIChoZWlnaHRJbmNsdWRpbmdTY3JvbGxiYXIgPT0g LTEpCisgICAgICAgIHJldHVybiAtMTsKKyAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgw KSwgaGVpZ2h0SW5jbHVkaW5nU2Nyb2xsYmFyIC0gc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsK K30KKwogV3JpdGluZ01vZGUgUmVuZGVyRmxleGlibGVCb3g6OnRyYW5zZm9ybWVkV3JpdGluZ01v ZGUoKSBjb25zdAogewogICAgIFdyaXRpbmdNb2RlIG1vZGUgPSBzdHlsZSgpLT53cml0aW5nTW9k ZSgpOwpAQCAtNjAyLDExICs2MTAsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZShMYXlvdXRVbml0IHByZWZlcnJlZE1haW4KICAgICBl bHNlIGlmIChoYXNPdmVycmlkZUhlaWdodCgpKQogICAgICAgICBjb250ZW50RXh0ZW50ID0gb3Zl cnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOwogICAgIGVsc2UgewotICAgICAgICBMYXlvdXRV bml0IGhlaWdodFJlc3VsdCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodFVzaW5nKE1haW5P clByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKSk7CisgICAgICAgIExheW91 dFVuaXQgaGVpZ2h0UmVzdWx0ID0gY29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQoTWFpbk9yUHJl ZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKTsKICAgICAgICAgaWYgKGhlaWdo dFJlc3VsdCA9PSAtMSkKICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IHByZWZlcnJlZE1haW5B eGlzRXh0ZW50OwotICAgICAgICBMYXlvdXRVbml0IG1pbkhlaWdodCA9IGNvbXB1dGVDb250ZW50 TG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0eWxlKCktPmxvZ2ljYWxNaW5IZWlnaHQoKSk7 IC8vIExlYXZlIGFzIC0xIGlmIHVuc2V0LgotICAgICAgICBMYXlvdXRVbml0IG1heEhlaWdodCA9 IHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKS5pc1VuZGVmaW5lZCgpID8gaGVpZ2h0UmVzdWx0 IDogY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0VXNpbmcoTWF4U2l6ZSwgc3R5bGUoKS0+bG9n aWNhbE1heEhlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBtaW5IZWlnaHQgPSBjb21wdXRl TG9naWNhbENsaWVudEhlaWdodChNaW5TaXplLCBzdHlsZSgpLT5sb2dpY2FsTWluSGVpZ2h0KCkp OyAvLyBMZWF2ZSBhcyAtMSBpZiB1bnNldC4KKyAgICAgICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQg PSBzdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNVbmRlZmluZWQoKSA/IGhlaWdodFJlc3Vs dCA6IGNvbXB1dGVMb2dpY2FsQ2xpZW50SGVpZ2h0KE1heFNpemUsIHN0eWxlKCktPmxvZ2ljYWxN YXhIZWlnaHQoKSk7CiAgICAgICAgIGlmIChtYXhIZWlnaHQgPT0gLTEpCiAgICAgICAgICAgICBt YXhIZWlnaHQgPSBoZWlnaHRSZXN1bHQ7CiAgICAgICAgIGhlaWdodFJlc3VsdCA9IHN0ZDo6bWlu KG1heEhlaWdodCwgaGVpZ2h0UmVzdWx0KTsKQEAgLTc3OSwxMCArNzg3LDEwIEBAIExheW91dFVu aXQgUmVuZGVyRmxleGlibGVCb3g6OmxpbmVCcmVha0xlbmd0aCgpCiAgICAgaWYgKCFpc0NvbHVt bkZsb3coKSkKICAgICAgICAgcmV0dXJuIG1haW5BeGlzQ29udGVudEV4dGVudCgpOwogCi0gICAg TGF5b3V0VW5pdCBoZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHRVc2luZyhNYWlu T3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkpOworICAgIExheW91dFVu aXQgaGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxDbGllbnRIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6 ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKTsKICAgICBpZiAoaGVpZ2h0ID09IC0xKQogICAg ICAgICBoZWlnaHQgPSBNQVhfTEFZT1VUX1VOSVQ7Ci0gICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQg PSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHRVc2luZyhNYXhTaXplLCBzdHlsZSgpLT5sb2dp Y2FsTWF4SGVpZ2h0KCkpOworICAgIExheW91dFVuaXQgbWF4SGVpZ2h0ID0gY29tcHV0ZUxvZ2lj YWxDbGllbnRIZWlnaHQoTWF4U2l6ZSwgc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpKTsKICAg ICBpZiAobWF4SGVpZ2h0ICE9IC0xKQogICAgICAgICBoZWlnaHQgPSBzdGQ6Om1pbihoZWlnaHQs IG1heEhlaWdodCk7CiAgICAgcmV0dXJuIGhlaWdodDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggMWE5ZWJjOTgyMWEwOGExMmM5YzNiMGNmN2I1 ZmUxZTgzZTEzNzk0NS4uMjVjN2NiYjhhODU3YzRjMmVkM2Y5MjhkNzA0NWZkNWI2M2NhYWEzYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTg0 LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50KCkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNDb250ZW50RXh0ZW50KCkgY29uc3Q7CiAgICAg TGF5b3V0VW5pdCBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKTsKKyAgICBMYXlvdXRVbml0IGNvbXB1 dGVMb2dpY2FsQ2xpZW50SGVpZ2h0KFNpemVUeXBlLCBjb25zdCBMZW5ndGgmIGhlaWdodCk7CiAg ICAgV3JpdGluZ01vZGUgdHJhbnNmb3JtZWRXcml0aW5nTW9kZSgpIGNvbnN0OwogICAgIExheW91 dFVuaXQgZmxvd0F3YXJlQm9yZGVyU3RhcnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGZsb3dB d2FyZUJvcmRlckVuZCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYzOGE5OTk4Y2UzMTk5MzEyOWNiMzRkMzY3 YTI1MTMwMTM2ODFjNmEuLjFlZGIxNTUzNmQ5ZmZjZGVkZGM0ZTY3ZGY1OWZhMjQ4M2VlNzc1NmMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNy0zMSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT046IGZsZXhib3ggY29udGVudC1zaXplIGZh aWxzIHRvIGV4Y2x1ZGUgc2Nyb2xsYmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MjY2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBjb2x1bW4gZmxvdyB0ZXN0IGNhc2VzIHdpdGggc2Nyb2xsYmFy cyBmb3JjZWQgb24uCisKKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvY29udGVudC1oZWlnaHQtd2l0 aC1zY3JvbGxiYXJzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJv eC9jb250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJhcnMuaHRtbDogQWRkZWQuCisKIDIwMTItMDct MzEgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRd W1dLMl0gVW5yZXZpZXdlZCBnYXJkZW5pbmcsIGxhc3QgYXR0ZW1wdCB0byBwYWludCB0aGUgV0sy IGJvdCBncmVlbiB0b2RheS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9j b250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJhcnMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3Rz L2NzczMvZmxleGJveC9jb250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJhcnMtZXhwZWN0ZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi43ODAwMjhkNjE0ZTE5YmEwNjQ2MDFhYmNhZDg1OTAzZTNiZmI1MmI3Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2NvbnRlbnQtaGVpZ2h0 LXdpdGgtc2Nyb2xsYmFycy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNDYgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5vdXRlciB7CisgICAgaGVpZ2h0OiAx MDBweDsKKyAgICBvdmVyZmxvdzpzY3JvbGw7Cit9Cisub3V0ZXIgPiBkaXYsIHRkOm50aC1jaGls ZCgxKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRncmVlbjsKK30KK3RkOm50aC1jaGls ZCgyKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlOworfQordGFibGUsIHRkIHsK KyAgICBwYWRkaW5nOiAwOworICAgIGJvcmRlci1zcGFjaW5nOiAwOworfQorPC9zdHlsZT4KKzwv aGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0cyB0aGF0IHdoZW4gc2V0dGluZyB0aGUgaGVpZ2h0 IG9mIGEgZmxleCBpdGVtIHRvIGEgcGVyY2VudGFnZQoraGVpZ2h0LCB3ZSB1c2UgdGhlIGNvbnRl bnQgaGVpZ2h0IHdpdGggc2Nyb2xsYmFycy4gVGhlIGNvbnRlbnQgc2hvdWxkIG5vdCBiZQorc2Ny b2xsYWJsZSBpbiBhbnkgb2YgdGhlIHRlc3QgY2FzZXMgYmVsb3cuPC9wPgorCis8ZGl2IGNsYXNz PSJvdXRlciI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogMTAwJSI+PC9kaXY+Cis8L2Rpdj4KKwor PGRpdiBjbGFzcz0ib3V0ZXIiPgorICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDEwMCU7IGJveC1zaXpp bmc6IGJvcmRlci1ib3g7IGJvcmRlcjogNXB4IHNvbGlkIGdyZWVuIj48L2Rpdj4KKzwvZGl2Pgor Cis8ZGl2IGNsYXNzPSJvdXRlciI+CisgIDxkaXYgc3R5bGU9ImRpc3BsYXk6aW5saW5lLWJsb2Nr OyBoZWlnaHQ6IDUwcHg7IHdpZHRoOiA1MCU7Ij48L2Rpdj48ZGl2CisgICAgICBzdHlsZT0iZGlz cGxheTppbmxpbmUtYmxvY2s7IGhlaWdodDogNTBweDsgd2lkdGg6IDUwJTsgYmFja2dyb3VuZC1j b2xvcjogbGlnaHRibHVlIj48L2Rpdj4KKzwvZGl2PgorPGRpdiBjbGFzcz0ib3V0ZXIiIHN0eWxl PSJwYWRkaW5nOiAxMHB4OyBoZWlnaHQ6IGF1dG8iPgorICA8dGFibGUgc3R5bGU9Im1hcmdpbjog MDsgcGFkZGluZzogMDsgd2lkdGg6IDEwMCUiPgorICA8dHI+CisgICAgPHRkIHN0eWxlPSJ3aWR0 aDogNTAlOyBoZWlnaHQ6IDUwcHgiPjwvdGQ+CisgICAgPHRkIHN0eWxlPSJ3aWR0aDogNTAlOyBo ZWlnaHQ6IDUwcHgiPjwvdGQ+CisgIDwvdHI+CisgIDwvdGFibGU+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvY29udGVudC1oZWlnaHQtd2l0 aC1zY3JvbGxiYXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvY29udGVudC1oZWln aHQtd2l0aC1zY3JvbGxiYXJzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWYxNTg0Y2M5NzBmNjVhZmY0ZTYw NTY2NzMwYmNiZGM5YWYxZGE2MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMv ZmxleGJveC9jb250ZW50LWhlaWdodC13aXRoLXNjcm9sbGJhcnMuaHRtbApAQCAtMCwwICsxLDQy IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Cisub3V0ZXIgewor ICAgIGRpc3BsYXk6IC13ZWJraXQtZmxleDsKKyAgICAtd2Via2l0LWZsZXgtZmxvdzogY29sdW1u OworICAgIGhlaWdodDogMTAwcHg7CisgICAgb3ZlcmZsb3c6IHNjcm9sbDsKK30KKy5vdXRlciA+ IDpudGgtY2hpbGQoMSkgeworICAgIGJhY2tncm91bmQtY29sb3I6IGxpZ2h0Z3JlZW47Cit9Cisu b3V0ZXIgPiA6bnRoLWNoaWxkKDIpIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWU7 Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3RzIHRoYXQgd2hlbiBz ZXR0aW5nIHRoZSBoZWlnaHQgb2YgYSBmbGV4IGl0ZW0gdG8gYSBwZXJjZW50YWdlCitoZWlnaHQs IHdlIHVzZSB0aGUgY29udGVudCBoZWlnaHQgd2l0aCBzY3JvbGxiYXJzLiBUaGUgY29udGVudCBz aG91bGQgbm90IGJlCitzY3JvbGxhYmxlIGluIGFueSBvZiB0aGUgdGVzdCBjYXNlcyBiZWxvdy48 L3A+CisKKzxkaXYgY2xhc3M9Im91dGVyIj4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDAlIj48 L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJvdXRlciI+CisgIDxkaXYgc3R5bGU9ImhlaWdo dDogMTAwJTsgYm94LXNpemluZzogYm9yZGVyLWJveDsgYm9yZGVyOiA1cHggc29saWQgZ3JlZW4i PjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Im91dGVyIiBzdHlsZT0iLXdlYmtpdC1mbGV4 LXdyYXA6IHdyYXAiPgorICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwcHg7IHdpZHRoOiA1MCU7Ij48 L2Rpdj4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyB3aWR0aDogNTAlOyBiYWNrZ3JvdW5k LWNvbG9yOiBsaWdodGJsdWUiPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Im91dGVyIiBz dHlsZT0iLXdlYmtpdC1mbGV4LXdyYXA6IHdyYXA7IGhlaWdodDogYXV0bzsgbWF4LWhlaWdodDog MTAwcHg7IHBhZGRpbmc6IDEwcHg7Ij4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyB3aWR0 aDogNTAlOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgd2lkdGg6IDUwJTsg YmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlIj48L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgo=