57984 2011-04-06 14:31:47 -0700 WebKitTestRunner needs layoutTestController.pageSizeAndMarginsInPixels 2011-04-06 21:00:27 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 cshu cshu commit-queue darin oldest_to_newest 380842 0 cshu 2011-04-06 14:31:47 -0700 failing printing/page-format-data-display-none.html 380845 1 88514 cshu 2011-04-06 14:35:07 -0700 Created attachment 88514 fix patch 380985 2 88514 darin 2011-04-06 17:16:53 -0700 Comment on attachment 88514 fix patch View in context: https://bugs.webkit.org/attachment.cgi?id=88514&action=review > Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp:183 > + return ""; I suggest String() instead of "". > Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp:186 > + return PrintContext::pageSizeAndMarginsInPixels(coreFrame, pageIndex, width, height, > + marginTop, marginRight, marginBottom, marginLeft); We don’t line up lines like this in WebKit. I suggest either doing a 4 pixel indent rather than lining things up or just putting all the arguments into one line. 381014 3 88551 cshu 2011-04-06 18:00:34 -0700 Created attachment 88551 r+ed patch with minor changes based on review 381112 4 88551 commit-queue 2011-04-06 21:00:23 -0700 Comment on attachment 88551 r+ed patch with minor changes based on review Clearing flags on attachment: 88551 Committed r83139: <http://trac.webkit.org/changeset/83139> 381113 5 commit-queue 2011-04-06 21:00:27 -0700 All reviewed patches have been landed. Closing bug. 88514 2011-04-06 14:35:07 -0700 2011-04-06 18:00:34 -0700 fix patch 57984_1.patch text/plain 9319 cshu SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMDk5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMDYgIENoYW5nIFNo dSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9sbGVy LnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01Nzk4NAorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHA6CisgICAgICAgIChXS0J1bmRsZVBhZ2VTaXplQW5k TWFyZ2luc0luUGl4ZWxzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvSW5qZWN0ZWRCdW5kbGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6 cGFnZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaDoKKwogMjAxMS0wNC0wNiAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29u LgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3Rl ZEJ1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHJldmlzaW9uIDgzMDk3KQorKysgU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE3Niw2ICsxNzYsMTYgQEAgaW50IEluamVjdGVkQnVuZGxlOjpwYWdl TnVtYmVyRm9yRWxlbWVudAogICAgIHJldHVybiBQcmludENvbnRleHQ6OnBhZ2VOdW1iZXJGb3JF bGVtZW50KGVsZW1lbnQsIEZsb2F0U2l6ZShwYWdlV2lkdGhJblBpeGVscywgcGFnZUhlaWdodElu UGl4ZWxzKSk7CiB9CiAKK1N0cmluZyBJbmplY3RlZEJ1bmRsZTo6cGFnZVNpemVBbmRNYXJnaW5z SW5QaXhlbHMoV2ViRnJhbWUqIGZyYW1lLCBpbnQgcGFnZUluZGV4LCBpbnQgd2lkdGgsIGludCBo ZWlnaHQsIGludCBtYXJnaW5Ub3AsIGludCBtYXJnaW5SaWdodCwgaW50IG1hcmdpbkJvdHRvbSwg aW50IG1hcmdpbkxlZnQpCit7CisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGZyYW1lID8gZnJhbWUt PmNvcmVGcmFtZSgpIDogMDsKKyAgICBpZiAoIWNvcmVGcmFtZSkKKyAgICAgICAgcmV0dXJuICIi OworCisgICAgcmV0dXJuIFByaW50Q29udGV4dDo6cGFnZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMo Y29yZUZyYW1lLCBwYWdlSW5kZXgsIHdpZHRoLCBoZWlnaHQsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFyZ2luVG9wLCBtYXJnaW5SaWdodCwg bWFyZ2luQm90dG9tLCBtYXJnaW5MZWZ0KTsKK30KKwogc3RhdGljIFBhc3NPd25QdHI8VmVjdG9y PFN0cmluZz4gPiB0b1N0cmluZ1ZlY3RvcihJbW11dGFibGVBcnJheSogcGF0dGVybnMpCiB7CiAg ICAgaWYgKCFwYXR0ZXJucykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmgJKHJldmlzaW9uIDgzMDk3 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05NSw2ICs5NSw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhXZWJQYWdlR3JvdXBQcm94eSosIGJvb2wp OwogICAgIGludCBudW1iZXJPZlBhZ2VzKFdlYkZyYW1lKiwgZG91YmxlLCBkb3VibGUpOwogICAg IGludCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoV2ViRnJhbWUqLCBjb25zdCBTdHJpbmcmLCBk b3VibGUsIGRvdWJsZSk7CisgICAgU3RyaW5nIHBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKFdl YkZyYW1lKiwgaW50LCBpbnQsIGludCwgaW50LCBpbnQsIGludCwgaW50KTsKIAogICAgIC8vIFVz ZXJDb250ZW50IEFQSQogICAgIHZvaWQgYWRkVXNlclNjcmlwdChXZWJQYWdlR3JvdXBQcm94eSos IEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQqLCBjb25zdCBTdHJpbmcmIHNvdXJjZSwgY29uc3Qg U3RyaW5nJiB1cmwsIEltbXV0YWJsZUFycmF5KiB3aGl0ZWxpc3QsIEltbXV0YWJsZUFycmF5KiBi bGFja2xpc3QsIFdlYkNvcmU6OlVzZXJTY3JpcHRJbmplY3Rpb25UaW1lLCBXZWJDb3JlOjpVc2Vy Q29udGVudEluamVjdGVkRnJhbWVzKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCShyZXZp c2lvbiA4MzA5NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2MvV0tCdW5kbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsMyArMTYyLDggQEAgaW50 IFdLQnVuZGxlUGFnZU51bWJlckZvckVsZW1lbnRCeUlkKFdLQgogewogICAgIHJldHVybiB0b0lt cGwoYnVuZGxlUmVmKS0+cGFnZU51bWJlckZvckVsZW1lbnRCeUlkKHRvSW1wbChmcmFtZVJlZiks IHRvSW1wbChpZFJlZiktPnN0cmluZygpLCBwYWdlV2lkdGhJblBpeGVscywgcGFnZUhlaWdodElu UGl4ZWxzKTsKIH0KKworV0tTdHJpbmdSZWYgV0tCdW5kbGVQYWdlU2l6ZUFuZE1hcmdpbnNJblBp eGVscyhXS0J1bmRsZVJlZiBidW5kbGVSZWYsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYsIGlu dCBwYWdlSW5kZXgsIGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IG1hcmdpblRvcCwgaW50IG1h cmdpblJpZ2h0LCBpbnQgbWFyZ2luQm90dG9tLCBpbnQgbWFyZ2luTGVmdCkKK3sKKyAgICByZXR1 cm4gdG9Db3BpZWRBUEkodG9JbXBsKGJ1bmRsZVJlZiktPnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4 ZWxzKHRvSW1wbChmcmFtZVJlZiksIHBhZ2VJbmRleCwgd2lkdGgsIGhlaWdodCwgbWFyZ2luVG9w LCBtYXJnaW5SaWdodCwgbWFyZ2luQm90dG9tLCBtYXJnaW5MZWZ0KSk7Cit9CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVQcml2YXRlLmgJKHJldmlzaW9uIDgzMDk3KQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVByaXZhdGUuaAko d29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEsNyBAQCBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZUNs ZWFyQWxsRGF0YWJhc2VzCiBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVNldERhdGFiYXNlUXVvdGEo V0tCdW5kbGVSZWYgYnVuZGxlLCB1aW50NjRfdCk7CiBXS19FWFBPUlQgaW50IFdLQnVuZGxlTnVt YmVyT2ZQYWdlcyhXS0J1bmRsZVJlZiBidW5kbGUsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYs IGRvdWJsZSBwYWdlV2lkdGhJblBpeGVscywgZG91YmxlIHBhZ2VIZWlnaHRJblBpeGVscyk7CiBX S19FWFBPUlQgaW50IFdLQnVuZGxlUGFnZU51bWJlckZvckVsZW1lbnRCeUlkKFdLQnVuZGxlUmVm IGJ1bmRsZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZiwgV0tTdHJpbmdSZWYgaWRSZWYsIGRv dWJsZSBwYWdlV2lkdGhJblBpeGVscywgZG91YmxlIHBhZ2VIZWlnaHRJblBpeGVscyk7CitXS19F WFBPUlQgV0tTdHJpbmdSZWYgV0tCdW5kbGVQYWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscyhXS0J1 bmRsZVJlZiBidW5kbGUsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYsIGludCwgaW50LCBpbnQs IGludCwgaW50LCBpbnQsIGludCk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpJbmRleDogVG9v bHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gODMw OTkpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAor MjAxMS0wNC0wNiAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMg bGF5b3V0VGVzdENvbnRyb2xsZXIucGFnZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3OTg0CisKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRpbmdzL0xheW91dFRlc3RDb250 cm9sbGVyLmlkbDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0xh eW91dFRlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6TGF5b3V0VGVzdENvbnRyb2xs ZXI6OnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmg6CisKIDIwMTEtMDQtMDYg IFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCShyZXZp c2lvbiA4MzA5NykKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5 b3V0VGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzcsNiArMzM3LDEyIEBA IGludCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZU51bWJlckZvckUKICAgICByZXR1cm4gV0tC dW5kbGVQYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmJ1 bmRsZSgpLCBtYWluRnJhbWUsIHRvV0soaWQpLmdldCgpLCBwYWdlV2lkdGhJblBpeGVscywgcGFn ZUhlaWdodEluUGl4ZWxzKTsKIH0KIAorSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IExheW91dFRl c3RDb250cm9sbGVyOjpwYWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscyhpbnQgcGFnZUluZGV4LCBp bnQgd2lkdGgsIGludCBoZWlnaHQsIGludCBtYXJnaW5Ub3AsIGludCBtYXJnaW5SaWdodCwgaW50 IG1hcmdpbkJvdHRvbSwgaW50IG1hcmdpbkxlZnQpCit7CisgICAgV0tCdW5kbGVGcmFtZVJlZiBt YWluRnJhbWUgPSBXS0J1bmRsZVBhZ2VHZXRNYWluRnJhbWUoSW5qZWN0ZWRCdW5kbGU6OnNoYXJl ZCgpLnBhZ2UoKS0+cGFnZSgpKTsKKyAgICByZXR1cm4gdG9KUyhXS0J1bmRsZVBhZ2VTaXplQW5k TWFyZ2luc0luUGl4ZWxzKEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5idW5kbGUoKSwgbWFpbkZy YW1lLCBwYWdlSW5kZXgsIHdpZHRoLCBoZWlnaHQsIG1hcmdpblRvcCwgbWFyZ2luUmlnaHQsIG1h cmdpbkJvdHRvbSwgbWFyZ2luTGVmdCkpOworfQorCiB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJv bGxlcjo6d2luZG93Q291bnQoKQogewogICAgIHJldHVybiBJbmplY3RlZEJ1bmRsZTo6c2hhcmVk KCkucGFnZUNvdW50KCk7CkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCShyZXZpc2lvbiA4 MzA5NykKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVz dENvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzExNSw3IEBAIHB1YmxpYzoK ICAgICAvLyBQcmludGluZwogICAgIGludCBudW1iZXJPZlBhZ2VzKGRvdWJsZSBwYWdlV2lkdGhJ blBpeGVscywgZG91YmxlIHBhZ2VIZWlnaHRJblBpeGVscyk7CiAgICAgaW50IHBhZ2VOdW1iZXJG b3JFbGVtZW50QnlJZChKU1N0cmluZ1JlZiwgZG91YmxlIHBhZ2VXaWR0aEluUGl4ZWxzLCBkb3Vi bGUgcGFnZUhlaWdodEluUGl4ZWxzKTsKKyAgICBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gcGFn ZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMoaW50IHBhZ2VJbmRleCwgaW50IHdpZHRoLCBpbnQgaGVp Z2h0LCBpbnQgbWFyZ2luVG9wLCBpbnQgbWFyZ2luUmlnaHQsIGludCBtYXJnaW5Cb3R0b20sIGlu dCBtYXJnaW5MZWZ0KTsKIAogICAgIGVudW0gV2hhdFRvRHVtcCB7IFJlbmRlclRyZWUsIE1haW5G cmFtZVRleHQsIEFsbEZyYW1lc1RleHQgfTsKICAgICBXaGF0VG9EdW1wIHdoYXRUb0R1bXAoKSBj b25zdCB7IHJldHVybiBtX3doYXRUb0R1bXA7IH0KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvTGF5b3V0VGVzdENvbnRyb2xsZXIuaWRsCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3Mv TGF5b3V0VGVzdENvbnRyb2xsZXIuaWRsCShyZXZpc2lvbiA4MzA5NykKKysrIFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvTGF5b3V0VGVzdENvbnRyb2xsZXIu aWRsCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2Nyw3IEBAIG1vZHVsZSBXVFIgewogICAgICAg ICAvLyBQcmludGluZwogICAgICAgICBpbnQgbnVtYmVyT2ZQYWdlcyhpbiBkb3VibGUgcGFnZVdp ZHRoSW5QaXhlbHMsIGluIGRvdWJsZSBwYWdlSGVpZ2h0SW5QaXhlbHMpOwogICAgICAgICBpbnQg cGFnZU51bWJlckZvckVsZW1lbnRCeUlkKGluIERPTVN0cmluZyBpZCwgaW4gZG91YmxlIHBhZ2VX aWR0aEluUGl4ZWxzLCBpbiBkb3VibGUgcGFnZUhlaWdodEluUGl4ZWxzKTsKKyAgICAgICAgRE9N U3RyaW5nIHBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKGluIGludCBwYWdlSW5kZXgsIGluIGlu dCB3aWR0aCwgaW4gaW50IGhlaWdodCwgaW4gaW50IG1hcmdpblRvcCwgaW4gaW50IG1hcmdpblJp Z2h0LCBpbiBpbnQgbWFyZ2luQm90dG9tLCBpbiBpbnQgbWFyZ2luTGVmdCk7CiAKICAgICAgICAg Ly8gQW5pbWF0aW9uIHRlc3RpbmcuCiAgICAgICAgIGludCBudW1iZXJPZkFjdGl2ZUFuaW1hdGlv bnMoKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMDk5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMDYgIENoYW5nIFNodSAg PGNzaHVAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9sbGVyLnBh Z2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01Nzk4NAorCisgICAgICAgIFVuc2tpcCBwYXNzZWQgdGVzdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQ6CisKIDIwMTEtMDQtMDYgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI4MzAzOS4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azIvU2tpcHBlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Nr aXBwZWQJKHJldmlzaW9uIDgzMDk3KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9T a2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC0xNjU0LDkgKzE2NTQsNiBAQCBmYXN0L2RvbS9ub2Rl c0Zyb21SZWN0LWxpbmtzLWFuZC10ZXh0Lmh0CiAjIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgbGF5 b3V0VGVzdENvbnRyb2xsZXIuc2V0U3BhdGlhbE5hdmlnYXRpb25FbmFibGVkCiBmYXN0L3NwYXRp YWwtbmF2aWdhdGlvbgogCi0jIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgbGF5b3V0VGVzdENvbnRy b2xsZXIucGFnZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMKLXByaW50aW5nL3BhZ2UtZm9ybWF0LWRh dGEtZGlzcGxheS1ub25lLmh0bWwKLQogIyBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRl c3RDb250cm9sbGVyLmR1bXBVc2VyR2VzdHVyZUluRnJhbWVMb2FkQ2FsbGJhY2tzCiBmYXN0L2Zy YW1lcy9sb2NhdGlvbi1yZWRpcmVjdC11c2VyLWdlc3R1cmUuaHRtbAogZmFzdC9mcmFtZXMvbWV0 YS1yZWZyZXNoLXVzZXItZ2VzdHVyZS5odG1sCg== 88551 2011-04-06 18:00:34 -0700 2011-04-06 21:00:23 -0700 r+ed patch with minor changes based on review 57984_2.patch text/plain 9305 cshu SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMTI1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMDYgIENoYW5nIFNo dSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4K KworICAgICAgICBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9sbGVyLnBh Z2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01Nzk4NAorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHA6CisgICAgICAgIChXS0J1bmRsZVBhZ2VTaXplQW5kTWFy Z2luc0luUGl4ZWxzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j L1dLQnVuZGxlUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cGFn ZVNpemVBbmRNYXJnaW5zSW5QaXhlbHMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGUuaDoKKwogMjAxMS0wNC0wNiAgU2lkZGhhcnRoIE1hdGh1ciAg PHNpZGRoYXJ0aC5tYXRodXJAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJlbmph bWluIFBvdWxhaW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAkocmV2aXNpb24gODMxMjUp CisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc2LDYgKzE3NiwxNSBAQCBpbnQgSW5qZWN0ZWRC dW5kbGU6OnBhZ2VOdW1iZXJGb3JFbGVtZW50CiAgICAgcmV0dXJuIFByaW50Q29udGV4dDo6cGFn ZU51bWJlckZvckVsZW1lbnQoZWxlbWVudCwgRmxvYXRTaXplKHBhZ2VXaWR0aEluUGl4ZWxzLCBw YWdlSGVpZ2h0SW5QaXhlbHMpKTsKIH0KIAorU3RyaW5nIEluamVjdGVkQnVuZGxlOjpwYWdlU2l6 ZUFuZE1hcmdpbnNJblBpeGVscyhXZWJGcmFtZSogZnJhbWUsIGludCBwYWdlSW5kZXgsIGludCB3 aWR0aCwgaW50IGhlaWdodCwgaW50IG1hcmdpblRvcCwgaW50IG1hcmdpblJpZ2h0LCBpbnQgbWFy Z2luQm90dG9tLCBpbnQgbWFyZ2luTGVmdCkKK3sKKyAgICBGcmFtZSogY29yZUZyYW1lID0gZnJh bWUgPyBmcmFtZS0+Y29yZUZyYW1lKCkgOiAwOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICByZXR1cm4gUHJpbnRDb250ZXh0OjpwYWdlU2l6ZUFu ZE1hcmdpbnNJblBpeGVscyhjb3JlRnJhbWUsIHBhZ2VJbmRleCwgd2lkdGgsIGhlaWdodCwgbWFy Z2luVG9wLCBtYXJnaW5SaWdodCwgbWFyZ2luQm90dG9tLCBtYXJnaW5MZWZ0KTsKK30KKwogc3Rh dGljIFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4gPiB0b1N0cmluZ1ZlY3RvcihJbW11dGFibGVB cnJheSogcGF0dGVybnMpCiB7CiAgICAgaWYgKCFwYXR0ZXJucykKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlLmgJKHJldmlzaW9uIDgzMTI1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05NSw2ICs5NSw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhXZWJQ YWdlR3JvdXBQcm94eSosIGJvb2wpOwogICAgIGludCBudW1iZXJPZlBhZ2VzKFdlYkZyYW1lKiwg ZG91YmxlLCBkb3VibGUpOwogICAgIGludCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoV2ViRnJh bWUqLCBjb25zdCBTdHJpbmcmLCBkb3VibGUsIGRvdWJsZSk7CisgICAgU3RyaW5nIHBhZ2VTaXpl QW5kTWFyZ2luc0luUGl4ZWxzKFdlYkZyYW1lKiwgaW50LCBpbnQsIGludCwgaW50LCBpbnQsIGlu dCwgaW50KTsKIAogICAgIC8vIFVzZXJDb250ZW50IEFQSQogICAgIHZvaWQgYWRkVXNlclNjcmlw dChXZWJQYWdlR3JvdXBQcm94eSosIEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQqLCBjb25zdCBT dHJpbmcmIHNvdXJjZSwgY29uc3QgU3RyaW5nJiB1cmwsIEltbXV0YWJsZUFycmF5KiB3aGl0ZWxp c3QsIEltbXV0YWJsZUFycmF5KiBibGFja2xpc3QsIFdlYkNvcmU6OlVzZXJTY3JpcHRJbmplY3Rp b25UaW1lLCBXZWJDb3JlOjpVc2VyQ29udGVudEluamVjdGVkRnJhbWVzKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGUuY3BwCShyZXZpc2lvbiA4MzEyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNjIsMyArMTYyLDggQEAgaW50IFdLQnVuZGxlUGFnZU51bWJlckZvckVsZW1lbnRCeUlkKFdL QgogewogICAgIHJldHVybiB0b0ltcGwoYnVuZGxlUmVmKS0+cGFnZU51bWJlckZvckVsZW1lbnRC eUlkKHRvSW1wbChmcmFtZVJlZiksIHRvSW1wbChpZFJlZiktPnN0cmluZygpLCBwYWdlV2lkdGhJ blBpeGVscywgcGFnZUhlaWdodEluUGl4ZWxzKTsKIH0KKworV0tTdHJpbmdSZWYgV0tCdW5kbGVQ YWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscyhXS0J1bmRsZVJlZiBidW5kbGVSZWYsIFdLQnVuZGxl RnJhbWVSZWYgZnJhbWVSZWYsIGludCBwYWdlSW5kZXgsIGludCB3aWR0aCwgaW50IGhlaWdodCwg aW50IG1hcmdpblRvcCwgaW50IG1hcmdpblJpZ2h0LCBpbnQgbWFyZ2luQm90dG9tLCBpbnQgbWFy Z2luTGVmdCkKK3sKKyAgICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKGJ1bmRsZVJlZiktPnBh Z2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKHRvSW1wbChmcmFtZVJlZiksIHBhZ2VJbmRleCwgd2lk dGgsIGhlaWdodCwgbWFyZ2luVG9wLCBtYXJnaW5SaWdodCwgbWFyZ2luQm90dG9tLCBtYXJnaW5M ZWZ0KSk7Cit9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQcml2YXRlLmgJKHJldmlzaW9u IDgzMTI1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy9XS0J1bmRsZVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEsNyBAQCBXS19F WFBPUlQgdm9pZCBXS0J1bmRsZUNsZWFyQWxsRGF0YWJhc2VzCiBXS19FWFBPUlQgdm9pZCBXS0J1 bmRsZVNldERhdGFiYXNlUXVvdGEoV0tCdW5kbGVSZWYgYnVuZGxlLCB1aW50NjRfdCk7CiBXS19F WFBPUlQgaW50IFdLQnVuZGxlTnVtYmVyT2ZQYWdlcyhXS0J1bmRsZVJlZiBidW5kbGUsIFdLQnVu ZGxlRnJhbWVSZWYgZnJhbWVSZWYsIGRvdWJsZSBwYWdlV2lkdGhJblBpeGVscywgZG91YmxlIHBh Z2VIZWlnaHRJblBpeGVscyk7CiBXS19FWFBPUlQgaW50IFdLQnVuZGxlUGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZiwg V0tTdHJpbmdSZWYgaWRSZWYsIGRvdWJsZSBwYWdlV2lkdGhJblBpeGVscywgZG91YmxlIHBhZ2VI ZWlnaHRJblBpeGVscyk7CitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tCdW5kbGVQYWdlU2l6ZUFu ZE1hcmdpbnNJblBpeGVscyhXS0J1bmRsZVJlZiBidW5kbGUsIFdLQnVuZGxlRnJhbWVSZWYgZnJh bWVSZWYsIGludCwgaW50LCBpbnQsIGludCwgaW50LCBpbnQsIGludCk7CiAKICNpZmRlZiBfX2Nw bHVzcGx1cwogfQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0No YW5nZUxvZwkocmV2aXNpb24gODMxMjUpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNC0wNiAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFdlYktp dFRlc3RSdW5uZXIgbmVlZHMgbGF5b3V0VGVzdENvbnRyb2xsZXIucGFnZVNpemVBbmRNYXJnaW5z SW5QaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3OTg0CisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRp bmdzL0xheW91dFRlc3RDb250cm9sbGVyLmlkbDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6 TGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKToKKyAgICAg ICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVy Lmg6CisKIDIwMTEtMDQtMDYgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBUb29scy9XZWJL aXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0xheW91dFRl c3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gODMxMjUpCisrKyBUb29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzM3LDYgKzMzNywxMiBAQCBpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhZ2VOdW1i ZXJGb3JFCiAgICAgcmV0dXJuIFdLQnVuZGxlUGFnZU51bWJlckZvckVsZW1lbnRCeUlkKEluamVj dGVkQnVuZGxlOjpzaGFyZWQoKS5idW5kbGUoKSwgbWFpbkZyYW1lLCB0b1dLKGlkKS5nZXQoKSwg cGFnZVdpZHRoSW5QaXhlbHMsIHBhZ2VIZWlnaHRJblBpeGVscyk7CiB9CiAKK0pTUmV0YWluUHRy PEpTU3RyaW5nUmVmPiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZVNpemVBbmRNYXJnaW5zSW5Q aXhlbHMoaW50IHBhZ2VJbmRleCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBpbnQgbWFyZ2luVG9w LCBpbnQgbWFyZ2luUmlnaHQsIGludCBtYXJnaW5Cb3R0b20sIGludCBtYXJnaW5MZWZ0KQorewor ICAgIFdLQnVuZGxlRnJhbWVSZWYgbWFpbkZyYW1lID0gV0tCdW5kbGVQYWdlR2V0TWFpbkZyYW1l KEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5wYWdlKCktPnBhZ2UoKSk7CisgICAgcmV0dXJuIHRv SlMoV0tCdW5kbGVQYWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscyhJbmplY3RlZEJ1bmRsZTo6c2hh cmVkKCkuYnVuZGxlKCksIG1haW5GcmFtZSwgcGFnZUluZGV4LCB3aWR0aCwgaGVpZ2h0LCBtYXJn aW5Ub3AsIG1hcmdpblJpZ2h0LCBtYXJnaW5Cb3R0b20sIG1hcmdpbkxlZnQpKTsKK30KKwogdW5z aWduZWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndpbmRvd0NvdW50KCkKIHsKICAgICByZXR1cm4g SW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnBhZ2VDb3VudCgpOwpJbmRleDogVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENv bnRyb2xsZXIuaAkocmV2aXNpb24gODMxMjUpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEx NSw2ICsxMTUsNyBAQCBwdWJsaWM6CiAgICAgLy8gUHJpbnRpbmcKICAgICBpbnQgbnVtYmVyT2ZQ YWdlcyhkb3VibGUgcGFnZVdpZHRoSW5QaXhlbHMsIGRvdWJsZSBwYWdlSGVpZ2h0SW5QaXhlbHMp OwogICAgIGludCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoSlNTdHJpbmdSZWYsIGRvdWJsZSBw YWdlV2lkdGhJblBpeGVscywgZG91YmxlIHBhZ2VIZWlnaHRJblBpeGVscyk7CisgICAgSlNSZXRh aW5QdHI8SlNTdHJpbmdSZWY+IHBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKGludCBwYWdlSW5k ZXgsIGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IG1hcmdpblRvcCwgaW50IG1hcmdpblJpZ2h0 LCBpbnQgbWFyZ2luQm90dG9tLCBpbnQgbWFyZ2luTGVmdCk7CiAKICAgICBlbnVtIFdoYXRUb0R1 bXAgeyBSZW5kZXJUcmVlLCBNYWluRnJhbWVUZXh0LCBBbGxGcmFtZXNUZXh0IH07CiAgICAgV2hh dFRvRHVtcCB3aGF0VG9EdW1wKCkgY29uc3QgeyByZXR1cm4gbV93aGF0VG9EdW1wOyB9CkluZGV4 OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRpbmdzL0xheW91dFRl c3RDb250cm9sbGVyLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0JpbmRpbmdzL0xheW91dFRlc3RDb250cm9sbGVyLmlkbAkocmV2aXNpb24g ODMxMjUpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRpbmdz L0xheW91dFRlc3RDb250cm9sbGVyLmlkbAkod29ya2luZyBjb3B5KQpAQCAtNjcsNiArNjcsNyBA QCBtb2R1bGUgV1RSIHsKICAgICAgICAgLy8gUHJpbnRpbmcKICAgICAgICAgaW50IG51bWJlck9m UGFnZXMoaW4gZG91YmxlIHBhZ2VXaWR0aEluUGl4ZWxzLCBpbiBkb3VibGUgcGFnZUhlaWdodElu UGl4ZWxzKTsKICAgICAgICAgaW50IHBhZ2VOdW1iZXJGb3JFbGVtZW50QnlJZChpbiBET01TdHJp bmcgaWQsIGluIGRvdWJsZSBwYWdlV2lkdGhJblBpeGVscywgaW4gZG91YmxlIHBhZ2VIZWlnaHRJ blBpeGVscyk7CisgICAgICAgIERPTVN0cmluZyBwYWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscyhp biBpbnQgcGFnZUluZGV4LCBpbiBpbnQgd2lkdGgsIGluIGludCBoZWlnaHQsIGluIGludCBtYXJn aW5Ub3AsIGluIGludCBtYXJnaW5SaWdodCwgaW4gaW50IG1hcmdpbkJvdHRvbSwgaW4gaW50IG1h cmdpbkxlZnQpOwogCiAgICAgICAgIC8vIEFuaW1hdGlvbiB0ZXN0aW5nLgogICAgICAgICBpbnQg bnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKCk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzEyNSkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisy MDExLTA0LTA2ICBDaGFuZyBTaHUgIDxjc2h1QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBuZWVkcyBsYXlv dXRUZXN0Q29udHJvbGxlci5wYWdlU2l6ZUFuZE1hcmdpbnNJblBpeGVscworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc5ODQKKworICAgICAgICBVbnNr aXAgcGFzc2VkIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9Ta2lwcGVkOgor CiAyMDExLTA0LTA2ICBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgdXBkYXRlIGV4cGVjdGF0aW9ucyBmb3IgQ2hyb21pdW0gdmlzaXRlZCBs aW5rIHRlc3QuCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9Ta2lwcGVkCShyZXZpc2lv biA4MzEyNSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tpcHBlZAkod29ya2lu ZyBjb3B5KQpAQCAtMTY1NCw5ICsxNjU0LDYgQEAgZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1saW5r cy1hbmQtdGV4dC5odAogIyBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9s bGVyLnNldFNwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZAogZmFzdC9zcGF0aWFsLW5hdmlnYXRpb24K IAotIyBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9sbGVyLnBhZ2VTaXpl QW5kTWFyZ2luc0luUGl4ZWxzCi1wcmludGluZy9wYWdlLWZvcm1hdC1kYXRhLWRpc3BsYXktbm9u ZS5odG1sCi0KICMgV2ViS2l0VGVzdFJ1bm5lciBuZWVkcyBsYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wVXNlckdlc3R1cmVJbkZyYW1lTG9hZENhbGxiYWNrcwogZmFzdC9mcmFtZXMvbG9jYXRpb24t cmVkaXJlY3QtdXNlci1nZXN0dXJlLmh0bWwKIGZhc3QvZnJhbWVzL21ldGEtcmVmcmVzaC11c2Vy LWdlc3R1cmUuaHRtbAo=