110490 2013-02-21 10:43:11 -0800 [TextAutosizing] Refactoring to eliminate boolean parameter 2013-02-22 10:22:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107300 1 avayvod avayvod eric esprehn+autocc jchaffraix johnme ojan.autocc webkit.review.bot oldest_to_newest 838570 0 avayvod 2013-02-21 10:43:11 -0800 [TextAutosizing] Refactoring to eliminate boolean parameter 838579 1 189556 avayvod 2013-02-21 10:51:20 -0800 Created attachment 189556 Patch 838600 2 189556 johnme 2013-02-21 11:09:53 -0800 Comment on attachment 189556 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189556&action=review > Source/WebCore/rendering/TextAutosizer.cpp:178 > + float multiplier = clusterShouldBeAutosized(clusterInfo, textWidth) ? clusterMultiplier(clusterInfo, windowInfo, textWidth) : 1.0f; Nit: Might be clearer to first compute a "bool shouldBeAutosized" on a separate line. 838606 3 johnme 2013-02-21 11:12:10 -0800 This a nice refactoring - definitely makes things clearer (though I had to resort to "git diff --word-diff" to understand the patch!). Julien (as I think it was your suggestion to remove the boolean parameter), what do you think? 838757 4 189587 avayvod 2013-02-21 13:13:19 -0800 Created attachment 189587 Patch 839157 5 189587 jchaffraix 2013-02-21 19:54:15 -0800 Comment on attachment 189587 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189587&action=review > Source/WebCore/rendering/TextAutosizer.cpp:157 > + multiplier = std::max(1.0f, multiplier); > > + return multiplier; Nit: These 2 lines could be squashed in one: return std::max(1.0f, multiplier); > Source/WebCore/rendering/TextAutosizer.h:32 > +#include <WebCore/platform/text/WritingMode.h> We don't use absolute path when #including in WebCore. This should be enough: #include "WritingMode.h" 839516 6 189760 avayvod 2013-02-22 05:47:13 -0800 Created attachment 189760 Patch 839644 7 189760 jchaffraix 2013-02-22 09:10:13 -0800 Comment on attachment 189760 Patch You don't need to ask for review again, only commit-queue so that you are not stuck waiting on a reviewer. 839699 8 189760 webkit.review.bot 2013-02-22 10:22:05 -0800 Comment on attachment 189760 Patch Clearing flags on attachment: 189760 Committed r143749: <http://trac.webkit.org/changeset/143749> 839700 9 webkit.review.bot 2013-02-22 10:22:09 -0800 All reviewed patches have been landed. Closing bug. 189556 2013-02-21 10:51:20 -0800 2013-02-21 13:13:16 -0800 Patch bug-110490-20130221184740.patch text/plain 7031 avayvod U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzhlMTE2ZGNlN2YxMzQ5 YjVkYzA1MzBjNzFiYjMxZGFlNWMzYTZkOS4uZTNkMzFhMGU2N2UyNGNlNGMxMzRlODRiYmIwMDA1 N2VjYTVlMzk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIxICBBbnRv biBWYXl2b2QgIDxhdmF5dm9kQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVGV4dEF1dG9zaXpp bmddIFJlZmFjdG9yaW5nIHRvIGVsaW1pbmF0ZSBib29sZWFuIHBhcmFtZXRlci4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgZm9sbG93LXVwIHRvIHRo ZSByZWNlbnQgY2hhbmdlIHRoYXQgaW50cm9kdWNlZCBhIGJvb2xlYW4gcGFyYW1ldGVyIHRvCisg ICAgICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwgbWV0aG9kIG9mIFRleHRBdXRvc2l6ZXIuIEJv b2xlYW4gcGFyYW1ldGVycyBhcmUgZGlzY291cmFnZWQgYnkgdGhlCisgICAgICAgIFdlYktpdCBz dHlsZSBndWlkZS4gU2VlIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE0Mjg2Ngor CisgICAgICAgIFJlZmFjdG9yaW5nIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRl cmluZy9UZXh0QXV0b3NpemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6 OmNsdXN0ZXJNdWx0aXBsaWVyKToKKworICAgICAgICAgICAgICAgIENhbGN1bGF0ZXMgdGhlIGZv bnQgc2l6ZSBtdWx0aXBsaWVyIGZvciB0aGUgc3BlY2lmaWVkIGNsdXN0ZXIuCisKKyAgICAgICAg KFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJuYWwpOgorCisgICAg ICAgICAgICAgICAgQWNjZXB0cyB0aGUgZm9udCBzaXplIG11bHRpcGxpZXIgaW5zdGVhZCBvZiB8 c2hvdWxkQmVBdXRvc2l6ZWR8LgorCisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpw cm9jZXNzQ2x1c3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpwcm9jZXNz Q29tcG9zaXRlQ2x1c3Rlcik6CisKKyAgICAgICAgICAgICAgICBCb3RoIG1ldGhvZHMgYWJvdmUg bm93IGNhbGN1bGF0ZSB0aGUgbXVsdGlwbGllciBhbmQgdGhlbiBwYXNzIGl0IHRvCisgICAgICAg ICAgICAgICAgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbC4KKworICAgICAgICAqIHJlbmRlcmluZy9U ZXh0QXV0b3NpemVyLmg6CisKKyAgICAgICAgICAgICAgICBVcGRhdGVkIG1ldGhvZCBkZWNsYXJh dGlvbnMuCisKIDIwMTMtMDItMjAgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNha0Bnb29nbGUuY29t PgogCiAgICAgICAgIFtSZWZhY3RvcmluZ10gTWFrZSBtX3N0YXRlIGFuIG9uLXN0YWNrIG9iamVj dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCmluZGV4IDZjOTI2 YjgwNGNkMGNmMTg5ZDRlYWZjMGY4M2RhODFmMzY1ODM4ZjguLjFkNGE0ZDJiMjgzYzYwMjZhMWYz YjUyNzkzNDc1OTZiYTAwNzBiNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9UZXh0QXV0b3NpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1 dG9zaXplci5jcHAKQEAgLTE0MywyMCArMTQzLDIyIEBAIGJvb2wgVGV4dEF1dG9zaXplcjo6cHJv Y2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0KiBsYXlvdXRSb290KQogICAgIHJldHVybiB0cnVlOwog fQogCi12b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJuYWwoVGV4dEF1dG9z aXppbmdDbHVzdGVySW5mbyYgY2x1c3RlckluZm8sIFJlbmRlckJsb2NrKiBjb250YWluZXIsIFJl bmRlck9iamVjdCogc3VidHJlZVJvb3QsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYg d2luZG93SW5mbywgZmxvYXQgdGV4dFdpZHRoLCBib29sIHNob3VsZEJlQXV0b3NpemVkKQorZmxv YXQgVGV4dEF1dG9zaXplcjo6Y2x1c3Rlck11bHRpcGxpZXIoY29uc3QgVGV4dEF1dG9zaXppbmdD bHVzdGVySW5mbyYgY2x1c3RlckluZm8sIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYg d2luZG93SW5mbywgZmxvYXQgdGV4dFdpZHRoKSBjb25zdAogewotICAgIGZsb2F0IG11bHRpcGxp ZXIgPSAxOwotICAgIGlmIChzaG91bGRCZUF1dG9zaXplZCkgewotICAgICAgICBpbnQgbG9naWNh bFdpbmRvd1dpZHRoID0gY2x1c3RlckluZm8ucm9vdC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IHdpbmRvd0luZm8ud2luZG93U2l6ZS53aWR0aCgpIDogd2luZG93SW5mby53aW5kb3dTaXpl LmhlaWdodCgpOwotICAgICAgICBpbnQgbG9naWNhbExheW91dFdpZHRoID0gY2x1c3RlckluZm8u cm9vdC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpbmRvd0luZm8ubWluTGF5b3V0U2l6 ZS53aWR0aCgpIDogd2luZG93SW5mby5taW5MYXlvdXRTaXplLmhlaWdodCgpOwotICAgICAgICAv LyBJZ25vcmUgYm94IHdpZHRoIGluIGV4Y2VzcyBvZiB0aGUgbGF5b3V0IHdpZHRoLCB0byBhdm9p ZCBleHRyZW1lIG11bHRpcGxpZXJzLgotICAgICAgICBmbG9hdCBsb2dpY2FsQ2x1c3RlcldpZHRo ID0gc3RkOjptaW48ZmxvYXQ+KHRleHRXaWR0aCwgbG9naWNhbExheW91dFdpZHRoKTsKLQotICAg ICAgICBtdWx0aXBsaWVyID0gbG9naWNhbENsdXN0ZXJXaWR0aCAvIGxvZ2ljYWxXaW5kb3dXaWR0 aDsKLSAgICAgICAgbXVsdGlwbGllciAqPSBtX2RvY3VtZW50LT5zZXR0aW5ncygpLT50ZXh0QXV0 b3NpemluZ0ZvbnRTY2FsZUZhY3RvcigpOwotICAgICAgICBtdWx0aXBsaWVyID0gc3RkOjptYXgo MS4wZiwgbXVsdGlwbGllcik7Ci0gICAgfQorICAgIGludCBsb2dpY2FsV2luZG93V2lkdGggPSBj bHVzdGVySW5mby5yb290LT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gd2luZG93SW5mby53 aW5kb3dTaXplLndpZHRoKCkgOiB3aW5kb3dJbmZvLndpbmRvd1NpemUuaGVpZ2h0KCk7CisgICAg aW50IGxvZ2ljYWxMYXlvdXRXaWR0aCA9IGNsdXN0ZXJJbmZvLnJvb3QtPmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgPyB3aW5kb3dJbmZvLm1pbkxheW91dFNpemUud2lkdGgoKSA6IHdpbmRvd0lu Zm8ubWluTGF5b3V0U2l6ZS5oZWlnaHQoKTsKKyAgICAvLyBJZ25vcmUgYm94IHdpZHRoIGluIGV4 Y2VzcyBvZiB0aGUgbGF5b3V0IHdpZHRoLCB0byBhdm9pZCBleHRyZW1lIG11bHRpcGxpZXJzLgor ICAgIGZsb2F0IGxvZ2ljYWxDbHVzdGVyV2lkdGggPSBzdGQ6Om1pbjxmbG9hdD4odGV4dFdpZHRo LCBsb2dpY2FsTGF5b3V0V2lkdGgpOworCisgICAgZmxvYXQgbXVsdGlwbGllciA9IGxvZ2ljYWxD bHVzdGVyV2lkdGggLyBsb2dpY2FsV2luZG93V2lkdGg7CisgICAgbXVsdGlwbGllciAqPSBtX2Rv Y3VtZW50LT5zZXR0aW5ncygpLT50ZXh0QXV0b3NpemluZ0ZvbnRTY2FsZUZhY3RvcigpOworICAg IG11bHRpcGxpZXIgPSBzdGQ6Om1heCgxLjBmLCBtdWx0aXBsaWVyKTsKKworICAgIHJldHVybiBt dWx0aXBsaWVyOworfQogCit2b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJu YWwoVGV4dEF1dG9zaXppbmdDbHVzdGVySW5mbyYgY2x1c3RlckluZm8sIFJlbmRlckJsb2NrKiBj b250YWluZXIsIFJlbmRlck9iamVjdCogc3VidHJlZVJvb3QsIGNvbnN0IFRleHRBdXRvc2l6aW5n V2luZG93SW5mbyYgd2luZG93SW5mbywgZmxvYXQgbXVsdGlwbGllcikKK3sKICAgICBwcm9jZXNz Q29udGFpbmVyKG11bHRpcGxpZXIsIGNvbnRhaW5lciwgY2x1c3RlckluZm8sIHN1YnRyZWVSb290 LCB3aW5kb3dJbmZvKTsKIAogICAgIFZlY3RvcjxWZWN0b3I8VGV4dEF1dG9zaXppbmdDbHVzdGVy SW5mbz4gPiBuYXJyb3dEZXNjZW5kYW50c0dyb3VwczsKQEAgLTE3Myw3ICsxNzUsOCBAQCB2b2lk IFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVyKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8m IGNsdXN0ZXJJbmZvLCBSZW5kZQogICAgIC8vIHRleHQpLCBhbmQgdXNlIGl0cyB3aWR0aCBpbnN0 ZWFkLgogICAgIGNsdXN0ZXJJbmZvLmJsb2NrQ29udGFpbmluZ0FsbFRleHQgPSBmaW5kRGVlcGVz dEJsb2NrQ29udGFpbmluZ0FsbFRleHQoY2x1c3RlckluZm8ucm9vdCk7CiAgICAgZmxvYXQgdGV4 dFdpZHRoID0gY2x1c3RlckluZm8uYmxvY2tDb250YWluaW5nQWxsVGV4dC0+Y29udGVudExvZ2lj YWxXaWR0aCgpOwotICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwoY2x1c3RlckluZm8sIGNvbnRh aW5lciwgc3VidHJlZVJvb3QsIHdpbmRvd0luZm8sIHRleHRXaWR0aCwgY2x1c3RlclNob3VsZEJl QXV0b3NpemVkKGNsdXN0ZXJJbmZvLCB0ZXh0V2lkdGgpKTsKKyAgICBmbG9hdCBtdWx0aXBsaWVy ID0gY2x1c3RlclNob3VsZEJlQXV0b3NpemVkKGNsdXN0ZXJJbmZvLCB0ZXh0V2lkdGgpID8gY2x1 c3Rlck11bHRpcGxpZXIoY2x1c3RlckluZm8sIHdpbmRvd0luZm8sIHRleHRXaWR0aCkgOiAxLjBm OworICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwoY2x1c3RlckluZm8sIGNvbnRhaW5lciwgc3Vi dHJlZVJvb3QsIHdpbmRvd0luZm8sIG11bHRpcGxpZXIpOwogfQogCiB2b2lkIFRleHRBdXRvc2l6 ZXI6OnByb2Nlc3NDb21wb3NpdGVDbHVzdGVyKFZlY3RvcjxUZXh0QXV0b3NpemluZ0NsdXN0ZXJJ bmZvPiYgY2x1c3RlckluZm9zLCBjb25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mIHdpbmRv d0luZm8pCkBAIC0xODYsOCArMTg5LDEwIEBAIHZvaWQgVGV4dEF1dG9zaXplcjo6cHJvY2Vzc0Nv bXBvc2l0ZUNsdXN0ZXIoVmVjdG9yPFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8+JiBjCiAgICAg fQogCiAgICAgYm9vbCBzaG91bGRCZUF1dG9zaXplZCA9IGNvbXBvc2l0ZUNsdXN0ZXJTaG91bGRC ZUF1dG9zaXplZChjbHVzdGVySW5mb3MsIG1heFRleHRXaWR0aCk7Ci0gICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBjbHVzdGVySW5mb3Muc2l6ZSgpOyArK2kpCi0gICAgICAgIHByb2Nlc3NDbHVz dGVySW50ZXJuYWwoY2x1c3RlckluZm9zW2ldLCBjbHVzdGVySW5mb3NbaV0ucm9vdCwgY2x1c3Rl ckluZm9zW2ldLnJvb3QsIHdpbmRvd0luZm8sIG1heFRleHRXaWR0aCwgc2hvdWxkQmVBdXRvc2l6 ZWQpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY2x1c3RlckluZm9zLnNpemUoKTsgKytp KSB7CisgICAgICAgIGZsb2F0IG11bHRpcGxpZXIgPSBzaG91bGRCZUF1dG9zaXplZCA/IGNsdXN0 ZXJNdWx0aXBsaWVyKGNsdXN0ZXJJbmZvc1tpXSwgd2luZG93SW5mbywgbWF4VGV4dFdpZHRoKSA6 IDEuMGY7CisgICAgICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwoY2x1c3RlckluZm9zW2ldLCBj bHVzdGVySW5mb3NbaV0ucm9vdCwgY2x1c3RlckluZm9zW2ldLnJvb3QsIHdpbmRvd0luZm8sIG11 bHRpcGxpZXIpOworICAgIH0KIH0KIAogdm9pZCBUZXh0QXV0b3NpemVyOjpwcm9jZXNzQ29udGFp bmVyKGZsb2F0IG11bHRpcGxpZXIsIFJlbmRlckJsb2NrKiBjb250YWluZXIsIFRleHRBdXRvc2l6 aW5nQ2x1c3RlckluZm8mIGNsdXN0ZXJJbmZvLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBj b25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mIHdpbmRvd0luZm8pCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuaAppbmRleCAxZjdmN2I3MTFlMGRjNWMxNGZiZDYyYzI2 OTNmZGVkMTBhZmQyZGEzLi41YWJkOGU4ODAyNWUzNjUyMDNkOTI3MzUyNjFiNWM3OWYzMGM5MjU5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmgKQEAgLTYyLDcgKzYy LDkgQEAgcHJpdmF0ZToKIAogICAgIGV4cGxpY2l0IFRleHRBdXRvc2l6ZXIoRG9jdW1lbnQqKTsK IAotICAgIHZvaWQgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbChUZXh0QXV0b3NpemluZ0NsdXN0ZXJJ bmZvJiwgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciwgUmVuZGVyT2JqZWN0KiBzdWJ0cmVlUm9vdCwg Y29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJiwgZmxvYXQgdGV4dFdpZHRoLCBib29sIHNo b3VsZEJlQXV0b3NpemVkKTsKKyAgICBmbG9hdCBjbHVzdGVyTXVsdGlwbGllcihjb25zdCBUZXh0 QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJiwg ZmxvYXQgdGV4dFdpZHRoKSBjb25zdDsKKworICAgIHZvaWQgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5h bChUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiwgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciwgUmVu ZGVyT2JqZWN0KiBzdWJ0cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJiwg ZmxvYXQgbXVsdGlwbGllcik7CiAgICAgdm9pZCBwcm9jZXNzQ2x1c3RlcihUZXh0QXV0b3Npemlu Z0NsdXN0ZXJJbmZvJiwgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciwgUmVuZGVyT2JqZWN0KiBzdWJ0 cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJik7CiAgICAgdm9pZCBwcm9j ZXNzQ29tcG9zaXRlQ2x1c3RlcihWZWN0b3I8VGV4dEF1dG9zaXppbmdDbHVzdGVySW5mbz4mLCBj b25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mKTsKICAgICB2b2lkIHByb2Nlc3NDb250YWlu ZXIoZmxvYXQgbXVsdGlwbGllciwgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciwgVGV4dEF1dG9zaXpp bmdDbHVzdGVySW5mbyYsIFJlbmRlck9iamVjdCogc3VidHJlZVJvb3QsIGNvbnN0IFRleHRBdXRv c2l6aW5nV2luZG93SW5mbyYpOwo= 189587 2013-02-21 13:13:19 -0800 2013-02-22 05:47:09 -0800 Patch bug-110490-20130221210939.patch text/plain 7741 avayvod U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzhlMTE2ZGNlN2YxMzQ5 YjVkYzA1MzBjNzFiYjMxZGFlNWMzYTZkOS4uZTNkMzFhMGU2N2UyNGNlNGMxMzRlODRiYmIwMDA1 N2VjYTVlMzk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIxICBBbnRv biBWYXl2b2QgIDxhdmF5dm9kQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVGV4dEF1dG9zaXpp bmddIFJlZmFjdG9yaW5nIHRvIGVsaW1pbmF0ZSBib29sZWFuIHBhcmFtZXRlci4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgZm9sbG93LXVwIHRvIHRo ZSByZWNlbnQgY2hhbmdlIHRoYXQgaW50cm9kdWNlZCBhIGJvb2xlYW4gcGFyYW1ldGVyIHRvCisg ICAgICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwgbWV0aG9kIG9mIFRleHRBdXRvc2l6ZXIuIEJv b2xlYW4gcGFyYW1ldGVycyBhcmUgZGlzY291cmFnZWQgYnkgdGhlCisgICAgICAgIFdlYktpdCBz dHlsZSBndWlkZS4gU2VlIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE0Mjg2Ngor CisgICAgICAgIFJlZmFjdG9yaW5nIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRl cmluZy9UZXh0QXV0b3NpemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6 OmNsdXN0ZXJNdWx0aXBsaWVyKToKKworICAgICAgICAgICAgICAgIENhbGN1bGF0ZXMgdGhlIGZv bnQgc2l6ZSBtdWx0aXBsaWVyIGZvciB0aGUgc3BlY2lmaWVkIGNsdXN0ZXIuCisKKyAgICAgICAg KFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJuYWwpOgorCisgICAg ICAgICAgICAgICAgQWNjZXB0cyB0aGUgZm9udCBzaXplIG11bHRpcGxpZXIgaW5zdGVhZCBvZiB8 c2hvdWxkQmVBdXRvc2l6ZWR8LgorCisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpw cm9jZXNzQ2x1c3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpwcm9jZXNz Q29tcG9zaXRlQ2x1c3Rlcik6CisKKyAgICAgICAgICAgICAgICBCb3RoIG1ldGhvZHMgYWJvdmUg bm93IGNhbGN1bGF0ZSB0aGUgbXVsdGlwbGllciBhbmQgdGhlbiBwYXNzIGl0IHRvCisgICAgICAg ICAgICAgICAgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbC4KKworICAgICAgICAqIHJlbmRlcmluZy9U ZXh0QXV0b3NpemVyLmg6CisKKyAgICAgICAgICAgICAgICBVcGRhdGVkIG1ldGhvZCBkZWNsYXJh dGlvbnMuCisKIDIwMTMtMDItMjAgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNha0Bnb29nbGUuY29t PgogCiAgICAgICAgIFtSZWZhY3RvcmluZ10gTWFrZSBtX3N0YXRlIGFuIG9uLXN0YWNrIG9iamVj dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCmluZGV4IDZjOTI2 YjgwNGNkMGNmMTg5ZDRlYWZjMGY4M2RhODFmMzY1ODM4ZjguLmRkMGU4NzdmNzI4ZWE2YzFkYzBk ZWEwOTMyZDQ3MTZlN2EyYzYxNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9UZXh0QXV0b3NpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1 dG9zaXplci5jcHAKQEAgLTE0MywyMCArMTQzLDIyIEBAIGJvb2wgVGV4dEF1dG9zaXplcjo6cHJv Y2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0KiBsYXlvdXRSb290KQogICAgIHJldHVybiB0cnVlOwog fQogCi12b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJuYWwoVGV4dEF1dG9z aXppbmdDbHVzdGVySW5mbyYgY2x1c3RlckluZm8sIFJlbmRlckJsb2NrKiBjb250YWluZXIsIFJl bmRlck9iamVjdCogc3VidHJlZVJvb3QsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYg d2luZG93SW5mbywgZmxvYXQgdGV4dFdpZHRoLCBib29sIHNob3VsZEJlQXV0b3NpemVkKQorZmxv YXQgVGV4dEF1dG9zaXplcjo6Y2x1c3Rlck11bHRpcGxpZXIoV3JpdGluZ01vZGUgd3JpdGluZ01v ZGUsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYgd2luZG93SW5mbywgZmxvYXQgdGV4 dFdpZHRoKSBjb25zdAogewotICAgIGZsb2F0IG11bHRpcGxpZXIgPSAxOwotICAgIGlmIChzaG91 bGRCZUF1dG9zaXplZCkgewotICAgICAgICBpbnQgbG9naWNhbFdpbmRvd1dpZHRoID0gY2x1c3Rl ckluZm8ucm9vdC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpbmRvd0luZm8ud2luZG93 U2l6ZS53aWR0aCgpIDogd2luZG93SW5mby53aW5kb3dTaXplLmhlaWdodCgpOwotICAgICAgICBp bnQgbG9naWNhbExheW91dFdpZHRoID0gY2x1c3RlckluZm8ucm9vdC0+aXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSA/IHdpbmRvd0luZm8ubWluTGF5b3V0U2l6ZS53aWR0aCgpIDogd2luZG93SW5m by5taW5MYXlvdXRTaXplLmhlaWdodCgpOwotICAgICAgICAvLyBJZ25vcmUgYm94IHdpZHRoIGlu IGV4Y2VzcyBvZiB0aGUgbGF5b3V0IHdpZHRoLCB0byBhdm9pZCBleHRyZW1lIG11bHRpcGxpZXJz LgotICAgICAgICBmbG9hdCBsb2dpY2FsQ2x1c3RlcldpZHRoID0gc3RkOjptaW48ZmxvYXQ+KHRl eHRXaWR0aCwgbG9naWNhbExheW91dFdpZHRoKTsKLQotICAgICAgICBtdWx0aXBsaWVyID0gbG9n aWNhbENsdXN0ZXJXaWR0aCAvIGxvZ2ljYWxXaW5kb3dXaWR0aDsKLSAgICAgICAgbXVsdGlwbGll ciAqPSBtX2RvY3VtZW50LT5zZXR0aW5ncygpLT50ZXh0QXV0b3NpemluZ0ZvbnRTY2FsZUZhY3Rv cigpOwotICAgICAgICBtdWx0aXBsaWVyID0gc3RkOjptYXgoMS4wZiwgbXVsdGlwbGllcik7Ci0g ICAgfQorICAgIGludCBsb2dpY2FsV2luZG93V2lkdGggPSBpc0hvcml6b250YWxXcml0aW5nTW9k ZSh3cml0aW5nTW9kZSkgPyB3aW5kb3dJbmZvLndpbmRvd1NpemUud2lkdGgoKSA6IHdpbmRvd0lu Zm8ud2luZG93U2l6ZS5oZWlnaHQoKTsKKyAgICBpbnQgbG9naWNhbExheW91dFdpZHRoID0gaXNI b3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGluZ01vZGUpID8gd2luZG93SW5mby5taW5MYXlvdXRT aXplLndpZHRoKCkgOiB3aW5kb3dJbmZvLm1pbkxheW91dFNpemUuaGVpZ2h0KCk7CisgICAgLy8g SWdub3JlIGJveCB3aWR0aCBpbiBleGNlc3Mgb2YgdGhlIGxheW91dCB3aWR0aCwgdG8gYXZvaWQg ZXh0cmVtZSBtdWx0aXBsaWVycy4KKyAgICBmbG9hdCBsb2dpY2FsQ2x1c3RlcldpZHRoID0gc3Rk OjptaW48ZmxvYXQ+KHRleHRXaWR0aCwgbG9naWNhbExheW91dFdpZHRoKTsKKworICAgIGZsb2F0 IG11bHRpcGxpZXIgPSBsb2dpY2FsQ2x1c3RlcldpZHRoIC8gbG9naWNhbFdpbmRvd1dpZHRoOwor ICAgIG11bHRpcGxpZXIgKj0gbV9kb2N1bWVudC0+c2V0dGluZ3MoKS0+dGV4dEF1dG9zaXppbmdG b250U2NhbGVGYWN0b3IoKTsKKyAgICBtdWx0aXBsaWVyID0gc3RkOjptYXgoMS4wZiwgbXVsdGlw bGllcik7CiAKKyAgICByZXR1cm4gbXVsdGlwbGllcjsKK30KKwordm9pZCBUZXh0QXV0b3NpemVy Ojpwcm9jZXNzQ2x1c3RlckludGVybmFsKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mIGNsdXN0 ZXJJbmZvLCBSZW5kZXJCbG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290 LCBjb25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mIHdpbmRvd0luZm8sIGZsb2F0IG11bHRp cGxpZXIpCit7CiAgICAgcHJvY2Vzc0NvbnRhaW5lcihtdWx0aXBsaWVyLCBjb250YWluZXIsIGNs dXN0ZXJJbmZvLCBzdWJ0cmVlUm9vdCwgd2luZG93SW5mbyk7CiAKICAgICBWZWN0b3I8VmVjdG9y PFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8+ID4gbmFycm93RGVzY2VuZGFudHNHcm91cHM7CkBA IC0xNzMsMTEgKzE3NSwxNyBAQCB2b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVyKFRl eHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mIGNsdXN0ZXJJbmZvLCBSZW5kZQogICAgIC8vIHRleHQp LCBhbmQgdXNlIGl0cyB3aWR0aCBpbnN0ZWFkLgogICAgIGNsdXN0ZXJJbmZvLmJsb2NrQ29udGFp bmluZ0FsbFRleHQgPSBmaW5kRGVlcGVzdEJsb2NrQ29udGFpbmluZ0FsbFRleHQoY2x1c3Rlcklu Zm8ucm9vdCk7CiAgICAgZmxvYXQgdGV4dFdpZHRoID0gY2x1c3RlckluZm8uYmxvY2tDb250YWlu aW5nQWxsVGV4dC0+Y29udGVudExvZ2ljYWxXaWR0aCgpOwotICAgIHByb2Nlc3NDbHVzdGVySW50 ZXJuYWwoY2x1c3RlckluZm8sIGNvbnRhaW5lciwgc3VidHJlZVJvb3QsIHdpbmRvd0luZm8sIHRl eHRXaWR0aCwgY2x1c3RlclNob3VsZEJlQXV0b3NpemVkKGNsdXN0ZXJJbmZvLCB0ZXh0V2lkdGgp KTsKKyAgICBmbG9hdCBtdWx0aXBsaWVyID0gIDEuMDsKKyAgICBpZiAoY2x1c3RlclNob3VsZEJl QXV0b3NpemVkKGNsdXN0ZXJJbmZvLCB0ZXh0V2lkdGgpKQorICAgICAgICBtdWx0aXBsaWVyID0g Y2x1c3Rlck11bHRpcGxpZXIoY2x1c3RlckluZm8ucm9vdC0+c3R5bGUoKS0+d3JpdGluZ01vZGUo KSwgd2luZG93SW5mbywgdGV4dFdpZHRoKTsKKyAgICBwcm9jZXNzQ2x1c3RlckludGVybmFsKGNs dXN0ZXJJbmZvLCBjb250YWluZXIsIHN1YnRyZWVSb290LCB3aW5kb3dJbmZvLCBtdWx0aXBsaWVy KTsKIH0KIAogdm9pZCBUZXh0QXV0b3NpemVyOjpwcm9jZXNzQ29tcG9zaXRlQ2x1c3RlcihWZWN0 b3I8VGV4dEF1dG9zaXppbmdDbHVzdGVySW5mbz4mIGNsdXN0ZXJJbmZvcywgY29uc3QgVGV4dEF1 dG9zaXppbmdXaW5kb3dJbmZvJiB3aW5kb3dJbmZvKQogeworICAgIGlmIChjbHVzdGVySW5mb3Mu aXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKICAgICBmbG9hdCBtYXhUZXh0V2lkdGggPSAw OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY2x1c3RlckluZm9zLnNpemUoKTsgKytpKSB7 CiAgICAgICAgIFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mIGNsdXN0ZXJJbmZvID0gY2x1c3Rl ckluZm9zW2ldOwpAQCAtMTg1LDkgKzE5MywxMyBAQCB2b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nl c3NDb21wb3NpdGVDbHVzdGVyKFZlY3RvcjxUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvPiYgYwog ICAgICAgICBtYXhUZXh0V2lkdGggPSBtYXg8ZmxvYXQ+KG1heFRleHRXaWR0aCwgY2x1c3Rlcklu Zm8uYmxvY2tDb250YWluaW5nQWxsVGV4dC0+Y29udGVudExvZ2ljYWxXaWR0aCgpKTsKICAgICB9 CiAKLSAgICBib29sIHNob3VsZEJlQXV0b3NpemVkID0gY29tcG9zaXRlQ2x1c3RlclNob3VsZEJl QXV0b3NpemVkKGNsdXN0ZXJJbmZvcywgbWF4VGV4dFdpZHRoKTsKLSAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IGNsdXN0ZXJJbmZvcy5zaXplKCk7ICsraSkKLSAgICAgICAgcHJvY2Vzc0NsdXN0 ZXJJbnRlcm5hbChjbHVzdGVySW5mb3NbaV0sIGNsdXN0ZXJJbmZvc1tpXS5yb290LCBjbHVzdGVy SW5mb3NbaV0ucm9vdCwgd2luZG93SW5mbywgbWF4VGV4dFdpZHRoLCBzaG91bGRCZUF1dG9zaXpl ZCk7CisgICAgZmxvYXQgbXVsdGlwbGllciA9IDEuMDsKKyAgICBpZiAoY29tcG9zaXRlQ2x1c3Rl clNob3VsZEJlQXV0b3NpemVkKGNsdXN0ZXJJbmZvcywgbWF4VGV4dFdpZHRoKSkKKyAgICAgICAg bXVsdGlwbGllciA9IGNsdXN0ZXJNdWx0aXBsaWVyKGNsdXN0ZXJJbmZvc1swXS5yb290LT5zdHls ZSgpLT53cml0aW5nTW9kZSgpLCB3aW5kb3dJbmZvLCBtYXhUZXh0V2lkdGgpOworICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgY2x1c3RlckluZm9zLnNpemUoKTsgKytpKSB7CisgICAgICAgIEFT U0VSVChjbHVzdGVySW5mb3NbaV0ucm9vdC0+c3R5bGUoKS0+d3JpdGluZ01vZGUoKSA9PSBjbHVz dGVySW5mb3NbMF0ucm9vdC0+c3R5bGUoKS0+d3JpdGluZ01vZGUoKSk7CisgICAgICAgIHByb2Nl c3NDbHVzdGVySW50ZXJuYWwoY2x1c3RlckluZm9zW2ldLCBjbHVzdGVySW5mb3NbaV0ucm9vdCwg Y2x1c3RlckluZm9zW2ldLnJvb3QsIHdpbmRvd0luZm8sIG11bHRpcGxpZXIpOworICAgIH0KIH0K IAogdm9pZCBUZXh0QXV0b3NpemVyOjpwcm9jZXNzQ29udGFpbmVyKGZsb2F0IG11bHRpcGxpZXIs IFJlbmRlckJsb2NrKiBjb250YWluZXIsIFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mIGNsdXN0 ZXJJbmZvLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBjb25zdCBUZXh0QXV0b3NpemluZ1dp bmRvd0luZm8mIHdpbmRvd0luZm8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvVGV4dEF1dG9zaXplci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6 ZXIuaAppbmRleCAxZjdmN2I3MTFlMGRjNWMxNGZiZDYyYzI2OTNmZGVkMTBhZmQyZGEzLi42MmFh M2ZiODNkNDA2NGIxZTJlZDQ3NmUyMTQ1YTc0ODY1OWE3YmMyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9UZXh0QXV0b3NpemVyLmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBFTkFCTEUoVEVY VF9BVVRPU0laSU5HKQogCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSA8V2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L1dyaXRpbmdNb2RlLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxl Lmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIApAQCAtNjIsNyArNjMsOSBAQCBwcml2 YXRlOgogCiAgICAgZXhwbGljaXQgVGV4dEF1dG9zaXplcihEb2N1bWVudCopOwogCi0gICAgdm9p ZCBwcm9jZXNzQ2x1c3RlckludGVybmFsKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mLCBSZW5k ZXJCbG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBjb25zdCBUZXh0 QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCB0ZXh0V2lkdGgsIGJvb2wgc2hvdWxkQmVBdXRv c2l6ZWQpOworICAgIGZsb2F0IGNsdXN0ZXJNdWx0aXBsaWVyKFdyaXRpbmdNb2RlLCBjb25zdCBU ZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCB0ZXh0V2lkdGgpIGNvbnN0OworCisgICAg dm9pZCBwcm9jZXNzQ2x1c3RlckludGVybmFsKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mLCBS ZW5kZXJCbG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBjb25zdCBU ZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCBtdWx0aXBsaWVyKTsKICAgICB2b2lkIHBy b2Nlc3NDbHVzdGVyKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mLCBSZW5kZXJCbG9jayogY29u dGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBjb25zdCBUZXh0QXV0b3NpemluZ1dp bmRvd0luZm8mKTsKICAgICB2b2lkIHByb2Nlc3NDb21wb3NpdGVDbHVzdGVyKFZlY3RvcjxUZXh0 QXV0b3NpemluZ0NsdXN0ZXJJbmZvPiYsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYp OwogICAgIHZvaWQgcHJvY2Vzc0NvbnRhaW5lcihmbG9hdCBtdWx0aXBsaWVyLCBSZW5kZXJCbG9j ayogY29udGFpbmVyLCBUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiwgUmVuZGVyT2JqZWN0KiBz dWJ0cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJik7Cg== 189760 2013-02-22 05:47:13 -0800 2013-02-22 10:22:05 -0800 Patch bug-110490-20130222134332.patch text/plain 7693 avayvod U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNlOWZjMzU0YzljMGI0 N2JhMTc3YzgxZDMzMWE3MTJmNzdlNjI5Ny4uODEwMTJmNmY5NjliNzhlZmU2Y2M2NjRhOTczMjI4 YjE0YzMxNjFmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIxICBBbnRv biBWYXl2b2QgIDxhdmF5dm9kQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVGV4dEF1dG9zaXpp bmddIFJlZmFjdG9yaW5nIHRvIGVsaW1pbmF0ZSBib29sZWFuIHBhcmFtZXRlci4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ5MAorCisgICAgICAg IFJldmlld2VkIGJ5IEp1bGllbiBDaGFmZnJhaXguCisKKyAgICAgICAgQSBmb2xsb3ctdXAgdG8g dGhlIHJlY2VudCBjaGFuZ2UgdGhhdCBpbnRyb2R1Y2VkIGEgYm9vbGVhbiBwYXJhbWV0ZXIgdG8K KyAgICAgICAgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbCBtZXRob2Qgb2YgVGV4dEF1dG9zaXplci4g Qm9vbGVhbiBwYXJhbWV0ZXJzIGFyZSBkaXNjb3VyYWdlZCBieSB0aGUKKyAgICAgICAgV2ViS2l0 IHN0eWxlIGd1aWRlLiBTZWUgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTQyODY2 CisKKyAgICAgICAgUmVmYWN0b3Jpbmcgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcmVu ZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEF1dG9zaXpl cjo6Y2x1c3Rlck11bHRpcGxpZXIpOgorCisgICAgICAgICAgICAgICAgQ2FsY3VsYXRlcyB0aGUg Zm9udCBzaXplIG11bHRpcGxpZXIgZm9yIHRoZSBzcGVjaWZpZWQgY2x1c3Rlci4KKworICAgICAg ICAoV2ViQ29yZTo6VGV4dEF1dG9zaXplcjo6cHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbCk6CisKKyAg ICAgICAgICAgICAgICBBY2NlcHRzIHRoZSBmb250IHNpemUgbXVsdGlwbGllciBpbnN0ZWFkIG9m IHxzaG91bGRCZUF1dG9zaXplZHwuCisKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6 OnByb2Nlc3NDbHVzdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6OnByb2Nl c3NDb21wb3NpdGVDbHVzdGVyKToKKworICAgICAgICAgICAgICAgIEJvdGggbWV0aG9kcyBhYm92 ZSBub3cgY2FsY3VsYXRlIHRoZSBtdWx0aXBsaWVyIGFuZCB0aGVuIHBhc3MgaXQgdG8KKyAgICAg ICAgICAgICAgICBwcm9jZXNzQ2x1c3RlckludGVybmFsLgorCisgICAgICAgICogcmVuZGVyaW5n L1RleHRBdXRvc2l6ZXIuaDoKKworICAgICAgICAgICAgICAgIFVwZGF0ZWQgbWV0aG9kIGRlY2xh cmF0aW9ucy4KKwogMjAxMy0wMi0yMSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgUGx1Zy1pbiBzbmFwc2hvdHRpbmcgY29kZSBhbHdheXMgYWNjZXB0cyBmaXJzdCBz bmFwc2hvdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCmluZGV4 IDcwZDA3NGY3NTg0MjlkMTBhNjAyNjZjOTljZmVhMTYxZWJlZGM4YmQuLjkwMzM5OGM5N2E5MDI0 NDI3NDY3MGU4NzM4OWE3ZWMyMzZhOTUxNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv VGV4dEF1dG9zaXplci5jcHAKQEAgLTE0MSwyMCArMTQxLDIwIEBAIGJvb2wgVGV4dEF1dG9zaXpl cjo6cHJvY2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0KiBsYXlvdXRSb290KQogICAgIHJldHVybiB0 cnVlOwogfQogCi12b2lkIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NDbHVzdGVySW50ZXJuYWwoVGV4 dEF1dG9zaXppbmdDbHVzdGVySW5mbyYgY2x1c3RlckluZm8sIFJlbmRlckJsb2NrKiBjb250YWlu ZXIsIFJlbmRlck9iamVjdCogc3VidHJlZVJvb3QsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93 SW5mbyYgd2luZG93SW5mbywgZmxvYXQgdGV4dFdpZHRoLCBib29sIHNob3VsZEJlQXV0b3NpemVk KQorZmxvYXQgVGV4dEF1dG9zaXplcjo6Y2x1c3Rlck11bHRpcGxpZXIoV3JpdGluZ01vZGUgd3Jp dGluZ01vZGUsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYgd2luZG93SW5mbywgZmxv YXQgdGV4dFdpZHRoKSBjb25zdAogewotICAgIGZsb2F0IG11bHRpcGxpZXIgPSAxOwotICAgIGlm IChzaG91bGRCZUF1dG9zaXplZCkgewotICAgICAgICBpbnQgbG9naWNhbFdpbmRvd1dpZHRoID0g Y2x1c3RlckluZm8ucm9vdC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpbmRvd0luZm8u d2luZG93U2l6ZS53aWR0aCgpIDogd2luZG93SW5mby53aW5kb3dTaXplLmhlaWdodCgpOwotICAg ICAgICBpbnQgbG9naWNhbExheW91dFdpZHRoID0gY2x1c3RlckluZm8ucm9vdC0+aXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA/IHdpbmRvd0luZm8ubWluTGF5b3V0U2l6ZS53aWR0aCgpIDogd2lu ZG93SW5mby5taW5MYXlvdXRTaXplLmhlaWdodCgpOwotICAgICAgICAvLyBJZ25vcmUgYm94IHdp ZHRoIGluIGV4Y2VzcyBvZiB0aGUgbGF5b3V0IHdpZHRoLCB0byBhdm9pZCBleHRyZW1lIG11bHRp cGxpZXJzLgotICAgICAgICBmbG9hdCBsb2dpY2FsQ2x1c3RlcldpZHRoID0gc3RkOjptaW48Zmxv YXQ+KHRleHRXaWR0aCwgbG9naWNhbExheW91dFdpZHRoKTsKLQotICAgICAgICBtdWx0aXBsaWVy ID0gbG9naWNhbENsdXN0ZXJXaWR0aCAvIGxvZ2ljYWxXaW5kb3dXaWR0aDsKLSAgICAgICAgbXVs dGlwbGllciAqPSBtX2RvY3VtZW50LT5zZXR0aW5ncygpLT50ZXh0QXV0b3NpemluZ0ZvbnRTY2Fs ZUZhY3RvcigpOwotICAgICAgICBtdWx0aXBsaWVyID0gc3RkOjptYXgoMS4wZiwgbXVsdGlwbGll cik7Ci0gICAgfQorICAgIGludCBsb2dpY2FsV2luZG93V2lkdGggPSBpc0hvcml6b250YWxXcml0 aW5nTW9kZSh3cml0aW5nTW9kZSkgPyB3aW5kb3dJbmZvLndpbmRvd1NpemUud2lkdGgoKSA6IHdp bmRvd0luZm8ud2luZG93U2l6ZS5oZWlnaHQoKTsKKyAgICBpbnQgbG9naWNhbExheW91dFdpZHRo ID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGluZ01vZGUpID8gd2luZG93SW5mby5taW5M YXlvdXRTaXplLndpZHRoKCkgOiB3aW5kb3dJbmZvLm1pbkxheW91dFNpemUuaGVpZ2h0KCk7Cisg ICAgLy8gSWdub3JlIGJveCB3aWR0aCBpbiBleGNlc3Mgb2YgdGhlIGxheW91dCB3aWR0aCwgdG8g YXZvaWQgZXh0cmVtZSBtdWx0aXBsaWVycy4KKyAgICBmbG9hdCBsb2dpY2FsQ2x1c3RlcldpZHRo ID0gc3RkOjptaW48ZmxvYXQ+KHRleHRXaWR0aCwgbG9naWNhbExheW91dFdpZHRoKTsKKworICAg IGZsb2F0IG11bHRpcGxpZXIgPSBsb2dpY2FsQ2x1c3RlcldpZHRoIC8gbG9naWNhbFdpbmRvd1dp ZHRoOworICAgIG11bHRpcGxpZXIgKj0gbV9kb2N1bWVudC0+c2V0dGluZ3MoKS0+dGV4dEF1dG9z aXppbmdGb250U2NhbGVGYWN0b3IoKTsKKyAgICByZXR1cm4gc3RkOjptYXgoMS4wZiwgbXVsdGlw bGllcik7Cit9CiAKK3ZvaWQgVGV4dEF1dG9zaXplcjo6cHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbChU ZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiBjbHVzdGVySW5mbywgUmVuZGVyQmxvY2sqIGNvbnRh aW5lciwgUmVuZGVyT2JqZWN0KiBzdWJ0cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5k b3dJbmZvJiB3aW5kb3dJbmZvLCBmbG9hdCBtdWx0aXBsaWVyKQorewogICAgIHByb2Nlc3NDb250 YWluZXIobXVsdGlwbGllciwgY29udGFpbmVyLCBjbHVzdGVySW5mbywgc3VidHJlZVJvb3QsIHdp bmRvd0luZm8pOwogCiAgICAgVmVjdG9yPFZlY3RvcjxUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZv PiA+IG5hcnJvd0Rlc2NlbmRhbnRzR3JvdXBzOwpAQCAtMTcxLDExICsxNzEsMTcgQEAgdm9pZCBU ZXh0QXV0b3NpemVyOjpwcm9jZXNzQ2x1c3RlcihUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiBj bHVzdGVySW5mbywgUmVuZGUKICAgICAvLyB0ZXh0KSwgYW5kIHVzZSBpdHMgd2lkdGggaW5zdGVh ZC4KICAgICBjbHVzdGVySW5mby5ibG9ja0NvbnRhaW5pbmdBbGxUZXh0ID0gZmluZERlZXBlc3RC bG9ja0NvbnRhaW5pbmdBbGxUZXh0KGNsdXN0ZXJJbmZvLnJvb3QpOwogICAgIGZsb2F0IHRleHRX aWR0aCA9IGNsdXN0ZXJJbmZvLmJsb2NrQ29udGFpbmluZ0FsbFRleHQtPmNvbnRlbnRMb2dpY2Fs V2lkdGgoKTsKLSAgICBwcm9jZXNzQ2x1c3RlckludGVybmFsKGNsdXN0ZXJJbmZvLCBjb250YWlu ZXIsIHN1YnRyZWVSb290LCB3aW5kb3dJbmZvLCB0ZXh0V2lkdGgsIGNsdXN0ZXJTaG91bGRCZUF1 dG9zaXplZChjbHVzdGVySW5mbywgdGV4dFdpZHRoKSk7CisgICAgZmxvYXQgbXVsdGlwbGllciA9 ICAxLjA7CisgICAgaWYgKGNsdXN0ZXJTaG91bGRCZUF1dG9zaXplZChjbHVzdGVySW5mbywgdGV4 dFdpZHRoKSkKKyAgICAgICAgbXVsdGlwbGllciA9IGNsdXN0ZXJNdWx0aXBsaWVyKGNsdXN0ZXJJ bmZvLnJvb3QtPnN0eWxlKCktPndyaXRpbmdNb2RlKCksIHdpbmRvd0luZm8sIHRleHRXaWR0aCk7 CisgICAgcHJvY2Vzc0NsdXN0ZXJJbnRlcm5hbChjbHVzdGVySW5mbywgY29udGFpbmVyLCBzdWJ0 cmVlUm9vdCwgd2luZG93SW5mbywgbXVsdGlwbGllcik7CiB9CiAKIHZvaWQgVGV4dEF1dG9zaXpl cjo6cHJvY2Vzc0NvbXBvc2l0ZUNsdXN0ZXIoVmVjdG9yPFRleHRBdXRvc2l6aW5nQ2x1c3Rlcklu Zm8+JiBjbHVzdGVySW5mb3MsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2luZG93SW5mbyYgd2luZG93 SW5mbykKIHsKKyAgICBpZiAoY2x1c3RlckluZm9zLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu OworCiAgICAgZmxvYXQgbWF4VGV4dFdpZHRoID0gMDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IGNsdXN0ZXJJbmZvcy5zaXplKCk7ICsraSkgewogICAgICAgICBUZXh0QXV0b3NpemluZ0Ns dXN0ZXJJbmZvJiBjbHVzdGVySW5mbyA9IGNsdXN0ZXJJbmZvc1tpXTsKQEAgLTE4Myw5ICsxODks MTMgQEAgdm9pZCBUZXh0QXV0b3NpemVyOjpwcm9jZXNzQ29tcG9zaXRlQ2x1c3RlcihWZWN0b3I8 VGV4dEF1dG9zaXppbmdDbHVzdGVySW5mbz4mIGMKICAgICAgICAgbWF4VGV4dFdpZHRoID0gbWF4 PGZsb2F0PihtYXhUZXh0V2lkdGgsIGNsdXN0ZXJJbmZvLmJsb2NrQ29udGFpbmluZ0FsbFRleHQt PmNvbnRlbnRMb2dpY2FsV2lkdGgoKSk7CiAgICAgfQogCi0gICAgYm9vbCBzaG91bGRCZUF1dG9z aXplZCA9IGNvbXBvc2l0ZUNsdXN0ZXJTaG91bGRCZUF1dG9zaXplZChjbHVzdGVySW5mb3MsIG1h eFRleHRXaWR0aCk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjbHVzdGVySW5mb3Muc2l6 ZSgpOyArK2kpCi0gICAgICAgIHByb2Nlc3NDbHVzdGVySW50ZXJuYWwoY2x1c3RlckluZm9zW2ld LCBjbHVzdGVySW5mb3NbaV0ucm9vdCwgY2x1c3RlckluZm9zW2ldLnJvb3QsIHdpbmRvd0luZm8s IG1heFRleHRXaWR0aCwgc2hvdWxkQmVBdXRvc2l6ZWQpOworICAgIGZsb2F0IG11bHRpcGxpZXIg PSAxLjA7CisgICAgaWYgKGNvbXBvc2l0ZUNsdXN0ZXJTaG91bGRCZUF1dG9zaXplZChjbHVzdGVy SW5mb3MsIG1heFRleHRXaWR0aCkpCisgICAgICAgIG11bHRpcGxpZXIgPSBjbHVzdGVyTXVsdGlw bGllcihjbHVzdGVySW5mb3NbMF0ucm9vdC0+c3R5bGUoKS0+d3JpdGluZ01vZGUoKSwgd2luZG93 SW5mbywgbWF4VGV4dFdpZHRoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNsdXN0ZXJJ bmZvcy5zaXplKCk7ICsraSkgeworICAgICAgICBBU1NFUlQoY2x1c3RlckluZm9zW2ldLnJvb3Qt PnN0eWxlKCktPndyaXRpbmdNb2RlKCkgPT0gY2x1c3RlckluZm9zWzBdLnJvb3QtPnN0eWxlKCkt PndyaXRpbmdNb2RlKCkpOworICAgICAgICBwcm9jZXNzQ2x1c3RlckludGVybmFsKGNsdXN0ZXJJ bmZvc1tpXSwgY2x1c3RlckluZm9zW2ldLnJvb3QsIGNsdXN0ZXJJbmZvc1tpXS5yb290LCB3aW5k b3dJbmZvLCBtdWx0aXBsaWVyKTsKKyAgICB9CiB9CiAKIHZvaWQgVGV4dEF1dG9zaXplcjo6cHJv Y2Vzc0NvbnRhaW5lcihmbG9hdCBtdWx0aXBsaWVyLCBSZW5kZXJCbG9jayogY29udGFpbmVyLCBU ZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiBjbHVzdGVySW5mbywgUmVuZGVyT2JqZWN0KiBzdWJ0 cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJiB3aW5kb3dJbmZvKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmgKaW5kZXggMWY3ZjdiNzExZTBkYzVj MTRmYmQ2MmMyNjkzZmRlZDEwYWZkMmRhMy4uZjFmNjc1Mzg1Y2FiYzRjNjQzMWVlYzQ0Y2Q1YTI2 ZTk5MzU1ODk1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRv c2l6ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5oCkBA IC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykKIAogI2luY2x1ZGUg IkhUTUxOYW1lcy5oIgorI2luY2x1ZGUgIldyaXRpbmdNb2RlLmgiCiAjaW5jbHVkZSA8d3RmL05v bmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIApAQCAtNjIsNyArNjMs OSBAQCBwcml2YXRlOgogCiAgICAgZXhwbGljaXQgVGV4dEF1dG9zaXplcihEb2N1bWVudCopOwog Ci0gICAgdm9pZCBwcm9jZXNzQ2x1c3RlckludGVybmFsKFRleHRBdXRvc2l6aW5nQ2x1c3Rlcklu Zm8mLCBSZW5kZXJCbG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBj b25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCB0ZXh0V2lkdGgsIGJvb2wgc2hv dWxkQmVBdXRvc2l6ZWQpOworICAgIGZsb2F0IGNsdXN0ZXJNdWx0aXBsaWVyKFdyaXRpbmdNb2Rl LCBjb25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCB0ZXh0V2lkdGgpIGNvbnN0 OworCisgICAgdm9pZCBwcm9jZXNzQ2x1c3RlckludGVybmFsKFRleHRBdXRvc2l6aW5nQ2x1c3Rl ckluZm8mLCBSZW5kZXJCbG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290 LCBjb25zdCBUZXh0QXV0b3NpemluZ1dpbmRvd0luZm8mLCBmbG9hdCBtdWx0aXBsaWVyKTsKICAg ICB2b2lkIHByb2Nlc3NDbHVzdGVyKFRleHRBdXRvc2l6aW5nQ2x1c3RlckluZm8mLCBSZW5kZXJC bG9jayogY29udGFpbmVyLCBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290LCBjb25zdCBUZXh0QXV0 b3NpemluZ1dpbmRvd0luZm8mKTsKICAgICB2b2lkIHByb2Nlc3NDb21wb3NpdGVDbHVzdGVyKFZl Y3RvcjxUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvPiYsIGNvbnN0IFRleHRBdXRvc2l6aW5nV2lu ZG93SW5mbyYpOwogICAgIHZvaWQgcHJvY2Vzc0NvbnRhaW5lcihmbG9hdCBtdWx0aXBsaWVyLCBS ZW5kZXJCbG9jayogY29udGFpbmVyLCBUZXh0QXV0b3NpemluZ0NsdXN0ZXJJbmZvJiwgUmVuZGVy T2JqZWN0KiBzdWJ0cmVlUm9vdCwgY29uc3QgVGV4dEF1dG9zaXppbmdXaW5kb3dJbmZvJik7Cg==