57367 2011-03-29 11:34:40 -0700 Rename BidiResolver::last to m_last to match modern style 2011-03-29 16:34:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 57363 57369 1 eric eric abarth commit-queue rniwa oldest_to_newest 375587 0 eric 2011-03-29 11:34:40 -0700 Rename BidiResolver::last to m_last to match modern style 375589 1 87376 eric 2011-03-29 11:35:39 -0700 Created attachment 87376 Patch 375590 2 87376 dglazkov 2011-03-29 11:36:42 -0700 Comment on attachment 87376 Patch m_stamp 375867 3 commit-queue 2011-03-29 16:31:15 -0700 The commit-queue encountered the following flaky tests while processing attachment 87376: inspector/debugger/source-frame.html bug 57399 (author: podivilov@chromium.org) The commit-queue is continuing to process your patch. 375870 4 87376 commit-queue 2011-03-29 16:34:16 -0700 Comment on attachment 87376 Patch Clearing flags on attachment: 87376 Committed r82354: <http://trac.webkit.org/changeset/82354> 375871 5 commit-queue 2011-03-29 16:34:21 -0700 All reviewed patches have been landed. Closing bug. 87376 2011-03-29 11:35:39 -0700 2011-03-29 16:34:16 -0700 Patch bug-57367-20110329203533.patch text/plain 10905 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NWFhZTA5MzgyODRmYWE0 NzUyYmQyMWMwZmQ3YzlhN2U3ZmRmZjg2Li45YjAyN2I3ODhmNWE5ZTBiMGI0ODdlOGFkNTZlZTRh MWVhOWMzYmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTggQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgQmlkaVJlc29sdmVyOjpsYXN0 IHRvIG1fbGFzdCB0byBtYXRjaCBtb2Rlcm4gc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzY3CisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0 L0JpZGlSZXNvbHZlci5oOgorICAgICAgICAoV2ViQ29yZTo6Ojpsb3dlckV4cGxpY2l0RW1iZWRk aW5nTGV2ZWwpOgorICAgICAgICAoV2ViQ29yZTo6OjpyYWlzZUV4cGxpY2l0RW1iZWRkaW5nTGV2 ZWwpOgorICAgICAgICAoV2ViQ29yZTo6OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUpOgorCisyMDEx LTAzLTI5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBSZW5hbWUgQmlkaVJlc29sdmVyOjpjdXJy ZW50IHRvIEJpZGlSZXNvbHZlcjo6bV9jdXJyZW50IHRvIG1hdGNoIG1vZGVybiBzdHlsZQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNjMKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKaW5kZXggNDMxNmYzNGYz YWJmZTc0YzFkNWM0ZTM1ZmJhODYxMDU3YTViZDEyYS4uN2I2ZGZhYWFiNmQxYjUwNzIzY2QzYzEz YjYyNjc0MDQ0NTU1ZmViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9CaWRpUmVzb2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlS ZXNvbHZlci5oCkBAIC0xOTEsNyArMTkxLDcgQEAgcHJvdGVjdGVkOgogICAgIEl0ZXJhdG9yIG1f Y3VycmVudDsKICAgICBJdGVyYXRvciBzb3I7CiAgICAgSXRlcmF0b3IgZW9yOwotICAgIEl0ZXJh dG9yIGxhc3Q7CisgICAgSXRlcmF0b3IgbV9sYXN0OwogICAgIEJpZGlTdGF0dXMgbV9zdGF0dXM7 CiAgICAgV1RGOjpVbmljb2RlOjpEaXJlY3Rpb24gbV9kaXJlY3Rpb247CiAgICAgSXRlcmF0b3Ig ZW5kT2ZMaW5lOwpAQCAtMzM5LDcgKzMzOSw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9y LCBSdW4+Ojpsb3dlckV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwoV1RGOjpVbmljb2RlOjpEaXJlCiB7 CiAgICAgdXNpbmcgbmFtZXNwYWNlIFdURjo6VW5pY29kZTsKIAotICAgIGlmICghZW1wdHlSdW4g JiYgZW9yICE9IGxhc3QpIHsKKyAgICBpZiAoIWVtcHR5UnVuICYmIGVvciAhPSBtX2xhc3QpIHsK ICAgICAgICAgY2hlY2tEaXJlY3Rpb25Jbkxvd2VyUmFpc2VFbWJlZGRpbmdMZXZlbCgpOwogICAg ICAgICAvLyBiaWRpLnNvciAuLi4gYmlkaS5lb3IgLi4uIGJpZGkubGFzdCBlb3I7IG5lZWQgdG8g YXBwZW5kIHRoZSBiaWRpLnNvci1iaWRpLmVvciBydW4gb3IgZXh0ZW5kIGl0IHRocm91Z2ggYmlk aS5sYXN0CiAgICAgICAgIGlmIChmcm9tID09IExlZnRUb1JpZ2h0KSB7CkBAIC0zNjAsNyArMzYw LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46Omxvd2VyRXhwbGljaXRFbWJl ZGRpbmdMZXZlbChXVEY6OlVuaWNvZGU6OkRpcmUKICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwog ICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKICAgICAgICAgfQotICAgICAg ICBlb3IgPSBsYXN0OworICAgICAgICBlb3IgPSBtX2xhc3Q7CiAgICAgfQogICAgIGFwcGVuZFJ1 bigpOwogICAgIGVtcHR5UnVuID0gdHJ1ZTsKQEAgLTM3NSw3ICszNzUsNyBAQCB2b2lkIEJpZGlS ZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6cmFpc2VFeHBsaWNpdEVtYmVkZGluZ0xldmVsKFdURjo6 VW5pY29kZTo6RGlyZQogewogICAgIHVzaW5nIG5hbWVzcGFjZSBXVEY6OlVuaWNvZGU7CiAKLSAg ICBpZiAoIWVtcHR5UnVuICYmIGVvciAhPSBsYXN0KSB7CisgICAgaWYgKCFlbXB0eVJ1biAmJiBl b3IgIT0gbV9sYXN0KSB7CiAgICAgICAgIGNoZWNrRGlyZWN0aW9uSW5Mb3dlclJhaXNlRW1iZWRk aW5nTGV2ZWwoKTsKICAgICAgICAgLy8gYmlkaS5zb3IgLi4uIGJpZGkuZW9yIC4uLiBiaWRpLmxh c3QgZW9yOyBuZWVkIHRvIGFwcGVuZCB0aGUgYmlkaS5zb3ItYmlkaS5lb3IgcnVuIG9yIGV4dGVu ZCBpdCB0aHJvdWdoIGJpZGkubGFzdAogICAgICAgICBpZiAodG8gPT0gTGVmdFRvUmlnaHQpIHsK QEAgLTM5OCw3ICszOTgsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6cmFp c2VFeHBsaWNpdEVtYmVkZGluZ0xldmVsKFdURjo6VW5pY29kZTo6RGlyZQogICAgICAgICAgICAg YXBwZW5kUnVuKCk7CiAgICAgICAgICAgICBtX2RpcmVjdGlvbiA9IFJpZ2h0VG9MZWZ0OwogICAg ICAgICB9Ci0gICAgICAgIGVvciA9IGxhc3Q7CisgICAgICAgIGVvciA9IG1fbGFzdDsKICAgICB9 CiAgICAgYXBwZW5kUnVuKCk7CiAgICAgZW1wdHlSdW4gPSB0cnVlOwpAQCAtNTkwLDcgKzU5MCw3 IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0Zvckxp bmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAKICAgICBlb3IgPSBJdGVyYXRvcigpOwogCi0g ICAgbGFzdCA9IG1fY3VycmVudDsKKyAgICBtX2xhc3QgPSBtX2N1cnJlbnQ7CiAgICAgYm9vbCBw YXN0RW5kID0gZmFsc2U7CiAgICAgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+IHN0YXRlQXRF bmQ7CiAKQEAgLTY2Miw3ICs2NjIsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVu Pjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChjb250ZXh0KCktPmRpcigpICE9IExlZnRUb1JpZ2h0KSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIHRoZSBuZXV0cmFscyB0YWtlIHRoZSBlbWJlZGRpbmcg ZGlyZWN0aW9uLCB3aGljaCBpcyBSCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVv ciA9IGxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVvciA9IG1fbGFzdDsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVm dDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfQpAQCAtNjczLDE0ICs2NzMsMTQgQEAgdm9pZCBCaWRpUmVz b2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRv ciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGNvbnRleHQoKS0+ZGlyKCkgIT0gTGVmdFRvUmlnaHQpIHsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1i ZWRkaW5nIGRpcmVjdGlvbiwgd2hpY2ggaXMgUgotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGVvciA9IGxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9sYXN0Owog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gUmlnaHRUb0xlZnQ7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdGF0dXMubGFzdFN0 cm9uZyAhPSBMZWZ0VG9SaWdodCkgewogICAgICAgICAgICAgICAgICAgICAgICAgLy9sYXN0IHN0 dWZmIHRha2VzIGVtYmVkZGluZyBkaXIKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChjb250 ZXh0KCktPmRpcigpID09IFJpZ2h0VG9MZWZ0KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgZW9yID0gbGFzdDsgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9sYXN0 OyAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlvbiA9IFJpZ2h0VG9MZWZ0 OwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgYXBw ZW5kUnVuKCk7CkBAIC03MTMsMTMgKzcxMywxMyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRv ciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwog ICAgICAgICAgICAgICAgIGNhc2UgT3RoZXJOZXV0cmFsOgogICAgICAgICAgICAgICAgICAgICBp ZiAobV9zdGF0dXMuZW9yID09IEV1cm9wZWFuTnVtYmVyKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAobV9zdGF0dXMubGFzdFN0cm9uZyA9PSBMZWZ0VG9SaWdodCAmJiBjb250ZXh0KCkt PmRpcigpID09IExlZnRUb1JpZ2h0KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVvciA9 IGxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9sYXN0OwogICAgICAg ICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAobV9zdGF0dXMuZW9yID09IEFyYWJpY051bWJlcikKICAgICAgICAgICAgICAgICAgICAg ICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChtX3N0YXR1cy5s YXN0U3Ryb25nID09IExlZnRUb1JpZ2h0KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo Y29udGV4dCgpLT5kaXIoKSA9PSBMZWZ0VG9SaWdodCkKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBlb3IgPSBsYXN0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVvciA9IG1fbGFz dDsKICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgZGVmYXVsdDoKQEAgLTc0Myw3ICs3NDMsNyBAQCB2b2lk IEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0 IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgICAgICBjYXNlIFJpZ2h0VG9MZWZ0 OgogICAgICAgICAgICAgICAgICAgICBjYXNlIFJpZ2h0VG9MZWZ0QXJhYmljOgogICAgICAgICAg ICAgICAgICAgICBjYXNlIEFyYWJpY051bWJlcjoKLSAgICAgICAgICAgICAgICAgICAgICAgIGVv ciA9IGxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CiAgICAgICAg ICAgICAgICAgICAgICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1f ZGlyZWN0aW9uID0gRXVyb3BlYW5OdW1iZXI7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKQEAgLTc2Myw3ICs3NjMsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6 Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBUZXJtaW5hdGUgdGhlIEVOIHJ1bi4KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIE1ha2UgYW4gUiBydW4uCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVvciA9IG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1iZXJUZXJtaW5hdG9yID8g bGFzdEJlZm9yZUVUIDogbGFzdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9y ID0gbV9zdGF0dXMubGFzdCA9PSBFdXJvcGVhbk51bWJlclRlcm1pbmF0b3IgPyBsYXN0QmVmb3Jl RVQgOiBtX2xhc3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9u ID0gUmlnaHRUb0xlZnQ7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1 bigpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBCZWdpbiBhIG5ldyBFTiBy dW4uCkBAIC03NzQsNyArNzc0LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46 OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAobV9zdGF0dXMubGFzdFN0cm9uZyA9PSBSaWdodFRvTGVmdCB8fCBjb250ZXh0KCkt PmRpcigpID09IFJpZ2h0VG9MZWZ0KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8vIE1ha2UgYW4gUiBydW4uCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVvciA9 IG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1iZXJUZXJtaW5hdG9yID8gbGFzdEJlZm9yZUVU IDogbGFzdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9zdGF0dXMu bGFzdCA9PSBFdXJvcGVhbk51bWJlclRlcm1pbmF0b3IgPyBsYXN0QmVmb3JlRVQgOiBtX2xhc3Q7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gUmlnaHRUb0xl ZnQ7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBCZWdpbiBhIG5ldyBFTiBydW4uCkBAIC03ODIs NyArNzgyLDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlS dW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG1fc3RhdHVzLmxh c3RTdHJvbmcgPT0gUmlnaHRUb0xlZnQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBFeHRlbmQgdGhlIFIgcnVuIHRvIGluY2x1ZGUgdGhlIG5ldXRyYWxzLgotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVvciA9IG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1iZXJUZXJt aW5hdG9yID8gbGFzdEJlZm9yZUVUIDogbGFzdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlb3IgPSBtX3N0YXR1cy5sYXN0ID09IEV1cm9wZWFuTnVtYmVyVGVybWluYXRvciA/IGxhc3RC ZWZvcmVFVCA6IG1fbGFzdDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlv biA9IFJpZ2h0VG9MZWZ0OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEJlZ2luIGEgbmV3IEVOIHJ1bi4KQEAg LTgwOSw3ICs4MDksNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRl QmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAg IGNhc2UgUmlnaHRUb0xlZnQ6CiAgICAgICAgICAgICAgICAgY2FzZSBSaWdodFRvTGVmdEFyYWJp YzoKICAgICAgICAgICAgICAgICBjYXNlIEV1cm9wZWFuTnVtYmVyOgotICAgICAgICAgICAgICAg ICAgICBlb3IgPSBsYXN0OworICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CiAgICAg ICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICBjYXNlIENvbW1vbk51bWJlclNlcGFyYXRvcjoKQEAgLTgzMSw3ICs4 MzEsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNG b3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgICAgICAgICAg bV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlm IChtX2RpcmVjdGlvbiA9PSBPdGhlck5ldXRyYWwpCiAgICAgICAgICAgICAgICAgICAgICAgICBt X2RpcmVjdGlvbiA9IG1fc3RhdHVzLmxhc3RTdHJvbmcgPT0gTGVmdFRvUmlnaHQgPyBMZWZ0VG9S aWdodCA6IFJpZ2h0VG9MZWZ0OwotICAgICAgICAgICAgICAgICAgICBlb3IgPSBsYXN0OworICAg ICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CiAgICAgICAgICAgICAgICAgICAgIGFwcGVu ZFJ1bigpOwogICAgICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwpAQCAtODUwLDEyICs4NTAsMTIgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1 bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAg ICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICAgICAgbV9zdGF0dXMuZW9y ID0gZGlyQ3VycmVudDsKICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdGF0dXMubGFzdCAhPSBF dXJvcGVhbk51bWJlclRlcm1pbmF0b3IpCi0gICAgICAgICAgICAgICAgbGFzdEJlZm9yZUVUID0g ZW1wdHlSdW4gPyBlb3IgOiBsYXN0OworICAgICAgICAgICAgICAgIGxhc3RCZWZvcmVFVCA9IGVt cHR5UnVuID8gZW9yIDogbV9sYXN0OwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgLy8g Ym91bmRhcnkgbmV1dHJhbHMgc2hvdWxkIGJlIGlnbm9yZWQKICAgICAgICAgY2FzZSBCb3VuZGFy eU5ldXRyYWw6Ci0gICAgICAgICAgICBpZiAoZW9yID09IGxhc3QpCisgICAgICAgICAgICBpZiAo ZW9yID09IG1fbGFzdCkKICAgICAgICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIC8vIG5ldXRyYWxzCkBAIC04OTQsNyArODk0LDcgQEAg dm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShj b25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgIG1fc3RhdHVzID0gc3RhdGVBdEVu ZC5tX3N0YXR1czsKICAgICAgICAgICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKICAgICAgICAg ICAgIGVvciA9IHN0YXRlQXRFbmQuZW9yOwotICAgICAgICAgICAgbGFzdCA9IHN0YXRlQXRFbmQu bGFzdDsKKyAgICAgICAgICAgIG1fbGFzdCA9IHN0YXRlQXRFbmQubV9sYXN0OwogICAgICAgICAg ICAgbV9yZWFjaGVkRW5kT2ZMaW5lID0gc3RhdGVBdEVuZC5tX3JlYWNoZWRFbmRPZkxpbmU7CiAg ICAgICAgICAgICBsYXN0QmVmb3JlRVQgPSBzdGF0ZUF0RW5kLmxhc3RCZWZvcmVFVDsKICAgICAg ICAgICAgIGVtcHR5UnVuID0gc3RhdGVBdEVuZC5lbXB0eVJ1bjsKQEAgLTkwMyw3ICs5MDMsNyBA QCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5l KGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICB9CiAKICAgICAgICAgdXBkYXRlU3Rh dHVzTGFzdEZyb21DdXJyZW50RGlyZWN0aW9uKGRpckN1cnJlbnQpOwotICAgICAgICBsYXN0ID0g bV9jdXJyZW50OworICAgICAgICBtX2xhc3QgPSBtX2N1cnJlbnQ7CiAKICAgICAgICAgaWYgKGVt cHR5UnVuKSB7CiAgICAgICAgICAgICBzb3IgPSBtX2N1cnJlbnQ7CkBAIC05MTgsNyArOTE4LDcg QEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGlu ZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICBtX3N0YXR1cyA9IHN0 YXRlQXRFbmQubV9zdGF0dXM7CiAgICAgICAgICAgICAgICAgc29yID0gc3RhdGVBdEVuZC5zb3I7 IAogICAgICAgICAgICAgICAgIGVvciA9IHN0YXRlQXRFbmQuZW9yOwotICAgICAgICAgICAgICAg IGxhc3QgPSBzdGF0ZUF0RW5kLmxhc3Q7CisgICAgICAgICAgICAgICAgbV9sYXN0ID0gc3RhdGVB dEVuZC5tX2xhc3Q7CiAgICAgICAgICAgICAgICAgbV9yZWFjaGVkRW5kT2ZMaW5lID0gc3RhdGVB dEVuZC5tX3JlYWNoZWRFbmRPZkxpbmU7CiAgICAgICAgICAgICAgICAgbGFzdEJlZm9yZUVUID0g c3RhdGVBdEVuZC5sYXN0QmVmb3JlRVQ7CiAgICAgICAgICAgICAgICAgZW1wdHlSdW4gPSBzdGF0 ZUF0RW5kLmVtcHR5UnVuOwpAQCAtOTMzLDExICs5MzMsMTEgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8 SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5k LCBWaXMKICAgICAgICAgICAgIHN0YXRlQXRFbmQubV9zdGF0dXMgPSBtX3N0YXR1czsKICAgICAg ICAgICAgIHN0YXRlQXRFbmQuc29yID0gc29yOyAKICAgICAgICAgICAgIHN0YXRlQXRFbmQuZW9y ID0gZW9yOwotICAgICAgICAgICAgc3RhdGVBdEVuZC5sYXN0ID0gbGFzdDsKKyAgICAgICAgICAg IHN0YXRlQXRFbmQubV9sYXN0ID0gbV9sYXN0OwogICAgICAgICAgICAgc3RhdGVBdEVuZC5tX3Jl YWNoZWRFbmRPZkxpbmUgPSBtX3JlYWNoZWRFbmRPZkxpbmU7CiAgICAgICAgICAgICBzdGF0ZUF0 RW5kLmxhc3RCZWZvcmVFVCA9IGxhc3RCZWZvcmVFVDsKICAgICAgICAgICAgIHN0YXRlQXRFbmQu ZW1wdHlSdW4gPSBlbXB0eVJ1bjsKLSAgICAgICAgICAgIGVuZE9mTGluZSA9IGxhc3Q7CisgICAg ICAgICAgICBlbmRPZkxpbmUgPSBtX2xhc3Q7CiAgICAgICAgICAgICBwYXN0RW5kID0gdHJ1ZTsK ICAgICAgICAgfQogICAgIH0K