83112 2012-04-03 20:22:47 -0700 Call histogramCustomCounts directly 2012-04-04 12:46:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82948 1 pilgrim pilgrim abarth cc-bugs fishd jamesr webkit.review.bot oldest_to_newest 595190 0 pilgrim 2012-04-03 20:22:47 -0700 Call histogramCustomCounts directly 595192 1 135497 pilgrim 2012-04-03 20:23:17 -0700 Created attachment 135497 Patch 595205 2 135497 jamesr 2012-04-03 20:41:24 -0700 Comment on attachment 135497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135497&action=review I'd like Adam to check that this is the intended use of WebKit::Platform, but if so then this looks all right > Source/WebKit/chromium/src/painting/PaintAggregator.cpp:36 > +#include <public/Platform.h> this seems spurious 595230 3 135497 abarth 2012-04-03 21:23:24 -0700 Comment on attachment 135497 Patch Yep. Looks great. Thanks. 595495 4 135581 pilgrim 2012-04-04 06:46:06 -0700 Created attachment 135581 Patch 595498 5 pilgrim 2012-04-04 06:47:05 -0700 Removed spurious include in PaintAggregator.cpp. 595813 6 135581 webkit.review.bot 2012-04-04 12:46:48 -0700 Comment on attachment 135581 Patch Clearing flags on attachment: 135581 Committed r113227: <http://trac.webkit.org/changeset/113227> 595814 7 webkit.review.bot 2012-04-04 12:46:53 -0700 All reviewed patches have been landed. Closing bug. 135497 2012-04-03 20:23:17 -0700 2012-04-04 06:46:01 -0700 Patch bug-83112-20120403232307.patch text/plain 9685 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzEzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA0LTAzICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxsIGhpc3RvZ3JhbUN1 c3RvbUNvdW50cyBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODMxMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAg ICAoUGxhdGZvcm1TdXBwb3J0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50TGF5 ZXJQYWludGVyOjpwYWludCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NPdmVyZHJhd01ldHJpY3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NPdmVyZHJhd01l dHJpY3M6OnJlY29yZE1ldHJpY3NJbnRlcm5hbCk6CisKIDIwMTItMDQtMDMgIEtlbmljaGkgSXNo aWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gT3V0LW9m LXByb2Nlc3MgZm9udCBsb2FkaW5nIGdhcmJsZXMgdGV4dApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgJKHJldmlzaW9uIDEx MzEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9y dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjAsNyArMjYwLDYgQEAgcHVibGljOgogICAgIHN0YXRp YyB2b2lkIHN0b3BTaGFyZWRUaW1lcigpOwogCiAgICAgLy8gU3RhdHNDb3VudGVycyAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KLSAgICBzdGF0 aWMgdm9pZCBoaXN0b2dyYW1DdXN0b21Db3VudHMoY29uc3QgY2hhciogbmFtZSwgaW50IHNhbXBs ZSwgaW50IG1pbiwgaW50IG1heCwgaW50IGJ1Y2tldENvdW50KTsKICAgICBzdGF0aWMgdm9pZCBo aXN0b2dyYW1FbnVtZXJhdGlvbihjb25zdCBjaGFyKiBuYW1lLCBpbnQgc2FtcGxlLCBpbnQgYm91 bmRhcnlWYWx1ZSk7CiAKICAgICAvLyBTdWRkZW4gVGVybWluYXRpb24KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDExMzEyOSkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQAogI2luY2x1ZGUgIkxheWVyUmVuZGVy ZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgogI2luY2x1ZGUgImNj L0NDTGF5ZXJUcmVlSG9zdC5oIgorI2luY2x1ZGUgPHB1YmxpYy9QbGF0Zm9ybS5oPgogI2luY2x1 ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC02MSw4ICs2 Miw4IEBAIHB1YmxpYzoKICAgICAgICAgbV9kZWxlZ2F0ZS0+cGFpbnRDb250ZW50cyhjb250ZXh0 LCBjb250ZW50UmVjdCk7CiAgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7 CiAgICAgICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAoY29udGVudFJlY3Qud2lkdGgoKSAqIGNv bnRlbnRSZWN0LmhlaWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOwotICAgICAgICBQ bGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2VsQ29u dGVudFBhaW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwg MTIwLCAzMCk7Ci0gICAgICAgIFBsYXRmb3JtU3VwcG9ydDo6aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxDb250ZW50UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVy U2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpj dXJyZW50KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2VsQ29udGVudFBh aW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwgMTIwLCAz MCk7CisgICAgICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9t Q291bnRzKCJSZW5kZXJlcjQuQWNjZWxDb250ZW50UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4 ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0KIHByaXZhdGU6CiAgICAg ZXhwbGljaXQgQ29udGVudExheWVyUGFpbnRlcihDb250ZW50TGF5ZXJEZWxlZ2F0ZSogZGVsZWdh dGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q092ZXJkcmF3TWV0cmljcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPdmVyZHJhd01ldHJpY3MuY3BwCShyZXZpc2lvbiAx MTMxMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q092ZXJkcmF3TWV0cmljcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNp bmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJUcmVl SG9zdC5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaCIKKyNpbmNsdWRlIDxw dWJsaWMvUGxhdGZvcm0uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMzcsMTEgKzEz OCwxMSBAQCB2b2lkIENDT3ZlcmRyYXdNZXRyaWNzOjpyZWNvcmRNZXRyaWNzSW50CiAgICAgQVNT RVJUKGhpc3RvZ3JhbU9wYXF1ZU5hbWUpOwogCiAgICAgZmxvYXQgbm9ybWFsaXphdGlvbiA9IDEw MDAuZiAvIChsYXllclRyZWVIb3N0LT52aWV3cG9ydFNpemUoKS53aWR0aCgpICogbGF5ZXJUcmVl SG9zdC0+dmlld3BvcnRTaXplKCkuaGVpZ2h0KCkpOwotICAgIFBsYXRmb3JtU3VwcG9ydDo6aGlz dG9ncmFtQ3VzdG9tQ291bnRzKGhpc3RvZ3JhbU9wYXF1ZU5hbWUsIHN0YXRpY19jYXN0PGludD4o bm9ybWFsaXphdGlvbiAqIG1fcGl4ZWxzRHJhd25PcGFxdWUpLCAxMDAsIDEwMDAwMDAsIDUwKTsK LSAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0b2dyYW1UcmFu c2x1Y2VudE5hbWUsIHN0YXRpY19jYXN0PGludD4obm9ybWFsaXphdGlvbiAqIG1fcGl4ZWxzRHJh d25UcmFuc2x1Y2VudCksIDEwMCwgMTAwMDAwMCwgNTApOwotICAgIFBsYXRmb3JtU3VwcG9ydDo6 aGlzdG9ncmFtQ3VzdG9tQ291bnRzKGhpc3RvZ3JhbUN1bGxlZE5hbWUsIHN0YXRpY19jYXN0PGlu dD4obm9ybWFsaXphdGlvbiAqIG1fcGl4ZWxzQ3VsbGVkKSwgMTAwLCAxMDAwMDAwLCA1MCk7Cisg ICAgV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5oaXN0b2dyYW1DdXN0b21Db3VudHMoaGlz dG9ncmFtT3BhcXVlTmFtZSwgc3RhdGljX2Nhc3Q8aW50Pihub3JtYWxpemF0aW9uICogbV9waXhl bHNEcmF3bk9wYXF1ZSksIDEwMCwgMTAwMDAwMCwgNTApOworICAgIFdlYktpdDo6UGxhdGZvcm06 OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRzKGhpc3RvZ3JhbVRyYW5zbHVjZW50TmFt ZSwgc3RhdGljX2Nhc3Q8aW50Pihub3JtYWxpemF0aW9uICogbV9waXhlbHNEcmF3blRyYW5zbHVj ZW50KSwgMTAwLCAxMDAwMDAwLCA1MCk7CisgICAgV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgp LT5oaXN0b2dyYW1DdXN0b21Db3VudHMoaGlzdG9ncmFtQ3VsbGVkTmFtZSwgc3RhdGljX2Nhc3Q8 aW50Pihub3JtYWxpemF0aW9uICogbV9waXhlbHNDdWxsZWQpLCAxMDAsIDEwMDAwMDAsIDUwKTsK ICAgICBpZiAocGFpbnRlZENvdW50ZXJOYW1lKQotICAgICAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhp c3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0b2dyYW1QYWludGVkTmFtZSwgc3RhdGljX2Nhc3Q8aW50 Pihub3JtYWxpemF0aW9uICogbV9waXhlbHNQYWludGVkKSwgMTAwLCAxMDAwMDAwLCA1MCk7Cisg ICAgICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRz KGhpc3RvZ3JhbVBhaW50ZWROYW1lLCBzdGF0aWNfY2FzdDxpbnQ+KG5vcm1hbGl6YXRpb24gKiBt X3BpeGVsc1BhaW50ZWQpLCAxMDAsIDEwMDAwMDAsIDUwKTsKIAogICAgIFRSQUNFX0NPVU5URVJf SUQxKCJ3ZWJraXQiLCBjdWxsQ291bnRlck5hbWUsIGxheWVyVHJlZUhvc3QsIG1fcGl4ZWxzQ3Vs bGVkKTsKICAgICBUUkFDRV9FVkVOVDIoIndlYmtpdCIsICJDQ092ZXJkcmF3TWV0cmljcyIsIG9w YXF1ZUNvdW50ZXJOYW1lLCBtX3BpeGVsc0RyYXduT3BhcXVlLCB0cmFuc2x1Y2VudENvdW50ZXJO YW1lLCBtX3BpeGVsc0RyYXduVHJhbnNsdWNlbnQpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHJldmlzaW9uIDExMzEzMikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMDMgIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENhbGwgaGlzdG9ncmFtQ3Vz dG9tQ291bnRzIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MzExMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6cGFpbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbENvbnRlbnRQYWludGVy OjpwYWludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmdBY3RpdmUpOgorICAgICAgICAqIHNyYy9wYWludGluZy9QYWludEFnZ3JlZ2F0 b3IuY3BwOgorCiAyMDEyLTA0LTAzICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gSW5jbHVkZSBJbWFnZS5oIGluIFRleHRGaWVsZERlY29y YXRvckltcGwuY3BwCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1 cHBvcnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRm b3JtU3VwcG9ydC5jcHAJKHJldmlzaW9uIDExMzEyOSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxMywxMSArNzEz LDYgQEAgdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6OnN0b3BTaGFyZWRUaW1lcigpCiAKIC8vIFN0YXRz Q291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAotdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNv dW50cyhjb25zdCBjaGFyKiBuYW1lLCBpbnQgc2FtcGxlLCBpbnQgbWluLCBpbnQgbWF4LCBpbnQg YnVja2V0Q291bnQpCi17Ci0gICAgd2ViS2l0UGxhdGZvcm1TdXBwb3J0KCktPmhpc3RvZ3JhbUN1 c3RvbUNvdW50cyhuYW1lLCBzYW1wbGUsIG1pbiwgbWF4LCBidWNrZXRDb3VudCk7Ci19Ci0KIHZv aWQgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbihjb25zdCBjaGFyKiBuYW1l LCBpbnQgc2FtcGxlLCBpbnQgYm91bmRhcnlWYWx1ZSkKIHsKICAgICB3ZWJLaXRQbGF0Zm9ybVN1 cHBvcnQoKS0+aGlzdG9ncmFtRW51bWVyYXRpb24obmFtZSwgc2FtcGxlLCBib3VuZGFyeVZhbHVl KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJl dmlzaW9uIDExMzEyOSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCw3IEBACiAjaW5jbHVkZSAicGxhdGZv cm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViU3RyaW5n LmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCisjaW5jbHVkZSA8cHVibGljL1Bs YXRmb3JtLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYkZsb2F0UG9pbnQuaD4KICNpbmNsdWRlIDxw dWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViTGF5ZXIu aD4KQEAgLTE0OTQsOCArMTQ5NSw4IEBAIHZvaWQgV2ViVmlld0ltcGw6OnBhaW50KFdlYkNhbnZh cyogY2FudmEKICAgICAgICAgICAgIHdlYmZyYW1lLT5wYWludChjYW52YXMsIHJlY3QpOwogICAg ICAgICBkb3VibGUgcGFpbnRFbmQgPSBjdXJyZW50VGltZSgpOwogICAgICAgICBkb3VibGUgcGl4 ZWxzUGVyU2VjID0gKHJlY3Qud2lkdGggKiByZWN0LmhlaWdodCkgLyAocGFpbnRFbmQgLSBwYWlu dFN0YXJ0KTsKLSAgICAgICAgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1DdXN0b21Db3VudHMo IlJlbmRlcmVyNC5Tb2Z0d2FyZVBhaW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3Rh cnQpICogMTAwMCwgMCwgMTIwLCAzMCk7Ci0gICAgICAgIFBsYXRmb3JtU3VwcG9ydDo6aGlzdG9n cmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludE1lZ2FwaXhQZXJTZWNvbmQi LCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLCAxMCwgMjEwLCAzMCk7CisgICAgICAgIFdlYktpdDo6 UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29m dHdhcmVQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAs IDEyMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmhpc3RvZ3Jh bUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LlNvZnR3YXJlUGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwg cGl4ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0KIH0KIApAQCAtMzI3 Miw4ICszMjczLDggQEAgcHVibGljOgogICAgICAgICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250 ZXh0LCBjb250ZW50UmVjdCk7CiAgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1l KCk7CiAgICAgICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAoY29udGVudFJlY3Qud2lkdGgoKSAq IGNvbnRlbnRSZWN0LmhlaWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOwotICAgICAg ICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2Vs Um9vdFBhaW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwg MTIwLCAzMCk7Ci0gICAgICAgIFBsYXRmb3JtU3VwcG9ydDo6aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2Vj IC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJy ZW50KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2VsUm9vdFBhaW50RHVy YXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwgMTIwLCAzMCk7Cisg ICAgICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2Vj IC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogCiAgICAgICAgIG1fd2ViVmlld0ltcGwtPm5vbkNv bXBvc2l0ZWRDb250ZW50SG9zdCgpLT5zZXRCYWNrZ3JvdW5kQ29sb3Iodmlldy0+ZG9jdW1lbnRC YWNrZ3JvdW5kQ29sb3IoKSk7CiAKQEAgLTMyOTAsNyArMzI5MSw3IEBAIHByaXZhdGU6CiAKIHZv aWQgV2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sIGFj dGl2ZSkKIHsKLSAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUVudW1lcmF0aW9uKCJHUFUu c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlIiwgYWN0aXZlICogMiArIG1faXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlLCA0KTsKKyAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJy ZW50KCktPmhpc3RvZ3JhbUVudW1lcmF0aW9uKCJHUFUuc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQWN0aXZlIiwgYWN0aXZlICogMiArIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZl LCA0KTsKIAogICAgIGlmIChtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSA9PSBhY3Rp dmUpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL3Bh aW50aW5nL1BhaW50QWdncmVnYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvcGFpbnRpbmcvUGFpbnRBZ2dyZWdhdG9yLmNwcAkocmV2aXNpb24gMTEzMTI5 KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvcGFpbnRpbmcvUGFpbnRBZ2dyZWdhdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogCiAjaW5jbHVkZSAiV2ViS2l0 LmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgiCisjaW5jbHVk ZSA8cHVibGljL1BsYXRmb3JtLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCg== 135581 2012-04-04 06:46:06 -0700 2012-04-04 12:46:48 -0700 Patch bug-83112-20120404094555.patch text/plain 9267 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzE4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA0LTA0ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxsIGhpc3RvZ3JhbUN1 c3RvbUNvdW50cyBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODMxMTIKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChQ bGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nv bnRlbnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRMYXllclBh aW50ZXI6OnBhaW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q092ZXJkcmF3TWV0cmljcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ092ZXJkcmF3TWV0cmlj czo6cmVjb3JkTWV0cmljc0ludGVybmFsKToKKwogMjAxMi0wNC0wNCAgQWxsYW4gU2FuZGZlbGQg SmVuc2VuICA8YWxsYW4uamVuc2VuQG5va2lhLmNvbT4KIAogICAgICAgICBCZXN0IHpvb21hYmxl IGFyZWEgZG9lcyBub3QgYmFsYW5jZSBpbnRlcnNlY3Rpb24gd2l0aCB0YXJnZXQgYXJlYS4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3Vw cG9ydC5oCShyZXZpc2lvbiAxMTMxODMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjYwLDcgKzI2MCw2IEBA IHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBzdG9wU2hhcmVkVGltZXIoKTsKIAogICAgIC8vIFN0 YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCi0gICAgc3RhdGljIHZvaWQgaGlzdG9ncmFtQ3VzdG9tQ291bnRzKGNvbnN0IGNo YXIqIG5hbWUsIGludCBzYW1wbGUsIGludCBtaW4sIGludCBtYXgsIGludCBidWNrZXRDb3VudCk7 CiAgICAgc3RhdGljIHZvaWQgaGlzdG9ncmFtRW51bWVyYXRpb24oY29uc3QgY2hhciogbmFtZSwg aW50IHNhbXBsZSwgaW50IGJvdW5kYXJ5VmFsdWUpOwogCiAgICAgLy8gU3VkZGVuIFRlcm1pbmF0 aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250 ZW50TGF5ZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiAx MTMxODMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250 ZW50TGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAKICNp bmNsdWRlICJMYXllclJlbmRlcmVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN1cHBv cnQuaCIKICNpbmNsdWRlICJjYy9DQ0xheWVyVHJlZUhvc3QuaCIKKyNpbmNsdWRlIDxwdWJsaWMv UGxhdGZvcm0uaD4KICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewpAQCAtNjEsOCArNjIsOCBAQCBwdWJsaWM6CiAgICAgICAgIG1fZGVsZWdhdGUtPnBh aW50Q29udGVudHMoY29udGV4dCwgY29udGVudFJlY3QpOwogICAgICAgICBkb3VibGUgcGFpbnRF bmQgPSBjdXJyZW50VGltZSgpOwogICAgICAgICBkb3VibGUgcGl4ZWxzUGVyU2VjID0gKGNvbnRl bnRSZWN0LndpZHRoKCkgKiBjb250ZW50UmVjdC5oZWlnaHQoKSkgLyAocGFpbnRFbmQgLSBwYWlu dFN0YXJ0KTsKLSAgICAgICAgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1DdXN0b21Db3VudHMo IlJlbmRlcmVyNC5BY2NlbENvbnRlbnRQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWlu dFN0YXJ0KSAqIDEwMDAsIDAsIDEyMCwgMzApOwotICAgICAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhp c3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2VsQ29udGVudFBhaW50TWVnYXBpeFBl clNlY29uZCIsIHBpeGVsc1BlclNlYyAvIDEwMDAwMDAsIDEwLCAyMTAsIDMwKTsKKyAgICAgICAg V2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5oaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRl cmVyNC5BY2NlbENvbnRlbnRQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0 KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50 KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2VsQ29udGVudFBhaW50TWVn YXBpeFBlclNlY29uZCIsIHBpeGVsc1BlclNlYyAvIDEwMDAwMDAsIDEwLCAyMTAsIDMwKTsKICAg ICB9CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IENvbnRlbnRMYXllclBhaW50ZXIoQ29udGVudExh eWVyRGVsZWdhdGUqIGRlbGVnYXRlKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NPdmVyZHJhd01ldHJpY3MuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDT3ZlcmRyYXdNZXRy aWNzLmNwcAkocmV2aXNpb24gMTEzMTgzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NPdmVyZHJhd01ldHJpY3MuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKICNpbmNs dWRlICJjYy9DQ0xheWVyVHJlZUhvc3QuaCIKICNpbmNsdWRlICJjYy9DQ0xheWVyVHJlZUhvc3RJ bXBsLmgiCisjaW5jbHVkZSA8cHVibGljL1BsYXRmb3JtLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIApAQCAtMTM3LDExICsxMzgsMTEgQEAgdm9pZCBDQ092ZXJkcmF3TWV0cmljczo6cmVjb3Jk TWV0cmljc0ludAogICAgIEFTU0VSVChoaXN0b2dyYW1PcGFxdWVOYW1lKTsKIAogICAgIGZsb2F0 IG5vcm1hbGl6YXRpb24gPSAxMDAwLmYgLyAobGF5ZXJUcmVlSG9zdC0+dmlld3BvcnRTaXplKCku d2lkdGgoKSAqIGxheWVyVHJlZUhvc3QtPnZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpKTsKLSAgICBQ bGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0b2dyYW1PcGFxdWVOYW1l LCBzdGF0aWNfY2FzdDxpbnQ+KG5vcm1hbGl6YXRpb24gKiBtX3BpeGVsc0RyYXduT3BhcXVlKSwg MTAwLCAxMDAwMDAwLCA1MCk7Ci0gICAgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1DdXN0b21D b3VudHMoaGlzdG9ncmFtVHJhbnNsdWNlbnROYW1lLCBzdGF0aWNfY2FzdDxpbnQ+KG5vcm1hbGl6 YXRpb24gKiBtX3BpeGVsc0RyYXduVHJhbnNsdWNlbnQpLCAxMDAsIDEwMDAwMDAsIDUwKTsKLSAg ICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0b2dyYW1DdWxsZWRO YW1lLCBzdGF0aWNfY2FzdDxpbnQ+KG5vcm1hbGl6YXRpb24gKiBtX3BpeGVsc0N1bGxlZCksIDEw MCwgMTAwMDAwMCwgNTApOworICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9n cmFtQ3VzdG9tQ291bnRzKGhpc3RvZ3JhbU9wYXF1ZU5hbWUsIHN0YXRpY19jYXN0PGludD4obm9y bWFsaXphdGlvbiAqIG1fcGl4ZWxzRHJhd25PcGFxdWUpLCAxMDAsIDEwMDAwMDAsIDUwKTsKKyAg ICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0 b2dyYW1UcmFuc2x1Y2VudE5hbWUsIHN0YXRpY19jYXN0PGludD4obm9ybWFsaXphdGlvbiAqIG1f cGl4ZWxzRHJhd25UcmFuc2x1Y2VudCksIDEwMCwgMTAwMDAwMCwgNTApOworICAgIFdlYktpdDo6 UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRzKGhpc3RvZ3JhbUN1bGxl ZE5hbWUsIHN0YXRpY19jYXN0PGludD4obm9ybWFsaXphdGlvbiAqIG1fcGl4ZWxzQ3VsbGVkKSwg MTAwLCAxMDAwMDAwLCA1MCk7CiAgICAgaWYgKHBhaW50ZWRDb3VudGVyTmFtZSkKLSAgICAgICAg UGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1DdXN0b21Db3VudHMoaGlzdG9ncmFtUGFpbnRlZE5h bWUsIHN0YXRpY19jYXN0PGludD4obm9ybWFsaXphdGlvbiAqIG1fcGl4ZWxzUGFpbnRlZCksIDEw MCwgMTAwMDAwMCwgNTApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmhp c3RvZ3JhbUN1c3RvbUNvdW50cyhoaXN0b2dyYW1QYWludGVkTmFtZSwgc3RhdGljX2Nhc3Q8aW50 Pihub3JtYWxpemF0aW9uICogbV9waXhlbHNQYWludGVkKSwgMTAwLCAxMDAwMDAwLCA1MCk7CiAK ICAgICBUUkFDRV9DT1VOVEVSX0lEMSgid2Via2l0IiwgY3VsbENvdW50ZXJOYW1lLCBsYXllclRy ZWVIb3N0LCBtX3BpeGVsc0N1bGxlZCk7CiAgICAgVFJBQ0VfRVZFTlQyKCJ3ZWJraXQiLCAiQ0NP dmVyZHJhd01ldHJpY3MiLCBvcGFxdWVDb3VudGVyTmFtZSwgbV9waXhlbHNEcmF3bk9wYXF1ZSwg dHJhbnNsdWNlbnRDb3VudGVyTmFtZSwgbV9waXhlbHNEcmF3blRyYW5zbHVjZW50KTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTMxODMpCisrKyBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisy MDEyLTA0LTA0ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAg ICBDYWxsIGhpc3RvZ3JhbUN1c3RvbUNvdW50cyBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMxMTIKKworICAgICAgICBSZXZpZXdlZCBi eSBBZGFtIEJhcnRoLgorCisgICAgICAgICogc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHA6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6cGFpbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bENvbnRlbnRQYWludGVyOjpwYWludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpz ZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUpOgorICAgICAgICAqIHNyYy9wYWludGlu Zy9QYWludEFnZ3JlZ2F0b3IuY3BwOgorCiAyMDEyLTA0LTA0ICBIYW5zIFdlbm5ib3JnICA8aGFu c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViU3BlZWNoUmVjb2duaXplci5oOiBhZGQgbWlz c2luZyBmb3J3YXJkIGRlY2xhcmF0aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9QbGF0Zm9ybVN1cHBvcnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAJKHJldmlzaW9uIDExMzE4MykKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTcxMywxMSArNzEzLDYgQEAgdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6OnN0b3BTaGFyZWRUaW1lcigp CiAKIC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3Rv Z3JhbUN1c3RvbUNvdW50cyhjb25zdCBjaGFyKiBuYW1lLCBpbnQgc2FtcGxlLCBpbnQgbWluLCBp bnQgbWF4LCBpbnQgYnVja2V0Q291bnQpCi17Ci0gICAgd2ViS2l0UGxhdGZvcm1TdXBwb3J0KCkt Pmhpc3RvZ3JhbUN1c3RvbUNvdW50cyhuYW1lLCBzYW1wbGUsIG1pbiwgbWF4LCBidWNrZXRDb3Vu dCk7Ci19Ci0KIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbihjb25z dCBjaGFyKiBuYW1lLCBpbnQgc2FtcGxlLCBpbnQgYm91bmRhcnlWYWx1ZSkKIHsKICAgICB3ZWJL aXRQbGF0Zm9ybVN1cHBvcnQoKS0+aGlzdG9ncmFtRW51bWVyYXRpb24obmFtZSwgc2FtcGxlLCBi b3VuZGFyeVZhbHVlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAJKHJldmlzaW9uIDExMzE4MykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCw3IEBACiAjaW5j bHVkZSAicGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgiCiAjaW5jbHVkZSAicGxhdGZv cm0vV2ViU3RyaW5nLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCisjaW5jbHVk ZSA8cHVibGljL1BsYXRmb3JtLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYkZsb2F0UG9pbnQuaD4K ICNpbmNsdWRlIDxwdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4KICNpbmNsdWRlIDxwdWJs aWMvV2ViTGF5ZXIuaD4KQEAgLTE0OTcsOCArMTQ5OCw4IEBAIHZvaWQgV2ViVmlld0ltcGw6OnBh aW50KFdlYkNhbnZhcyogY2FudmEKICAgICAgICAgICAgIHdlYmZyYW1lLT5wYWludChjYW52YXMs IHJlY3QpOwogICAgICAgICBkb3VibGUgcGFpbnRFbmQgPSBjdXJyZW50VGltZSgpOwogICAgICAg ICBkb3VibGUgcGl4ZWxzUGVyU2VjID0gKHJlY3Qud2lkdGggKiByZWN0LmhlaWdodCkgLyAocGFp bnRFbmQgLSBwYWludFN0YXJ0KTsKLSAgICAgICAgUGxhdGZvcm1TdXBwb3J0OjpoaXN0b2dyYW1D dXN0b21Db3VudHMoIlJlbmRlcmVyNC5Tb2Z0d2FyZVBhaW50RHVyYXRpb25NUyIsIChwYWludEVu ZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwgMTIwLCAzMCk7Ci0gICAgICAgIFBsYXRmb3JtU3Vw cG9ydDo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludE1lZ2Fw aXhQZXJTZWNvbmQiLCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLCAxMCwgMjEwLCAzMCk7CisgICAg ICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJS ZW5kZXJlcjQuU29mdHdhcmVQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0 KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50 KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LlNvZnR3YXJlUGFpbnRNZWdhcGl4 UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0K IH0KIApAQCAtMzI3NSw4ICszMjc2LDggQEAgcHVibGljOgogICAgICAgICB2aWV3LT5wYWludENv bnRlbnRzKCZjb250ZXh0LCBjb250ZW50UmVjdCk7CiAgICAgICAgIGRvdWJsZSBwYWludEVuZCA9 IGN1cnJlbnRUaW1lKCk7CiAgICAgICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAoY29udGVudFJl Y3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0LmhlaWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3Rh cnQpOwotICAgICAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVu ZGVyZXI0LkFjY2VsUm9vdFBhaW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQp ICogMTAwMCwgMCwgMTIwLCAzMCk7Ci0gICAgICAgIFBsYXRmb3JtU3VwcG9ydDo6aGlzdG9ncmFt Q3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwg cGl4ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOworICAgICAgICBXZWJLaXQ6OlBs YXRmb3JtOjpjdXJyZW50KCktPmhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2Vs Um9vdFBhaW50RHVyYXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMCwgMCwg MTIwLCAzMCk7CisgICAgICAgIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGlzdG9ncmFt Q3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwg cGl4ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogCiAgICAgICAgIG1fd2ViVmll d0ltcGwtPm5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdCgpLT5zZXRCYWNrZ3JvdW5kQ29sb3Iodmll dy0+ZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3IoKSk7CiAKQEAgLTMyOTMsNyArMzI5NCw3IEBAIHBy aXZhdGU6CiAKIHZvaWQgV2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Fj dGl2ZShib29sIGFjdGl2ZSkKIHsKLSAgICBQbGF0Zm9ybVN1cHBvcnQ6Omhpc3RvZ3JhbUVudW1l cmF0aW9uKCJHUFUuc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlIiwgYWN0aXZlICog MiArIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlLCA0KTsKKyAgICBXZWJLaXQ6OlBs YXRmb3JtOjpjdXJyZW50KCktPmhpc3RvZ3JhbUVudW1lcmF0aW9uKCJHUFUuc2V0SXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nQWN0aXZlIiwgYWN0aXZlICogMiArIG1faXNBY2NlbGVyYXRlZENvbXBv c2l0aW5nQWN0aXZlLCA0KTsKIAogICAgIGlmIChtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Fj dGl2ZSA9PSBhY3RpdmUpCiAgICAgICAgIHJldHVybjsK