63471 2011-06-27 12:05:59 -0700 Extract LineBreakIteratorPool class into its own file 2011-06-27 14:10:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned darin joepeck webkit.review.bot oldest_to_newest 428163 0 joepeck 2011-06-27 12:05:59 -0700 Extract LineBreakIteratorPool class into it's own file. 428171 1 98763 joepeck 2011-06-27 12:11:23 -0700 Created attachment 98763 [PATCH] Add LineBreakIteratorPoolICU.h I added it to all the builds that I saw had TextBreakIteratorICU.h 428176 2 webkit.review.bot 2011-06-27 12:17:48 -0700 Attachment 98763 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/text/TextBreakIteratorICU.cpp:26: Alphabetical sorting problem. [build/include_order] [4] Source/WebCore/WebCore.vcproj/WebCore.vcproj:31534: mismatched tag [xml/syntax] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 428178 3 98763 joepeck 2011-06-27 12:22:35 -0700 Comment on attachment 98763 [PATCH] Add LineBreakIteratorPoolICU.h View in context: https://bugs.webkit.org/attachment.cgi?id=98763&action=review >> Source/WebCore/platform/text/TextBreakIteratorICU.cpp:26 >> +#include "LineBreakIteratorPoolICU.h" > > Alphabetical sorting problem. [build/include_order] [4] Whoops, twice in one week... Will fix with other review comments / before landing. 428191 4 98763 darin 2011-06-27 12:35:07 -0700 Comment on attachment 98763 [PATCH] Add LineBreakIteratorPoolICU.h View in context: https://bugs.webkit.org/attachment.cgi?id=98763&action=review > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:2 > + * Copyright (C) 2006 Lars Knoll <lars@trolltech.com> Lars shouldn’t get copyright for this new code. > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:3 > + * Copyright (C) 2007 Apple Inc. All rights reserved. The code you put into this file is all new. The copyright should be 2011, not 2007. > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:34 > +WTF_MAKE_NONCOPYABLE(LineBreakIteratorPool); I think this should be indented. 428236 5 joepeck 2011-06-27 13:43:30 -0700 (In reply to comment #4) > (From update of attachment 98763 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98763&action=review > > > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:2 > > + * Copyright (C) 2006 Lars Knoll <lars@trolltech.com> > > Lars shouldn’t get copyright for this new code. > > > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:3 > > + * Copyright (C) 2007 Apple Inc. All rights reserved. > > The code you put into this file is all new. The copyright should be 2011, not 2007. Wow, I didn't realize how new it was! That sounds good. http://trac.webkit.org/changeset/89592 > > Source/WebCore/platform/text/LineBreakIteratorPoolICU.h:34 > > +WTF_MAKE_NONCOPYABLE(LineBreakIteratorPool); > > I think this should be indented. Okay, will fix. 428277 6 joepeck 2011-06-27 14:10:37 -0700 Landed in r89851: <http://trac.webkit.org/changeset/89851>. 98763 2011-06-27 12:11:23 -0700 2011-06-27 12:35:07 -0700 [PATCH] Add LineBreakIteratorPoolICU.h extract.patch text/plain 12038 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOGEwNzliLi5hMDYzYTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMDYtMjcgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRyYWN0IExp bmVCcmVha0l0ZXJhdG9yUG9vbCBjbGFzcyBpbnRvIGl0cyBvd24gZmlsZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM0NzEKKworICAgICAgICAqIEdO VW1ha2VmaWxlLmxpc3QuYW06CisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRkIHRoZSBuZXcgZmlsZSB0byBidWlsZHMgdGhh dCB1c2VkIFRleHRCcmVha0l0ZXJhdG9yUG9vbElDVS5oLgorCisgICAgICAgICogcGxhdGZvcm0v dGV4dC9MaW5lQnJlYWtJdGVyYXRvclBvb2xJQ1UuaDogQWRkZWQuCisgICAgICAgIChXZWJDb3Jl OjpMaW5lQnJlYWtJdGVyYXRvclBvb2w6OnNoYXJlZFBvb2wpOgorICAgICAgICAoV2ViQ29yZTo6 TGluZUJyZWFrSXRlcmF0b3JQb29sOjpMaW5lQnJlYWtJdGVyYXRvclBvb2wpOgorICAgICAgICBF eHBvc2UgdGhlIGNvbnN0cnVjdG9yIHNvIGl0IGNhbiBiZSB1c2VkIGJ5IG90aGVycy4KKworICAg ICAgICAqIHBsYXRmb3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3JJQ1UuY3BwOgorICAgICAgICBS ZW1vdmUgdGhlIG9sZCBMaW5lQnJlYWtJdGVyYXRvclBvb2wgaW1wbGVtZW50YXRpb24uCisKIDIw MTEtMDUtMTcgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvR05VbWFr ZWZpbGUubGlzdC5hbSBiL1NvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KaW5kZXgg M2FmOGNiNi4uYzcxMDU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUu bGlzdC5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCkBAIC0yNzg0 LDYgKzI3ODQsNyBAQCB3ZWJjb3JlX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvQmlkaVJ1bkxpc3QuaCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9I eXBoZW5hdGlvbi5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvSHlwaGVuYXRp b24uaCBcCisJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9MaW5lQnJlYWtJdGVyYXRvclBv b2xJQ1UuaCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9MaW5lRW5kaW5nLmNwcCBc CiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9MaW5lRW5kaW5nLmggXAogCVNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkRGF0ZS5oIFwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRl eCBlZThmYjg2Li45ZDUwYWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC05MjksNiArOTI5LDcgQEAK ICAgICAgICAgICAgICdwbGF0Zm9ybS90ZXh0L0JpZGlSdW5MaXN0LmgnLAogICAgICAgICAgICAg J3BsYXRmb3JtL3RleHQvQmlkaUNvbnRleHQuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vdGV4 dC9CaWRpUmVzb2x2ZXIuaCcsCisgICAgICAgICAgICAncGxhdGZvcm0vdGV4dC9MaW5lQnJlYWtJ dGVyYXRvclBvb2xJQ1UuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vdGV4dC9MaW5lRW5kaW5n LmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL3RleHQvUGxhdGZvcm1TdHJpbmcuaCcsCiAgICAg ICAgICAgICAncGxhdGZvcm0vdGV4dC9RdW90ZWRQcmludGFibGUuaCcsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDZjZjhmY2UuLjgzZTZjNTgg MTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9q CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC0z MTI1Nyw2ICszMTI1Nyw5IEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJ UmVsYXRpdmVQYXRoPSIuLlxwbGF0Zm9ybVx0ZXh0XExpbmVCcmVha0l0ZXJhdG9yUG9vbElDVS5o IgorCQkJCQk+CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxwbGF0Zm9ybVx0ZXh0 XExpbmVFbmRpbmcuY3BwIgogCQkJCQk+CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDAwY2IyYjEuLmUzZTA0 NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKQEAgLTMyNjQsNiArMzI2NCw3IEBACiAJCUE1NzMyQjBGMTM2QTE3MTUwMDVDOEQ3QyAv KiBMb2NhbGl6ZWREYXRlTm9uZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBBNTczMkIwRTEzNkExNzE1MDA1QzhEN0MgLyogTG9jYWxpemVkRGF0ZU5v bmUuY3BwICovOyB9OwogCQlBNTlFM0MxRTExNTgwRjUxMDA3MjkyOEUgLyogS2V5RXZlbnRDb2Rl c0lQaG9uZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g QTU5RTNDMUMxMTU4MEY1MTAwNzI5MjhFIC8qIEtleUV2ZW50Q29kZXNJUGhvbmUuaCAqLzsgfTsK IAkJQTU5RTNDMUYxMTU4MEY1MTAwNzI5MjhFIC8qIEtleUV2ZW50SVBob25lLm1tIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTU5RTNDMUQxMTU4MEY1MTAw NzI5MjhFIC8qIEtleUV2ZW50SVBob25lLm1tICovOyB9OworCQlBNUFCQjc4NzEzQjkwNEJDMDBG MTk3RTMgLyogTGluZUJyZWFrSXRlcmF0b3JQb29sSUNVLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBNUFCQjc4NjEzQjkwNEJDMDBGMTk3RTMgLyogTGlu ZUJyZWFrSXRlcmF0b3JQb29sSUNVLmggKi87IH07CiAJCUE1QUZCMzRGMTE1MTUxQTcwMEIwNDVD QiAvKiBTdGVwUmFuZ2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQTVBRkIzNEQxMTUxNTFBNzAwQjA0NUNCIC8qIFN0ZXBSYW5nZS5jcHAgKi87IH07 CiAJCUE1QUZCMzUwMTE1MTUxQTcwMEIwNDVDQiAvKiBTdGVwUmFuZ2UuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1QUZCMzRFMTE1MTUxQTcwMEIwNDVD QiAvKiBTdGVwUmFuZ2UuaCAqLzsgfTsKIAkJQTYxNDhBNjIxMkU0MUQzQTAwNDRBNzg0IC8qIERP TUhUTUxLZXlnZW5FbGVtZW50SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEE2MTQ4QTYxMTJFNDFEM0EwMDQ0QTc4NCAvKiBET01IVE1MS2V5 Z2VuRWxlbWVudEludGVybmFsLmggKi87IH07CkBAIC05Nzc5LDYgKzk3ODAsNyBAQAogCQlBNTcz MkIwRTEzNkExNzE1MDA1QzhEN0MgLyogTG9jYWxpemVkRGF0ZU5vbmUuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTG9jYWxpemVkRGF0ZU5vbmUuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlBNTlFM0MxQzExNTgwRjUxMDA3MjkyOEUgLyogS2V5RXZl bnRDb2Rlc0lQaG9uZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBLZXlFdmVu dENvZGVzSVBob25lLmg7IHBhdGggPSBpcGhvbmUvS2V5RXZlbnRDb2Rlc0lQaG9uZS5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBNTlFM0MxRDExNTgwRjUxMDA3MjkyOEUgLyogS2V5 RXZlbnRJUGhvbmUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBL ZXlFdmVudElQaG9uZS5tbTsgcGF0aCA9IGlwaG9uZS9LZXlFdmVudElQaG9uZS5tbTsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQTVBQkI3ODYxM0I5MDRCQzAwRjE5N0UzIC8qIExpbmVC cmVha0l0ZXJhdG9yUG9vbElDVS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBM aW5lQnJlYWtJdGVyYXRvclBvb2xJQ1UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ QTVBRkIzNEQxMTUxNTFBNzAwQjA0NUNCIC8qIFN0ZXBSYW5nZS5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTdGVwUmFuZ2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQlBNUFGQjM0RTExNTE1MUE3MDBCMDQ1Q0IgLyogU3RlcFJhbmdlLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFN0ZXBSYW5nZS5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlBNUM5NzRDRjExNDg1RkYxMDA2NkYyQUIgLyogS2V5RXZlbnRDb2NvYS5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBLZXlFdmVudENvY29hLmg7IHBhdGgg PSBjb2NvYS9LZXlFdmVudENvY29hLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0x ODEwMiw2ICsxODEwNCw3IEBACiAJCQkJQjJDM0Q5RjQwRDAwNkMxRDAwRUY2RjI2IC8qIEJpZGlS ZXNvbHZlci5oICovLAogCQkJCUE4QzQwMjkyMTM0OEIyMjIwMDYzRjFFNSAvKiBCaWRpUnVuTGlz dC5oICovLAogCQkJCTM3NUNEMjMxMTE5RDQzQzgwMEEyQTg1OSAvKiBIeXBoZW5hdGlvbi5oICov LAorCQkJCUE1QUJCNzg2MTNCOTA0QkMwMEYxOTdFMyAvKiBMaW5lQnJlYWtJdGVyYXRvclBvb2xJ Q1UuaCAqLywKIAkJCQk4OUI1RUE5RjExRTgwMDNEMDBGMjM2N0UgLyogTGluZUVuZGluZy5jcHAg Ki8sCiAJCQkJODlCNUVBQTAxMUU4MDAzRDAwRjIzNjdFIC8qIExpbmVFbmRpbmcuaCAqLywKIAkJ CQlBNTczMkIwQzEzNkExNkM0MDA1QzhEN0MgLyogTG9jYWxpemVkRGF0ZS5oICovLApAQCAtMjMw NzksNiArMjMwODIsNyBAQAogCQkJCTA4NzU1OEM2MTNCNEE1N0QwMEY0OTMwNyAvKiBTdXJyb2dh dGVQYWlyQXdhcmVUZXh0SXRlcmF0b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCTA4NjM5NTE2MTNC NUZFNTcwMEJCMzQ0RCAvKiBTVkdBbmltYXRlZFBhdGguaCBpbiBIZWFkZXJzICovLAogCQkJCTQz MUEyRjlDMTNCNkYyQjAwMDc3OTFFNCAvKiBTVkdBbmltYXRlZE51bWJlck9wdGlvbmFsTnVtYmVy LmggaW4gSGVhZGVycyAqLywKKwkJCQlBNUFCQjc4NzEzQjkwNEJDMDBGMTk3RTMgLyogTGluZUJy ZWFrSXRlcmF0b3JQb29sSUNVLmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9y RGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3RleHQvTGluZUJyZWFrSXRlcmF0b3JQb29sSUNVLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xpbmVCcmVha0l0ZXJhdG9yUG9vbElDVS5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdhMzgwYjYKLS0tIC9kZXYvbnVsbAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xpbmVCcmVha0l0ZXJhdG9yUG9vbElDVS5oCkBA IC0wLDAgKzEsOTMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYgTGFycyBLbm9sbCA8bGFy c0B0cm9sbHRlY2guY29tPgorICogQ29weXJpZ2h0IChDKSAyMDA3IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNo ZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIg b2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisg KgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2ls bCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0 aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSBy ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UK KyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJ ZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1 MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAx LCBVU0EuCisgKgorICovCisKKyNpZm5kZWYgTGluZUJyZWFrSXRlcmF0b3JQb29sSUNVX2gKKyNk ZWZpbmUgTGluZUJyZWFrSXRlcmF0b3JQb29sSUNVX2gKKworI2luY2x1ZGUgIlRleHRCcmVha0l0 ZXJhdG9ySW50ZXJuYWxJQ1UuaCIKKyNpbmNsdWRlIDx1bmljb2RlL3VicmsuaD4KKyNpbmNsdWRl IDx3dGYvQXNzZXJ0aW9ucy5oPgorI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CisjaW5jbHVkZSA8 d3RmL3RleHQvQ1N0cmluZy5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK2NsYXNzIExpbmVC cmVha0l0ZXJhdG9yUG9vbCB7CitXVEZfTUFLRV9OT05DT1BZQUJMRShMaW5lQnJlYWtJdGVyYXRv clBvb2wpOworcHVibGljOgorICAgIHN0YXRpYyBMaW5lQnJlYWtJdGVyYXRvclBvb2wmIHNoYXJl ZFBvb2woKQorICAgIHsKKyAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICAgICAg REVGSU5FX1NUQVRJQ19MT0NBTChMaW5lQnJlYWtJdGVyYXRvclBvb2wsIHBvb2wsICgpKTsKKyAg ICAgICAgcmV0dXJuIHBvb2w7CisgICAgfQorCisgICAgTGluZUJyZWFrSXRlcmF0b3JQb29sKCkg eyB9CisKKyAgICBVQnJlYWtJdGVyYXRvciogdGFrZShjb25zdCBBdG9taWNTdHJpbmcmIGxvY2Fs ZSkKKyAgICB7CisgICAgICAgIFVCcmVha0l0ZXJhdG9yKiBpdGVyYXRvciA9IDA7CisgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wb29sLnNpemUoKTsgKytpKSB7CisgICAgICAgICAg ICBpZiAobV9wb29sW2ldLmZpcnN0ID09IGxvY2FsZSkgeworICAgICAgICAgICAgICAgIGl0ZXJh dG9yID0gbV9wb29sW2ldLnNlY29uZDsKKyAgICAgICAgICAgICAgICBtX3Bvb2wucmVtb3ZlKGkp OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAg ICAgICAgaWYgKCFpdGVyYXRvcikgeworICAgICAgICAgICAgVUVycm9yQ29kZSBvcGVuU3RhdHVz ID0gVV9aRVJPX0VSUk9SOworICAgICAgICAgICAgaXRlcmF0b3IgPSB1YnJrX29wZW4oVUJSS19M SU5FLCBsb2NhbGUuaXNFbXB0eSgpID8gY3VycmVudFRleHRCcmVha0xvY2FsZUlEKCkgOiBsb2Nh bGUuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgMCwgMCwgJm9wZW5TdGF0dXMpOworICAgICAgICAg ICAgaWYgKFVfRkFJTFVSRShvcGVuU3RhdHVzKSkgeworICAgICAgICAgICAgICAgIExPR19FUlJP UigidWJya19vcGVuIGZhaWxlZCB3aXRoIHN0YXR1cyAlZCIsIG9wZW5TdGF0dXMpOworICAgICAg ICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAg QVNTRVJUKCFtX3ZlbmRlZEl0ZXJhdG9ycy5jb250YWlucyhpdGVyYXRvcikpOworICAgICAgICBt X3ZlbmRlZEl0ZXJhdG9ycy5zZXQoaXRlcmF0b3IsIGxvY2FsZSk7CisgICAgICAgIHJldHVybiBp dGVyYXRvcjsKKyAgICB9CisKKyAgICB2b2lkIHB1dChVQnJlYWtJdGVyYXRvciogaXRlcmF0b3Ip CisgICAgeworICAgICAgICBBU1NFUlRfQVJHKGl0ZXJhdG9yLCBtX3ZlbmRlZEl0ZXJhdG9ycy5j b250YWlucyhpdGVyYXRvcikpOworCisgICAgICAgIGlmIChtX3Bvb2wuc2l6ZSgpID09IGNhcGFj aXR5KSB7CisgICAgICAgICAgICB1YnJrX2Nsb3NlKG1fcG9vbFswXS5zZWNvbmQpOworICAgICAg ICAgICAgbV9wb29sLnJlbW92ZSgwKTsKKyAgICAgICAgfQorCisgICAgICAgIG1fcG9vbC5hcHBl bmQoRW50cnkobV92ZW5kZWRJdGVyYXRvcnMudGFrZShpdGVyYXRvciksIGl0ZXJhdG9yKSk7Cisg ICAgfQorCitwcml2YXRlOgorICAgIHN0YXRpYyBjb25zdCBzaXplX3QgY2FwYWNpdHkgPSA0Owor CisgICAgdHlwZWRlZiBwYWlyPEF0b21pY1N0cmluZywgVUJyZWFrSXRlcmF0b3IqPiBFbnRyeTsK KyAgICB0eXBlZGVmIFZlY3RvcjxFbnRyeSwgY2FwYWNpdHk+IFBvb2w7CisgICAgUG9vbCBtX3Bv b2w7CisgICAgSGFzaE1hcDxVQnJlYWtJdGVyYXRvciosIEF0b21pY1N0cmluZz4gbV92ZW5kZWRJ dGVyYXRvcnM7Cit9OworCit9CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9UZXh0QnJlYWtJdGVyYXRvcklDVS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L1RleHRCcmVha0l0ZXJhdG9ySUNVLmNwcAppbmRleCAyOTUwNzI3Li4wZGEx YTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRCcmVha0l0 ZXJhdG9ySUNVLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRCcmVh a0l0ZXJhdG9ySUNVLmNwcApAQCAtMjMsMTEgKzIzLDcgQEAKICNpbmNsdWRlICJUZXh0QnJlYWtJ dGVyYXRvci5oIgogCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKLSNpbmNsdWRlICJUZXh0 QnJlYWtJdGVyYXRvckludGVybmFsSUNVLmgiCi0jaW5jbHVkZSA8dW5pY29kZS91YnJrLmg+Ci0j aW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KLSNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgotI2lu Y2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KKyNpbmNsdWRlICJMaW5lQnJlYWtJdGVyYXRvclBv b2xJQ1UuaCIKIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIApAQCAtNzIsNjQgKzY4LDYgQEAgVGV4 dEJyZWFrSXRlcmF0b3IqIHdvcmRCcmVha0l0ZXJhdG9yKGNvbnN0IFVDaGFyKiBzdHJpbmcsIGlu dCBsZW5ndGgpCiAgICAgICAgIHN0YXRpY1dvcmRCcmVha0l0ZXJhdG9yLCBVQlJLX1dPUkQsIHN0 cmluZywgbGVuZ3RoKTsKIH0KIAotY2xhc3MgTGluZUJyZWFrSXRlcmF0b3JQb29sIHsKLVdURl9N QUtFX05PTkNPUFlBQkxFKExpbmVCcmVha0l0ZXJhdG9yUG9vbCk7Ci1wdWJsaWM6Ci0gICAgc3Rh dGljIExpbmVCcmVha0l0ZXJhdG9yUG9vbCYgc2hhcmVkUG9vbCgpCi0gICAgewotICAgICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKExpbmVC cmVha0l0ZXJhdG9yUG9vbCwgcG9vbCwgKCkpOwotICAgICAgICByZXR1cm4gcG9vbDsKLSAgICB9 Ci0KLSAgICBVQnJlYWtJdGVyYXRvciogdGFrZShjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsZSkK LSAgICB7Ci0gICAgICAgIFVCcmVha0l0ZXJhdG9yKiBpdGVyYXRvciA9IDA7Ci0gICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wb29sLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBp ZiAobV9wb29sW2ldLmZpcnN0ID09IGxvY2FsZSkgewotICAgICAgICAgICAgICAgIGl0ZXJhdG9y ID0gbV9wb29sW2ldLnNlY29uZDsKLSAgICAgICAgICAgICAgICBtX3Bvb2wucmVtb3ZlKGkpOwot ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAg ICAgaWYgKCFpdGVyYXRvcikgewotICAgICAgICAgICAgVUVycm9yQ29kZSBvcGVuU3RhdHVzID0g VV9aRVJPX0VSUk9SOwotICAgICAgICAgICAgaXRlcmF0b3IgPSB1YnJrX29wZW4oVUJSS19MSU5F LCBsb2NhbGUuaXNFbXB0eSgpID8gY3VycmVudFRleHRCcmVha0xvY2FsZUlEKCkgOiBsb2NhbGUu c3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgMCwgMCwgJm9wZW5TdGF0dXMpOwotICAgICAgICAgICAg aWYgKFVfRkFJTFVSRShvcGVuU3RhdHVzKSkgewotICAgICAgICAgICAgICAgIExPR19FUlJPUigi dWJya19vcGVuIGZhaWxlZCB3aXRoIHN0YXR1cyAlZCIsIG9wZW5TdGF0dXMpOwotICAgICAgICAg ICAgICAgIHJldHVybiAwOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgQVNT RVJUKCFtX3ZlbmRlZEl0ZXJhdG9ycy5jb250YWlucyhpdGVyYXRvcikpOwotICAgICAgICBtX3Zl bmRlZEl0ZXJhdG9ycy5zZXQoaXRlcmF0b3IsIGxvY2FsZSk7Ci0gICAgICAgIHJldHVybiBpdGVy YXRvcjsKLSAgICB9Ci0KLSAgICB2b2lkIHB1dChVQnJlYWtJdGVyYXRvciogaXRlcmF0b3IpCi0g ICAgewotICAgICAgICBBU1NFUlRfQVJHKGl0ZXJhdG9yLCBtX3ZlbmRlZEl0ZXJhdG9ycy5jb250 YWlucyhpdGVyYXRvcikpOwotCi0gICAgICAgIGlmIChtX3Bvb2wuc2l6ZSgpID09IGNhcGFjaXR5 KSB7Ci0gICAgICAgICAgICB1YnJrX2Nsb3NlKG1fcG9vbFswXS5zZWNvbmQpOwotICAgICAgICAg ICAgbV9wb29sLnJlbW92ZSgwKTsKLSAgICAgICAgfQotCi0gICAgICAgIG1fcG9vbC5hcHBlbmQo RW50cnkobV92ZW5kZWRJdGVyYXRvcnMudGFrZShpdGVyYXRvciksIGl0ZXJhdG9yKSk7Ci0gICAg fQotCi1wcml2YXRlOgotICAgIExpbmVCcmVha0l0ZXJhdG9yUG9vbCgpIHsgfQotCi0gICAgc3Rh dGljIGNvbnN0IHNpemVfdCBjYXBhY2l0eSA9IDQ7Ci0KLSAgICB0eXBlZGVmIHBhaXI8QXRvbWlj U3RyaW5nLCBVQnJlYWtJdGVyYXRvcio+IEVudHJ5OwotICAgIHR5cGVkZWYgVmVjdG9yPEVudHJ5 LCBjYXBhY2l0eT4gUG9vbDsKLSAgICBQb29sIG1fcG9vbDsKLSAgICBIYXNoTWFwPFVCcmVha0l0 ZXJhdG9yKiwgQXRvbWljU3RyaW5nPiBtX3ZlbmRlZEl0ZXJhdG9yczsKLX07Ci0KIFRleHRCcmVh a0l0ZXJhdG9yKiBhY3F1aXJlTGluZUJyZWFrSXRlcmF0b3IoY29uc3QgVUNoYXIqIHN0cmluZywg aW50IGxlbmd0aCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbGUpCiB7CiAgICAgVUJyZWFrSXRl cmF0b3IqIGl0ZXJhdG9yID0gTGluZUJyZWFrSXRlcmF0b3JQb29sOjpzaGFyZWRQb29sKCkudGFr ZShsb2NhbGUpOwo=