94855 2012-08-23 14:29:02 -0700 flex item sized incorrectly in a column flexbox with height set via top/bottom 2012-09-12 16:48:25 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac (Intel) OS X 10.7 RESOLVED FIXED HasReduction P2 Normal --- 94982 62048 1 sorvell tony eric ojan tony webkit.review.bot oldest_to_newest 703375 0 160246 sorvell 2012-08-23 14:29:02 -0700 Created attachment 160246 Reduction showing actual and expected output. If a display: -webkit-flex element with flex-flow: column is itself sized by fitting to another container via: setting position absolute + top, bottom, right, left all to 0, then its flex items lose their flexibility and appear to have natural size. Note, this problem only occurs for column flex-flow, row is ok. Further, setting height: 100% is ok. 703383 1 160251 sorvell 2012-08-23 14:35:08 -0700 Created attachment 160251 corrected reduction 703404 2 ojan 2012-08-23 14:45:28 -0700 Yup, looks like a bug. Not sure where exactly the bug is though. 703415 3 tony 2012-08-23 14:52:16 -0700 (In reply to comment #2) > Yup, looks like a bug. Not sure where exactly the bug is though. I think it's because we do our own calculation of height by calling computeLogicalClientHeight directly in RenderFlexibleBox::mainAxisContentExtent. It doesn't look like computeLogicalClientHeight handles absolute sized boxes. If you look at computeLogicalHeight, it does: if (isOutOfFlowPositioned()) computePositionedLogicalHeight(); Ok, I think I now know enough to fix this bug :) 704532 4 tony 2012-08-24 17:03:12 -0700 Sorry, it's going to take a while to fix this bug. I need to fix bug 94982 first, and that's going to take a while. 718831 5 163723 tony 2012-09-12 15:49:04 -0700 Created attachment 163723 Patch 718854 6 163723 ojan 2012-09-12 16:16:01 -0700 Comment on attachment 163723 Patch Add a FIXME for mainAxisContentExtent to be used for all the places we call computeLogicalHeight(...)? 718862 7 163729 tony 2012-09-12 16:22:16 -0700 Created attachment 163729 Patch for landing 718881 8 163729 webkit.review.bot 2012-09-12 16:48:22 -0700 Comment on attachment 163729 Patch for landing Clearing flags on attachment: 163729 Committed r128383: <http://trac.webkit.org/changeset/128383> 718882 9 webkit.review.bot 2012-09-12 16:48:25 -0700 All reviewed patches have been landed. Closing bug. 160246 2012-08-23 14:29:02 -0700 2012-08-23 14:47:55 -0700 Reduction showing actual and expected output. flexbox-trbl.html text/html 1210 sorvell PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgPHRpdGxlPkZsZXggVHJibCBwcm9ibGVt PC90aXRsZT4KICAgPHN0eWxlPgoJCS5ib3ggewoJCQlwb3NpdGlvbjogcmVsYXRpdmU7CgkJCWhl aWdodDogMTUwcHg7CgkJCXdpZHRoOiAxNTBweDsKCQkJYm9yZGVyOiAxcHggc29saWQgYmxhY2s7 CgkJfQoJCQoJCS5maXQgewoJCQlwb3NpdGlvbjogYWJzb2x1dGU7CgkJCXRvcDogMDsKCQkJcmln aHQ6IDA7CgkJCWJvdHRvbTogMDsKCQkJbGVmdDogMDsKCQl9CgkJCgkJLmZpdDIgewoJCQlwb3Np dGlvbjogYWJzb2x1dGU7CgkJCXRvcDogMDsKCQkJbGVmdDogMDsKCQkJaGVpZ2h0OiAxMDAlOwoJ CQlyaWdodDogMDsKCQl9CgkJCgkJLmZsZXhib3ggewoJCQlkaXNwbGF5OiAtd2Via2l0LWZsZXg7 CgkJfQoJCQoJCS5jb2x1bW4gewoJCQktd2Via2l0LWZsZXgtZmxvdzogY29sdW1uOwoJCX0KCQkK CQkuZmxleCB7CgkJCS13ZWJraXQtZmxleDogMTsKCQl9CgkJCgkJLmxpZ2h0Ymx1ZSB7CgkJCWJh Y2tncm91bmQ6IGxpZ2h0Ymx1ZTsKCQl9Cgk8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgoJQWN0dWFs IHJlbmRlcmluZzogbm90ZSBzaXplIG9mIGZsZXggaXRlbSBpbiBhIGZsZXggYm94IHdpdGggaGVp Z2h0IHNldCB2aWEgdG9wOiAwOyBib3R0b206IDA7Cgk8ZGl2IGNsYXNzPSJib3giPgoJCTxkaXYg Y2xhc3M9ImZpdCBmbGV4Ym94IGNvbHVtbiI+CgkJCTxkaXY+Q29udGVudDwvZGl2PgoJCQk8ZGl2 IGNsYXNzPSJmbGV4IGxpZ2h0Ymx1ZSI+RmxleCAxPC9kaXY+CgkJPC9kaXY+Cgk8L2Rpdj4KCQoJ PGJyPjxocj48YnI+CgkKCUV4cGVjdGVkIHJlbmRlcmluZzogc2FtZSBzZXR1cCBidXQgaGVpZ2h0 IHNldCB2aWEgaGVpZ2h0OiAxMDAlIGlzIG9rLgoJPGRpdiBjbGFzcz0iYm94IGZsZXhib3ggY29s dW1uIj4KCQk8ZGl2PkNvbnRlbnQ8L2Rpdj4KCQk8ZGl2IGNsYXNzPSJmbGV4IGxpZ2h0Ymx1ZSI+ RmxleCAxPC9kaXY+Cgk8L2Rpdj4KCQoJCgk8YnI+PGhyPjxicj4KCQoJTk9URTogZmxleGliaWxp dHkgd2l0aCAtd2Via2l0LWZsZXgtZmxvdzogcm93IGlzIG9rLgoJPGRpdiBjbGFzcz0iYm94Ij4K CQk8ZGl2IGNsYXNzPSJmaXQgZmxleGJveCI+CgkJCTxkaXY+Q29udGVudDwvZGl2PgoJCQk8ZGl2 IGNsYXNzPSJmbGV4IGxpZ2h0Ymx1ZSI+RmxleCAxPC9kaXY+CgkJPC9kaXY+Cgk8L2Rpdj4KPC9i b2R5Pgo8L2h0bWw+Cg== 160251 2012-08-23 14:35:08 -0700 2012-08-23 14:35:08 -0700 corrected reduction flexbox-trbl.html text/html 1242 sorvell PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgPHRpdGxlPkZsZXggVHJibCBwcm9ibGVt PC90aXRsZT4KICAgPHN0eWxlPgoJCS5ib3ggewoJCQlwb3NpdGlvbjogcmVsYXRpdmU7CgkJCWhl aWdodDogMTUwcHg7CgkJCXdpZHRoOiAxNTBweDsKCQkJYm9yZGVyOiAxcHggc29saWQgYmxhY2s7 CgkJfQoJCQoJCS5maXQgewoJCQlwb3NpdGlvbjogYWJzb2x1dGU7CgkJCXRvcDogMDsKCQkJcmln aHQ6IDA7CgkJCWJvdHRvbTogMDsKCQkJbGVmdDogMDsKCQl9CgkJCgkJLmZpdDIgewoJCQlwb3Np dGlvbjogYWJzb2x1dGU7CgkJCXRvcDogMDsKCQkJbGVmdDogMDsKCQkJaGVpZ2h0OiAxMDAlOwoJ CQlyaWdodDogMDsKCQl9CgkJCgkJLmZsZXhib3ggewoJCQlkaXNwbGF5OiAtd2Via2l0LWZsZXg7 CgkJfQoJCQoJCS5jb2x1bW4gewoJCQktd2Via2l0LWZsZXgtZmxvdzogY29sdW1uOwoJCX0KCQkK CQkuZmxleCB7CgkJCS13ZWJraXQtZmxleDogMTsKCQl9CgkJCgkJLmxpZ2h0Ymx1ZSB7CgkJCWJh Y2tncm91bmQ6IGxpZ2h0Ymx1ZTsKCQl9Cgk8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgoJQWN0dWFs IHJlbmRlcmluZzogbm90ZSBzaXplIG9mIGZsZXggaXRlbSBpbiBhIGZsZXggYm94IHdpdGggaGVp Z2h0IHNldCB2aWEgdG9wOiAwOyBib3R0b206IDA7Cgk8ZGl2IGNsYXNzPSJib3giPgoJCTxkaXYg Y2xhc3M9ImZpdCBmbGV4Ym94IGNvbHVtbiI+CgkJCTxkaXY+Q29udGVudDwvZGl2PgoJCQk8ZGl2 IGNsYXNzPSJmbGV4IGxpZ2h0Ymx1ZSI+RmxleCAxPC9kaXY+CgkJPC9kaXY+Cgk8L2Rpdj4KCQoJ PGJyPjxocj48YnI+CgkKCUV4cGVjdGVkIHJlbmRlcmluZzogc2FtZSBzZXR1cCBidXQgaGVpZ2h0 IHNldCB2aWEgaGVpZ2h0OiAxMDAlIGlzIG9rLgoJPGRpdiBjbGFzcz0iYm94Ij4KCQk8ZGl2IGNs YXNzPSJmaXQyIGZsZXhib3ggY29sdW1uIj4KCQkJPGRpdj5Db250ZW50PC9kaXY+CgkJCTxkaXYg Y2xhc3M9ImZsZXggbGlnaHRibHVlIj5GbGV4IDE8L2Rpdj4KCQk8L2Rpdj4KCTwvZGl2PgoJCgkK CTxicj48aHI+PGJyPgoJCglOT1RFOiBmbGV4aWJpbGl0eSB3aXRoIC13ZWJraXQtZmxleC1mbG93 OiByb3cgaXMgb2suCgk8ZGl2IGNsYXNzPSJib3giPgoJCTxkaXYgY2xhc3M9ImZpdCBmbGV4Ym94 Ij4KCQkJPGRpdj5Db250ZW50PC9kaXY+CgkJCTxkaXYgY2xhc3M9ImZsZXggbGlnaHRibHVlIj5G bGV4IDE8L2Rpdj4KCQk8L2Rpdj4KCTwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 163723 2012-09-12 15:49:04 -0700 2012-09-12 16:22:14 -0700 Patch bug-94855-20120912154838.patch text/plain 8214 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRjOWE3YmQwNTY0ZmFj OTAxMmFhMWZmZjZmMTNjN2U3ODA1ODBiZC4uZWFiNGY3NWVlNGIwZTFhYjU2M2JiYTRmZWZiOWYw N2QzNzg3YTJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTEyICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgZmxleCBpdGVtIHNpemVkIGlu Y29ycmVjdGx5IGluIGEgY29sdW1uIGZsZXhib3ggd2l0aCBoZWlnaHQgc2V0IHZpYSB0b3AvYm90 dG9tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDg1 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3Ag dXNpbmcgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgdG8gZ2V0IHRoZSBoZWlnaHQgb2Yg dGhlIGZsZXhib3ggYW5kCisgICAgICAgIHVzZSBjb21wdXRlTG9naWNhbEhlaWdodCBkaXJlY3Rs eS4gIFRoaXMgcHJvcGVybHkgdGFrZXMgaW50byBhY2NvdW50IG91dCBvZiBmbG93CisgICAgICAg IHBvc2l0aW9uaW5nLgorCisgICAgICAgIFdlIGNhbiBhY3R1YWxseSByZWZhY3RvciBzb21lIG9m IHRoaXMgaW50byBjb21tb24gY29kZSwgYnV0IEkgd2FudCB0byBkbyB0aGF0IGFzCisgICAgICAg IGEgc2VwYXJhdGUgcGFzcy4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhib3gvY29sdW1ucy1o ZWlnaHQtc2V0LXZpYS10b3AtYm90dG9tLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6 cmVwb3NpdGlvbkxvZ2ljYWxIZWlnaHREZXBlbmRlbnRGbGV4SXRlbXMpOiBGaXggb3V0IG9mIGRh dGUgY29tbWVudC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjptYWluQXhp c0NvbnRlbnRFeHRlbnQpOiBVc2UgY29tcHV0ZUxvZ2ljYWxIZWlnaHQgaW5zdGVhZCBvZiBjb21w dXRlQ29udGVudExvZ2ljYWxIZWlnaHQuCisgICAgICAgIFRoaXMgY29kZSBhY3R1YWxseSBuZXZl ciBnZXRzIHVzZWQtLSBJJ2xsIHRyeSB0byByZW1vdmUgaW4gYSBmb2xsb3cgdXAuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZSk6 IFVzZSBjb21wdXRlTG9naWNhbEhlaWdodCBpbnN0ZWFkIG9mIGNvbXB1dGVDb250ZW50TG9naWNh bEhlaWdodC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsaW5lQnJlYWtM ZW5ndGgpOiBVc2UgY29tcHV0ZUxvZ2ljYWxIZWlnaHQgaW5zdGVhZCBvZiBjb21wdXRlQ29udGVu dExvZ2ljYWxIZWlnaHQuCisKIDIwMTItMDktMTIgIFNpcmFqIFJhemljayAgPHNpcmFqLnJhemlj a0Bjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgW0dUS10gUHJvdGVjdCBSZWRpcmVjdGVkWENv bXBvc2l0ZVdpbmRvdyB3aXRoIFVTRShHTFgpIHdoZW4gYnVpbGRpbmcgdGhlIGNsdXR0ZXIgQUMg YmFja2VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAKaW5kZXggOTYwZjM2NjVjYjZjNzk4YzZkYzMzOTg2MjA3NjgzZWU3Zjc4MmVkMy4uZTUwYTRk NGRkN2E3ZmY2MWRkMGY5YzIzMjE0YTA0NzA2MmZkYTBjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0zMDcsNyArMzA3LDcgQEAgdm9p ZCBSZW5kZXJGbGV4aWJsZUJveDo6cmVwb3NpdGlvbkxvZ2ljYWxIZWlnaHREZXBlbmRlbnRGbGV4 SXRlbXMoT3JkZXJJdGVyYXRvciYKICAgICBhbGlnbkZsZXhMaW5lcyhpdGVyYXRvciwgbGluZUNv bnRleHRzKTsKIAogICAgIC8vIElmIHdlIGhhdmUgYSBzaW5nbGUgbGluZSBmbGV4Ym94LCB0aGUg bGluZSBoZWlnaHQgaXMgYWxsIHRoZSBhdmFpbGFibGUgc3BhY2UuCi0gICAgLy8gRm9yIGZsZXgt ZGlyZWN0aW9uOiByb3csIHRoaXMgbWVhbnMgd2UgbmVlZCB0byB1c2UgdGhlIGhlaWdodCwgc28g d2UgZG8gdGhpcyBhZnRlciBjYWxsaW5nIGNvbXB1dGVMb2dpY2FsSGVpZ2h0LgorICAgIC8vIEZv ciBmbGV4LWRpcmVjdGlvbjogcm93LCB0aGlzIG1lYW5zIHdlIG5lZWQgdG8gdXNlIHRoZSBoZWln aHQsIHNvIHdlIGRvIHRoaXMgYWZ0ZXIgY2FsbGluZyB1cGRhdGVMb2dpY2FsSGVpZ2h0LgogICAg IGlmICghaXNNdWx0aWxpbmUoKSAmJiBsaW5lQ29udGV4dHMuc2l6ZSgpID09IDEpCiAgICAgICAg IGxpbmVDb250ZXh0c1swXS5jcm9zc0F4aXNFeHRlbnQgPSBjcm9zc0F4aXNDb250ZW50RXh0ZW50 KCk7CiAgICAgYWxpZ25DaGlsZHJlbihpdGVyYXRvciwgbGluZUNvbnRleHRzKTsKQEAgLTM5NSw4 ICszOTUsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NBeGlzQ29udGVu dEV4dGVudCgpIGNvbnN0CiAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlz Q29udGVudEV4dGVudCgpCiB7Ci0gICAgaWYgKGlzQ29sdW1uRmxvdygpKQotICAgICAgICByZXR1 cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KE1h aW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKSkpOworICAgIGlmIChp c0NvbHVtbkZsb3coKSkgeworICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29t cHV0ZWRWYWx1ZXM7CisgICAgICAgIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQo KSwgbG9naWNhbFRvcCgpLCBjb21wdXRlZFZhbHVlcyk7CisgICAgICAgIHJldHVybiBzdGQ6Om1h eChMYXlvdXRVbml0KDApLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRp bmdMb2dpY2FsSGVpZ2h0KCkgLSBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCkpOworICAgIH0KICAg ICByZXR1cm4gY29udGVudExvZ2ljYWxXaWR0aCgpOwogfQogCkBAIC02MTMsMTkgKzYxNiwxMCBA QCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQXZhaWxhYmxlRnJlZVNwYWNl KExheW91dFVuaXQgcHJlZmVycmVkTWFpbgogICAgIExheW91dFVuaXQgY29udGVudEV4dGVudCA9 IDA7CiAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKICAgICAgICAgY29udGVudEV4dGVudCA9IG1h aW5BeGlzQ29udGVudEV4dGVudCgpOwotICAgIGVsc2UgaWYgKGhhc092ZXJyaWRlSGVpZ2h0KCkp Ci0gICAgICAgIGNvbnRlbnRFeHRlbnQgPSBvdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCk7 CiAgICAgZWxzZSB7Ci0gICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVzdWx0ID0gY29tcHV0ZUNv bnRlbnRMb2dpY2FsSGVpZ2h0KE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxI ZWlnaHQoKSk7Ci0gICAgICAgIGlmIChoZWlnaHRSZXN1bHQgPT0gLTEpCi0gICAgICAgICAgICBo ZWlnaHRSZXN1bHQgPSBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsKLSAgICAgICAgTGF5b3V0VW5p dCBtaW5IZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWluU2l6ZSwgc3R5bGUo KS0+bG9naWNhbE1pbkhlaWdodCgpKTsgLy8gTGVhdmUgYXMgLTEgaWYgdW5zZXQuCi0gICAgICAg IExheW91dFVuaXQgbWF4SGVpZ2h0ID0gc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpLmlzVW5k ZWZpbmVkKCkgPyBoZWlnaHRSZXN1bHQgOiBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWF4 U2l6ZSwgc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpKTsKLSAgICAgICAgaWYgKG1heEhlaWdo dCA9PSAtMSkKLSAgICAgICAgICAgIG1heEhlaWdodCA9IGhlaWdodFJlc3VsdDsKLSAgICAgICAg aGVpZ2h0UmVzdWx0ID0gc3RkOjptaW4obWF4SGVpZ2h0LCBoZWlnaHRSZXN1bHQpOwotICAgICAg ICBoZWlnaHRSZXN1bHQgPSBzdGQ6Om1heChtaW5IZWlnaHQsIGhlaWdodFJlc3VsdCk7Ci0gICAg ICAgIGNvbnRlbnRFeHRlbnQgPSBoZWlnaHRSZXN1bHQ7CisgICAgICAgIExvZ2ljYWxFeHRlbnRD b21wdXRlZFZhbHVlcyBjb21wdXRlZFZhbHVlczsKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWln aHQocHJlZmVycmVkTWFpbkF4aXNFeHRlbnQsIGxvZ2ljYWxUb3AoKSwgY29tcHV0ZWRWYWx1ZXMp OworICAgICAgICBjb250ZW50RXh0ZW50ID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3Jk ZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwog ICAgIH0KIAogICAgIHJldHVybiBjb250ZW50RXh0ZW50IC0gcHJlZmVycmVkTWFpbkF4aXNFeHRl bnQ7CkBAIC04MDEsMTMgKzc5NSw5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Omxp bmVCcmVha0xlbmd0aCgpCiAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJu IG1haW5BeGlzQ29udGVudEV4dGVudCgpOwogCi0gICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBjb21w dXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9n aWNhbEhlaWdodCgpKTsKLSAgICBpZiAoaGVpZ2h0ID09IC0xKQotICAgICAgICBoZWlnaHQgPSBN QVhfTEFZT1VUX1VOSVQ7Ci0gICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQgPSBjb21wdXRlQ29udGVu dExvZ2ljYWxIZWlnaHQoTWF4U2l6ZSwgc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpKTsKLSAg ICBpZiAobWF4SGVpZ2h0ICE9IC0xKQotICAgICAgICBoZWlnaHQgPSBzdGQ6Om1pbihoZWlnaHQs IG1heEhlaWdodCk7Ci0gICAgcmV0dXJuIGhlaWdodDsKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0 ZWRWYWx1ZXMgY29tcHV0ZWRWYWx1ZXM7CisgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTUFYX0xB WU9VVF9VTklULCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKKyAgICByZXR1cm4gY29t cHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0g c2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl Qm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0 VW5pdCBjaGlsZFNpemUsIExheW91dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQp CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggOTc5MTQ0YjE1YzUwNzZlYWM1MWMxNTgyNTJjZTIxNjEwMTEwYzI3ZS4uYzJmMWUx OTQ5MmFjMmI3ZWQ1NDFlMTU2NDQyZjBhNTgxNzA1YjBkZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDEyLTA5LTEyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg ZmxleCBpdGVtIHNpemVkIGluY29ycmVjdGx5IGluIGEgY29sdW1uIGZsZXhib3ggd2l0aCBoZWln aHQgc2V0IHZpYSB0b3AvYm90dG9tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NDg1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRlc3Qgd2hlcmUgdGhlIGhlaWdodCBvZiBhIGNvbHVtbiBmbGV4Ym94IGlz IHNldCB2aWEgdG9wIGFuZCBib3R0b20uCisKKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvY29sdW1u cy1oZWlnaHQtc2V0LXZpYS10b3AtYm90dG9tLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogY3NzMy9mbGV4Ym94L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJvdHRvbS5odG1sOiBB ZGRlZC4KKwogMjAxMi0wOS0xMiAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEluZGV4ZWREQjogVGhlIHxzb3VyY2V8IHByb3BlcnR5IG9mIElEQkZhY3Rvcnku b3BlbigpIHJlcXVlc3Qgc2hvdWxkIGJlIG51bGwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nz czMvZmxleGJveC9jb2x1bW5zLWhlaWdodC1zZXQtdmlhLXRvcC1ib3R0b20tZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJv dHRvbS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzhlMDM1MjUxNTVjMWJkMmNkNjQ4NWRlMjM1 ZWRiNDJkNTRhZmExZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJv eC9jb2x1bW5zLWhlaWdodC1zZXQtdmlhLXRvcC1ib3R0b20tZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsMiBAQAorUEFTUworUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94 L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJvdHRvbS5odG1sIGIvTGF5b3V0VGVzdHMvY3Nz My9mbGV4Ym94L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJvdHRvbS5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjYwYWI4NmRmNWYxYzU5NTY2ZDBkZTQ0N2UzNTY3YWNjOWVjNjY2ZGQKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvY29sdW1ucy1oZWlnaHQtc2V0LXZpYS10 b3AtYm90dG9tLmh0bWwKQEAgLTAsMCArMSw0OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBoZWln aHQ6IDEwMHB4OworICAgIHdpZHRoOiAxMDBweDsKKyAgICBib3JkZXI6IDJweCBzb2xpZCBvcmFu Z2U7Cit9CisuZmxleGJveCB7CisgICAgZGlzcGxheTogLXdlYmtpdC1mbGV4OworICAgIC13ZWJr aXQtZmxleC1mbG93OiBjb2x1bW47CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDog MDsKKyAgICByaWdodDogMDsKKyAgICBib3R0b206IDA7CisgICAgbGVmdDogMDsKKyAgICBwYWRk aW5nOiAxMHB4OworfQorLmZsZXhib3ggPiA6bnRoLWNoaWxkKDEpIHsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiBsaWdodGJsdWU7Cit9CisuZmxleGJveCA+IDpudGgtY2hpbGQoMikgeworICAgIGJh Y2tncm91bmQtY29sb3I6IGxpZ2h0Z3JlZW47Cit9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3 aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMiPjwvc2NyaXB0 PgorPGJvZHkgb25sb2FkPSJjaGVja0xheW91dCgnLmZsZXhib3gnKSI+CisKKzxkaXYgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgPGRpdiBkYXRhLWV4cGVjdGVkLWhlaWdodD0xMDAgY2xhc3M9ImZs ZXhib3giPgorICAgICAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTMwIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9ODAgc3R5bGU9ImhlaWdodDogMzBweCI+PC9kaXY+CisgICAgICAgIDxkaXYgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9NTAgZGF0YS1leHBlY3RlZC13aWR0aD04MCBzdHlsZT0iLXdlYmtp dC1mbGV4OiAxIj48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250 YWluZXIiPgorICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZmxleC13cmFwOiB3cmFwIiBjbGFzcz0i ZmxleGJveCI+CisgICAgICAgIDxkaXYgZGF0YS1leHBlY3RlZC1oZWlnaHQ9NTAgZGF0YS1leHBl Y3RlZC13aWR0aD00MCBzdHlsZT0iaGVpZ2h0OiA1MHB4Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBk YXRhLWV4cGVjdGVkLWhlaWdodD04MCBkYXRhLWV4cGVjdGVkLXdpZHRoPTQwIHN0eWxlPSItd2Vi a2l0LWZsZXg6IDEgNTBweCI+PC9kaXY+CisgICAgPC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4K 163729 2012-09-12 16:22:16 -0700 2012-09-12 16:48:22 -0700 Patch for landing bug-94855-20120912162150.patch text/plain 8359 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRjOWE3YmQwNTY0ZmFj OTAxMmFhMWZmZjZmMTNjN2U3ODA1ODBiZC4uYzRkNTE4YWFjYWJmZTE1YWJmY2E4YzlmMzJiOTg5 NGE3ZGJjZGIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTEyICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgZmxleCBpdGVtIHNpemVkIGlu Y29ycmVjdGx5IGluIGEgY29sdW1uIGZsZXhib3ggd2l0aCBoZWlnaHQgc2V0IHZpYSB0b3AvYm90 dG9tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDg1 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCisKKyAgICAgICAgU3RvcCB1c2lu ZyBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoKSB0byBnZXQgdGhlIGhlaWdodCBvZiB0aGUg ZmxleGJveCBhbmQKKyAgICAgICAgdXNlIGNvbXB1dGVMb2dpY2FsSGVpZ2h0IGRpcmVjdGx5LiAg VGhpcyBwcm9wZXJseSB0YWtlcyBpbnRvIGFjY291bnQgb3V0IG9mIGZsb3cKKyAgICAgICAgcG9z aXRpb25pbmcuCisKKyAgICAgICAgV2UgY2FuIGFjdHVhbGx5IHJlZmFjdG9yIHNvbWUgb2YgdGhp cyBpbnRvIGNvbW1vbiBjb2RlLCBidXQgSSB3YW50IHRvIGRvIHRoYXQgYXMKKyAgICAgICAgYSBz ZXBhcmF0ZSBwYXNzLgorCisgICAgICAgIFRlc3Q6IGNzczMvZmxleGJveC9jb2x1bW5zLWhlaWdo dC1zZXQtdmlhLXRvcC1ib3R0b20uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpyZXBv c2l0aW9uTG9naWNhbEhlaWdodERlcGVuZGVudEZsZXhJdGVtcyk6IEZpeCBvdXQgb2YgZGF0ZSBj b21tZW50LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29u dGVudEV4dGVudCk6IFVzZSBjb21wdXRlTG9naWNhbEhlaWdodCBpbnN0ZWFkIG9mIGNvbXB1dGVD b250ZW50TG9naWNhbEhlaWdodC4KKyAgICAgICAgVGhpcyBjb2RlIGFjdHVhbGx5IG5ldmVyIGdl dHMgdXNlZC0tIEknbGwgdHJ5IHRvIHJlbW92ZSBpbiBhIGZvbGxvdyB1cC4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQXZhaWxhYmxlRnJlZVNwYWNlKTogVXNl IGNvbXB1dGVMb2dpY2FsSGVpZ2h0IGluc3RlYWQgb2YgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVp Z2h0LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxpbmVCcmVha0xlbmd0 aCk6IFVzZSBjb21wdXRlTG9naWNhbEhlaWdodCBpbnN0ZWFkIG9mIGNvbXB1dGVDb250ZW50TG9n aWNhbEhlaWdodC4KKwogMjAxMi0wOS0xMiAgU2lyYWogUmF6aWNrICA8c2lyYWoucmF6aWNrQGNv bGxhYm9yYS5jby51az4KIAogICAgICAgICBbR1RLXSBQcm90ZWN0IFJlZGlyZWN0ZWRYQ29tcG9z aXRlV2luZG93IHdpdGggVVNFKEdMWCkgd2hlbiBidWlsZGluZyB0aGUgY2x1dHRlciBBQyBiYWNr ZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApp bmRleCA5NjBmMzY2NWNiNmM3OThjNmRjMzM5ODYyMDc2ODNlZTdmNzgyZWQzLi4yODZhYjdjN2I3 ZTEyNzNjYzFiOTQ3YzIxMDk3YjVkY2NiODk5YzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTMwNyw3ICszMDcsNyBAQCB2b2lkIFJl bmRlckZsZXhpYmxlQm94OjpyZXBvc2l0aW9uTG9naWNhbEhlaWdodERlcGVuZGVudEZsZXhJdGVt cyhPcmRlckl0ZXJhdG9yJgogICAgIGFsaWduRmxleExpbmVzKGl0ZXJhdG9yLCBsaW5lQ29udGV4 dHMpOwogCiAgICAgLy8gSWYgd2UgaGF2ZSBhIHNpbmdsZSBsaW5lIGZsZXhib3gsIHRoZSBsaW5l IGhlaWdodCBpcyBhbGwgdGhlIGF2YWlsYWJsZSBzcGFjZS4KLSAgICAvLyBGb3IgZmxleC1kaXJl Y3Rpb246IHJvdywgdGhpcyBtZWFucyB3ZSBuZWVkIHRvIHVzZSB0aGUgaGVpZ2h0LCBzbyB3ZSBk byB0aGlzIGFmdGVyIGNhbGxpbmcgY29tcHV0ZUxvZ2ljYWxIZWlnaHQuCisgICAgLy8gRm9yIGZs ZXgtZGlyZWN0aW9uOiByb3csIHRoaXMgbWVhbnMgd2UgbmVlZCB0byB1c2UgdGhlIGhlaWdodCwg c28gd2UgZG8gdGhpcyBhZnRlciBjYWxsaW5nIHVwZGF0ZUxvZ2ljYWxIZWlnaHQuCiAgICAgaWYg KCFpc011bHRpbGluZSgpICYmIGxpbmVDb250ZXh0cy5zaXplKCkgPT0gMSkKICAgICAgICAgbGlu ZUNvbnRleHRzWzBdLmNyb3NzQXhpc0V4dGVudCA9IGNyb3NzQXhpc0NvbnRlbnRFeHRlbnQoKTsK ICAgICBhbGlnbkNoaWxkcmVuKGl0ZXJhdG9yLCBsaW5lQ29udGV4dHMpOwpAQCAtMzk1LDggKzM5 NSwxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNDb250ZW50RXh0 ZW50KCkgY29uc3QKIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250 ZW50RXh0ZW50KCkKIHsKLSAgICBpZiAoaXNDb2x1bW5GbG93KCkpCi0gICAgICAgIHJldHVybiBz dGQ6Om1heChMYXlvdXRVbml0KDApLCBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWFpbk9y UHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKSk7CisgICAgaWYgKGlzQ29s dW1uRmxvdygpKSB7CisgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBjb21wdXRl ZFZhbHVlczsKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpLCBs b2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KExh eW91dFVuaXQoMCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyQW5kUGFkZGluZ0xv Z2ljYWxIZWlnaHQoKSAtIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSk7CisgICAgfQogICAgIHJl dHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7CiB9CiAKQEAgLTYxMywxOSArNjE2LDExIEBAIExh eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBdmFpbGFibGVGcmVlU3BhY2UoTGF5 b3V0VW5pdCBwcmVmZXJyZWRNYWluCiAgICAgTGF5b3V0VW5pdCBjb250ZW50RXh0ZW50ID0gMDsK ICAgICBpZiAoIWlzQ29sdW1uRmxvdygpKQogICAgICAgICBjb250ZW50RXh0ZW50ID0gbWFpbkF4 aXNDb250ZW50RXh0ZW50KCk7Ci0gICAgZWxzZSBpZiAoaGFzT3ZlcnJpZGVIZWlnaHQoKSkKLSAg ICAgICAgY29udGVudEV4dGVudCA9IG92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsKICAg ICBlbHNlIHsKLSAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRSZXN1bHQgPSBjb21wdXRlQ29udGVu dExvZ2ljYWxIZWlnaHQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdo dCgpKTsKLSAgICAgICAgaWYgKGhlaWdodFJlc3VsdCA9PSAtMSkKLSAgICAgICAgICAgIGhlaWdo dFJlc3VsdCA9IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwotICAgICAgICBMYXlvdXRVbml0IG1p bkhlaWdodCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodChNaW5TaXplLCBzdHlsZSgpLT5s b2dpY2FsTWluSGVpZ2h0KCkpOyAvLyBMZWF2ZSBhcyAtMSBpZiB1bnNldC4KLSAgICAgICAgTGF5 b3V0VW5pdCBtYXhIZWlnaHQgPSBzdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNVbmRlZmlu ZWQoKSA/IGhlaWdodFJlc3VsdCA6IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodChNYXhTaXpl LCBzdHlsZSgpLT5sb2dpY2FsTWF4SGVpZ2h0KCkpOwotICAgICAgICBpZiAobWF4SGVpZ2h0ID09 IC0xKQotICAgICAgICAgICAgbWF4SGVpZ2h0ID0gaGVpZ2h0UmVzdWx0OwotICAgICAgICBoZWln aHRSZXN1bHQgPSBzdGQ6Om1pbihtYXhIZWlnaHQsIGhlaWdodFJlc3VsdCk7Ci0gICAgICAgIGhl aWdodFJlc3VsdCA9IHN0ZDo6bWF4KG1pbkhlaWdodCwgaGVpZ2h0UmVzdWx0KTsKLSAgICAgICAg Y29udGVudEV4dGVudCA9IGhlaWdodFJlc3VsdDsKKyAgICAgICAgLy8gRklYTUU6IFJlZmFjdG9y IHRvIGF2b2lkIHNpbWlsYXIgY29kZSBpbiBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKS4KKyAgICAg ICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIGNvbXB1dGVkVmFsdWVzOworICAgICAgICBj b21wdXRlTG9naWNhbEhlaWdodChwcmVmZXJyZWRNYWluQXhpc0V4dGVudCwgbG9naWNhbFRvcCgp LCBjb21wdXRlZFZhbHVlcyk7CisgICAgICAgIGNvbnRlbnRFeHRlbnQgPSBjb21wdXRlZFZhbHVl cy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgLSBzY3JvbGxiYXJM b2dpY2FsSGVpZ2h0KCk7CiAgICAgfQogCiAgICAgcmV0dXJuIGNvbnRlbnRFeHRlbnQgLSBwcmVm ZXJyZWRNYWluQXhpc0V4dGVudDsKQEAgLTgwMSwxMyArNzk2LDEwIEBAIExheW91dFVuaXQgUmVu ZGVyRmxleGlibGVCb3g6OmxpbmVCcmVha0xlbmd0aCgpCiAgICAgaWYgKCFpc0NvbHVtbkZsb3co KSkKICAgICAgICAgcmV0dXJuIG1haW5BeGlzQ29udGVudEV4dGVudCgpOwogCi0gICAgTGF5b3V0 VW5pdCBoZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWFpbk9yUHJlZmVycmVk U2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKTsKLSAgICBpZiAoaGVpZ2h0ID09IC0xKQot ICAgICAgICBoZWlnaHQgPSBNQVhfTEFZT1VUX1VOSVQ7Ci0gICAgTGF5b3V0VW5pdCBtYXhIZWln aHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWF4U2l6ZSwgc3R5bGUoKS0+bG9naWNh bE1heEhlaWdodCgpKTsKLSAgICBpZiAobWF4SGVpZ2h0ICE9IC0xKQotICAgICAgICBoZWlnaHQg PSBzdGQ6Om1pbihoZWlnaHQsIG1heEhlaWdodCk7Ci0gICAgcmV0dXJuIGhlaWdodDsKKyAgICAv LyBGSVhNRTogUmVmYWN0b3IgdG8gYXZvaWQgc2ltaWxhciBjb2RlIGluIG1haW5BeGlzQ29udGVu dEV4dGVudCgpLgorICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBjb21wdXRlZFZhbHVl czsKKyAgICBjb21wdXRlTG9naWNhbEhlaWdodChNQVhfTEFZT1VUX1VOSVQsIGxvZ2ljYWxUb3Ao KSwgY29tcHV0ZWRWYWx1ZXMpOworICAgIHJldHVybiBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAt IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgLSBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0 KCk7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZv ck1pbkFuZE1heChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSwgTGF5b3V0 VW5pdCBmbGV4Ym94QXZhaWxhYmxlQ29udGVudEV4dGVudCkKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5NzkxNDRiMTVjNTA3 NmVhYzUxYzE1ODI1MmNlMjE2MTAxMTBjMjdlLi4zZTRiYTNmZWY0YzU5YTAyNTBjZDEwYTY2NWJi M2JjYTk4MmYxMTc2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDktMTIgIFRvbnkgQ2hh bmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBmbGV4IGl0ZW0gc2l6ZWQgaW5jb3Jy ZWN0bHkgaW4gYSBjb2x1bW4gZmxleGJveCB3aXRoIGhlaWdodCBzZXQgdmlhIHRvcC9ib3R0b20K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODU1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KKworICAgICAgICBUZXN0IHdoZXJlIHRo ZSBoZWlnaHQgb2YgYSBjb2x1bW4gZmxleGJveCBpcyBzZXQgdmlhIHRvcCBhbmQgYm90dG9tLgor CisgICAgICAgICogY3NzMy9mbGV4Ym94L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJvdHRv bS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJveC9jb2x1bW5zLWhl aWdodC1zZXQtdmlhLXRvcC1ib3R0b20uaHRtbDogQWRkZWQuCisKIDIwMTItMDktMTIgIEpvc2h1 YSBCZWxsICA8anNiZWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6IFRoZSB8 c291cmNlfCBwcm9wZXJ0eSBvZiBJREJGYWN0b3J5Lm9wZW4oKSByZXF1ZXN0IHNob3VsZCBiZSBu dWxsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvY29sdW1ucy1oZWlnaHQt c2V0LXZpYS10b3AtYm90dG9tLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJv eC9jb2x1bW5zLWhlaWdodC1zZXQtdmlhLXRvcC1ib3R0b20tZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjM4ZTAzNTI1MTU1YzFiZDJjZDY0ODVkZTIzNWVkYjQyZDU0YWZhMWYKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvY29sdW1ucy1oZWlnaHQtc2V0LXZpYS10 b3AtYm90dG9tLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK1BBU1MKK1BBU1MKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jb2x1bW5zLWhlaWdodC1zZXQtdmlhLXRv cC1ib3R0b20uaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jb2x1bW5zLWhlaWdodC1z ZXQtdmlhLXRvcC1ib3R0b20uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42MGFiODZkZjVmMWM1OTU2NmQwZGU0 NDdlMzU2N2FjYzllYzY2NmRkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9m bGV4Ym94L2NvbHVtbnMtaGVpZ2h0LXNldC12aWEtdG9wLWJvdHRvbS5odG1sCkBAIC0wLDAgKzEs NDggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAg ICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICB3aWR0aDogMTAw cHg7CisgICAgYm9yZGVyOiAycHggc29saWQgb3JhbmdlOworfQorLmZsZXhib3ggeworICAgIGRp c3BsYXk6IC13ZWJraXQtZmxleDsKKyAgICAtd2Via2l0LWZsZXgtZmxvdzogY29sdW1uOworICAg IHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDA7CisgICAgcmlnaHQ6IDA7CisgICAgYm90 dG9tOiAwOworICAgIGxlZnQ6IDA7CisgICAgcGFkZGluZzogMTBweDsKK30KKy5mbGV4Ym94ID4g Om50aC1jaGlsZCgxKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlOworfQorLmZs ZXhib3ggPiA6bnRoLWNoaWxkKDIpIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGdyZWVu OworfQorPC9zdHlsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVz dFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvY2hlY2stbGF5b3V0LmpzIj48L3NjcmlwdD4KKzxib2R5IG9ubG9hZD0iY2hlY2tMYXlv dXQoJy5mbGV4Ym94JykiPgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9MTAwIGNsYXNzPSJmbGV4Ym94Ij4KKyAgICAgICAgPGRpdiBkYXRh LWV4cGVjdGVkLWhlaWdodD0zMCBkYXRhLWV4cGVjdGVkLXdpZHRoPTgwIHN0eWxlPSJoZWlnaHQ6 IDMwcHgiPjwvZGl2PgorICAgICAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTUwIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9ODAgc3R5bGU9Ii13ZWJraXQtZmxleDogMSI+PC9kaXY+CisgICAgPC9k aXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IHN0eWxlPSIt d2Via2l0LWZsZXgtd3JhcDogd3JhcCIgY2xhc3M9ImZsZXhib3giPgorICAgICAgICA8ZGl2IGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PTUwIGRhdGEtZXhwZWN0ZWQtd2lkdGg9NDAgc3R5bGU9ImhlaWdo dDogNTBweCI+PC9kaXY+CisgICAgICAgIDxkaXYgZGF0YS1leHBlY3RlZC1oZWlnaHQ9ODAgZGF0 YS1leHBlY3RlZC13aWR0aD00MCBzdHlsZT0iLXdlYmtpdC1mbGV4OiAxIDUwcHgiPjwvZGl2Pgor ICAgIDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==