57326 2011-03-29 03:56:38 -0700 Remove a bunch of duplicate code by adding some InlineIterator helper methods 2011-03-29 11:19:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth commit-queue eric mitz rniwa webkit.review.bot oldest_to_newest 375175 0 eric 2011-03-29 03:56:38 -0700 Remove a bunch of duplicate code by adding some InlineIterator helper methods 375177 1 87295 eric 2011-03-29 03:59:49 -0700 Created attachment 87295 Patch 375189 2 87295 rniwa 2011-03-29 04:38:04 -0700 Comment on attachment 87295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87295&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:1949 > if (!currentCharacterIsWS && previousCharacterIsWS) { > - if (autoWrap && o->style()->breakOnlyAfterWhiteSpace()) { > - lBreak.m_obj = o; > - lBreak.m_pos = pos; > - lBreak.m_nextBreakablePosition = nextBreakable; > - } > + if (autoWrap && o->style()->breakOnlyAfterWhiteSpace()) > + lBreak.moveTo(o, pos, nextBreakable); We should just combine these two if statements. 375195 3 87295 eric 2011-03-29 04:56:47 -0700 Comment on attachment 87295 Patch Next patch. 375244 4 87295 commit-queue 2011-03-29 06:20:37 -0700 Comment on attachment 87295 Patch Rejecting attachment 87295 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-8', 'apply-..." exit_code: 2 Last 500 characters of output: FAILED at 1683. Hunk #5 FAILED at 1754. Hunk #6 FAILED at 1850. Hunk #7 FAILED at 1889. Hunk #8 FAILED at 1899. Hunk #9 FAILED at 1908. Hunk #10 FAILED at 1945. Hunk #11 FAILED at 2008. Hunk #12 FAILED at 2038. Hunk #13 FAILED at 2055. Hunk #14 FAILED at 2064. 13 out of 14 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderBlockLineLayout.cpp.rej 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/8282306 375260 5 87295 commit-queue 2011-03-29 06:40:47 -0700 Comment on attachment 87295 Patch Rejecting attachment 87295 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: FAILED at 1683. Hunk #5 FAILED at 1754. Hunk #6 FAILED at 1850. Hunk #7 FAILED at 1889. Hunk #8 FAILED at 1899. Hunk #9 FAILED at 1908. Hunk #10 FAILED at 1945. Hunk #11 FAILED at 2008. Hunk #12 FAILED at 2038. Hunk #13 FAILED at 2055. Hunk #14 FAILED at 2064. 13 out of 14 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderBlockLineLayout.cpp.rej 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/8283285 375507 6 commit-queue 2011-03-29 10:41:28 -0700 The commit-queue encountered the following flaky tests while processing attachment 87295: java/lc3/JSObject/ToObject-001.html bug 53091 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 375512 7 87295 commit-queue 2011-03-29 10:45:03 -0700 Comment on attachment 87295 Patch Clearing flags on attachment: 87295 Committed r82277: <http://trac.webkit.org/changeset/82277> 375513 8 commit-queue 2011-03-29 10:45:08 -0700 All reviewed patches have been landed. Closing bug. 375562 9 webkit.review.bot 2011-03-29 11:19:25 -0700 http://trac.webkit.org/changeset/82277 might have broken Leopard Intel Debug (Tests) 87295 2011-03-29 03:59:49 -0700 2011-03-29 10:45:03 -0700 Patch bug-57326-20110329125947.patch text/plain 11367 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyMTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NjU1ZTYxNzJlM2JlY2Fh MmIxODdkYTI2ODVmZTkwMzdjN2NlYjQxLi4yNjkwOWMzMmI1ZmZjMjkzMmY4NmY4YmY4NDRmZDYz ZWU0YTM4YWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjggQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW1vdmUgYSBidW5jaCBvZiBkdXBsaWNh dGUgY29kZSBieSBhZGRpbmcgc29tZSBJbmxpbmVJdGVyYXRvciBoZWxwZXIgbWV0aG9kcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczMjYKKworICAg ICAgICBPbmNlIEkgc3RhcnRlZCBhZGRpbmcgdGhlc2UgaXQgYmVjYW1lIGNsZWFyIGhvdyBtdWNo IGNyYXp5IGR1cGxpY2F0ZWQgY29kZQorICAgICAgICB3ZSBoYWQgZHVlIHRvIHRyZWF0aW5nIElu bGluZUl0ZXJhdG9yIGFzIGEgc3RydWN0IGFuZCBhY2Nlc3NpbmcgaXRzCisgICAgICAgIG1lbWJl cnMgZGlyZWN0bHkuICBXZSBjYW4ndCBxdWl0ZSBtYWtlIHRoZSBtZW1iZXJzIHByaXZhdGUgeWV0 IHNpbmNlCisgICAgICAgIGZpbmROZXh0TGluZUJyZWFrIHN0aWxsIHNwbGl0cyBvdXQgdGhlIG1l bWJlcnMuICBCdXQgdGhpcyBjaGFuZ2UKKyAgICAgICAgbWFrZXMgdGhlIGNvZGUgbXVjaCBjbGVh bmVyLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChX ZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5l SXRlcmF0b3I6Om1vdmVUb1N0YXJ0T2YpOmkKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJh dG9yOjptb3ZlVG8pOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OmluY3JlbWVu dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp0cnlIeXBoZW5hdGluZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9jazo6ZmluZE5leHRMaW5lQnJlYWspOgorCisyMDExLTAzLTI5ICBFcmljIFNlaWRlbCAgPGVy aWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBSZW5hbWUgSW5saW5lSXRlcmF0b3I6Om5leHRCcmVha2FibGVQb3NpdGlvbiB0byBt X25leHRCcmVha2FibGVQb3NpdGlvbiB0byBtYXRjaCBtb2Rlcm4gc3R5bGUKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzIzCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKaW5kZXggZjI2OWYxNzk4MDAyMTQ4MTc2ZDRl NGY2MDg1MGVlNDhkZmRmYmVkMC4uYjhiMzkzNGU5MzJkMWY0YTIwZjNkZjJlY2E1NzZmMDA1MzRl YTBmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKQEAgLTQ5 LDYgKzQ5LDIxIEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCisgICAgdm9pZCBjbGVhcigpIHsg bW92ZVRvKDAsIDApOyB9CisKKyAgICB2b2lkIG1vdmVUb1N0YXJ0T2YoUmVuZGVyT2JqZWN0KiBv YmplY3QpCisgICAgeworICAgICAgICBBU1NFUlQob2JqZWN0KTsKKyAgICAgICAgbW92ZVRvKG9i amVjdCwgMCk7CisgICAgfQorCisgICAgdm9pZCBtb3ZlVG8oUmVuZGVyT2JqZWN0KiBvYmplY3Qs IHVuc2lnbmVkIG9mZnNldCwgaW50IG5leHRCcmVhayA9IC0xKQorICAgIHsKKyAgICAgICAgbV9v YmogPSBvYmplY3Q7CisgICAgICAgIG1fcG9zID0gb2Zmc2V0OworICAgICAgICBtX25leHRCcmVh a2FibGVQb3NpdGlvbiA9IG5leHRCcmVhazsKKyAgICB9CisKICAgICB2b2lkIGluY3JlbWVudChJ bmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyID0gMCk7CiAgICAgYm9vbCBhdEVuZCgpIGNvbnN0 OwogCkBAIC0xODUsMTYgKzIwMCwxMSBAQCBpbmxpbmUgdm9pZCBJbmxpbmVJdGVyYXRvcjo6aW5j cmVtZW50KElubGluZUJpZGlSZXNvbHZlciogcmVzb2x2ZXIpCiAgICAgICAgIHJldHVybjsKICAg ICBpZiAobV9vYmotPmlzVGV4dCgpKSB7CiAgICAgICAgIG1fcG9zKys7Ci0gICAgICAgIGlmICht X3BvcyA+PSB0b1JlbmRlclRleHQobV9vYmopLT50ZXh0TGVuZ3RoKCkpIHsKLSAgICAgICAgICAg IG1fb2JqID0gYmlkaU5leHQobV9ibG9jaywgbV9vYmosIHJlc29sdmVyKTsKLSAgICAgICAgICAg IG1fcG9zID0gMDsKLSAgICAgICAgICAgIG1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7Ci0g ICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgICBtX29iaiA9IGJpZGlOZXh0KG1fYmxvY2ss IG1fb2JqLCByZXNvbHZlcik7Ci0gICAgICAgIG1fcG9zID0gMDsKLSAgICAgICAgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24gPSAtMTsKKyAgICAgICAgaWYgKG1fcG9zIDwgdG9SZW5kZXJUZXh0KG1f b2JqKS0+dGV4dExlbmd0aCgpKQorICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICAvLyBi aWRpTmV4dCBjYW4gcmV0dXJuIDAsIHNvIHVzZSBtb3ZlVG8gaW5zdGVhZCBvZiBtb3ZlVG9TdGFy dE9mCisgICAgbW92ZVRvKGJpZGlOZXh0KG1fYmxvY2ssIG1fb2JqLCByZXNvbHZlciksIDApOwog fQogCiBpbmxpbmUgYm9vbCBJbmxpbmVJdGVyYXRvcjo6YXRFbmQoKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCBm MmFiZmYyMDJiZmE1ZjY2Y2Q3YTQ0Y2VmNTA4YzE4YmZiZDliMmEwLi4wYzY3ZmJjMDRiNThkNzMz NTQ2NmQ4Yzk5ZmFjOWNiNWVkMmMzYTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtMTUwNCw5ICsxNTA0LDcgQEAgc3Rh dGljIHZvaWQgdHJ5SHlwaGVuYXRpbmcoUmVuZGVyVGV4dCogdGV4dCwgY29uc3QgRm9udCYgZm9u dCwgY29uc3QgQXRvbWljU3RyaW4KICAgICBVTlVTRURfUEFSQU0oaXNGaXhlZFBpdGNoKTsKICNl bmRpZgogCi0gICAgbGluZUJyZWFrLm1fb2JqID0gdGV4dDsKLSAgICBsaW5lQnJlYWsubV9wb3Mg PSBsYXN0U3BhY2UgKyBwcmVmaXhMZW5ndGg7Ci0gICAgbGluZUJyZWFrLm1fbmV4dEJyZWFrYWJs ZVBvc2l0aW9uID0gbmV4dEJyZWFrYWJsZTsKKyAgICBsaW5lQnJlYWsubW92ZVRvKHRleHQsIGxh c3RTcGFjZSArIHByZWZpeExlbmd0aCwgbmV4dEJyZWFrYWJsZSk7CiAgICAgaHlwaGVuYXRlZCA9 IHRydWU7CiB9CiAKQEAgLTE1NDYsNiArMTU0NCw4IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJs b2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29s CiAKICAgICBJbmxpbmVJdGVyYXRvciBsQnJlYWsgPSByZXNvbHZlci5wb3NpdGlvbigpOwogCisg ICAgLy8gRklYTUU6IEl0IGlzIGVycm9yLXByb25lIHRvIHNwbGl0IHRoZSBwb3NpdGlvbiBvYmpl Y3Qgb3V0IGxpa2UgdGhpcy4KKyAgICAvLyBUZWFjaCB0aGlzIGNvZGUgdG8gd29yayB3aXRoIG9i amVjdHMgaW5zdGVhZCBvZiB0aGlzIHNwbGl0IHR1cGxlLgogICAgIFJlbmRlck9iamVjdCogbyA9 IHJlc29sdmVyLnBvc2l0aW9uKCkubV9vYmo7CiAgICAgUmVuZGVyT2JqZWN0KiBsYXN0ID0gbzsK ICAgICB1bnNpZ25lZCBwb3MgPSByZXNvbHZlci5wb3NpdGlvbigpLm1fcG9zOwpAQCAtMTU4NCw5 ICsxNTg0LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFr KElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgIAogICAgICAg ICBpZiAoby0+aXNCUigpKSB7CiAgICAgICAgICAgICBpZiAodyArIHRtcFcgPD0gd2lkdGgpIHsK LSAgICAgICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwotICAgICAgICAgICAgICAgIGxCcmVh ay5tX3BvcyA9IDA7Ci0gICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0 aW9uID0gLTE7CisgICAgICAgICAgICAgICAgbEJyZWFrLm1vdmVUb1N0YXJ0T2Yobyk7CiAgICAg ICAgICAgICAgICAgbEJyZWFrLmluY3JlbWVudCgpOwogCiAgICAgICAgICAgICAgICAgLy8gQSA8 YnI+IGFsd2F5cyBicmVha3MgYSBsaW5lLCBzbyBkb24ndCBsZXQgdGhlIGxpbmUgYmUgY29sbGFw c2VkCkBAIC0xNjg1LDkgKzE2ODMsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6Zmlu ZE5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAg ICAgICAgaWYgKChhdXRvV3JhcCB8fCBSZW5kZXJTdHlsZTo6YXV0b1dyYXAobGFzdFdTKSkgJiYg KCFvLT5pc0ltYWdlKCkgfHwgYWxsb3dJbWFnZXNUb0JyZWFrKSkgewogICAgICAgICAgICAgICAg IHcgKz0gdG1wVzsKICAgICAgICAgICAgICAgICB0bXBXID0gMDsKLSAgICAgICAgICAgICAgICBs QnJlYWsubV9vYmogPSBvOwotICAgICAgICAgICAgICAgIGxCcmVhay5tX3BvcyA9IDA7Ci0gICAg ICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7CisgICAgICAg ICAgICAgICAgbEJyZWFrLm1vdmVUb1N0YXJ0T2Yobyk7CiAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIGlmIChpZ25vcmluZ1NwYWNlcykKQEAgLTE3NTgsOSArMTc1NCw3IEBAIElubGluZUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXIm IHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICBpZiAodC0+aXNXb3JkQnJlYWsoKSkgewogICAg ICAgICAgICAgICAgIHcgKz0gdG1wVzsKICAgICAgICAgICAgICAgICB0bXBXID0gMDsKLSAgICAg ICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwotICAgICAgICAgICAgICAgIGxCcmVhay5tX3Bv cyA9IDA7Ci0gICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0g LTE7CisgICAgICAgICAgICAgICAgbEJyZWFrLm1vdmVUb1N0YXJ0T2Yobyk7CiAgICAgICAgICAg ICAgICAgQVNTRVJUKCFsZW4pOwogICAgICAgICAgICAgfQogCkBAIC0xODU2LDkgKzE4NTAsNyBA QCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlk aVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8v IGFkZGl0aW9uYWwgd2hpdGVzcGFjZS4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo dyArIHRtcFcgKyBjaGFyV2lkdGggPiB3aWR0aCkgewogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBsaW5lV2FzVG9vV2lkZSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGxCcmVhay5tX29iaiA9IG87Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxCcmVhay5tX3BvcyA9IHBvczsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbEJy ZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gbmV4dEJyZWFrYWJsZTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1vdmVUbyhvLCBwb3MsIG5leHRCcmVha2FibGUp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBza2lwVHJhaWxpbmdXaGl0ZXNwYWNl KGxCcmVhaywgaXNMaW5lRW1wdHksIHByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMTg5 Nyw5ICsxODg5LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJy ZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBhZGRNaWRwb2ludChsaW5lTWlkcG9pbnRTdGF0ZSwgSW5saW5lSXRlcmF0b3Io MCwgbywgcG9zIC0gMSkpOyAvLyBTdG9wCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRk TWlkcG9pbnQobGluZU1pZHBvaW50U3RhdGUsIElubGluZUl0ZXJhdG9yKDAsIG8sIHBvcykpOyAv LyBTdGFydAogICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAg ICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX3Bv cyA9IHBvczsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQ b3NpdGlvbiA9IG5leHRCcmVha2FibGU7CisgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsu bW92ZVRvKG8sIHBvcywgbmV4dEJyZWFrYWJsZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBs QnJlYWsuaW5jcmVtZW50KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91c0xpbmVC cm9rZUNsZWFubHkgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGxCcmVh azsKQEAgLTE5MDksOSArMTg5OSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5k TmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAg ICAgICAgICAgICAgICAgICB3ICs9IHRtcFc7CiAgICAgICAgICAgICAgICAgICAgICAgICB3cmFw VyA9IDA7CiAgICAgICAgICAgICAgICAgICAgICAgICB0bXBXID0gMDsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87Ci0gICAgICAgICAgICAgICAgICAgICAgICBsQnJl YWsubV9wb3MgPSBwb3M7Ci0gICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJl YWthYmxlUG9zaXRpb24gPSBuZXh0QnJlYWthYmxlOworICAgICAgICAgICAgICAgICAgICAgICAg bEJyZWFrLm1vdmVUbyhvLCBwb3MsIG5leHRCcmVha2FibGUpOwogICAgICAgICAgICAgICAgICAg ICAgICAgLy8gQXV0by13cmFwcGluZyB0ZXh0IHNob3VsZCBub3Qgd3JhcCBpbiB0aGUgbWlkZGxl IG9mIGEgd29yZCBvbmNlIGl0IGhhcyBoYWQgYW4KICAgICAgICAgICAgICAgICAgICAgICAgIC8v IG9wcG9ydHVuaXR5IHRvIGJyZWFrIGFmdGVyIGEgd29yZC4KICAgICAgICAgICAgICAgICAgICAg ICAgIGJyZWFrV29yZHMgPSBmYWxzZTsKQEAgLTE5MjAsOSArMTkwOCw3IEBAIElubGluZUl0ZXJh dG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJl c29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgICAgIGlmIChtaWRXb3JkQnJlYWspIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIFJlbWVtYmVyIHRoaXMgYXMgYSBicmVha2FibGUgcG9z aXRpb24gaW4gY2FzZQogICAgICAgICAgICAgICAgICAgICAgICAgLy8gYWRkaW5nIHRoZSBlbmQg d2lkdGggZm9yY2VzIGEgYnJlYWsuCi0gICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9v YmogPSBvOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fcG9zID0gcG9zOwotICAg ICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gbmV4 dEJyZWFrYWJsZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tb3ZlVG8obywgcG9z LCBuZXh0QnJlYWthYmxlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1pZFdvcmRCcmVhayAm PSAoYnJlYWtXb3JkcyB8fCBicmVha0FsbCk7CiAgICAgICAgICAgICAgICAgICAgIH0KIApAQCAt MTk1OSwxMSArMTk0NSw4IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExp bmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgaWYgKCFjdXJyZW50Q2hhcmFjdGVySXNXUyAmJiBwcmV2 aW91c0NoYXJhY3RlcklzV1MpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGF1dG9XcmFwICYm IG8tPnN0eWxlKCktPmJyZWFrT25seUFmdGVyV2hpdGVTcGFjZSgpKSB7Ci0gICAgICAgICAgICAg ICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJy ZWFrLm1fcG9zID0gcG9zOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJy ZWFrYWJsZVBvc2l0aW9uID0gbmV4dEJyZWFrYWJsZTsKLSAgICAgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgICAgICBpZiAoYXV0b1dyYXAgJiYgby0+c3R5bGUoKS0+YnJlYWtPbmx5 QWZ0ZXJXaGl0ZVNwYWNlKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubW92ZVRv KG8sIHBvcywgbmV4dEJyZWFrYWJsZSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg ICAgIAogICAgICAgICAgICAgICAgIGlmIChjb2xsYXBzZVdoaXRlU3BhY2UgJiYgY3VycmVudENo YXJhY3RlcklzU3BhY2UgJiYgIWlnbm9yaW5nU3BhY2VzKQpAQCAtMjAyNSw5ICsyMDA4LDcgQEAg SW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlS ZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgaWYgKGNhblBsYWNl T25MaW5lICYmIGNoZWNrRm9yQnJlYWspIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHcgKz0g dG1wVzsKICAgICAgICAgICAgICAgICAgICAgICAgIHRtcFcgPSAwOwotICAgICAgICAgICAgICAg ICAgICAgICAgbEJyZWFrLm1fb2JqID0gbmV4dDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxC cmVhay5tX3BvcyA9IDA7Ci0gICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJl YWthYmxlUG9zaXRpb24gPSAtMTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tb3Zl VG9TdGFydE9mKG5leHQpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQpAQCAtMjA1Nyw5ICsyMDM4LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVu ZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIs IGJvb2wKICAgICAgICAgICAgIGlmIChsYXN0LT5pc1JlcGxhY2VkKCkgJiYgYXV0b1dyYXAgJiYg KCFsYXN0LT5pc0ltYWdlKCkgfHwgYWxsb3dJbWFnZXNUb0JyZWFrKSAmJiAoIWxhc3QtPmlzTGlz dE1hcmtlcigpIHx8IHRvUmVuZGVyTGlzdE1hcmtlcihsYXN0KS0+aXNJbnNpZGUoKSkpIHsKICAg ICAgICAgICAgICAgICB3ICs9IHRtcFc7CiAgICAgICAgICAgICAgICAgdG1wVyA9IDA7Ci0gICAg ICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0gbmV4dDsKLSAgICAgICAgICAgICAgICBsQnJlYWsu bV9wb3MgPSAwOwotICAgICAgICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlv biA9IC0xOworICAgICAgICAgICAgICAgIGxCcmVhay5tb3ZlVG9TdGFydE9mKG5leHQpOwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTIwNzYsMTEgKzIwNTUsOCBAQCBJbmxpbmVJdGVy YXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiBy ZXNvbHZlciwgYm9vbAogICAgIH0KIAogICAgIAotICAgIGlmICh3ICsgdG1wVyA8PSB3aWR0aCB8 fCBsYXN0V1MgPT0gTk9XUkFQKSB7Ci0gICAgICAgIGxCcmVhay5tX29iaiA9IDA7Ci0gICAgICAg IGxCcmVhay5tX3BvcyA9IDA7Ci0gICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlv biA9IC0xOwotICAgIH0KKyAgICBpZiAodyArIHRtcFcgPD0gd2lkdGggfHwgbGFzdFdTID09IE5P V1JBUCkKKyAgICAgICAgbEJyZWFrLmNsZWFyKCk7CiAKICBlbmQ6CiAgICAgaWYgKGxCcmVhayA9 PSByZXNvbHZlci5wb3NpdGlvbigpICYmICghbEJyZWFrLm1fb2JqIHx8ICFsQnJlYWsubV9vYmot PmlzQlIoKSkpIHsKQEAgLTIwODgsMjAgKzIwNjQsMTcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVy QmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJv b2wKICAgICAgICAgaWYgKHN0eWxlKCktPndoaXRlU3BhY2UoKSA9PSBQUkUpIHsKICAgICAgICAg ICAgIC8vIEZJWE1FOiBEb24ndCByZWFsbHkgdW5kZXJzdGFuZCB0aGlzIGNhc2UuCiAgICAgICAg ICAgICBpZiAocG9zICE9IDApIHsKKyAgICAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgY2FsbCBtb3ZlVG8gd2hpY2ggd291bGQgY2xlYXIgbV9uZXh0QnJlYWthYmxlUG9zaXRpb24K KyAgICAgICAgICAgICAgICAvLyB0aGlzIGNvZGUgYXMtaXMgaXMgbGlrZWx5IHdyb25nLgogICAg ICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87CiAgICAgICAgICAgICAgICAgbEJyZWFrLm1f cG9zID0gcG9zIC0gMTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgbEJy ZWFrLm1fb2JqID0gbGFzdDsKLSAgICAgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBsYXN0LT5p c1RleHQoKSA/IGxhc3QtPmxlbmd0aCgpIDogMDsKLSAgICAgICAgICAgICAgICBsQnJlYWsubV9u ZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgICAgIGxCcmVhay5tb3ZlVG8obGFzdCwgbGFzdC0+aXNUZXh0KCkg PyBsYXN0LT5sZW5ndGgoKSA6IDApOwogICAgICAgICB9IGVsc2UgaWYgKGxCcmVhay5tX29iaikg ewogICAgICAgICAgICAgLy8gRG9uJ3QgZXZlciBicmVhayBpbiB0aGUgbWlkZGxlIG9mIGEgd29y ZCBpZiB3ZSBjYW4gaGVscCBpdC4KICAgICAgICAgICAgIC8vIFRoZXJlJ3Mgbm8gcm9vbSBhdCBh bGwuIFdlIGp1c3QgaGF2ZSB0byBiZSBvbiB0aGlzIGxpbmUsCiAgICAgICAgICAgICAvLyBldmVu IHRob3VnaCB3ZSdsbCBzcGlsbCBvdXQuCi0gICAgICAgICAgICBsQnJlYWsubV9vYmogPSBvOwot ICAgICAgICAgICAgbEJyZWFrLm1fcG9zID0gcG9zOwotICAgICAgICAgICAgbEJyZWFrLm1fbmV4 dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7CisgICAgICAgICAgICBsQnJlYWsubW92ZVRvKG8sIHBv cyk7CiAgICAgICAgIH0KICAgICB9CiAK