57323 2011-03-29 03:02:41 -0700 Rename InlineIterator::nextBreakablePosition to m_nextBreakablePosition to match modern style 2011-03-29 07:35:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 50912 1 eric eric abarth commit-queue rniwa oldest_to_newest 375146 0 eric 2011-03-29 03:02:41 -0700 Rename InlineIterator::nextBreakablePosition to m_nextBreakablePosition to match modern style 375148 1 87289 eric 2011-03-29 03:04:47 -0700 Created attachment 87289 Patch 375150 2 87289 rniwa 2011-03-29 03:06:29 -0700 Comment on attachment 87289 Patch cq- because of the change log diff. 375152 3 87289 eric 2011-03-29 03:13:28 -0700 Comment on attachment 87289 Patch The bots are smart enough to fix those types of diffs 375227 4 87289 commit-queue 2011-03-29 06:00:32 -0700 Comment on attachment 87289 Patch Rejecting attachment 87289 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: ith fuzz 2. Hunk #7 succeeded at 1899 with fuzz 2. Hunk #8 succeeded at 1911 with fuzz 2. Hunk #9 succeeded at 1922 with fuzz 2. Hunk #10 succeeded at 1962 with fuzz 2. Hunk #11 succeeded at 2027 with fuzz 2. Hunk #12 succeeded at 2059 with fuzz 2. Hunk #13 succeeded at 2079 with fuzz 2. Hunk #14 succeeded at 2093 with fuzz 2. Hunk #15 succeeded at 2101 with fuzz 2. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Ryosuke Niwa', u'--for..." exit_code: 1 Full output: http://queues.webkit.org/results/8273855 375262 5 87289 commit-queue 2011-03-29 06:45:47 -0700 Comment on attachment 87289 Patch Rejecting attachment 87289 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-4', 'apply-..." exit_code: 2 Last 500 characters of output: at 1 with fuzz 3. patching file Source/WebCore/rendering/InlineIterator.h Hunk #1 succeeded at 37 with fuzz 1. Hunk #2 succeeded at 45 with fuzz 1. Hunk #3 succeeded at 58 with fuzz 1. Hunk #4 FAILED at 188. 1 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/rendering/InlineIterator.h.rej patching file Source/WebCore/rendering/RenderBlockLineLayout.cpp Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Ryosuke Niwa', u'--for..." exit_code: 1 Full output: http://queues.webkit.org/results/8285294 375277 6 87289 eric 2011-03-29 07:07:56 -0700 Comment on attachment 87289 Patch I think this is next in the chain. :) 375313 7 87289 commit-queue 2011-03-29 07:35:28 -0700 Comment on attachment 87289 Patch Clearing flags on attachment: 87289 Committed r82249: <http://trac.webkit.org/changeset/82249> 375314 8 commit-queue 2011-03-29 07:35:33 -0700 All reviewed patches have been landed. Closing bug. 87289 2011-03-29 03:04:47 -0700 2011-03-29 07:35:28 -0700 Patch bug-57323-20110329120444.patch text/plain 9475 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyMTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNmVjN2Q4YzAyYzU5Njhm ZWI4OGI4MWM2YWIwOTBiMTRmYmUyYTA1Li45NjU1ZTYxNzJlM2JlY2FhMmIxODdkYTI2ODVmZTkw MzdjN2NlYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjYgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgSW5saW5lSXRlcmF0b3I6Om5l eHRCcmVha2FibGVQb3NpdGlvbiB0byBtX25leHRCcmVha2FibGVQb3NpdGlvbiB0byBtYXRjaCBt b2Rlcm4gc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU3MzIzCisKKyAgICAgICAgQWxsIG9mIHRoZXNlIG1fbmV4dEJyZWFrYWJsZVBvc2l0aW9u ID0gLTEgY291bGQgcHJvYmFibHkgYmUgcmVwbGFjZWQgd2l0aAorICAgICAgICBzb21lIG5ldyBt ZXRob2RzLiAgQnV0IEknbGwgZG8gdGhhdCBpbiBhIHNlcGFyYXRlIGNoYW5nZS4gIENsZWFybHkK KyAgICAgICAgbV9uZXh0QnJlYWthYmxlUG9zaXRpb24gaXMganVzdCBhIGNhY2hlZCB2YWx1ZSB3 aGljaCBzaG91bGQgYmUgY2xlYXJlZAorICAgICAgICBhdCB0aGUgcmlnaHQgdGltZXMuICBJIHN1 c3BlY3Qgd2UgbWF5IGV2ZW4gZmFpbCB0byBjbGVhciBpdCBzb21ldGltZXMgd2hlbgorICAgICAg ICB3ZSBzaG91bGQgZHVlIHRvIHRoZSBjdXJyZW50IHVzZWQgb2YgZGlyZWN0IGFjY2VzcyBpbnN0 ZWFkIG9mIHNtYXJ0ZXIgZnVuY3Rpb25zLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUl0 ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6SW5saW5lSXRlcmF0 b3IpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OmluY3JlbWVudCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjp0cnlIeXBoZW5hdGluZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6Zmlu ZE5leHRMaW5lQnJlYWspOgorCisyMDExLTAzLTI5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0 Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBS ZW5hbWUgSW5saW5lSXRlcmF0b3I6OmJsb2NrIHRvIG1fYmxvY2sgdG8gbWF0Y2ggbW9kZXJuIHN0 eWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzMy MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3Iu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCmluZGV4IDQyMTQx MzQ0MzFhZGVmYzM1ZmMzOWYwYmJjNDc1NTIxMDVmMTg0ZGMuLmI3NjEyZTBlNDExMGUyZTlkM2Ez ZTFiYzE3ZDJmOTA1YzFiYmFhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJ dGVyYXRvci5oCkBAIC0zNyw3ICszNyw3IEBAIHB1YmxpYzoKICAgICAgICAgOiBtX2Jsb2NrKDAp CiAgICAgICAgICwgbV9vYmooMCkKICAgICAgICAgLCBwb3MoMCkKLSAgICAgICAgLCBuZXh0QnJl YWthYmxlUG9zaXRpb24oLTEpCisgICAgICAgICwgbV9uZXh0QnJlYWthYmxlUG9zaXRpb24oLTEp CiAgICAgewogICAgIH0KIApAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAgICAgICAgIDogbV9i bG9jayhiKQogICAgICAgICAsIG1fb2JqKG8pCiAgICAgICAgICwgcG9zKHApCi0gICAgICAgICwg bmV4dEJyZWFrYWJsZVBvc2l0aW9uKC0xKQorICAgICAgICAsIG1fbmV4dEJyZWFrYWJsZVBvc2l0 aW9uKC0xKQogICAgIHsKICAgICB9CiAKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIFJl bmRlckJsb2NrKiBtX2Jsb2NrOwogICAgIFJlbmRlck9iamVjdCogbV9vYmo7CiAgICAgdW5zaWdu ZWQgcG9zOwotICAgIGludCBuZXh0QnJlYWthYmxlUG9zaXRpb247CisgICAgaW50IG1fbmV4dEJy ZWFrYWJsZVBvc2l0aW9uOwogfTsKIAogaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBJbmxp bmVJdGVyYXRvciYgaXQxLCBjb25zdCBJbmxpbmVJdGVyYXRvciYgaXQyKQpAQCAtMTg4LDEyICsx ODgsMTIgQEAgaW5saW5lIHZvaWQgSW5saW5lSXRlcmF0b3I6OmluY3JlbWVudChJbmxpbmVCaWRp UmVzb2x2ZXIqIHJlc29sdmVyKQogICAgICAgICBpZiAocG9zID49IHRvUmVuZGVyVGV4dChtX29i aiktPnRleHRMZW5ndGgoKSkgewogICAgICAgICAgICAgbV9vYmogPSBiaWRpTmV4dChtX2Jsb2Nr LCBtX29iaiwgcmVzb2x2ZXIpOwogICAgICAgICAgICAgcG9zID0gMDsKLSAgICAgICAgICAgIG5l eHRCcmVha2FibGVQb3NpdGlvbiA9IC0xOworICAgICAgICAgICAgbV9uZXh0QnJlYWthYmxlUG9z aXRpb24gPSAtMTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fb2JqID0gYmlk aU5leHQobV9ibG9jaywgbV9vYmosIHJlc29sdmVyKTsKICAgICAgICAgcG9zID0gMDsKLSAgICAg ICAgbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7CisgICAgICAgIG1fbmV4dEJyZWFrYWJsZVBv c2l0aW9uID0gLTE7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IDg2NGUyODhkOWU5NDMxN2VjYTM5NzE1 YzJmNDY2OGNhOWE2MGYwZjMuLjA2MTA5YTkzYzRjNWFiMDU1ZmNhNmIzMjc3YmI5YTdmNDdlZDZm NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwCkBAIC0xNTA2LDcgKzE1MDYsNyBAQCBzdGF0aWMgdm9pZCB0cnlIeXBoZW5hdGlu ZyhSZW5kZXJUZXh0KiB0ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBBdG9taWNTdHJpbgog CiAgICAgbGluZUJyZWFrLm1fb2JqID0gdGV4dDsKICAgICBsaW5lQnJlYWsucG9zID0gbGFzdFNw YWNlICsgcHJlZml4TGVuZ3RoOwotICAgIGxpbmVCcmVhay5uZXh0QnJlYWthYmxlUG9zaXRpb24g PSBuZXh0QnJlYWthYmxlOworICAgIGxpbmVCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlvbiA9 IG5leHRCcmVha2FibGU7CiAgICAgaHlwaGVuYXRlZCA9IHRydWU7CiB9CiAKQEAgLTE1NDksNyAr MTU0OSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJ bmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgUmVuZGVyT2JqZWN0KiBvID0g cmVzb2x2ZXIucG9zaXRpb24oKS5tX29iajsKICAgICBSZW5kZXJPYmplY3QqIGxhc3QgPSBvOwog ICAgIHVuc2lnbmVkIHBvcyA9IHJlc29sdmVyLnBvc2l0aW9uKCkucG9zOwotICAgIGludCBuZXh0 QnJlYWthYmxlID0gcmVzb2x2ZXIucG9zaXRpb24oKS5uZXh0QnJlYWthYmxlUG9zaXRpb247Cisg ICAgaW50IG5leHRCcmVha2FibGUgPSByZXNvbHZlci5wb3NpdGlvbigpLm1fbmV4dEJyZWFrYWJs ZVBvc2l0aW9uOwogICAgIGJvb2wgYXRTdGFydCA9IHRydWU7CiAKICAgICBib29sIHByZXZMaW5l QnJva2VDbGVhbmx5ID0gcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5OwpAQCAtMTU4Niw3ICsxNTg2 LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGlu ZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgIGlmICh3ICsgdG1wVyA8 PSB3aWR0aCkgewogICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87CiAgICAgICAgICAg ICAgICAgbEJyZWFrLnBvcyA9IDA7Ci0gICAgICAgICAgICAgICAgbEJyZWFrLm5leHRCcmVha2Fi bGVQb3NpdGlvbiA9IC0xOworICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQ b3NpdGlvbiA9IC0xOwogICAgICAgICAgICAgICAgIGxCcmVhay5pbmNyZW1lbnQoKTsKIAogICAg ICAgICAgICAgICAgIC8vIEEgPGJyPiBhbHdheXMgYnJlYWtzIGEgbGluZSwgc28gZG9uJ3QgbGV0 IHRoZSBsaW5lIGJlIGNvbGxhcHNlZApAQCAtMTY4Nyw3ICsxNjg3LDcgQEAgSW5saW5lSXRlcmF0 b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVz b2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICB0bXBXID0gMDsKICAgICAgICAgICAgICAgICBs QnJlYWsubV9vYmogPSBvOwogICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSAwOwotICAgICAg ICAgICAgICAgIGxCcmVhay5uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKKyAgICAgICAgICAg ICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgaWYgKGlnbm9yaW5nU3BhY2VzKQpAQCAtMTc2MCw3ICsxNzYwLDcgQEAg SW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlS ZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICB0bXBXID0gMDsKICAgICAg ICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwogICAgICAgICAgICAgICAgIGxCcmVhay5wb3Mg PSAwOwotICAgICAgICAgICAgICAgIGxCcmVhay5uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsK KyAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAg ICAgICAgICAgICAgICBBU1NFUlQoIWxlbik7CiAgICAgICAgICAgICB9CiAKQEAgLTE4NTgsNyAr MTg1OCw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJ bmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGxpbmVXYXNUb29XaWRlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbEJyZWFrLm1fb2JqID0gbzsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbEJyZWFrLnBvcyA9IHBvczsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbEJy ZWFrLm5leHRCcmVha2FibGVQb3NpdGlvbiA9IG5leHRCcmVha2FibGU7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlvbiA9IG5leHRC cmVha2FibGU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNraXBUcmFpbGluZ1do aXRlc3BhY2UobEJyZWFrLCBpc0xpbmVFbXB0eSwgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KTsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICB9 CkBAIC0xODk5LDcgKzE4OTksNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5l eHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0g bzsKICAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSBwb3M7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBsQnJlYWsubmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gbmV4dEJyZWFrYWJs ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlv biA9IG5leHRCcmVha2FibGU7CiAgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsuaW5jcmVt ZW50KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkg PSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGxCcmVhazsKQEAgLTE5MTEs NyArMTkxMSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVh ayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgICAg ICAgICB0bXBXID0gMDsKICAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87 CiAgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsucG9zID0gcG9zOwotICAgICAgICAgICAg ICAgICAgICAgICAgbEJyZWFrLm5leHRCcmVha2FibGVQb3NpdGlvbiA9IG5leHRCcmVha2FibGU7 CisgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24g PSBuZXh0QnJlYWthYmxlOwogICAgICAgICAgICAgICAgICAgICAgICAgLy8gQXV0by13cmFwcGlu ZyB0ZXh0IHNob3VsZCBub3Qgd3JhcCBpbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBvbmNlIGl0IGhh cyBoYWQgYW4KICAgICAgICAgICAgICAgICAgICAgICAgIC8vIG9wcG9ydHVuaXR5IHRvIGJyZWFr IGFmdGVyIGEgd29yZC4KICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrV29yZHMgPSBmYWxz ZTsKQEAgLTE5MjIsNyArMTkyMiw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5k TmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBhZGRpbmcgdGhlIGVuZCB3aWR0aCBmb3JjZXMgYSBicmVhay4K ICAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87CiAgICAgICAgICAgICAg ICAgICAgICAgICBsQnJlYWsucG9zID0gcG9zOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJy ZWFrLm5leHRCcmVha2FibGVQb3NpdGlvbiA9IG5leHRCcmVha2FibGU7CisgICAgICAgICAgICAg ICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSBuZXh0QnJlYWthYmxl OwogICAgICAgICAgICAgICAgICAgICAgICAgbWlkV29yZEJyZWFrICY9IChicmVha1dvcmRzIHx8 IGJyZWFrQWxsKTsKICAgICAgICAgICAgICAgICAgICAgfQogCkBAIC0xOTYyLDcgKzE5NjIsNyBA QCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlk aVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAgICAgICAgICAgICBpZiAoYXV0b1dy YXAgJiYgby0+c3R5bGUoKS0+YnJlYWtPbmx5QWZ0ZXJXaGl0ZVNwYWNlKCkpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87CiAgICAgICAgICAgICAgICAgICAgICAg ICBsQnJlYWsucG9zID0gcG9zOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm5leHRC cmVha2FibGVQb3NpdGlvbiA9IG5leHRCcmVha2FibGU7CisgICAgICAgICAgICAgICAgICAgICAg ICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSBuZXh0QnJlYWthYmxlOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIApAQCAt MjAyNyw3ICsyMDI3LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGlu ZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAg ICAgICAgICAgIHRtcFcgPSAwOwogICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fb2Jq ID0gbmV4dDsKICAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSAwOwotICAgICAg ICAgICAgICAgICAgICAgICAgbEJyZWFrLm5leHRCcmVha2FibGVQb3NpdGlvbiA9IC0xOworICAg ICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7 CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 CkBAIC0yMDU5LDcgKzIwNTksNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5l eHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAg ICAgICAgIHRtcFcgPSAwOwogICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG5leHQ7CiAg ICAgICAgICAgICAgICAgbEJyZWFrLnBvcyA9IDA7Ci0gICAgICAgICAgICAgICAgbEJyZWFrLm5l eHRCcmVha2FibGVQb3NpdGlvbiA9IC0xOworICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRC cmVha2FibGVQb3NpdGlvbiA9IC0xOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTIw NzksNyArMjA3OSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVC cmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgaWYgKHcgKyB0bXBX IDw9IHdpZHRoIHx8IGxhc3RXUyA9PSBOT1dSQVApIHsKICAgICAgICAgbEJyZWFrLm1fb2JqID0g MDsKICAgICAgICAgbEJyZWFrLnBvcyA9IDA7Ci0gICAgICAgIGxCcmVhay5uZXh0QnJlYWthYmxl UG9zaXRpb24gPSAtMTsKKyAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0g LTE7CiAgICAgfQogCiAgZW5kOgpAQCAtMjA5Myw3ICsyMDkzLDcgQEAgSW5saW5lSXRlcmF0b3Ig UmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2 ZXIsIGJvb2wKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgbEJyZWFrLm1f b2JqID0gbGFzdDsKICAgICAgICAgICAgICAgICBsQnJlYWsucG9zID0gbGFzdC0+aXNUZXh0KCkg PyBsYXN0LT5sZW5ndGgoKSA6IDA7Ci0gICAgICAgICAgICAgICAgbEJyZWFrLm5leHRCcmVha2Fi bGVQb3NpdGlvbiA9IC0xOworICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQ b3NpdGlvbiA9IC0xOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGxCcmVhay5t X29iaikgewogICAgICAgICAgICAgLy8gRG9uJ3QgZXZlciBicmVhayBpbiB0aGUgbWlkZGxlIG9m IGEgd29yZCBpZiB3ZSBjYW4gaGVscCBpdC4KQEAgLTIxMDEsNyArMjEwMSw3IEBAIElubGluZUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXIm IHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAvLyBldmVuIHRob3VnaCB3ZSdsbCBzcGlsbCBv dXQuCiAgICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwogICAgICAgICAgICAgbEJyZWFrLnBv cyA9IHBvczsKLSAgICAgICAgICAgIGxCcmVhay5uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsK KyAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlvbiA9IC0xOwogICAgICAg ICB9CiAgICAgfQogCg==