130731 2014-03-25 11:41:19 -0700 [CSSRegions] Rename inNamedFlow flag to isNamedFlowContentNode flag 2014-03-27 02:46:01 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 57312 1 mihnea mihnea cmarcelo commit-queue esprehn+autocc glenn kangil.han kondapallykalyan WebkitBugTracker oldest_to_newest 994265 0 mihnea 2014-03-25 11:41:19 -0700 Currently, the inNamedFlow flag in Node class actually tells is a node is a content node, one that has a style with flow-into. Since it is used only for those nodes and not propagated through hierarchy, i want to renamed it to a more meaningful name. 994269 1 227777 mihnea 2014-03-25 11:46:34 -0700 Created attachment 227777 Patch 994281 2 227777 abucur 2014-03-25 12:21:24 -0700 Comment on attachment 227777 Patch r=me 994868 3 227777 commit-queue 2014-03-27 01:09:55 -0700 Comment on attachment 227777 Patch Rejecting attachment 227777 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 227777, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: t 497 (offset 13 lines). Hunk #3 succeeded at 518 (offset 13 lines). Hunk #4 succeeded at 634 (offset 13 lines). patching file Source/WebCore/style/StyleResolveTree.cpp Hunk #1 FAILED at 422. Hunk #2 succeeded at 723 with fuzz 2 (offset 59 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/style/StyleResolveTree.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Andrei Bucur']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/4665520531963904 994879 4 227935 mihnea 2014-03-27 02:07:46 -0700 Created attachment 227935 Patch for landing 994885 5 227935 commit-queue 2014-03-27 02:45:57 -0700 Comment on attachment 227935 Patch for landing Clearing flags on attachment: 227935 Committed r166354: <http://trac.webkit.org/changeset/166354> 994886 6 commit-queue 2014-03-27 02:46:01 -0700 All reviewed patches have been landed. Closing bug. 227777 2014-03-25 11:46:34 -0700 2014-03-27 02:07:26 -0700 Patch 130731.patch text/plain 8384 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYTZmOGIzLi5iZDk1YmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDMtMjUgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdIFJlbmFtZSBpbk5hbWVkRmxvdyBmbGFnIHRvIGlzTmFtZWRGbG93 Q29udGVudE5vZGUgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMwNzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ3VycmVudGx5LCB0aGUgaW5OYW1lZEZsb3cgZmxhZyBpbiBOb2RlIGNsYXNzIHRl bGxzIGlmIGEgbm9kZSBpcyBhIGNvbnRlbnQgbm9kZSwgb25lIHRoYXQgaGFzIGEgc3R5bGUgd2l0 aCBmbG93LWludG8uCisgICAgICAgIFNpbmNlIGl0IGlzIHVzZWQgb25seSBmb3IgdGhvc2Ugbm9k ZXMgYW5kIG5vdCBwcm9wYWdhdGVkIHRocm91Z2ggaGllcmFyY2h5LCBpIHdhbnQgdG8gcmVuYW1l ZCBpdCB0byBhIG1vcmUgbWVhbmluZ2Z1bCBuYW1lLgorICAgICAgICBObyBuZXcgZnVuY3Rpb25h bGl0eSwgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZGVzdHJveVJlbmRlclRyZWVJZk5lZWRlZCk6CisgICAgICAgICog ZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6fkVsZW1lbnQpOgor ICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6dW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVt ZW50KToKKyAgICAgICAgKiBkb20vTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6aXNO YW1lZEZsb3dDb250ZW50Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpzZXRJc05hbWVk Rmxvd0NvbnRlbnROb2RlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmNsZWFySXNOYW1lZEZs b3dDb250ZW50Tm9kZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVh ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OmNsZWFyQ29u dGVudEVsZW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck5hbWVkRmxvd1RocmVhZDo6 cmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJOYW1lZEZsb3dUaHJlYWQ6OnVucmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpuZXh0Tm9kZUluc2lkZUNvbnRlbnRFbGVtZW50KToKKyAgICAgICAg KiBzdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjph dHRhY2hDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6cmVzb2x2ZUxvY2FsKToK KwogMjAxNC0wMy0yNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBQcmV2ZW50ICdyZW1vdmV0cmFjaycgZXZlbnRzIGZyb20gZmlyaW5nIHdoZW4gYWxsIGlu YmFuZCB0ZXh0IHRyYWNrcyBhcmUgcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Db250YWluZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcAppbmRleCBkYjM5Zjk0Li4yYjQwOTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vQ29udGFpbmVyTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5v ZGUuY3BwCkBAIC05NSw3ICs5NSw3IEBAIHZvaWQgQ29udGFpbmVyTm9kZTo6cmVtb3ZlRGV0YWNo ZWRDaGlsZHJlbigpCiBzdGF0aWMgaW5saW5lIHZvaWQgZGVzdHJveVJlbmRlclRyZWVJZk5lZWRl ZChOb2RlJiBjaGlsZCkKIHsKICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGUgbmFtZWQgZmxv dyB0ZXN0LgotICAgIGlmICghY2hpbGQucmVuZGVyZXIoKSAmJiAhY2hpbGQuaW5OYW1lZEZsb3co KSkKKyAgICBpZiAoIWNoaWxkLnJlbmRlcmVyKCkgJiYgIWNoaWxkLmlzTmFtZWRGbG93Q29udGVu dE5vZGUoKSkKICAgICAgICAgcmV0dXJuOwogICAgIGlmIChjaGlsZC5pc0VsZW1lbnROb2RlKCkp CiAgICAgICAgIFN0eWxlOjpkZXRhY2hSZW5kZXJUcmVlKHRvRWxlbWVudChjaGlsZCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCmluZGV4IDM1MDc0NjEuLmJhYThmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAKQEAgLTE0Niw4ICsxNDYsOCBAQCBFbGVtZW50Ojp+RWxlbWVudCgpCiAgICAgaWYgKGRv Y3VtZW50KCkuaGFzTGl2aW5nUmVuZGVyVHJlZSgpKSB7CiAgICAgICAgIC8vIFdoZW4gdGhlIGRv Y3VtZW50IGlzIG5vdCBkZXN0cm95ZWQsIGFuIGVsZW1lbnQgdGhhdCB3YXMgcGFydCBvZiBhIG5h bWVkIGZsb3cKICAgICAgICAgLy8gY29udGVudCBub2RlcyBzaG91bGQgaGF2ZSBiZWVuIHJlbW92 ZWQgZnJvbSB0aGUgY29udGVudCBub2RlcyBjb2xsZWN0aW9uCi0gICAgICAgIC8vIGFuZCB0aGUg aW5OYW1lZEZsb3cgZmxhZyByZXNldC4KLSAgICAgICAgQVNTRVJUKCFpbk5hbWVkRmxvdygpKTsK KyAgICAgICAgLy8gYW5kIHRoZSBpc05hbWVkRmxvd0NvbnRlbnROb2RlIGZsYWcgcmVzZXQuCisg ICAgICAgIEFTU0VSVCghaXNOYW1lZEZsb3dDb250ZW50Tm9kZSgpKTsKICAgICB9CiAjZW5kaWYK IApAQCAtMTM3Niw3ICsxMzc2LDcgQEAgdm9pZCBFbGVtZW50OjpyZW1vdmVkRnJvbShDb250YWlu ZXJOb2RlJiBpbnNlcnRpb25Qb2ludCkKIAogdm9pZCBFbGVtZW50Ojp1bnJlZ2lzdGVyTmFtZWRG bG93Q29udGVudEVsZW1lbnQoKQogewotICAgIGlmIChkb2N1bWVudCgpLmNzc1JlZ2lvbnNFbmFi bGVkKCkgJiYgaW5OYW1lZEZsb3coKSAmJiBkb2N1bWVudCgpLnJlbmRlclZpZXcoKSkKKyAgICBp ZiAoZG9jdW1lbnQoKS5jc3NSZWdpb25zRW5hYmxlZCgpICYmIGlzTmFtZWRGbG93Q29udGVudE5v ZGUoKSAmJiBkb2N1bWVudCgpLnJlbmRlclZpZXcoKSkKICAgICAgICAgZG9jdW1lbnQoKS5yZW5k ZXJWaWV3KCktPmZsb3dUaHJlYWRDb250cm9sbGVyKCkudW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRl bnRFbGVtZW50KCp0aGlzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKaW5kZXggMWI3Mzk2NDUuLmM5MTRlNzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL05vZGUuaApAQCAtMjU5LDcgKzI1OSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgbmVl ZHNOb2RlUmVuZGVyaW5nVHJhdmVyc2FsU2xvd1BhdGgoKSBjb25zdDsKIAotICAgIGJvb2wgaW5O YW1lZEZsb3coKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKEluTmFtZWRGbG93RmxhZyk7IH0KKyAg ICBib29sIGlzTmFtZWRGbG93Q29udGVudE5vZGUoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKElz TmFtZWRGbG93Q29udGVudE5vZGVGbGFnKTsgfQogICAgIGJvb2wgaGFzQ3VzdG9tU3R5bGVSZXNv bHZlQ2FsbGJhY2tzKCkgY29uc3QgeyByZXR1cm4gZ2V0RmxhZyhIYXNDdXN0b21TdHlsZVJlc29s dmVDYWxsYmFja3NGbGFnKTsgfQogCiAgICAgYm9vbCBoYXNTeW50aGV0aWNBdHRyQ2hpbGROb2Rl cygpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSGFzU3ludGhldGljQXR0ckNoaWxkTm9kZXNGbGFn KTsgfQpAQCAtMzM3LDggKzMzNyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldElzTGluaygpIHsg c2V0RmxhZyhJc0xpbmtGbGFnKTsgfQogICAgIHZvaWQgY2xlYXJJc0xpbmsoKSB7IGNsZWFyRmxh ZyhJc0xpbmtGbGFnKTsgfQogCi0gICAgdm9pZCBzZXRJbk5hbWVkRmxvdygpIHsgc2V0RmxhZyhJ bk5hbWVkRmxvd0ZsYWcpOyB9Ci0gICAgdm9pZCBjbGVhckluTmFtZWRGbG93KCkgeyBjbGVhckZs YWcoSW5OYW1lZEZsb3dGbGFnKTsgfQorICAgIHZvaWQgc2V0SXNOYW1lZEZsb3dDb250ZW50Tm9k ZSgpIHsgc2V0RmxhZyhJc05hbWVkRmxvd0NvbnRlbnROb2RlRmxhZyk7IH0KKyAgICB2b2lkIGNs ZWFySXNOYW1lZEZsb3dDb250ZW50Tm9kZSgpIHsgY2xlYXJGbGFnKElzTmFtZWRGbG93Q29udGVu dE5vZGVGbGFnKTsgfQogCiAgICAgYm9vbCBoYXNFdmVudFRhcmdldERhdGEoKSBjb25zdCB7IHJl dHVybiBnZXRGbGFnKEhhc0V2ZW50VGFyZ2V0RGF0YUZsYWcpOyB9CiAgICAgdm9pZCBzZXRIYXNF dmVudFRhcmdldERhdGEoYm9vbCBmbGFnKSB7IHNldEZsYWcoZmxhZywgSGFzRXZlbnRUYXJnZXRE YXRhRmxhZyk7IH0KQEAgLTU5Niw3ICs1OTYsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICAgICAgU3R5 bGVDaGFuZ2VNYXNrID0gMSA8PCBub2RlU3R5bGVDaGFuZ2VTaGlmdCB8IDEgPDwgKG5vZGVTdHls ZUNoYW5nZVNoaWZ0ICsgMSkgfCAxIDw8IChub2RlU3R5bGVDaGFuZ2VTaGlmdCArIDIpLAogICAg ICAgICBJc0VkaXRpbmdUZXh0RmxhZyA9IDEgPDwgMTcsCi0gICAgICAgIEluTmFtZWRGbG93Rmxh ZyA9IDEgPDwgMTgsCisgICAgICAgIElzTmFtZWRGbG93Q29udGVudE5vZGVGbGFnID0gMSA8PCAx OCwKICAgICAgICAgSGFzU3ludGhldGljQXR0ckNoaWxkTm9kZXNGbGFnID0gMSA8PCAxOSwKICAg ICAgICAgSGFzQ3VzdG9tU3R5bGVSZXNvbHZlQ2FsbGJhY2tzRmxhZyA9IDEgPDwgMjAsCiAgICAg ICAgIEhhc0V2ZW50VGFyZ2V0RGF0YUZsYWcgPSAxIDw8IDIxLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmNwcAppbmRleCA3ZjBhNGVhLi5l MmY3NTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93VGhyZWFkLmNwcApAQCAtNzUsMTAgKzc1LDEwIEBAIHZvaWQgUmVuZGVyTmFtZWRGbG93VGhy ZWFkOjpjbGVhckNvbnRlbnRFbGVtZW50cygpCiB7CiAgICAgZm9yIChhdXRvJiBjb250ZW50RWxl bWVudCA6IG1fY29udGVudEVsZW1lbnRzKSB7CiAgICAgICAgIEFTU0VSVChjb250ZW50RWxlbWVu dCk7Ci0gICAgICAgIEFTU0VSVChjb250ZW50RWxlbWVudC0+aW5OYW1lZEZsb3coKSk7CisgICAg ICAgIEFTU0VSVChjb250ZW50RWxlbWVudC0+aXNOYW1lZEZsb3dDb250ZW50Tm9kZSgpKTsKICAg ICAgICAgQVNTRVJUKCZjb250ZW50RWxlbWVudC0+ZG9jdW1lbnQoKSA9PSAmZG9jdW1lbnQoKSk7 CiAgICAgICAgIAotICAgICAgICBjb250ZW50RWxlbWVudC0+Y2xlYXJJbk5hbWVkRmxvdygpOwor ICAgICAgICBjb250ZW50RWxlbWVudC0+Y2xlYXJJc05hbWVkRmxvd0NvbnRlbnROb2RlKCk7CiAg ICAgfQogICAgIAogICAgIG1fY29udGVudEVsZW1lbnRzLmNsZWFyKCk7CkBAIC00ODQsNyArNDg0 LDcgQEAgdm9pZCBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lzdGVyTmFtZWRGbG93Q29udGVu dEVsZW1lbnQoRWxlbWVudCYgY29udGVudEVsZW0KIHsKICAgICBBU1NFUlQoJmNvbnRlbnRFbGVt ZW50LmRvY3VtZW50KCkgPT0gJmRvY3VtZW50KCkpOwogCi0gICAgY29udGVudEVsZW1lbnQuc2V0 SW5OYW1lZEZsb3coKTsKKyAgICBjb250ZW50RWxlbWVudC5zZXRJc05hbWVkRmxvd0NvbnRlbnRO b2RlKCk7CiAKICAgICByZXNldE1hcmtGb3JEZXN0cnVjdGlvbigpOwogCkBAIC01MDUsMTAgKzUw NSwxMCBAQCB2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVnaXN0ZXJOYW1lZEZsb3dDb250 ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxlbQogdm9pZCBSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6OnVucmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxl bWVudCkKIHsKICAgICBBU1NFUlQobV9jb250ZW50RWxlbWVudHMuY29udGFpbnMoJmNvbnRlbnRF bGVtZW50KSk7Ci0gICAgQVNTRVJUKGNvbnRlbnRFbGVtZW50LmluTmFtZWRGbG93KCkpOworICAg IEFTU0VSVChjb250ZW50RWxlbWVudC5pc05hbWVkRmxvd0NvbnRlbnROb2RlKCkpOwogICAgIEFT U0VSVCgmY29udGVudEVsZW1lbnQuZG9jdW1lbnQoKSA9PSAmZG9jdW1lbnQoKSk7CiAKLSAgICBj b250ZW50RWxlbWVudC5jbGVhckluTmFtZWRGbG93KCk7CisgICAgY29udGVudEVsZW1lbnQuY2xl YXJJc05hbWVkRmxvd0NvbnRlbnROb2RlKCk7CiAgICAgbV9jb250ZW50RWxlbWVudHMucmVtb3Zl KCZjb250ZW50RWxlbWVudCk7CiAKICAgICBpZiAoY2FuQmVEZXN0cm95ZWQoKSkKQEAgLTYyMSw3 ICs2MjEsNyBAQCBzdGF0aWMgYm9vbCBib3hJbnRlcnNlY3RzUmVnaW9uKExheW91dFVuaXQgbG9n aWNhbFRvcEZvckJveCwgTGF5b3V0VW5pdCBsb2dpY2FsQgogc3RhdGljIE5vZGUqIG5leHROb2Rl SW5zaWRlQ29udGVudEVsZW1lbnQoY29uc3QgTm9kZSogY3Vyck5vZGUsIGNvbnN0IEVsZW1lbnQq IGNvbnRlbnRFbGVtZW50KQogewogICAgIEFTU0VSVChjdXJyTm9kZSk7Ci0gICAgQVNTRVJUKGNv bnRlbnRFbGVtZW50ICYmIGNvbnRlbnRFbGVtZW50LT5pbk5hbWVkRmxvdygpKTsKKyAgICBBU1NF UlQoY29udGVudEVsZW1lbnQgJiYgY29udGVudEVsZW1lbnQtPmlzTmFtZWRGbG93Q29udGVudE5v ZGUoKSk7CiAKICAgICBpZiAoY3Vyck5vZGUtPnJlbmRlcmVyKCkgJiYgY3Vyck5vZGUtPnJlbmRl cmVyKCktPmlzU1ZHUm9vdCgpKQogICAgICAgICByZXR1cm4gTm9kZVRyYXZlcnNhbDo6bmV4dFNr aXBwaW5nQ2hpbGRyZW4oY3Vyck5vZGUsIGNvbnRlbnRFbGVtZW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKaW5kZXggZjhiNWIyZC4uYTZjNjNhOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKQEAgLTQyMiw3ICs0MjIsNyBA QCB2b2lkIHVwZGF0ZVRleHRSZW5kZXJlckFmdGVyQ29udGVudENoYW5nZShUZXh0JiB0ZXh0Tm9k ZSwgdW5zaWduZWQgb2Zmc2V0T2ZSZXBsYQogc3RhdGljIHZvaWQgYXR0YWNoQ2hpbGRyZW4oQ29u dGFpbmVyTm9kZSYgY3VycmVudCwgQ29udGFpbmVyTm9kZSYgcmVuZGVyaW5nUGFyZW50Tm9kZSkK IHsKICAgICBmb3IgKE5vZGUqIGNoaWxkID0gY3VycmVudC5maXJzdENoaWxkKCk7IGNoaWxkOyBj aGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIEFTU0VSVCgoIWNoaWxkLT5y ZW5kZXJlcigpIHx8IGNoaWxkLT5pbk5hbWVkRmxvdygpKSB8fCBjdXJyZW50LnNoYWRvd1Jvb3Qo KSk7CisgICAgICAgIEFTU0VSVCgoIWNoaWxkLT5yZW5kZXJlcigpIHx8IGNoaWxkLT5pc05hbWVk Rmxvd0NvbnRlbnROb2RlKCkpIHx8IGN1cnJlbnQuc2hhZG93Um9vdCgpKTsKICAgICAgICAgaWYg KGNoaWxkLT5yZW5kZXJlcigpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmIChj aGlsZC0+aXNUZXh0Tm9kZSgpKSB7CkBAIC02NjQsNyArNjY0LDcgQEAgc3RhdGljIENoYW5nZSBy ZXNvbHZlTG9jYWwoRWxlbWVudCYgY3VycmVudCwgQ29udGFpbmVyTm9kZSYgcmVuZGVyaW5nUGFy ZW50Tm9kZSwKICAgICAgICAgbG9jYWxDaGFuZ2UgPSBkZXRlcm1pbmVDaGFuZ2UoY3VycmVudFN0 eWxlLmdldCgpLCBuZXdTdHlsZS5nZXQoKSk7CiAgICAgfQogICAgIGlmIChsb2NhbENoYW5nZSA9 PSBEZXRhY2gpIHsKLSAgICAgICAgaWYgKGN1cnJlbnQucmVuZGVyZXIoKSB8fCBjdXJyZW50Lmlu TmFtZWRGbG93KCkpCisgICAgICAgIGlmIChjdXJyZW50LnJlbmRlcmVyKCkgfHwgY3VycmVudC5p c05hbWVkRmxvd0NvbnRlbnROb2RlKCkpCiAgICAgICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKGN1 cnJlbnQsIFJlYXR0YWNoRGV0YWNoKTsKICAgICAgICAgYXR0YWNoUmVuZGVyVHJlZShjdXJyZW50 LCByZW5kZXJpbmdQYXJlbnROb2RlLCBuZXdTdHlsZS5yZWxlYXNlKCkpOwogICAgICAgICBpbnZh bGlkYXRlV2hpdGVzcGFjZU9ubHlUZXh0U2libGluZ3NBZnRlckF0dGFjaElmTmVlZGVkKGN1cnJl bnQpOwo= 227935 2014-03-27 02:07:46 -0700 2014-03-27 02:45:57 -0700 Patch for landing bug-130731-20140327110728.patch text/plain 8955 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVkMTUwYWNkNzVjZGIx MTZlMWRhZmNhYmEyZWZjZmY2NzhmYWE2MS4uZmNlYmE4YzI4MzdlZTVjZjc5M2UxODdlMTZiODNh MTk1NTYxYjUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTAzLTI3ICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgogCisgICAgICAgIFtDU1NSZWdpb25zXSBS ZW5hbWUgaW5OYW1lZEZsb3cgZmxhZyB0byBpc05hbWVkRmxvd0NvbnRlbnROb2RlIGZsYWcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDczMQorCisg ICAgICAgIFJldmlld2VkIGJ5IEFuZHJlaSBCdWN1ci4KKworICAgICAgICBDdXJyZW50bHksIHRo ZSBpbk5hbWVkRmxvdyBmbGFnIGluIE5vZGUgY2xhc3MgdGVsbHMgaWYgYSBub2RlIGlzIGEgY29u dGVudCBub2RlLCBvbmUgdGhhdCBoYXMgYSBzdHlsZSB3aXRoIGZsb3ctaW50by4KKyAgICAgICAg U2luY2UgaXQgaXMgdXNlZCBvbmx5IGZvciB0aG9zZSBub2RlcyBhbmQgbm90IHByb3BhZ2F0ZWQg dGhyb3VnaCBoaWVyYXJjaHksIGkgd2FudCB0byByZW5hbWVkIGl0IHRvIGEgbW9yZSBtZWFuaW5n ZnVsIG5hbWUuCisgICAgICAgIE5vIG5ldyBmdW5jdGlvbmFsaXR5LCBubyBuZXcgdGVzdHMuCisK KyAgICAgICAgKiBkb20vQ29udGFpbmVyTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkZXN0 cm95UmVuZGVyVHJlZUlmTmVlZGVkKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFbGVtZW50Ojp+RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVt ZW50Ojp1bnJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9O b2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjppc05hbWVkRmxvd0NvbnRlbnROb2RlKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNldElzTmFtZWRGbG93Q29udGVudE5vZGUpOgorICAg ICAgICAoV2ViQ29yZTo6Tm9kZTo6Y2xlYXJJc05hbWVkRmxvd0NvbnRlbnROb2RlKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlck5hbWVkRmxvd1RocmVhZDo6Y2xlYXJDb250ZW50RWxlbWVudHMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjpyZWdpc3Rlck5hbWVkRmxvd0NvbnRl bnRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck5hbWVkRmxvd1RocmVhZDo6dW5y ZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Om5leHRO b2RlSW5zaWRlQ29udGVudEVsZW1lbnQpOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZVRy ZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmF0dGFjaENoaWxkcmVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpyZXNvbHZlTG9jYWwpOgorCisyMDE0LTAzLTI3ICBNaWhuZWEg T3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCiAgICAgICAgIFtDU1NSZWdpb25zXSBDcmFz aCB3aGVuIGNsb25pbmcgYSByZWdpb24gY2hpbGQgd2l0aCBhIGNvbnRlbnQgbm9kZSBjaGlsZAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5ODExCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAppbmRleCBkYjM5Zjk0YjVhNzRlOTQ4NjI3 MjBhN2M3ZmMwMzk1YjQ4ZGZmMmQ0Li4yYjQwOTQ4Y2JmZmQ4ZTdiZTFkNGI2YzBlNTVmM2VmN2Ey OGQzZGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCkBAIC05NSw3ICs5NSw3 IEBAIHZvaWQgQ29udGFpbmVyTm9kZTo6cmVtb3ZlRGV0YWNoZWRDaGlsZHJlbigpCiBzdGF0aWMg aW5saW5lIHZvaWQgZGVzdHJveVJlbmRlclRyZWVJZk5lZWRlZChOb2RlJiBjaGlsZCkKIHsKICAg ICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGUgbmFtZWQgZmxvdyB0ZXN0LgotICAgIGlmICghY2hp bGQucmVuZGVyZXIoKSAmJiAhY2hpbGQuaW5OYW1lZEZsb3coKSkKKyAgICBpZiAoIWNoaWxkLnJl bmRlcmVyKCkgJiYgIWNoaWxkLmlzTmFtZWRGbG93Q29udGVudE5vZGUoKSkKICAgICAgICAgcmV0 dXJuOwogICAgIGlmIChjaGlsZC5pc0VsZW1lbnROb2RlKCkpCiAgICAgICAgIFN0eWxlOjpkZXRh Y2hSZW5kZXJUcmVlKHRvRWxlbWVudChjaGlsZCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4 IDM4ODNmYjgyM2U5ZTIxNmFkY2VjMWM2NjYxNTNkOTgwNTUzM2ZhYzAuLmFlMjY1OTI0OWE4ZDc1 MjE5MzQwNzhjYWVlNzdhMDBjYjU0NmJhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTE0 Niw4ICsxNDYsOCBAQCBFbGVtZW50Ojp+RWxlbWVudCgpCiAgICAgaWYgKGRvY3VtZW50KCkuaGFz TGl2aW5nUmVuZGVyVHJlZSgpKSB7CiAgICAgICAgIC8vIFdoZW4gdGhlIGRvY3VtZW50IGlzIG5v dCBkZXN0cm95ZWQsIGFuIGVsZW1lbnQgdGhhdCB3YXMgcGFydCBvZiBhIG5hbWVkIGZsb3cKICAg ICAgICAgLy8gY29udGVudCBub2RlcyBzaG91bGQgaGF2ZSBiZWVuIHJlbW92ZWQgZnJvbSB0aGUg Y29udGVudCBub2RlcyBjb2xsZWN0aW9uCi0gICAgICAgIC8vIGFuZCB0aGUgaW5OYW1lZEZsb3cg ZmxhZyByZXNldC4KLSAgICAgICAgQVNTRVJUKCFpbk5hbWVkRmxvdygpKTsKKyAgICAgICAgLy8g YW5kIHRoZSBpc05hbWVkRmxvd0NvbnRlbnROb2RlIGZsYWcgcmVzZXQuCisgICAgICAgIEFTU0VS VCghaXNOYW1lZEZsb3dDb250ZW50Tm9kZSgpKTsKICAgICB9CiAjZW5kaWYKIApAQCAtMTM3Niw3 ICsxMzc2LDcgQEAgdm9pZCBFbGVtZW50OjpyZW1vdmVkRnJvbShDb250YWluZXJOb2RlJiBpbnNl cnRpb25Qb2ludCkKIAogdm9pZCBFbGVtZW50Ojp1bnJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVs ZW1lbnQoKQogewotICAgIGlmIChkb2N1bWVudCgpLmNzc1JlZ2lvbnNFbmFibGVkKCkgJiYgaW5O YW1lZEZsb3coKSAmJiBkb2N1bWVudCgpLnJlbmRlclZpZXcoKSkKKyAgICBpZiAoZG9jdW1lbnQo KS5jc3NSZWdpb25zRW5hYmxlZCgpICYmIGlzTmFtZWRGbG93Q29udGVudE5vZGUoKSAmJiBkb2N1 bWVudCgpLnJlbmRlclZpZXcoKSkKICAgICAgICAgZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCktPmZs b3dUaHJlYWRDb250cm9sbGVyKCkudW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KCp0 aGlzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmgKaW5kZXggMWI3Mzk2NDVjNmY1ZTM4MmQ3NWEwNzhmMDc5MTBk ZjYwYTllNTZmNy4uYzkxNGU3MDliMzE2MmFmZWQ5ZTI2NTAzZWYxZTcwOWJmYTBiODcwMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZS5oCkBAIC0yNTksNyArMjU5LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBuZWVkc05v ZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCgpIGNvbnN0OwogCi0gICAgYm9vbCBpbk5hbWVk RmxvdygpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSW5OYW1lZEZsb3dGbGFnKTsgfQorICAgIGJv b2wgaXNOYW1lZEZsb3dDb250ZW50Tm9kZSgpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSXNOYW1l ZEZsb3dDb250ZW50Tm9kZUZsYWcpOyB9CiAgICAgYm9vbCBoYXNDdXN0b21TdHlsZVJlc29sdmVD YWxsYmFja3MoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKEhhc0N1c3RvbVN0eWxlUmVzb2x2ZUNh bGxiYWNrc0ZsYWcpOyB9CiAKICAgICBib29sIGhhc1N5bnRoZXRpY0F0dHJDaGlsZE5vZGVzKCkg Y29uc3QgeyByZXR1cm4gZ2V0RmxhZyhIYXNTeW50aGV0aWNBdHRyQ2hpbGROb2Rlc0ZsYWcpOyB9 CkBAIC0zMzcsOCArMzM3LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0SXNMaW5rKCkgeyBzZXRG bGFnKElzTGlua0ZsYWcpOyB9CiAgICAgdm9pZCBjbGVhcklzTGluaygpIHsgY2xlYXJGbGFnKElz TGlua0ZsYWcpOyB9CiAKLSAgICB2b2lkIHNldEluTmFtZWRGbG93KCkgeyBzZXRGbGFnKEluTmFt ZWRGbG93RmxhZyk7IH0KLSAgICB2b2lkIGNsZWFySW5OYW1lZEZsb3coKSB7IGNsZWFyRmxhZyhJ bk5hbWVkRmxvd0ZsYWcpOyB9CisgICAgdm9pZCBzZXRJc05hbWVkRmxvd0NvbnRlbnROb2RlKCkg eyBzZXRGbGFnKElzTmFtZWRGbG93Q29udGVudE5vZGVGbGFnKTsgfQorICAgIHZvaWQgY2xlYXJJ c05hbWVkRmxvd0NvbnRlbnROb2RlKCkgeyBjbGVhckZsYWcoSXNOYW1lZEZsb3dDb250ZW50Tm9k ZUZsYWcpOyB9CiAKICAgICBib29sIGhhc0V2ZW50VGFyZ2V0RGF0YSgpIGNvbnN0IHsgcmV0dXJu IGdldEZsYWcoSGFzRXZlbnRUYXJnZXREYXRhRmxhZyk7IH0KICAgICB2b2lkIHNldEhhc0V2ZW50 VGFyZ2V0RGF0YShib29sIGZsYWcpIHsgc2V0RmxhZyhmbGFnLCBIYXNFdmVudFRhcmdldERhdGFG bGFnKTsgfQpAQCAtNTk2LDcgKzU5Niw3IEBAIHByb3RlY3RlZDoKIAogICAgICAgICBTdHlsZUNo YW5nZU1hc2sgPSAxIDw8IG5vZGVTdHlsZUNoYW5nZVNoaWZ0IHwgMSA8PCAobm9kZVN0eWxlQ2hh bmdlU2hpZnQgKyAxKSB8IDEgPDwgKG5vZGVTdHlsZUNoYW5nZVNoaWZ0ICsgMiksCiAgICAgICAg IElzRWRpdGluZ1RleHRGbGFnID0gMSA8PCAxNywKLSAgICAgICAgSW5OYW1lZEZsb3dGbGFnID0g MSA8PCAxOCwKKyAgICAgICAgSXNOYW1lZEZsb3dDb250ZW50Tm9kZUZsYWcgPSAxIDw8IDE4LAog ICAgICAgICBIYXNTeW50aGV0aWNBdHRyQ2hpbGROb2Rlc0ZsYWcgPSAxIDw8IDE5LAogICAgICAg ICBIYXNDdXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3NGbGFnID0gMSA8PCAyMCwKICAgICAgICAg SGFzRXZlbnRUYXJnZXREYXRhRmxhZyA9IDEgPDwgMjEsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3BwCmluZGV4IDlmYzcyODE0NzRmOTQw OGI0OGNmN2YxNzk5NDVlNjI4NmQ4YWIxZmUuLjI2ODU2ZjNhN2FhODA5OWU5MDY3ZTQ0MTAyNDNl ZDBlY2FkMDhjMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJO YW1lZEZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJO YW1lZEZsb3dUaHJlYWQuY3BwCkBAIC03NSwxMCArNzUsMTAgQEAgdm9pZCBSZW5kZXJOYW1lZEZs b3dUaHJlYWQ6OmNsZWFyQ29udGVudEVsZW1lbnRzKCkKIHsKICAgICBmb3IgKGF1dG8mIGNvbnRl bnRFbGVtZW50IDogbV9jb250ZW50RWxlbWVudHMpIHsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRF bGVtZW50KTsKLSAgICAgICAgQVNTRVJUKGNvbnRlbnRFbGVtZW50LT5pbk5hbWVkRmxvdygpKTsK KyAgICAgICAgQVNTRVJUKGNvbnRlbnRFbGVtZW50LT5pc05hbWVkRmxvd0NvbnRlbnROb2RlKCkp OwogICAgICAgICBBU1NFUlQoJmNvbnRlbnRFbGVtZW50LT5kb2N1bWVudCgpID09ICZkb2N1bWVu dCgpKTsKICAgICAgICAgCi0gICAgICAgIGNvbnRlbnRFbGVtZW50LT5jbGVhckluTmFtZWRGbG93 KCk7CisgICAgICAgIGNvbnRlbnRFbGVtZW50LT5jbGVhcklzTmFtZWRGbG93Q29udGVudE5vZGUo KTsKICAgICB9CiAgICAgCiAgICAgbV9jb250ZW50RWxlbWVudHMuY2xlYXIoKTsKQEAgLTQ5Nyw3 ICs0OTcsNyBAQCB2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVnaXN0ZXJOYW1lZEZsb3dD b250ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxlbQogewogICAgIEFTU0VSVCgmY29udGVu dEVsZW1lbnQuZG9jdW1lbnQoKSA9PSAmZG9jdW1lbnQoKSk7CiAKLSAgICBjb250ZW50RWxlbWVu dC5zZXRJbk5hbWVkRmxvdygpOworICAgIGNvbnRlbnRFbGVtZW50LnNldElzTmFtZWRGbG93Q29u dGVudE5vZGUoKTsKIAogICAgIHJlc2V0TWFya0ZvckRlc3RydWN0aW9uKCk7CiAKQEAgLTUxOCwx MCArNTE4LDEwIEBAIHZvaWQgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjpyZWdpc3Rlck5hbWVkRmxv d0NvbnRlbnRFbGVtZW50KEVsZW1lbnQmIGNvbnRlbnRFbGVtCiB2b2lkIFJlbmRlck5hbWVkRmxv d1RocmVhZDo6dW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KEVsZW1lbnQmIGNvbnRl bnRFbGVtZW50KQogewogICAgIEFTU0VSVChtX2NvbnRlbnRFbGVtZW50cy5jb250YWlucygmY29u dGVudEVsZW1lbnQpKTsKLSAgICBBU1NFUlQoY29udGVudEVsZW1lbnQuaW5OYW1lZEZsb3coKSk7 CisgICAgQVNTRVJUKGNvbnRlbnRFbGVtZW50LmlzTmFtZWRGbG93Q29udGVudE5vZGUoKSk7CiAg ICAgQVNTRVJUKCZjb250ZW50RWxlbWVudC5kb2N1bWVudCgpID09ICZkb2N1bWVudCgpKTsKIAot ICAgIGNvbnRlbnRFbGVtZW50LmNsZWFySW5OYW1lZEZsb3coKTsKKyAgICBjb250ZW50RWxlbWVu dC5jbGVhcklzTmFtZWRGbG93Q29udGVudE5vZGUoKTsKICAgICBtX2NvbnRlbnRFbGVtZW50cy5y ZW1vdmUoJmNvbnRlbnRFbGVtZW50KTsKIAogICAgIGlmIChjYW5CZURlc3Ryb3llZCgpKQpAQCAt NjM0LDcgKzYzNCw3IEBAIHN0YXRpYyBib29sIGJveEludGVyc2VjdHNSZWdpb24oTGF5b3V0VW5p dCBsb2dpY2FsVG9wRm9yQm94LCBMYXlvdXRVbml0IGxvZ2ljYWxCCiBzdGF0aWMgTm9kZSogbmV4 dE5vZGVJbnNpZGVDb250ZW50RWxlbWVudChjb25zdCBOb2RlKiBjdXJyTm9kZSwgY29uc3QgRWxl bWVudCogY29udGVudEVsZW1lbnQpCiB7CiAgICAgQVNTRVJUKGN1cnJOb2RlKTsKLSAgICBBU1NF UlQoY29udGVudEVsZW1lbnQgJiYgY29udGVudEVsZW1lbnQtPmluTmFtZWRGbG93KCkpOworICAg IEFTU0VSVChjb250ZW50RWxlbWVudCAmJiBjb250ZW50RWxlbWVudC0+aXNOYW1lZEZsb3dDb250 ZW50Tm9kZSgpKTsKIAogICAgIGlmIChjdXJyTm9kZS0+cmVuZGVyZXIoKSAmJiBjdXJyTm9kZS0+ cmVuZGVyZXIoKS0+aXNTVkdSb290KCkpCiAgICAgICAgIHJldHVybiBOb2RlVHJhdmVyc2FsOjpu ZXh0U2tpcHBpbmdDaGlsZHJlbihjdXJyTm9kZSwgY29udGVudEVsZW1lbnQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcAppbmRleCAwNTkwYTMzMTAwNDVmZWY1ZGMz ZDdjMzg5OWFiMzMxNzhjYzVlYTEwLi40Yzg3YzQ0OGRiOTcwZWU1NzhhM2U2OWZmZmRiOGMwYThl YWZhNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcApAQCAt NDczLDcgKzQ3Myw3IEBAIHZvaWQgdXBkYXRlVGV4dFJlbmRlcmVyQWZ0ZXJDb250ZW50Q2hhbmdl KFRleHQmIHRleHROb2RlLCB1bnNpZ25lZCBvZmZzZXRPZlJlcGxhCiBzdGF0aWMgdm9pZCBhdHRh Y2hDaGlsZHJlbihDb250YWluZXJOb2RlJiBjdXJyZW50LCBDb250YWluZXJOb2RlJiByZW5kZXJp bmdQYXJlbnROb2RlLCBSZW5kZXJUcmVlUG9zaXRpb24mIHJlbmRlclRyZWVQb3NpdGlvbikKIHsK ICAgICBmb3IgKE5vZGUqIGNoaWxkID0gY3VycmVudC5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGls ZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIEFTU0VSVCgoIWNoaWxkLT5yZW5k ZXJlcigpIHx8IGNoaWxkLT5pbk5hbWVkRmxvdygpKSB8fCBjdXJyZW50LnNoYWRvd1Jvb3QoKSk7 CisgICAgICAgIEFTU0VSVCgoIWNoaWxkLT5yZW5kZXJlcigpIHx8IGNoaWxkLT5pc05hbWVkRmxv d0NvbnRlbnROb2RlKCkpIHx8IGN1cnJlbnQuc2hhZG93Um9vdCgpKTsKICAgICAgICAgaWYgKGNo aWxkLT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICByZW5kZXJUcmVlUG9zaXRpb24uaW52YWxp ZGF0ZU5leHRTaWJsaW5nKCpjaGlsZC0+cmVuZGVyZXIoKSk7CiAgICAgICAgICAgICBjb250aW51 ZTsKQEAgLTcyMyw3ICs3MjMsNyBAQCBzdGF0aWMgQ2hhbmdlIHJlc29sdmVMb2NhbChFbGVtZW50 JiBjdXJyZW50LCBDb250YWluZXJOb2RlJiByZW5kZXJpbmdQYXJlbnROb2RlLAogICAgICAgICBs b2NhbENoYW5nZSA9IGRldGVybWluZUNoYW5nZShjdXJyZW50U3R5bGUuZ2V0KCksIG5ld1N0eWxl LmdldCgpKTsKICAgICB9CiAgICAgaWYgKGxvY2FsQ2hhbmdlID09IERldGFjaCkgewotICAgICAg ICBpZiAoY3VycmVudC5yZW5kZXJlcigpIHx8IGN1cnJlbnQuaW5OYW1lZEZsb3coKSkKKyAgICAg ICAgaWYgKGN1cnJlbnQucmVuZGVyZXIoKSB8fCBjdXJyZW50LmlzTmFtZWRGbG93Q29udGVudE5v ZGUoKSkKICAgICAgICAgICAgIGRldGFjaFJlbmRlclRyZWUoY3VycmVudCwgUmVhdHRhY2hEZXRh Y2gpOwogICAgICAgICBhdHRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIHJlbmRlcmluZ1BhcmVudE5v ZGUsIHJlbmRlclRyZWVQb3NpdGlvbiwgbmV3U3R5bGUucmVsZWFzZSgpKTsKICAgICAgICAgaW52 YWxpZGF0ZVdoaXRlc3BhY2VPbmx5VGV4dFNpYmxpbmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZChjdXJy ZW50KTsK