86884 2012-05-18 12:39:04 -0700 [chromium] Expand damage from the background-blurred layer to ensure readback is only including pixels below that layer 2012-05-22 09:09:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj cc-bugs enne jamesr piman shawnsingh webkit.review.bot wjmaclean oldest_to_newest 627938 0 danakj 2012-05-18 12:39:04 -0700 [chromium] Expand damage from the background-blurred layer to ensure readback is only including pixels below that layer 627941 1 142765 danakj 2012-05-18 12:44:05 -0700 Created attachment 142765 Patch 629395 2 142765 enne 2012-05-21 12:39:54 -0700 Comment on attachment 142765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142765&action=review > Source/WebCore/ChangeLog:15 > + Consider layers in back-to-front order A, B, and C, where layer B has > + a blur background filter applied, and C exactly covers A. When B does > + its readback to perform its blur, it should include the pixels of A > + not C. With partial swap, if B is damaged, that damaged area will read > + pixels from outside of the damage rect. Those pixels should use the > + contents of A, not C, so we must expand the damage to ensure we redraw > + all pixels that are going to be included in the blur for the current > + frame. How does C enter into this? I understand that if B is damaged we need to expand the damage to include B and layers below B, but that doesn't seem to be affected by C. 629624 3 danakj 2012-05-21 15:42:14 -0700 C draws over top of A. If you damage B and do a readback on the next frame (with partial swap), you will be reading the pixels of C instead of A. 629670 4 danakj 2012-05-21 16:08:43 -0700 http://i.imgur.com/2zlPR.png Hope this helps. The blue damage should be expanded so that the pixels read back to draw it are blurring the contents of A not C. 629715 5 enne 2012-05-21 16:48:30 -0700 (In reply to comment #3) > C draws over top of A. If you damage B and do a readback on the next frame (with partial swap), you will be reading the pixels of C instead of A. Sure, but this patch is about damage rects, not about readback order. Wouldn't you need the exact same damage rect regardless of whether C was involved? I'm just trying to understand why you constructed the example like that, because I feel like I'm missing something. 629744 6 142765 enne 2012-05-21 17:17:19 -0700 Comment on attachment 142765 Patch Ok, I see. The damage rects are still wrong even if C isn't there, but having C in the example makes the readback pixels wrong too. Sorry for my confusion. :) 629806 7 142765 webkit.review.bot 2012-05-21 18:13:24 -0700 Comment on attachment 142765 Patch Rejecting attachment 142765 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: mit-queue/Source/WebKit/chromium/third_party/skia/src --revision 3995 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 45>At revision 3995. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/12749138 630405 8 143310 danakj 2012-05-22 08:43:46 -0700 Created attachment 143310 Patch for landing 630425 9 143310 webkit.review.bot 2012-05-22 09:09:28 -0700 Comment on attachment 143310 Patch for landing Clearing flags on attachment: 143310 Committed r117981: <http://trac.webkit.org/changeset/117981> 630426 10 webkit.review.bot 2012-05-22 09:09:34 -0700 All reviewed patches have been landed. Closing bug. 142765 2012-05-18 12:44:05 -0700 2012-05-22 08:43:41 -0700 Patch bug-86884-20120518154403.patch text/plain 10104 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNmYmI5MjM5OTdkMTkz ZDhkMzVlMjQyYzg0YzdjYTA1YWYxMjZlOC4uODlmOGNhM2RkNDg0OGE0NDgzNjM2YzdjOTY0NDcz YWE4YjcyYmZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA1LTE4ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gRXhw YW5kIGRhbWFnZSBmcm9tIHRoZSBiYWNrZ3JvdW5kLWJsdXJyZWQgbGF5ZXIgdG8gZW5zdXJlIHJl YWRiYWNrIGlzIG9ubHkgaW5jbHVkaW5nIHBpeGVscyBiZWxvdyB0aGF0IGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njg4NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnNpZGVyIGxheWVycyBp biBiYWNrLXRvLWZyb250IG9yZGVyIEEsIEIsIGFuZCBDLCB3aGVyZSBsYXllciBCIGhhcworICAg ICAgICBhIGJsdXIgYmFja2dyb3VuZCBmaWx0ZXIgYXBwbGllZCwgYW5kIEMgZXhhY3RseSBjb3Zl cnMgQS4gV2hlbiBCIGRvZXMKKyAgICAgICAgaXRzIHJlYWRiYWNrIHRvIHBlcmZvcm0gaXRzIGJs dXIsIGl0IHNob3VsZCBpbmNsdWRlIHRoZSBwaXhlbHMgb2YgQQorICAgICAgICBub3QgQy4gV2l0 aCBwYXJ0aWFsIHN3YXAsIGlmIEIgaXMgZGFtYWdlZCwgdGhhdCBkYW1hZ2VkIGFyZWEgd2lsbCBy ZWFkCisgICAgICAgIHBpeGVscyBmcm9tIG91dHNpZGUgb2YgdGhlIGRhbWFnZSByZWN0LiBUaG9z ZSBwaXhlbHMgc2hvdWxkIHVzZSB0aGUKKyAgICAgICAgY29udGVudHMgb2YgQSwgbm90IEMsIHNv IHdlIG11c3QgZXhwYW5kIHRoZSBkYW1hZ2UgdG8gZW5zdXJlIHdlIHJlZHJhdworICAgICAgICBh bGwgcGl4ZWxzIHRoYXQgYXJlIGdvaW5nIHRvIGJlIGluY2x1ZGVkIGluIHRoZSBibHVyIGZvciB0 aGUgY3VycmVudAorICAgICAgICBmcmFtZS4KKworICAgICAgICBBbHNvLCB3aGVuIGEgbGF5ZXIg YmVsb3cgQiBoYXMgZGFtYWdlIG91dHNpZGUgdGhlIGNvbnRlbnRCb3VuZHMgb2YgQgorICAgICAg ICBidXQgd2l0aGluIGl0cyBibHVyIHJhZGl1cywgdGhlbiB0aGF0IGRhbWFnZSB3aWxsIGJlIGJs dXJyZWQgaW5zaWRlIEIsCisgICAgICAgIHNvIGV4cGFuZCBhbGwgZGFtYWdlIHdpdGhpbiBCJ3Mg Ymx1cnJlZCBjb250ZW50Qm91bmRzLgorCisgICAgICAgIFVuaXQgdGVzdDogQ0NEYW1hZ2VUcmFj a2VyVGVzdC52ZXJpZnlEYW1hZ2VGb3JCYWNrZ3JvdW5kQmx1cnJlZENoaWxkCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RhbWFnZVRyYWNrZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6ZXhwYW5kUmVjdFdpdGhGaWx0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 OmV4cGFuZERhbWFnZVJlY3RJbnNpZGVSZWN0V2l0aEZpbHRlcnMpOgorICAgICAgICAoV2ViQ29y ZTo6Q0NEYW1hZ2VUcmFja2VyOjp1cGRhdGVEYW1hZ2VUcmFja2luZ1N0YXRlKToKKyAgICAgICAg KFdlYkNvcmU6OkNDRGFtYWdlVHJhY2tlcjo6ZXh0ZW5kRGFtYWdlRm9yUmVuZGVyU3VyZmFjZSk6 CisKIDIwMTItMDUtMTcgIE1pY2hhZWwgTW9zcyAgPG1tb3NzQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBMaW51eCBhbWQ2NCBwbGF0Zm9ybSByZXBvcnRlZCBhcyBpNjg2CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDk5MjRmNGQxMThhODlkOTYyZTAzYTMzNTRmMGEzYTQ2NTQ3ZTI2N2Qu LmNlMTg3ODE2OGJhYzc1YTcyNzg1ZThmNzU0MGQ2NGE4YmFhZGJkZDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDUtMTggIERhbmEgSmFuc2VucyAg PGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBFeHBhbmQgZGFtYWdl IGZyb20gdGhlIGJhY2tncm91bmQtYmx1cnJlZCBsYXllciB0byBlbnN1cmUgcmVhZGJhY2sgaXMg b25seSBpbmNsdWRpbmcgcGl4ZWxzIGJlbG93IHRoYXQgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2ODg0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0RhbWFnZVRyYWNrZXJUZXN0 LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUX0YpOgorCiAyMDEyLTA1LTE3ICBWYW5n ZWxpcyBLb2trZXZpcyAgPHZhbmdlbGlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBFeHBvc2Ug bGF5ZXIgdGlsaW5nIHNpemUgb3B0aW9ucyB0byBXZWJTZXR0aW5ncy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGFtYWdlVHJhY2tl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0Rh bWFnZVRyYWNrZXIuY3BwCmluZGV4IDk0YmJjMWRjNTUzMjFkY2JlNzRiMmRmZmJlYTI1ODMwOGQx Yzg4MzAuLjJjMzMxMjFmZWY5NGQwZjgxMzdlMzI3ZmYzYTQxMDRmNmM4MTUyYmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGFtYWdl VHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NEYW1hZ2VUcmFja2VyLmNwcApAQCAtNTgsMjAgKzU4LDIyIEBAIENDRGFtYWdlVHJh Y2tlcjo6fkNDRGFtYWdlVHJhY2tlcigpCiB7CiB9CiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBleHBh bmREYW1hZ2VSZWN0V2l0aEZpbHRlcnMoRmxvYXRSZWN0JiBkYW1hZ2VSZWN0LCBjb25zdCBGaWx0 ZXJPcGVyYXRpb25zJiBmaWx0ZXJzKQorc3RhdGljIGlubGluZSB2b2lkIGV4cGFuZFJlY3RXaXRo RmlsdGVycyhGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMp CiB7CiAgICAgaW50IHRvcCwgcmlnaHQsIGJvdHRvbSwgbGVmdDsKICAgICBmaWx0ZXJzLmdldE91 dHNldHModG9wLCByaWdodCwgYm90dG9tLCBsZWZ0KTsKLSAgICBkYW1hZ2VSZWN0Lm1vdmUoLWxl ZnQsIC10b3ApOwotICAgIGRhbWFnZVJlY3QuZXhwYW5kKGxlZnQgKyByaWdodCwgdG9wICsgYm90 dG9tKTsKKyAgICByZWN0Lm1vdmUoLWxlZnQsIC10b3ApOworICAgIHJlY3QuZXhwYW5kKGxlZnQg KyByaWdodCwgdG9wICsgYm90dG9tKTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGV4cGFuZERh bWFnZVJlY3RJbnNpZGVSZWN0V2l0aEZpbHRlcnMoRmxvYXRSZWN0JiBkYW1hZ2VSZWN0LCBjb25z dCBGbG9hdFJlY3QmIGZpbHRlclJlY3QsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMp CitzdGF0aWMgaW5saW5lIHZvaWQgZXhwYW5kRGFtYWdlUmVjdEluc2lkZVJlY3RXaXRoRmlsdGVy cyhGbG9hdFJlY3QmIGRhbWFnZVJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgcHJlRmlsdGVyUmVjdCwg Y29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVycykKIHsKICAgICBGbG9hdFJlY3QgZXhwYW5k ZWREYW1hZ2VSZWN0ID0gZGFtYWdlUmVjdDsKLSAgICBleHBhbmREYW1hZ2VSZWN0V2l0aEZpbHRl cnMoZXhwYW5kZWREYW1hZ2VSZWN0LCBmaWx0ZXJzKTsKLSAgICBleHBhbmRlZERhbWFnZVJlY3Qu aW50ZXJzZWN0KGZpbHRlclJlY3QpOworICAgIGV4cGFuZFJlY3RXaXRoRmlsdGVycyhleHBhbmRl ZERhbWFnZVJlY3QsIGZpbHRlcnMpOworICAgIEZsb2F0UmVjdCBmaWx0ZXJSZWN0ID0gcHJlRmls dGVyUmVjdDsKKyAgICBleHBhbmRSZWN0V2l0aEZpbHRlcnMoZmlsdGVyUmVjdCwgZmlsdGVycyk7 CiAKKyAgICBleHBhbmRlZERhbWFnZVJlY3QuaW50ZXJzZWN0KGZpbHRlclJlY3QpOwogICAgIGRh bWFnZVJlY3QudW5pdGUoZXhwYW5kZWREYW1hZ2VSZWN0KTsKIH0KIApAQCAtMTU3LDcgKzE1OSw3 IEBAIHZvaWQgQ0NEYW1hZ2VUcmFja2VyOjp1cGRhdGVEYW1hZ2VUcmFja2luZ1N0YXRlKGNvbnN0 IFZlY3RvcjxDQ0xheWVySW1wbCo+JiBsYXllCiAgICAgICAgIG1fY3VycmVudERhbWFnZVJlY3Qu dW5pdGVJZk5vblplcm8oZGFtYWdlRnJvbUxlZnRvdmVyUmVjdHMpOwogCiAgICAgICAgIGlmIChm aWx0ZXJzLmhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscygpKQotICAgICAgICAgICAgZXhwYW5kRGFt YWdlUmVjdFdpdGhGaWx0ZXJzKG1fY3VycmVudERhbWFnZVJlY3QsIGZpbHRlcnMpOworICAgICAg ICAgICAgZXhwYW5kUmVjdFdpdGhGaWx0ZXJzKG1fY3VycmVudERhbWFnZVJlY3QsIGZpbHRlcnMp OwogICAgIH0KIAogICAgIC8vIFRoZSBuZXh0IGhpc3RvcnkgbWFwIGJlY29tZXMgdGhlIGN1cnJl bnQgbWFwIGZvciB0aGUgbmV4dCBmcmFtZS4KQEAgLTI4OCwxMSArMjkwLDYgQEAgdm9pZCBDQ0Rh bWFnZVRyYWNrZXI6OmV4dGVuZERhbWFnZUZvclJlbmRlclN1cmZhY2UoQ0NMYXllckltcGwqIGxh eWVyLCBGbG9hdFJlY3QKICAgICBGbG9hdFJlY3Qgc3VyZmFjZVJlY3RJblRhcmdldFNwYWNlID0g cmVuZGVyU3VyZmFjZS0+ZHJhd2FibGVDb250ZW50UmVjdCgpOyAvLyBhbHJlYWR5IGluY2x1ZGVz IHJlcGxpY2EgaWYgaXQgZXhpc3RzLgogICAgIHNhdmVSZWN0Rm9yTmV4dEZyYW1lKGxheWVyLT5p ZCgpLCBzdXJmYWNlUmVjdEluVGFyZ2V0U3BhY2UpOwogCi0gICAgLy8gSWYgdGhlIGxheWVyIGhh cyBhIGJhY2tncm91bmQgZmlsdGVyLCB0aGlzIG1heSBjYXVzZSBwaXhlbHMgaW4gb3VyIHN1cmZh Y2UgdG8gYmUgZXhwYW5kZWQsIHNvIHdlIHdpbGwgbmVlZCB0byBleHBhbmQgYW55IGRhbWFnZQot ICAgIC8vIHRoYXQgZXhpc3RzIGJlbG93IHRoaXMgbGF5ZXIgYnkgdGhhdCBhbW91bnQuCi0gICAg aWYgKGxheWVyLT5iYWNrZ3JvdW5kRmlsdGVycygpLmhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscygp KQotICAgICAgICBleHBhbmREYW1hZ2VSZWN0SW5zaWRlUmVjdFdpdGhGaWx0ZXJzKHRhcmdldERh bWFnZVJlY3QsIHN1cmZhY2VSZWN0SW5UYXJnZXRTcGFjZSwgbGF5ZXItPmJhY2tncm91bmRGaWx0 ZXJzKCkpOwotCiAgICAgRmxvYXRSZWN0IGRhbWFnZVJlY3RJbkxvY2FsU3BhY2U7CiAgICAgaWYg KHN1cmZhY2VJc05ldyB8fCByZW5kZXJTdXJmYWNlLT5zdXJmYWNlUHJvcGVydHlDaGFuZ2VkKCkp IHsKICAgICAgICAgLy8gVGhlIGVudGlyZSBzdXJmYWNlIGNvbnRyaWJ1dGVzIGRhbWFnZS4KQEAg LTMzMyw2ICszMzAsMTMgQEAgdm9pZCBDQ0RhbWFnZVRyYWNrZXI6OmV4dGVuZERhbWFnZUZvclJl bmRlclN1cmZhY2UoQ0NMYXllckltcGwqIGxheWVyLCBGbG9hdFJlY3QKICAgICAgICAgaWYgKHJl cGxpY2FJc05ldyB8fCByZXBsaWNhTWFza0xheWVyLT5sYXllclByb3BlcnR5Q2hhbmdlZCgpIHx8 ICFyZXBsaWNhTWFza0xheWVyLT51cGRhdGVSZWN0KCkuaXNFbXB0eSgpKQogICAgICAgICAgICAg dGFyZ2V0RGFtYWdlUmVjdC51bml0ZUlmTm9uWmVybyhyZXBsaWNhTWFza0xheWVyUmVjdCk7CiAg ICAgfQorCisgICAgLy8gSWYgdGhlIGxheWVyIGhhcyBhIGJhY2tncm91bmQgZmlsdGVyLCB0aGlz IG1heSBjYXVzZSBwaXhlbHMgaW4gb3VyIHN1cmZhY2UgdG8gYmUgZXhwYW5kZWQsIHNvIHdlIHdp bGwgbmVlZCB0byBleHBhbmQgYW55IGRhbWFnZQorICAgIC8vIGF0IG9yIGJlbG93IHRoaXMgbGF5 ZXIuIFdlIGV4cGFuZCB0aGUgZGFtYWdlIGZyb20gdGhpcyBsYXllciB0b28sIGFzIHdlIG5lZWQg dG8gcmVhZGJhY2sgdGhvc2UgcGl4ZWxzIGZyb20gdGhlIHN1cmZhY2Ugd2l0aCBvbmx5CisgICAg Ly8gdGhlIGNvbnRlbnRzIG9mIGxheWVycyBiZWxvdyB0aGlzIG9uZSBpbiB0aGVtLiBUaGlzIG1l YW5zIHdlIG5lZWQgdG8gcmVkcmF3IGFueSBwaXhlbHMgaW4gdGhlIHN1cmZhY2UgYmVpbmcgdXNl ZCBmb3IgdGhlIGJsdXIgaW4KKyAgICAvLyB0aGlzIGxheWVyIHRoaXMgZnJhbWUuCisgICAgaWYg KGxheWVyLT5iYWNrZ3JvdW5kRmlsdGVycygpLmhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscygpKQor ICAgICAgICBleHBhbmREYW1hZ2VSZWN0SW5zaWRlUmVjdFdpdGhGaWx0ZXJzKHRhcmdldERhbWFn ZVJlY3QsIHN1cmZhY2VSZWN0SW5UYXJnZXRTcGFjZSwgbGF5ZXItPmJhY2tncm91bmRGaWx0ZXJz KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDRGFtYWdlVHJhY2tlclRlc3QuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9DQ0RhbWFnZVRyYWNrZXJUZXN0LmNwcAppbmRleCAxMWE4ODc4NGI5 ZTFjMmQ5N2VhZmEyN2I0YWYzMDllMTc1YTNkYzg4Li44NjYwYTkyYWQ3ZTE5YzVmMzY0MTk0YTE3 M2MxZmQ3YWM4YjEzMDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L0NDRGFtYWdlVHJhY2tlclRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NEYW1hZ2VUcmFja2VyVGVzdC5jcHAKQEAgLTM5MSw2ICszOTEsOSBAQCBURVNUX0YoQ0NE YW1hZ2VUcmFja2VyVGVzdCwgdmVyaWZ5RGFtYWdlRm9yQmFja2dyb3VuZEJsdXJyZWRDaGlsZCkK ICAgICBDQ0xheWVySW1wbCogY2hpbGQxID0gcm9vdC0+Y2hpbGRyZW4oKVswXS5nZXQoKTsKICAg ICBDQ0xheWVySW1wbCogY2hpbGQyID0gcm9vdC0+Y2hpbGRyZW4oKVsxXS5nZXQoKTsKIAorICAg IC8vIEFsbG93IHVzIHRvIHNldCBkYW1hZ2Ugb24gY2hpbGQxIHRvby4KKyAgICBjaGlsZDEtPnNl dERyYXdzQ29udGVudCh0cnVlKTsKKwogICAgIEZpbHRlck9wZXJhdGlvbnMgZmlsdGVyczsKICAg ICBmaWx0ZXJzLm9wZXJhdGlvbnMoKS5hcHBlbmQoQmx1ckZpbHRlck9wZXJhdGlvbjo6Y3JlYXRl KExlbmd0aCgyLCBXZWJDb3JlOjpGaXhlZCksIEZpbHRlck9wZXJhdGlvbjo6QkxVUikpOwogICAg IGludCBvdXRzZXRUb3AsIG91dHNldFJpZ2h0LCBvdXRzZXRCb3R0b20sIG91dHNldExlZnQ7CkBA IC00MzIsNyArNDM1LDcgQEAgVEVTVF9GKENDRGFtYWdlVHJhY2tlclRlc3QsIHZlcmlmeURhbWFn ZUZvckJhY2tncm91bmRCbHVycmVkQ2hpbGQpCiAgICAgZXhwZWN0ZWREYW1hZ2VSZWN0LmV4cGFu ZChvdXRzZXRMZWZ0LCBvdXRzZXRUb3ApOwogICAgIEVYUEVDVF9GTE9BVF9SRUNUX0VRKGV4cGVj dGVkRGFtYWdlUmVjdCwgcm9vdERhbWFnZVJlY3QpOwogCi0gICAgLy8gQ0FTRSAzOiBTZXR0aW5n IHRoaXMgdXBkYXRlIHJlY3Qgb3V0c2lkZSB0aGUgY29udGVudEJvdW5kcyBvZiB0aGUgYmx1cnJl ZAorICAgIC8vIENBU0UgMzogU2V0dGluZyB0aGlzIHVwZGF0ZSByZWN0IG91dHNpZGUgdGhlIGJs dXJyZWQgY29udGVudEJvdW5kcyBvZiB0aGUgYmx1cnJlZAogICAgIC8vIGNoaWxkMSB3aWxsIG5v dCBjYXVzZSBpdCB0byBiZSBleHBhbmRlZC4KICAgICByb290LT5zZXRVcGRhdGVSZWN0KEZsb2F0 UmVjdCgzMCwgMzAsIDIsIDIpKTsKIApAQCAtNDQ0LDcgKzQ0NywyMiBAQCBURVNUX0YoQ0NEYW1h Z2VUcmFja2VyVGVzdCwgdmVyaWZ5RGFtYWdlRm9yQmFja2dyb3VuZEJsdXJyZWRDaGlsZCkKICAg ICBleHBlY3RlZERhbWFnZVJlY3QgPSBGbG9hdFJlY3QoMzAsIDMwLCAyLCAyKTsKICAgICBFWFBF Q1RfRkxPQVRfUkVDVF9FUShleHBlY3RlZERhbWFnZVJlY3QsIHJvb3REYW1hZ2VSZWN0KTsKIAot ICAgIC8vIENBU0UgNDogU2V0dGluZyB0aGUgdXBkYXRlIHJlY3Qgb24gY2hpbGQyLCB3aGljaCBp cyBhYm92ZSBjaGlsZDEsIHdpbGwKKyAgICAvLyBDQVNFIDQ6IFNldHRpbmcgdGhpcyB1cGRhdGUg cmVjdCBpbnNpZGUgdGhlIGJsdXJyZWQgY29udGVudEJvdW5kcyBidXQgb3V0c2lkZSB0aGUKKyAg ICAvLyBvcmlnaW5hbCBjb250ZW50Qm91bmRzIG9mIHRoZSBibHVycmVkIGNoaWxkMSB3aWxsIGNh dXNlIGl0IHRvIGJlIGV4cGFuZGVkLgorICAgIHJvb3QtPnNldFVwZGF0ZVJlY3QoRmxvYXRSZWN0 KDk5LCA5OSwgMSwgMSkpOworCisgICAgZW11bGF0ZURyYXdpbmdPbmVGcmFtZShyb290LmdldCgp KTsKKworICAgIHJvb3REYW1hZ2VSZWN0ID0gcm9vdC0+cmVuZGVyU3VyZmFjZSgpLT5kYW1hZ2VU cmFja2VyKCktPmN1cnJlbnREYW1hZ2VSZWN0KCk7CisgICAgLy8gRGFtYWdlIG9uIHRoZSByb290 IHNob3VsZCBiZTogcG9zaXRpb24gb2YgdXBkYXRlUmVjdCAoOTksIDk5KSwgZXhwYW5kZWQKKyAg ICAvLyBieSB0aGUgYmx1cnJpbmcgb24gY2hpbGQxLCBidXQgc2luY2UgaXQgaXMgMSBwaXhlbCBv dXRzaWRlIHRoZSBsYXllciwgdGhlCisgICAgLy8gZXhwYW5kaW5nIHNob3VsZCBiZSByZWR1Y2Vk IGJ5IDEuCisgICAgZXhwZWN0ZWREYW1hZ2VSZWN0ID0gRmxvYXRSZWN0KDk5LCA5OSwgMSwgMSk7 CisgICAgZXhwZWN0ZWREYW1hZ2VSZWN0Lm1vdmUoLW91dHNldExlZnQgKyAxLCAtb3V0c2V0VG9w ICsgMSk7CisgICAgZXhwZWN0ZWREYW1hZ2VSZWN0LmV4cGFuZChvdXRzZXRMZWZ0ICsgb3V0c2V0 UmlnaHQgLSAxLCBvdXRzZXRUb3AgKyBvdXRzZXRCb3R0b20gLSAxKTsKKyAgICBFWFBFQ1RfRkxP QVRfUkVDVF9FUShleHBlY3RlZERhbWFnZVJlY3QsIHJvb3REYW1hZ2VSZWN0KTsKKworICAgIC8v IENBU0UgNTogU2V0dGluZyB0aGUgdXBkYXRlIHJlY3Qgb24gY2hpbGQyLCB3aGljaCBpcyBhYm92 ZSBjaGlsZDEsIHdpbGwKICAgICAvLyBub3QgZ2V0IGJsdXJyZWQgYnkgY2hpbGQxLCBzbyBpdCBk b2VzIG5vdCBuZWVkIHRvIGdldCBleHBhbmRlZC4KICAgICBjaGlsZDItPnNldFVwZGF0ZVJlY3Qo RmxvYXRSZWN0KDAsIDAsIDEsIDEpKTsKIApAQCAtNDU0LDYgKzQ3MiwxOSBAQCBURVNUX0YoQ0NE YW1hZ2VUcmFja2VyVGVzdCwgdmVyaWZ5RGFtYWdlRm9yQmFja2dyb3VuZEJsdXJyZWRDaGlsZCkK ICAgICAvLyBEYW1hZ2Ugb24gY2hpbGQyIHNob3VsZCBiZTogcG9zaXRpb24gb2YgdXBkYXRlUmVj dCBvZmZzZXQgYnkgdGhlIGNoaWxkJ3MgcG9zaXRpb24gKDExLCAxMSksIGFuZCBub3QgZXhwYW5k ZWQgYnkgYW55dGhpbmcuCiAgICAgZXhwZWN0ZWREYW1hZ2VSZWN0ID0gRmxvYXRSZWN0KDExLCAx MSwgMSwgMSk7CiAgICAgRVhQRUNUX0ZMT0FUX1JFQ1RfRVEoZXhwZWN0ZWREYW1hZ2VSZWN0LCBy b290RGFtYWdlUmVjdCk7CisKKyAgICAvLyBDQVNFIDY6IFNldHRpbmcgdGhlIHVwZGF0ZSByZWN0 IG9uIGNoaWxkMSB3aWxsIGFsc28gYmx1ciB0aGUgZGFtYWdlLCBzbworICAgIC8vIHRoYXQgYW55 IHBpeGVscyBuZWVkZWQgZm9yIHRoZSBibHVyIGFyZSByZWRyYXduIGluIHRoZSBjdXJyZW50IGZy YW1lLgorICAgIGNoaWxkMS0+c2V0VXBkYXRlUmVjdChGbG9hdFJlY3QoMCwgMCwgMSwgMSkpOwor CisgICAgZW11bGF0ZURyYXdpbmdPbmVGcmFtZShyb290LmdldCgpKTsKKworICAgIHJvb3REYW1h Z2VSZWN0ID0gcm9vdC0+cmVuZGVyU3VyZmFjZSgpLT5kYW1hZ2VUcmFja2VyKCktPmN1cnJlbnRE YW1hZ2VSZWN0KCk7CisgICAgLy8gRGFtYWdlIG9uIGNoaWxkMSBzaG91bGQgYmU6IHBvc2l0aW9u IG9mIHVwZGF0ZVJlY3Qgb2Zmc2V0IGJ5IHRoZSBjaGlsZCdzIHBvc2l0aW9uICgxMDAsIDEwMCks IGFuZCBleHBhbmRlZCBieSB0aGUgZGFtYWdlLgorICAgIGV4cGVjdGVkRGFtYWdlUmVjdCA9IEZs b2F0UmVjdCgxMDAsIDEwMCwgMSwgMSk7CisgICAgZXhwZWN0ZWREYW1hZ2VSZWN0Lm1vdmUoLW91 dHNldExlZnQsIC1vdXRzZXRUb3ApOworICAgIGV4cGVjdGVkRGFtYWdlUmVjdC5leHBhbmQob3V0 c2V0TGVmdCArIG91dHNldFJpZ2h0LCBvdXRzZXRUb3AgKyBvdXRzZXRCb3R0b20pOworICAgIEVY UEVDVF9GTE9BVF9SRUNUX0VRKGV4cGVjdGVkRGFtYWdlUmVjdCwgcm9vdERhbWFnZVJlY3QpOwog fQogCiBURVNUX0YoQ0NEYW1hZ2VUcmFja2VyVGVzdCwgdmVyaWZ5RGFtYWdlRm9yQWRkaW5nQW5k UmVtb3ZpbmdMYXllcikK 143310 2012-05-22 08:43:46 -0700 2012-05-22 09:09:28 -0700 Patch for landing bug-86884-20120522114345.patch text/plain 10126 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VhYTIzNGJiYTUyYTFj Mjc1Y2QzMzNkYjRiMDNkOGIwMmRkOWJjYS4uYmVmM2U3ZWQwZGQxZTgxOWFmNGQxYTcxMmVkNGE0 NTA5NzUxYThlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA1LTE4ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gRXhw YW5kIGRhbWFnZSBmcm9tIHRoZSBiYWNrZ3JvdW5kLWJsdXJyZWQgbGF5ZXIgdG8gZW5zdXJlIHJl YWRiYWNrIGlzIG9ubHkgaW5jbHVkaW5nIHBpeGVscyBiZWxvdyB0aGF0IGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njg4NAorCisgICAgICAg IFJldmlld2VkIGJ5IEFkcmllbm5lIFdhbGtlci4KKworICAgICAgICBDb25zaWRlciBsYXllcnMg aW4gYmFjay10by1mcm9udCBvcmRlciBBLCBCLCBhbmQgQywgd2hlcmUgbGF5ZXIgQiBoYXMKKyAg ICAgICAgYSBibHVyIGJhY2tncm91bmQgZmlsdGVyIGFwcGxpZWQsIGFuZCBDIGV4YWN0bHkgY292 ZXJzIEEuIFdoZW4gQiBkb2VzCisgICAgICAgIGl0cyByZWFkYmFjayB0byBwZXJmb3JtIGl0cyBi bHVyLCBpdCBzaG91bGQgaW5jbHVkZSB0aGUgcGl4ZWxzIG9mIEEKKyAgICAgICAgbm90IEMuIFdp dGggcGFydGlhbCBzd2FwLCBpZiBCIGlzIGRhbWFnZWQsIHRoYXQgZGFtYWdlZCBhcmVhIHdpbGwg cmVhZAorICAgICAgICBwaXhlbHMgZnJvbSBvdXRzaWRlIG9mIHRoZSBkYW1hZ2UgcmVjdC4gVGhv c2UgcGl4ZWxzIHNob3VsZCB1c2UgdGhlCisgICAgICAgIGNvbnRlbnRzIG9mIEEsIG5vdCBDLCBz byB3ZSBtdXN0IGV4cGFuZCB0aGUgZGFtYWdlIHRvIGVuc3VyZSB3ZSByZWRyYXcKKyAgICAgICAg YWxsIHBpeGVscyB0aGF0IGFyZSBnb2luZyB0byBiZSBpbmNsdWRlZCBpbiB0aGUgYmx1ciBmb3Ig dGhlIGN1cnJlbnQKKyAgICAgICAgZnJhbWUuCisKKyAgICAgICAgQWxzbywgd2hlbiBhIGxheWVy IGJlbG93IEIgaGFzIGRhbWFnZSBvdXRzaWRlIHRoZSBjb250ZW50Qm91bmRzIG9mIEIKKyAgICAg ICAgYnV0IHdpdGhpbiBpdHMgYmx1ciByYWRpdXMsIHRoZW4gdGhhdCBkYW1hZ2Ugd2lsbCBiZSBi bHVycmVkIGluc2lkZSBCLAorICAgICAgICBzbyBleHBhbmQgYWxsIGRhbWFnZSB3aXRoaW4gQidz IGJsdXJyZWQgY29udGVudEJvdW5kcy4KKworICAgICAgICBVbml0IHRlc3Q6IENDRGFtYWdlVHJh Y2tlclRlc3QudmVyaWZ5RGFtYWdlRm9yQmFja2dyb3VuZEJsdXJyZWRDaGlsZAorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEYW1hZ2VUcmFja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmV4cGFuZFJlY3RXaXRoRmlsdGVycyk6CisgICAgICAgIChXZWJDb3Jl OjpleHBhbmREYW1hZ2VSZWN0SW5zaWRlUmVjdFdpdGhGaWx0ZXJzKToKKyAgICAgICAgKFdlYkNv cmU6OkNDRGFtYWdlVHJhY2tlcjo6dXBkYXRlRGFtYWdlVHJhY2tpbmdTdGF0ZSk6CisgICAgICAg IChXZWJDb3JlOjpDQ0RhbWFnZVRyYWNrZXI6OmV4dGVuZERhbWFnZUZvclJlbmRlclN1cmZhY2Up OgorCiAyMDEyLTA1LTIyICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBIZWFwU25hcHNob3Q6IHNwZWVkVXAgYnVpbGRBZ2dy ZWdhdGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA4NWFmODNiZDE4OWRiZjA3MjYx MDY4MTAxMjNiZTExMTlmZmQyMjkxLi5jMzgzMDEwMzgyYTRmYWFmNzI5NzQ0YzljMWVkZTlhMWNk NzQ5NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEy LTA1LTE4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtj aHJvbWl1bV0gRXhwYW5kIGRhbWFnZSBmcm9tIHRoZSBiYWNrZ3JvdW5kLWJsdXJyZWQgbGF5ZXIg dG8gZW5zdXJlIHJlYWRiYWNrIGlzIG9ubHkgaW5jbHVkaW5nIHBpeGVscyBiZWxvdyB0aGF0IGxh eWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njg4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IEFkcmllbm5lIFdhbGtlci4KKworICAgICAgICAqIHRl c3RzL0NDRGFtYWdlVHJhY2tlclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0VGVzdHM6OlRFU1Rf Rik6CisKIDIwMTItMDUtMjIgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCB0aGUgQ29udGV4dE1lbnVJdGVtIFN1 Yk1lbnUgdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NEYW1hZ2VUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGFtYWdlVHJhY2tlci5jcHAKaW5kZXggZTVhODY5M2I3 NjA4OWQ3NGNiM2U5MmE5MjlhNGJlMjAwNDJiYTY0ZS4uNTY3YmQxZjFmZWEyMDAyZTU0Yjc1NWM3 NmVmYTkxZWU1NjU0YWVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NEYW1hZ2VUcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RhbWFnZVRyYWNrZXIuY3BwCkBAIC01 OCwyMCArNTgsMjIgQEAgQ0NEYW1hZ2VUcmFja2VyOjp+Q0NEYW1hZ2VUcmFja2VyKCkKIHsKIH0K IAotc3RhdGljIGlubGluZSB2b2lkIGV4cGFuZERhbWFnZVJlY3RXaXRoRmlsdGVycyhGbG9hdFJl Y3QmIGRhbWFnZVJlY3QsIGNvbnN0IFdlYktpdDo6V2ViRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVy cykKK3N0YXRpYyBpbmxpbmUgdm9pZCBleHBhbmRSZWN0V2l0aEZpbHRlcnMoRmxvYXRSZWN0JiBy ZWN0LCBjb25zdCBXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiB7CiAgICAg aW50IHRvcCwgcmlnaHQsIGJvdHRvbSwgbGVmdDsKICAgICBmaWx0ZXJzLmdldE91dHNldHModG9w LCByaWdodCwgYm90dG9tLCBsZWZ0KTsKLSAgICBkYW1hZ2VSZWN0Lm1vdmUoLWxlZnQsIC10b3Ap OwotICAgIGRhbWFnZVJlY3QuZXhwYW5kKGxlZnQgKyByaWdodCwgdG9wICsgYm90dG9tKTsKKyAg ICByZWN0Lm1vdmUoLWxlZnQsIC10b3ApOworICAgIHJlY3QuZXhwYW5kKGxlZnQgKyByaWdodCwg dG9wICsgYm90dG9tKTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGV4cGFuZERhbWFnZVJlY3RJ bnNpZGVSZWN0V2l0aEZpbHRlcnMoRmxvYXRSZWN0JiBkYW1hZ2VSZWN0LCBjb25zdCBGbG9hdFJl Y3QmIGZpbHRlclJlY3QsIGNvbnN0IFdlYktpdDo6V2ViRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVy cykKK3N0YXRpYyBpbmxpbmUgdm9pZCBleHBhbmREYW1hZ2VSZWN0SW5zaWRlUmVjdFdpdGhGaWx0 ZXJzKEZsb2F0UmVjdCYgZGFtYWdlUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBwcmVGaWx0ZXJSZWN0 LCBjb25zdCBXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiB7CiAgICAgRmxv YXRSZWN0IGV4cGFuZGVkRGFtYWdlUmVjdCA9IGRhbWFnZVJlY3Q7Ci0gICAgZXhwYW5kRGFtYWdl UmVjdFdpdGhGaWx0ZXJzKGV4cGFuZGVkRGFtYWdlUmVjdCwgZmlsdGVycyk7Ci0gICAgZXhwYW5k ZWREYW1hZ2VSZWN0LmludGVyc2VjdChmaWx0ZXJSZWN0KTsKKyAgICBleHBhbmRSZWN0V2l0aEZp bHRlcnMoZXhwYW5kZWREYW1hZ2VSZWN0LCBmaWx0ZXJzKTsKKyAgICBGbG9hdFJlY3QgZmlsdGVy UmVjdCA9IHByZUZpbHRlclJlY3Q7CisgICAgZXhwYW5kUmVjdFdpdGhGaWx0ZXJzKGZpbHRlclJl Y3QsIGZpbHRlcnMpOwogCisgICAgZXhwYW5kZWREYW1hZ2VSZWN0LmludGVyc2VjdChmaWx0ZXJS ZWN0KTsKICAgICBkYW1hZ2VSZWN0LnVuaXRlKGV4cGFuZGVkRGFtYWdlUmVjdCk7CiB9CiAKQEAg LTE1Nyw3ICsxNTksNyBAQCB2b2lkIENDRGFtYWdlVHJhY2tlcjo6dXBkYXRlRGFtYWdlVHJhY2tp bmdTdGF0ZShjb25zdCBWZWN0b3I8Q0NMYXllckltcGwqPiYgbGF5ZQogICAgICAgICBtX2N1cnJl bnREYW1hZ2VSZWN0LnVuaXRlSWZOb25aZXJvKGRhbWFnZUZyb21MZWZ0b3ZlclJlY3RzKTsKIAog ICAgICAgICBpZiAoZmlsdGVycy5oYXNGaWx0ZXJUaGF0TW92ZXNQaXhlbHMoKSkKLSAgICAgICAg ICAgIGV4cGFuZERhbWFnZVJlY3RXaXRoRmlsdGVycyhtX2N1cnJlbnREYW1hZ2VSZWN0LCBmaWx0 ZXJzKTsKKyAgICAgICAgICAgIGV4cGFuZFJlY3RXaXRoRmlsdGVycyhtX2N1cnJlbnREYW1hZ2VS ZWN0LCBmaWx0ZXJzKTsKICAgICB9CiAKICAgICAvLyBUaGUgbmV4dCBoaXN0b3J5IG1hcCBiZWNv bWVzIHRoZSBjdXJyZW50IG1hcCBmb3IgdGhlIG5leHQgZnJhbWUuCkBAIC0yODgsMTEgKzI5MCw2 IEBAIHZvaWQgQ0NEYW1hZ2VUcmFja2VyOjpleHRlbmREYW1hZ2VGb3JSZW5kZXJTdXJmYWNlKEND TGF5ZXJJbXBsKiBsYXllciwgRmxvYXRSZWN0CiAgICAgRmxvYXRSZWN0IHN1cmZhY2VSZWN0SW5U YXJnZXRTcGFjZSA9IHJlbmRlclN1cmZhY2UtPmRyYXdhYmxlQ29udGVudFJlY3QoKTsgLy8gYWxy ZWFkeSBpbmNsdWRlcyByZXBsaWNhIGlmIGl0IGV4aXN0cy4KICAgICBzYXZlUmVjdEZvck5leHRG cmFtZShsYXllci0+aWQoKSwgc3VyZmFjZVJlY3RJblRhcmdldFNwYWNlKTsKIAotICAgIC8vIElm IHRoZSBsYXllciBoYXMgYSBiYWNrZ3JvdW5kIGZpbHRlciwgdGhpcyBtYXkgY2F1c2UgcGl4ZWxz IGluIG91ciBzdXJmYWNlIHRvIGJlIGV4cGFuZGVkLCBzbyB3ZSB3aWxsIG5lZWQgdG8gZXhwYW5k IGFueSBkYW1hZ2UKLSAgICAvLyB0aGF0IGV4aXN0cyBiZWxvdyB0aGlzIGxheWVyIGJ5IHRoYXQg YW1vdW50LgotICAgIGlmIChsYXllci0+YmFja2dyb3VuZEZpbHRlcnMoKS5oYXNGaWx0ZXJUaGF0 TW92ZXNQaXhlbHMoKSkKLSAgICAgICAgZXhwYW5kRGFtYWdlUmVjdEluc2lkZVJlY3RXaXRoRmls dGVycyh0YXJnZXREYW1hZ2VSZWN0LCBzdXJmYWNlUmVjdEluVGFyZ2V0U3BhY2UsIGxheWVyLT5i YWNrZ3JvdW5kRmlsdGVycygpKTsKLQogICAgIEZsb2F0UmVjdCBkYW1hZ2VSZWN0SW5Mb2NhbFNw YWNlOwogICAgIGlmIChzdXJmYWNlSXNOZXcgfHwgcmVuZGVyU3VyZmFjZS0+c3VyZmFjZVByb3Bl cnR5Q2hhbmdlZCgpKSB7CiAgICAgICAgIC8vIFRoZSBlbnRpcmUgc3VyZmFjZSBjb250cmlidXRl cyBkYW1hZ2UuCkBAIC0zMzMsNiArMzMwLDEzIEBAIHZvaWQgQ0NEYW1hZ2VUcmFja2VyOjpleHRl bmREYW1hZ2VGb3JSZW5kZXJTdXJmYWNlKENDTGF5ZXJJbXBsKiBsYXllciwgRmxvYXRSZWN0CiAg ICAgICAgIGlmIChyZXBsaWNhSXNOZXcgfHwgcmVwbGljYU1hc2tMYXllci0+bGF5ZXJQcm9wZXJ0 eUNoYW5nZWQoKSB8fCAhcmVwbGljYU1hc2tMYXllci0+dXBkYXRlUmVjdCgpLmlzRW1wdHkoKSkK ICAgICAgICAgICAgIHRhcmdldERhbWFnZVJlY3QudW5pdGVJZk5vblplcm8ocmVwbGljYU1hc2tM YXllclJlY3QpOwogICAgIH0KKworICAgIC8vIElmIHRoZSBsYXllciBoYXMgYSBiYWNrZ3JvdW5k IGZpbHRlciwgdGhpcyBtYXkgY2F1c2UgcGl4ZWxzIGluIG91ciBzdXJmYWNlIHRvIGJlIGV4cGFu ZGVkLCBzbyB3ZSB3aWxsIG5lZWQgdG8gZXhwYW5kIGFueSBkYW1hZ2UKKyAgICAvLyBhdCBvciBi ZWxvdyB0aGlzIGxheWVyLiBXZSBleHBhbmQgdGhlIGRhbWFnZSBmcm9tIHRoaXMgbGF5ZXIgdG9v LCBhcyB3ZSBuZWVkIHRvIHJlYWRiYWNrIHRob3NlIHBpeGVscyBmcm9tIHRoZSBzdXJmYWNlIHdp dGggb25seQorICAgIC8vIHRoZSBjb250ZW50cyBvZiBsYXllcnMgYmVsb3cgdGhpcyBvbmUgaW4g dGhlbS4gVGhpcyBtZWFucyB3ZSBuZWVkIHRvIHJlZHJhdyBhbnkgcGl4ZWxzIGluIHRoZSBzdXJm YWNlIGJlaW5nIHVzZWQgZm9yIHRoZSBibHVyIGluCisgICAgLy8gdGhpcyBsYXllciB0aGlzIGZy YW1lLgorICAgIGlmIChsYXllci0+YmFja2dyb3VuZEZpbHRlcnMoKS5oYXNGaWx0ZXJUaGF0TW92 ZXNQaXhlbHMoKSkKKyAgICAgICAgZXhwYW5kRGFtYWdlUmVjdEluc2lkZVJlY3RXaXRoRmlsdGVy cyh0YXJnZXREYW1hZ2VSZWN0LCBzdXJmYWNlUmVjdEluVGFyZ2V0U3BhY2UsIGxheWVyLT5iYWNr Z3JvdW5kRmlsdGVycygpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0RhbWFnZVRyYWNrZXJUZXN0LmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NEYW1hZ2VUcmFja2VyVGVzdC5jcHAKaW5k ZXggNTAzZWY1NzZmNzkwMmE5YjZjOTBlMTljZWFiOWU0NDE4MmQxZDI3Zi4uYmJlYTk3MWRkNWE0 ZWZlNjdkMzM2MTYxYzlhMGRmYjcxNWFkN2FiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ0RhbWFnZVRyYWNrZXJUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0NDRGFtYWdlVHJhY2tlclRlc3QuY3BwCkBAIC0zOTQsNiArMzk0LDkg QEAgVEVTVF9GKENDRGFtYWdlVHJhY2tlclRlc3QsIHZlcmlmeURhbWFnZUZvckJhY2tncm91bmRC bHVycmVkQ2hpbGQpCiAgICAgQ0NMYXllckltcGwqIGNoaWxkMSA9IHJvb3QtPmNoaWxkcmVuKClb MF0uZ2V0KCk7CiAgICAgQ0NMYXllckltcGwqIGNoaWxkMiA9IHJvb3QtPmNoaWxkcmVuKClbMV0u Z2V0KCk7CiAKKyAgICAvLyBBbGxvdyB1cyB0byBzZXQgZGFtYWdlIG9uIGNoaWxkMSB0b28uCisg ICAgY2hpbGQxLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisKICAgICBXZWJGaWx0ZXJPcGVyYXRp b25zIGZpbHRlcnM7CiAgICAgZmlsdGVycy5hcHBlbmQoV2ViRmlsdGVyT3BlcmF0aW9uOjpjcmVh dGVCbHVyRmlsdGVyKDIpKTsKICAgICBpbnQgb3V0c2V0VG9wLCBvdXRzZXRSaWdodCwgb3V0c2V0 Qm90dG9tLCBvdXRzZXRMZWZ0OwpAQCAtNDM1LDcgKzQzOCw3IEBAIFRFU1RfRihDQ0RhbWFnZVRy YWNrZXJUZXN0LCB2ZXJpZnlEYW1hZ2VGb3JCYWNrZ3JvdW5kQmx1cnJlZENoaWxkKQogICAgIGV4 cGVjdGVkRGFtYWdlUmVjdC5leHBhbmQob3V0c2V0TGVmdCwgb3V0c2V0VG9wKTsKICAgICBFWFBF Q1RfRkxPQVRfUkVDVF9FUShleHBlY3RlZERhbWFnZVJlY3QsIHJvb3REYW1hZ2VSZWN0KTsKIAot ICAgIC8vIENBU0UgMzogU2V0dGluZyB0aGlzIHVwZGF0ZSByZWN0IG91dHNpZGUgdGhlIGNvbnRl bnRCb3VuZHMgb2YgdGhlIGJsdXJyZWQKKyAgICAvLyBDQVNFIDM6IFNldHRpbmcgdGhpcyB1cGRh dGUgcmVjdCBvdXRzaWRlIHRoZSBibHVycmVkIGNvbnRlbnRCb3VuZHMgb2YgdGhlIGJsdXJyZWQK ICAgICAvLyBjaGlsZDEgd2lsbCBub3QgY2F1c2UgaXQgdG8gYmUgZXhwYW5kZWQuCiAgICAgcm9v dC0+c2V0VXBkYXRlUmVjdChGbG9hdFJlY3QoMzAsIDMwLCAyLCAyKSk7CiAKQEAgLTQ0Nyw3ICs0 NTAsMjIgQEAgVEVTVF9GKENDRGFtYWdlVHJhY2tlclRlc3QsIHZlcmlmeURhbWFnZUZvckJhY2tn cm91bmRCbHVycmVkQ2hpbGQpCiAgICAgZXhwZWN0ZWREYW1hZ2VSZWN0ID0gRmxvYXRSZWN0KDMw LCAzMCwgMiwgMik7CiAgICAgRVhQRUNUX0ZMT0FUX1JFQ1RfRVEoZXhwZWN0ZWREYW1hZ2VSZWN0 LCByb290RGFtYWdlUmVjdCk7CiAKLSAgICAvLyBDQVNFIDQ6IFNldHRpbmcgdGhlIHVwZGF0ZSBy ZWN0IG9uIGNoaWxkMiwgd2hpY2ggaXMgYWJvdmUgY2hpbGQxLCB3aWxsCisgICAgLy8gQ0FTRSA0 OiBTZXR0aW5nIHRoaXMgdXBkYXRlIHJlY3QgaW5zaWRlIHRoZSBibHVycmVkIGNvbnRlbnRCb3Vu ZHMgYnV0IG91dHNpZGUgdGhlCisgICAgLy8gb3JpZ2luYWwgY29udGVudEJvdW5kcyBvZiB0aGUg Ymx1cnJlZCBjaGlsZDEgd2lsbCBjYXVzZSBpdCB0byBiZSBleHBhbmRlZC4KKyAgICByb290LT5z ZXRVcGRhdGVSZWN0KEZsb2F0UmVjdCg5OSwgOTksIDEsIDEpKTsKKworICAgIGVtdWxhdGVEcmF3 aW5nT25lRnJhbWUocm9vdC5nZXQoKSk7CisKKyAgICByb290RGFtYWdlUmVjdCA9IHJvb3QtPnJl bmRlclN1cmZhY2UoKS0+ZGFtYWdlVHJhY2tlcigpLT5jdXJyZW50RGFtYWdlUmVjdCgpOworICAg IC8vIERhbWFnZSBvbiB0aGUgcm9vdCBzaG91bGQgYmU6IHBvc2l0aW9uIG9mIHVwZGF0ZVJlY3Qg KDk5LCA5OSksIGV4cGFuZGVkCisgICAgLy8gYnkgdGhlIGJsdXJyaW5nIG9uIGNoaWxkMSwgYnV0 IHNpbmNlIGl0IGlzIDEgcGl4ZWwgb3V0c2lkZSB0aGUgbGF5ZXIsIHRoZQorICAgIC8vIGV4cGFu ZGluZyBzaG91bGQgYmUgcmVkdWNlZCBieSAxLgorICAgIGV4cGVjdGVkRGFtYWdlUmVjdCA9IEZs b2F0UmVjdCg5OSwgOTksIDEsIDEpOworICAgIGV4cGVjdGVkRGFtYWdlUmVjdC5tb3ZlKC1vdXRz ZXRMZWZ0ICsgMSwgLW91dHNldFRvcCArIDEpOworICAgIGV4cGVjdGVkRGFtYWdlUmVjdC5leHBh bmQob3V0c2V0TGVmdCArIG91dHNldFJpZ2h0IC0gMSwgb3V0c2V0VG9wICsgb3V0c2V0Qm90dG9t IC0gMSk7CisgICAgRVhQRUNUX0ZMT0FUX1JFQ1RfRVEoZXhwZWN0ZWREYW1hZ2VSZWN0LCByb290 RGFtYWdlUmVjdCk7CisKKyAgICAvLyBDQVNFIDU6IFNldHRpbmcgdGhlIHVwZGF0ZSByZWN0IG9u IGNoaWxkMiwgd2hpY2ggaXMgYWJvdmUgY2hpbGQxLCB3aWxsCiAgICAgLy8gbm90IGdldCBibHVy cmVkIGJ5IGNoaWxkMSwgc28gaXQgZG9lcyBub3QgbmVlZCB0byBnZXQgZXhwYW5kZWQuCiAgICAg Y2hpbGQyLT5zZXRVcGRhdGVSZWN0KEZsb2F0UmVjdCgwLCAwLCAxLCAxKSk7CiAKQEAgLTQ1Nyw2 ICs0NzUsMTkgQEAgVEVTVF9GKENDRGFtYWdlVHJhY2tlclRlc3QsIHZlcmlmeURhbWFnZUZvckJh Y2tncm91bmRCbHVycmVkQ2hpbGQpCiAgICAgLy8gRGFtYWdlIG9uIGNoaWxkMiBzaG91bGQgYmU6 IHBvc2l0aW9uIG9mIHVwZGF0ZVJlY3Qgb2Zmc2V0IGJ5IHRoZSBjaGlsZCdzIHBvc2l0aW9uICgx MSwgMTEpLCBhbmQgbm90IGV4cGFuZGVkIGJ5IGFueXRoaW5nLgogICAgIGV4cGVjdGVkRGFtYWdl UmVjdCA9IEZsb2F0UmVjdCgxMSwgMTEsIDEsIDEpOwogICAgIEVYUEVDVF9GTE9BVF9SRUNUX0VR KGV4cGVjdGVkRGFtYWdlUmVjdCwgcm9vdERhbWFnZVJlY3QpOworCisgICAgLy8gQ0FTRSA2OiBT ZXR0aW5nIHRoZSB1cGRhdGUgcmVjdCBvbiBjaGlsZDEgd2lsbCBhbHNvIGJsdXIgdGhlIGRhbWFn ZSwgc28KKyAgICAvLyB0aGF0IGFueSBwaXhlbHMgbmVlZGVkIGZvciB0aGUgYmx1ciBhcmUgcmVk cmF3biBpbiB0aGUgY3VycmVudCBmcmFtZS4KKyAgICBjaGlsZDEtPnNldFVwZGF0ZVJlY3QoRmxv YXRSZWN0KDAsIDAsIDEsIDEpKTsKKworICAgIGVtdWxhdGVEcmF3aW5nT25lRnJhbWUocm9vdC5n ZXQoKSk7CisKKyAgICByb290RGFtYWdlUmVjdCA9IHJvb3QtPnJlbmRlclN1cmZhY2UoKS0+ZGFt YWdlVHJhY2tlcigpLT5jdXJyZW50RGFtYWdlUmVjdCgpOworICAgIC8vIERhbWFnZSBvbiBjaGls ZDEgc2hvdWxkIGJlOiBwb3NpdGlvbiBvZiB1cGRhdGVSZWN0IG9mZnNldCBieSB0aGUgY2hpbGQn cyBwb3NpdGlvbiAoMTAwLCAxMDApLCBhbmQgZXhwYW5kZWQgYnkgdGhlIGRhbWFnZS4KKyAgICBl eHBlY3RlZERhbWFnZVJlY3QgPSBGbG9hdFJlY3QoMTAwLCAxMDAsIDEsIDEpOworICAgIGV4cGVj dGVkRGFtYWdlUmVjdC5tb3ZlKC1vdXRzZXRMZWZ0LCAtb3V0c2V0VG9wKTsKKyAgICBleHBlY3Rl ZERhbWFnZVJlY3QuZXhwYW5kKG91dHNldExlZnQgKyBvdXRzZXRSaWdodCwgb3V0c2V0VG9wICsg b3V0c2V0Qm90dG9tKTsKKyAgICBFWFBFQ1RfRkxPQVRfUkVDVF9FUShleHBlY3RlZERhbWFnZVJl Y3QsIHJvb3REYW1hZ2VSZWN0KTsKIH0KIAogVEVTVF9GKENDRGFtYWdlVHJhY2tlclRlc3QsIHZl cmlmeURhbWFnZUZvckFkZGluZ0FuZFJlbW92aW5nTGF5ZXIpCg==