94892 2012-08-23 19:56:42 -0700 [chromium] Fix lost context when textures are evicted 2012-08-23 21:59:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 piman piman cc-bugs enne jamesr nduca webkit.review.bot oldest_to_newest 703677 0 piman 2012-08-23 19:56:42 -0700 [chromium] Fix lost context when textures are evicted 703683 1 160313 piman 2012-08-23 20:26:27 -0700 Created attachment 160313 Patch 703685 2 160313 jamesr 2012-08-23 20:31:49 -0700 Comment on attachment 160313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160313&action=review R=me. I wish this didn't keep breaking :/ > Source/WebCore/ChangeLog:3 > + [chromium] Fix lost context when textures are evicted ambitious title :) > Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp:33 > +#include "CCSingleThreadProxy.h" hmm, need this just for DebugScoped...? we don't do a good job of putting utility things in good headers - I should go move some of these out into better places > Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp:2651 > + virtual void didCommitAndDrawFrame() OVERRIDE on this and the others please (got bit today trying to refactor some tests :/) 703693 3 160315 piman 2012-08-23 20:57:43 -0700 Created attachment 160315 Patch 703695 4 piman 2012-08-23 20:59:11 -0700 (In reply to comment #2) > (From update of attachment 160313 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=160313&action=review > > R=me. I wish this didn't keep breaking :/ > > > Source/WebCore/ChangeLog:3 > > + [chromium] Fix lost context when textures are evicted > > ambitious title :) > > > Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp:33 > > +#include "CCSingleThreadProxy.h" > > hmm, need this just for DebugScoped...? we don't do a good job of putting utility things in good headers - I should go move some of these out into better places > > > Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp:2651 > > + virtual void didCommitAndDrawFrame() > > OVERRIDE on this and the others please (got bit today trying to refactor some tests :/) Done. I didn't do big refactorings here, because I think I'd like to merge this. I have a follow up that adds OVERRIDEs everywhere in this file. 703696 5 160316 piman 2012-08-23 20:59:38 -0700 Created attachment 160316 Patch for landing 703698 6 160317 piman 2012-08-23 21:00:30 -0700 Created attachment 160317 Patch for landing 703703 7 piman 2012-08-23 21:03:13 -0700 (In reply to comment #4) > I have a follow up that adds OVERRIDEs everywhere in this file. https://bugs.webkit.org/show_bug.cgi?id=94894 703735 8 160317 webkit.review.bot 2012-08-23 21:59:39 -0700 Comment on attachment 160317 Patch for landing Clearing flags on attachment: 160317 Committed r126540: <http://trac.webkit.org/changeset/126540> 703736 9 webkit.review.bot 2012-08-23 21:59:43 -0700 All reviewed patches have been landed. Closing bug. 160313 2012-08-23 20:26:27 -0700 2012-08-23 20:57:40 -0700 Patch bug-94892-20120823202623.patch text/plain 8693 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyNTZlOWNjNDIzYTg3 MmFmNWVhMzE3YjM0MjAyMTZlYmE1NzJiMy4uMzczZmE0MjQ2OGFlNGQyZThiZmM2M2U5N2UxYTVh NzU3OTE3NWIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTIzICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZp eCBsb3N0IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJp b3JpdGl6ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJl IGFsbCBpdHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVt IHdlIHdpbGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVz dDogQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpyZWNyZWF0ZUNvbnRleHRPbkltcGxU aHJlYWQpOgorCiAyMDEyLTA4LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1Y4XSBPd25IYW5kbGUgaXMgYSBiaXQgb2YgYSBtaXNub21lcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA1OThiOTIzNjEwMzU0M2FlNTUwMTU1MDJiMTEyN2Y0ZjNhZWU3 MWM1Li5lNjY4YzUwMTc5ZjdjMzAwYzFlZWYxYTM0NTJiN2FmM2NkMDVmYTM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTIzICBBbnRvaW5lIExh Ym91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBsb3N0 IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJpb3JpdGl6 ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJlIGFsbCBp dHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVtIHdlIHdp bGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVzdDogQ0NM YXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisgICAgICAg ICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAgIChDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMpOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkNDTGF5ZXJUcmVl SG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlcyk6CisgICAgICAgIChXVEY6OkND TGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6YmVnaW5UZXN0 KToKKyAgICAgICAgKEV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2spOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkV2 aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4 dFRhc2spOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRl ckV2aWN0VGV4dHVyZXM6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6On5FdmljdFRl eHR1cmVzQW5kTG9zZUNvbnRleHRUYXNrKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0 VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzOjpFdmljdFRleHR1cmVzQW5kTG9zZUNv bnRleHRUYXNrOjpydW4pOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENv bnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OnBvc3RFdmljdFRleHR1cmVzQW5kTG9zZUNvbnRleHQp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0 VGV4dHVyZXM6OmRpZENvbW1pdEFuZERyYXdGcmFtZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6Y29tbWl0Q29tcGxldGVP bkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0 QWZ0ZXJFdmljdFRleHR1cmVzOjpkaWRSZWNyZWF0ZU91dHB1dFN1cmZhY2UpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OmFm dGVyVGVzdCk6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpURVNUX0YpOgorCiAyMDEy LTA4LTIzICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gQ3JlYXRlIHNoYXJlZFF1YWRTdGF0ZSBhdCBzYW1lIHRpbWUgYXMgY3JlYXRpbmcg cXVhZHMgYW5kIGdpdmUgdGhlbSB0byB0aGUgcXVhZFNpbmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2luZ2xlVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKaW5kZXggZTg0ZWIzMzI1MmJiYWFjYzRlN2RlYjQ2NjM0OWQ0OGVj ZDM4YmJmYS4uNjg3NmVhMjE4OGJhZjY2NjhhMjlhYzM3YzFjZDM4YzhjYjQ0MWNlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTaW5nbGVUaHJlYWRQcm94eS5jcHAKQEAgLTE1Niw3ICsxNTYsOCBAQCBi b29sIENDU2luZ2xlVGhyZWFkUHJveHk6OnJlY3JlYXRlQ29udGV4dCgpCiAgICAgYm9vbCBpbml0 aWFsaXplZDsKICAgICB7CiAgICAgICAgIERlYnVnU2NvcGVkU2V0SW1wbFRocmVhZCBpbXBsOwot ICAgICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJl YWQobV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICAgICAgaWYg KCFtX2xheWVyVHJlZUhvc3RJbXBsLT5jb250ZW50c1RleHR1cmVzUHVyZ2VkKCkpCisgICAgICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQo bV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKICAgICAgICAgaW5pdGlh bGl6ZWQgPSBtX2xheWVyVHJlZUhvc3RJbXBsLT5pbml0aWFsaXplUmVuZGVyZXIoY29udGV4dC5y ZWxlYXNlKCksIFVudGhyb3R0bGVkVXBsb2FkZXIpOwogICAgICAgICBpZiAoaW5pdGlhbGl6ZWQp IHsKICAgICAgICAgICAgIG1fUmVuZGVyZXJDYXBhYmlsaXRpZXNGb3JNYWluVGhyZWFkID0gbV9s YXllclRyZWVIb3N0SW1wbC0+cmVuZGVyZXJDYXBhYmlsaXRpZXMoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJl YWRQcm94eS5jcHAKaW5kZXggOTA3NDNmZDNjOTIxNDk5MzE1NjI5MjAxMzRkZjY4NDAyMjU1NDJi NS4uNTgzYzcwYzYwNDM2ZjUzN2VlODc4YjJkNzQwZGFmMjZjOTI5NzQ1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKQEAgLTg5Miw3ICs4OTIsOCBAQCB2b2lkIENDVGhyZWFkUHJveHk6 OnJlY3JlYXRlQ29udGV4dE9uSW1wbFRocmVhZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlv biwgQwogewogICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiQ0NUaHJlYWRQcm94eTo6cmVjcmVhdGVD b250ZXh0T25JbXBsVGhyZWFkIik7CiAgICAgQVNTRVJUKGlzSW1wbFRocmVhZCgpKTsKLSAgICBt X2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQobV9sYXll clRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICBpZiAoIW1fbGF5ZXJUcmVl SG9zdEltcGwtPmNvbnRlbnRzVGV4dHVyZXNQdXJnZWQoKSkKKyAgICAgICAgbV9sYXllclRyZWVI b3N0LT5kZWxldGVDb250ZW50c1RleHR1cmVzT25JbXBsVGhyZWFkKG1fbGF5ZXJUcmVlSG9zdElt cGwtPnJlc291cmNlUHJvdmlkZXIoKSk7CiAgICAgKnJlY3JlYXRlU3VjY2VlZGVkID0gbV9sYXll clRyZWVIb3N0SW1wbC0+aW5pdGlhbGl6ZVJlbmRlcmVyKGFkb3B0UHRyKGNvbnRleHRQdHIpLCB0 ZXh0dXJlVXBsb2FkZXIpOwogICAgIGlmICgqcmVjcmVhdGVTdWNjZWVkZWQpIHsKICAgICAgICAg KmNhcGFiaWxpdGllcyA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnJlbmRlcmVyQ2FwYWJpbGl0aWVz KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVl SG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcAppbmRleCA2YjlmOWIyYjUzODk0NWUwYmNmZmI5M2U3OTQzNmY3OGE0NGUyYzAy Li40NzQxODEyMmE1MzkxY2ViOTk1ZjM5OTlhZjg0MDZiZmMzMzE0ZDEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDQ0xheWVyVHJlZUhvc3RJbXBsLmgiCiAjaW5jbHVk ZSAiQ0NPY2NsdXNpb25UcmFja2VyVGVzdENvbW1vbi5oIgogI2luY2x1ZGUgIkNDU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJDQ1NpbmdsZVRocmVhZFByb3h5LmgiCiAjaW5jbHVkZSAiQ0NUZXh0dXJl VXBkYXRlUXVldWUuaCIKICNpbmNsdWRlICJDQ1RocmVhZGVkVGVzdC5oIgogI2luY2x1ZGUgIkND VGltaW5nRnVuY3Rpb24uaCIKQEAgLTI1OTQsNCArMjU5NSw5NyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0VGVzdEV2aWN0VGV4dHVyZXMsIHJ1bk11bHRpVGhyZWFkKQogICAgIHJ1blRlc3QodHJ1 ZSk7CiB9CiAKK2NsYXNzIENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RUZXN0IHsKK3B1YmxpYzoKKyAgICBDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMoKQorICAgICAgICA6 IG1fbGF5ZXIoRXZpY3Rpb25UZXN0TGF5ZXI6OmNyZWF0ZSgpKQorICAgICAgICAsIG1faW1wbEZv ckV2aWN0VGV4dHVyZXMoMCkKKyAgICAgICAgLCBtX251bUNvbW1pdHMoMCkKKyAgICB7CisgICAg fQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luVGVzdCgpCisgICAgeworICAgICAgICBtX2xheWVy VHJlZUhvc3QtPnNldFJvb3RMYXllcihtX2xheWVyKTsKKyAgICAgICAgbV9sYXllclRyZWVIb3N0 LT5zZXRWaWV3cG9ydFNpemUoSW50U2l6ZSgxMCwgMjApLCBJbnRTaXplKDEwLCAyMCkpOworCisg ICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4OworICAgICAgICBz ZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fbGF5ZXIuZ2V0KCksIDAsIGlkZW50aXR5TWF0 cml4LCBGbG9hdFBvaW50KDAsIDApLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKDEwLCAyMCks IHRydWUpOworICAgIH0KKworICAgIGNsYXNzIEV2aWN0VGV4dHVyZXNUYXNrIDogcHVibGljIFdl YktpdDo6V2ViVGhyZWFkOjpUYXNrIHsKKyAgICBwdWJsaWM6CisgICAgICAgIEV2aWN0VGV4dHVy ZXNUYXNrKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlcyog dGVzdCkgOiBtX3Rlc3QodGVzdCkgeyB9CisgICAgICAgIHZpcnR1YWwgfkV2aWN0VGV4dHVyZXNU YXNrKCkgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCBydW4oKQorICAgICAgICB7CisgICAgICAg ICAgICBtX3Rlc3QtPmV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQoKTsKKyAgICAgICAgfQorCisg ICAgcHJpdmF0ZToKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJF dmljdFRleHR1cmVzKiBtX3Rlc3Q7CisgICAgfTsKKworICAgIHZvaWQgcG9zdEV2aWN0VGV4dHVy ZXMoKQorICAgIHsKKyAgICAgICAgaWYgKHdlYlRocmVhZCgpKQorICAgICAgICAgICAgd2ViVGhy ZWFkKCktPnBvc3RUYXNrKG5ldyBFdmljdFRleHR1cmVzVGFzayh0aGlzKSk7CisgICAgICAgIGVs c2UgeworICAgICAgICAgICAgRGVidWdTY29wZWRTZXRJbXBsVGhyZWFkIGltcGw7CisgICAgICAg ICAgICBldmljdFRleHR1cmVzT25JbXBsVGhyZWFkKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICB2b2lkIGV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQoKQorICAgIHsKKyAgICAgICAgQVNTRVJU KG1faW1wbEZvckV2aWN0VGV4dHVyZXMpOworICAgICAgICBtX2ltcGxGb3JFdmljdFRleHR1cmVz LT5yZWxlYXNlQ29udGVudHNUZXh0dXJlcygpOworICAgIH0KKworICAgIC8vIENvbW1pdCAxOiBK dXN0IGNvbW1pdCBhbmQgZHJhdyBub3JtYWxseSwgdGhlbiBhdCB0aGUgZW5kLCBzZXQgb3Vyc2Vs dmVzCisgICAgLy8gaW52aXNpYmxlICh0byBwcmV2ZW50IGEgY29tbWl0IHRoYXQgd291bGQgcmVj cmVhdGUgdGV4dHVyZXMgYWZ0ZXIKKyAgICAvLyBldmljdGlvbiwgYmVmb3JlIHRoZSBjb250ZXh0 IHJlY292ZXJ5KSwgYW5kIHBvc3QgYSB0YXNrIHRoYXQgd2lsbCBldmljdAorICAgIC8vIHRleHR1 cmVzLCB0aGVuIGNhdXNlIHRoZSBjb250ZXh0IHRvIGJlIGxvc3QsIGFuZCB0aGVuIHNldCBvdXJz ZWx2ZXMKKyAgICAvLyB2aXNpYmxlIGFnYWluICh0byBhbGxvdyBjb21taXRzLCBzaW5jZSB0aGF0 J3Mgd2hhdCBjYXVzZXMgY29udGV4dAorICAgIC8vIHJlY292ZXJ5IGluIHNpbmdsZSB0aHJlYWQp LgorICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJhbWUoKQorICAgIHsKKyAgICAg ICAgKyttX251bUNvbW1pdHM7CisgICAgICAgIHN3aXRjaCAobV9udW1Db21taXRzKSB7CisgICAg ICAgIGNhc2UgMToKKyAgICAgICAgICAgIEVYUEVDVF9UUlVFKG1fbGF5ZXItPnVwZGF0ZWQoKSk7 CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldFZpc2libGUoZmFsc2UpOworICAgICAg ICAgICAgcG9zdEV2aWN0VGV4dHVyZXMoKTsKKyAgICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+ bG9zZUNvbnRleHQoMSk7CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldFZpc2libGUo dHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGNvbW1pdENvbXBs ZXRlT25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJbXBsKiBpbXBsKQorICAgIHsKKyAgICAgICAg bV9pbXBsRm9yRXZpY3RUZXh0dXJlcyA9IGltcGw7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lk IGRpZFJlY3JlYXRlT3V0cHV0U3VyZmFjZShib29sIHN1Y2NlZWRlZCkKKyAgICB7CisgICAgICAg IEVYUEVDVF9UUlVFKHN1Y2NlZWRlZCk7CisgICAgICAgIGVuZFRlc3QoKTsKKyAgICB9CisKKyAg ICB2aXJ0dWFsIHZvaWQgYWZ0ZXJUZXN0KCkKKyAgICB7CisgICAgfQorCitwcml2YXRlOgorICAg IE1vY2tDb250ZW50TGF5ZXJEZWxlZ2F0ZSBtX2RlbGVnYXRlOworICAgIFJlZlB0cjxFdmljdGlv blRlc3RMYXllcj4gbV9sYXllcjsKKyAgICBDQ0xheWVyVHJlZUhvc3RJbXBsKiBtX2ltcGxGb3JF dmljdFRleHR1cmVzOworICAgIGludCBtX251bUNvbW1pdHM7Cit9OworCitTSU5HTEVfQU5EX01V TFRJX1RIUkVBRF9URVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmlj dFRleHR1cmVzKQorCiB9IC8vIG5hbWVzcGFjZQo= 160315 2012-08-23 20:57:43 -0700 2012-08-23 20:59:35 -0700 Patch bug-94892-20120823205739.patch text/plain 8747 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyNTZlOWNjNDIzYTg3 MmFmNWVhMzE3YjM0MjAyMTZlYmE1NzJiMy4uMzczZmE0MjQ2OGFlNGQyZThiZmM2M2U5N2UxYTVh NzU3OTE3NWIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTIzICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZp eCBsb3N0IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJp b3JpdGl6ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJl IGFsbCBpdHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVt IHdlIHdpbGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVz dDogQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpyZWNyZWF0ZUNvbnRleHRPbkltcGxU aHJlYWQpOgorCiAyMDEyLTA4LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1Y4XSBPd25IYW5kbGUgaXMgYSBiaXQgb2YgYSBtaXNub21lcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA1OThiOTIzNjEwMzU0M2FlNTUwMTU1MDJiMTEyN2Y0ZjNhZWU3 MWM1Li5lNjY4YzUwMTc5ZjdjMzAwYzFlZWYxYTM0NTJiN2FmM2NkMDVmYTM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTIzICBBbnRvaW5lIExh Ym91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBsb3N0 IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJpb3JpdGl6 ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJlIGFsbCBp dHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVtIHdlIHdp bGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVzdDogQ0NM YXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisgICAgICAg ICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAgIChDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMpOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkNDTGF5ZXJUcmVl SG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlcyk6CisgICAgICAgIChXVEY6OkND TGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6YmVnaW5UZXN0 KToKKyAgICAgICAgKEV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2spOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkV2 aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4 dFRhc2spOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRl ckV2aWN0VGV4dHVyZXM6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6On5FdmljdFRl eHR1cmVzQW5kTG9zZUNvbnRleHRUYXNrKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0 VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzOjpFdmljdFRleHR1cmVzQW5kTG9zZUNv bnRleHRUYXNrOjpydW4pOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENv bnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OnBvc3RFdmljdFRleHR1cmVzQW5kTG9zZUNvbnRleHQp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0 VGV4dHVyZXM6OmRpZENvbW1pdEFuZERyYXdGcmFtZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6Y29tbWl0Q29tcGxldGVP bkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0 QWZ0ZXJFdmljdFRleHR1cmVzOjpkaWRSZWNyZWF0ZU91dHB1dFN1cmZhY2UpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OmFm dGVyVGVzdCk6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpURVNUX0YpOgorCiAyMDEy LTA4LTIzICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gQ3JlYXRlIHNoYXJlZFF1YWRTdGF0ZSBhdCBzYW1lIHRpbWUgYXMgY3JlYXRpbmcg cXVhZHMgYW5kIGdpdmUgdGhlbSB0byB0aGUgcXVhZFNpbmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2luZ2xlVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKaW5kZXggZTg0ZWIzMzI1MmJiYWFjYzRlN2RlYjQ2NjM0OWQ0OGVj ZDM4YmJmYS4uNjg3NmVhMjE4OGJhZjY2NjhhMjlhYzM3YzFjZDM4YzhjYjQ0MWNlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTaW5nbGVUaHJlYWRQcm94eS5jcHAKQEAgLTE1Niw3ICsxNTYsOCBAQCBi b29sIENDU2luZ2xlVGhyZWFkUHJveHk6OnJlY3JlYXRlQ29udGV4dCgpCiAgICAgYm9vbCBpbml0 aWFsaXplZDsKICAgICB7CiAgICAgICAgIERlYnVnU2NvcGVkU2V0SW1wbFRocmVhZCBpbXBsOwot ICAgICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJl YWQobV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICAgICAgaWYg KCFtX2xheWVyVHJlZUhvc3RJbXBsLT5jb250ZW50c1RleHR1cmVzUHVyZ2VkKCkpCisgICAgICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQo bV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKICAgICAgICAgaW5pdGlh bGl6ZWQgPSBtX2xheWVyVHJlZUhvc3RJbXBsLT5pbml0aWFsaXplUmVuZGVyZXIoY29udGV4dC5y ZWxlYXNlKCksIFVudGhyb3R0bGVkVXBsb2FkZXIpOwogICAgICAgICBpZiAoaW5pdGlhbGl6ZWQp IHsKICAgICAgICAgICAgIG1fUmVuZGVyZXJDYXBhYmlsaXRpZXNGb3JNYWluVGhyZWFkID0gbV9s YXllclRyZWVIb3N0SW1wbC0+cmVuZGVyZXJDYXBhYmlsaXRpZXMoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJl YWRQcm94eS5jcHAKaW5kZXggOTA3NDNmZDNjOTIxNDk5MzE1NjI5MjAxMzRkZjY4NDAyMjU1NDJi NS4uNTgzYzcwYzYwNDM2ZjUzN2VlODc4YjJkNzQwZGFmMjZjOTI5NzQ1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKQEAgLTg5Miw3ICs4OTIsOCBAQCB2b2lkIENDVGhyZWFkUHJveHk6 OnJlY3JlYXRlQ29udGV4dE9uSW1wbFRocmVhZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlv biwgQwogewogICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiQ0NUaHJlYWRQcm94eTo6cmVjcmVhdGVD b250ZXh0T25JbXBsVGhyZWFkIik7CiAgICAgQVNTRVJUKGlzSW1wbFRocmVhZCgpKTsKLSAgICBt X2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQobV9sYXll clRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICBpZiAoIW1fbGF5ZXJUcmVl SG9zdEltcGwtPmNvbnRlbnRzVGV4dHVyZXNQdXJnZWQoKSkKKyAgICAgICAgbV9sYXllclRyZWVI b3N0LT5kZWxldGVDb250ZW50c1RleHR1cmVzT25JbXBsVGhyZWFkKG1fbGF5ZXJUcmVlSG9zdElt cGwtPnJlc291cmNlUHJvdmlkZXIoKSk7CiAgICAgKnJlY3JlYXRlU3VjY2VlZGVkID0gbV9sYXll clRyZWVIb3N0SW1wbC0+aW5pdGlhbGl6ZVJlbmRlcmVyKGFkb3B0UHRyKGNvbnRleHRQdHIpLCB0 ZXh0dXJlVXBsb2FkZXIpOwogICAgIGlmICgqcmVjcmVhdGVTdWNjZWVkZWQpIHsKICAgICAgICAg KmNhcGFiaWxpdGllcyA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnJlbmRlcmVyQ2FwYWJpbGl0aWVz KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVl SG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcAppbmRleCA2YjlmOWIyYjUzODk0NWUwYmNmZmI5M2U3OTQzNmY3OGE0NGUyYzAy Li45ZDllZGRmZDFjYmJmZGI4NTU2NDQ3Nzk3NWQ1NTViY2IwZmQ5YTYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDQ0xheWVyVHJlZUhvc3RJbXBsLmgiCiAjaW5jbHVk ZSAiQ0NPY2NsdXNpb25UcmFja2VyVGVzdENvbW1vbi5oIgogI2luY2x1ZGUgIkNDU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJDQ1NpbmdsZVRocmVhZFByb3h5LmgiCiAjaW5jbHVkZSAiQ0NUZXh0dXJl VXBkYXRlUXVldWUuaCIKICNpbmNsdWRlICJDQ1RocmVhZGVkVGVzdC5oIgogI2luY2x1ZGUgIkND VGltaW5nRnVuY3Rpb24uaCIKQEAgLTI1OTQsNCArMjU5NSw5NyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0VGVzdEV2aWN0VGV4dHVyZXMsIHJ1bk11bHRpVGhyZWFkKQogICAgIHJ1blRlc3QodHJ1 ZSk7CiB9CiAKK2NsYXNzIENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RUZXN0IHsKK3B1YmxpYzoKKyAgICBDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMoKQorICAgICAgICA6 IG1fbGF5ZXIoRXZpY3Rpb25UZXN0TGF5ZXI6OmNyZWF0ZSgpKQorICAgICAgICAsIG1faW1wbEZv ckV2aWN0VGV4dHVyZXMoMCkKKyAgICAgICAgLCBtX251bUNvbW1pdHMoMCkKKyAgICB7CisgICAg fQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luVGVzdCgpIE9WRVJSSURFCisgICAgeworICAgICAg ICBtX2xheWVyVHJlZUhvc3QtPnNldFJvb3RMYXllcihtX2xheWVyKTsKKyAgICAgICAgbV9sYXll clRyZWVIb3N0LT5zZXRWaWV3cG9ydFNpemUoSW50U2l6ZSgxMCwgMjApLCBJbnRTaXplKDEwLCAy MCkpOworCisgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4Owor ICAgICAgICBzZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fbGF5ZXIuZ2V0KCksIDAsIGlk ZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXpl KDEwLCAyMCksIHRydWUpOworICAgIH0KKworICAgIGNsYXNzIEV2aWN0VGV4dHVyZXNUYXNrIDog cHVibGljIFdlYktpdDo6V2ViVGhyZWFkOjpUYXNrIHsKKyAgICBwdWJsaWM6CisgICAgICAgIEV2 aWN0VGV4dHVyZXNUYXNrKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyogdGVzdCkgOiBtX3Rlc3QodGVzdCkgeyB9CisgICAgICAgIHZpcnR1YWwgfkV2aWN0 VGV4dHVyZXNUYXNrKCkgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCBydW4oKSBPVkVSUklERQor ICAgICAgICB7CisgICAgICAgICAgICBtX3Rlc3QtPmV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQo KTsKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVz dExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzKiBtX3Rlc3Q7CisgICAgfTsKKworICAgIHZv aWQgcG9zdEV2aWN0VGV4dHVyZXMoKQorICAgIHsKKyAgICAgICAgaWYgKHdlYlRocmVhZCgpKQor ICAgICAgICAgICAgd2ViVGhyZWFkKCktPnBvc3RUYXNrKG5ldyBFdmljdFRleHR1cmVzVGFzayh0 aGlzKSk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgRGVidWdTY29wZWRTZXRJbXBsVGhy ZWFkIGltcGw7CisgICAgICAgICAgICBldmljdFRleHR1cmVzT25JbXBsVGhyZWFkKCk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICB2b2lkIGV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQoKQorICAg IHsKKyAgICAgICAgQVNTRVJUKG1faW1wbEZvckV2aWN0VGV4dHVyZXMpOworICAgICAgICBtX2lt cGxGb3JFdmljdFRleHR1cmVzLT5yZWxlYXNlQ29udGVudHNUZXh0dXJlcygpOworICAgIH0KKwor ICAgIC8vIENvbW1pdCAxOiBKdXN0IGNvbW1pdCBhbmQgZHJhdyBub3JtYWxseSwgdGhlbiBhdCB0 aGUgZW5kLCBzZXQgb3Vyc2VsdmVzCisgICAgLy8gaW52aXNpYmxlICh0byBwcmV2ZW50IGEgY29t bWl0IHRoYXQgd291bGQgcmVjcmVhdGUgdGV4dHVyZXMgYWZ0ZXIKKyAgICAvLyBldmljdGlvbiwg YmVmb3JlIHRoZSBjb250ZXh0IHJlY292ZXJ5KSwgYW5kIHBvc3QgYSB0YXNrIHRoYXQgd2lsbCBl dmljdAorICAgIC8vIHRleHR1cmVzLCB0aGVuIGNhdXNlIHRoZSBjb250ZXh0IHRvIGJlIGxvc3Qs IGFuZCB0aGVuIHNldCBvdXJzZWx2ZXMKKyAgICAvLyB2aXNpYmxlIGFnYWluICh0byBhbGxvdyBj b21taXRzLCBzaW5jZSB0aGF0J3Mgd2hhdCBjYXVzZXMgY29udGV4dAorICAgIC8vIHJlY292ZXJ5 IGluIHNpbmdsZSB0aHJlYWQpLgorICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJh bWUoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgKyttX251bUNvbW1pdHM7CisgICAgICAgIHN3 aXRjaCAobV9udW1Db21taXRzKSB7CisgICAgICAgIGNhc2UgMToKKyAgICAgICAgICAgIEVYUEVD VF9UUlVFKG1fbGF5ZXItPnVwZGF0ZWQoKSk7CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3Qt PnNldFZpc2libGUoZmFsc2UpOworICAgICAgICAgICAgcG9zdEV2aWN0VGV4dHVyZXMoKTsKKyAg ICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+bG9zZUNvbnRleHQoMSk7CisgICAgICAgICAgICBt X2xheWVyVHJlZUhvc3QtPnNldFZpc2libGUodHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisg ICAgdmlydHVhbCB2b2lkIGNvbW1pdENvbXBsZXRlT25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJ bXBsKiBpbXBsKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgbV9pbXBsRm9yRXZpY3RUZXh0dXJl cyA9IGltcGw7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGRpZFJlY3JlYXRlT3V0cHV0U3Vy ZmFjZShib29sIHN1Y2NlZWRlZCkgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIEVYUEVDVF9UUlVF KHN1Y2NlZWRlZCk7CisgICAgICAgIGVuZFRlc3QoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZv aWQgYWZ0ZXJUZXN0KCkgT1ZFUlJJREUKKyAgICB7CisgICAgfQorCitwcml2YXRlOgorICAgIE1v Y2tDb250ZW50TGF5ZXJEZWxlZ2F0ZSBtX2RlbGVnYXRlOworICAgIFJlZlB0cjxFdmljdGlvblRl c3RMYXllcj4gbV9sYXllcjsKKyAgICBDQ0xheWVyVHJlZUhvc3RJbXBsKiBtX2ltcGxGb3JFdmlj dFRleHR1cmVzOworICAgIGludCBtX251bUNvbW1pdHM7Cit9OworCitTSU5HTEVfQU5EX01VTFRJ X1RIUkVBRF9URVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRl eHR1cmVzKQorCiB9IC8vIG5hbWVzcGFjZQo= 160316 2012-08-23 20:59:38 -0700 2012-08-23 21:00:28 -0700 Patch for landing bug-94892-20120823205934.patch text/plain 8747 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyNTZlOWNjNDIzYTg3 MmFmNWVhMzE3YjM0MjAyMTZlYmE1NzJiMy4uMzczZmE0MjQ2OGFlNGQyZThiZmM2M2U5N2UxYTVh NzU3OTE3NWIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTIzICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZp eCBsb3N0IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJp b3JpdGl6ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJl IGFsbCBpdHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVt IHdlIHdpbGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVz dDogQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpyZWNyZWF0ZUNvbnRleHRPbkltcGxU aHJlYWQpOgorCiAyMDEyLTA4LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1Y4XSBPd25IYW5kbGUgaXMgYSBiaXQgb2YgYSBtaXNub21lcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA1OThiOTIzNjEwMzU0M2FlNTUwMTU1MDJiMTEyN2Y0ZjNhZWU3 MWM1Li5lNjY4YzUwMTc5ZjdjMzAwYzFlZWYxYTM0NTJiN2FmM2NkMDVmYTM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTIzICBBbnRvaW5lIExh Ym91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBsb3N0 IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJpb3JpdGl6 ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJlIGFsbCBp dHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVtIHdlIHdp bGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVzdDogQ0NM YXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisgICAgICAg ICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAgIChDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMpOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkNDTGF5ZXJUcmVl SG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlcyk6CisgICAgICAgIChXVEY6OkND TGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6YmVnaW5UZXN0 KToKKyAgICAgICAgKEV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2spOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkV2 aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4 dFRhc2spOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRl ckV2aWN0VGV4dHVyZXM6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6On5FdmljdFRl eHR1cmVzQW5kTG9zZUNvbnRleHRUYXNrKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0 VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzOjpFdmljdFRleHR1cmVzQW5kTG9zZUNv bnRleHRUYXNrOjpydW4pOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENv bnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OnBvc3RFdmljdFRleHR1cmVzQW5kTG9zZUNvbnRleHQp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0 VGV4dHVyZXM6OmRpZENvbW1pdEFuZERyYXdGcmFtZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6Y29tbWl0Q29tcGxldGVP bkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0 QWZ0ZXJFdmljdFRleHR1cmVzOjpkaWRSZWNyZWF0ZU91dHB1dFN1cmZhY2UpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OmFm dGVyVGVzdCk6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpURVNUX0YpOgorCiAyMDEy LTA4LTIzICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gQ3JlYXRlIHNoYXJlZFF1YWRTdGF0ZSBhdCBzYW1lIHRpbWUgYXMgY3JlYXRpbmcg cXVhZHMgYW5kIGdpdmUgdGhlbSB0byB0aGUgcXVhZFNpbmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2luZ2xlVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKaW5kZXggZTg0ZWIzMzI1MmJiYWFjYzRlN2RlYjQ2NjM0OWQ0OGVj ZDM4YmJmYS4uNjg3NmVhMjE4OGJhZjY2NjhhMjlhYzM3YzFjZDM4YzhjYjQ0MWNlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTaW5nbGVUaHJlYWRQcm94eS5jcHAKQEAgLTE1Niw3ICsxNTYsOCBAQCBi b29sIENDU2luZ2xlVGhyZWFkUHJveHk6OnJlY3JlYXRlQ29udGV4dCgpCiAgICAgYm9vbCBpbml0 aWFsaXplZDsKICAgICB7CiAgICAgICAgIERlYnVnU2NvcGVkU2V0SW1wbFRocmVhZCBpbXBsOwot ICAgICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJl YWQobV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICAgICAgaWYg KCFtX2xheWVyVHJlZUhvc3RJbXBsLT5jb250ZW50c1RleHR1cmVzUHVyZ2VkKCkpCisgICAgICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQo bV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKICAgICAgICAgaW5pdGlh bGl6ZWQgPSBtX2xheWVyVHJlZUhvc3RJbXBsLT5pbml0aWFsaXplUmVuZGVyZXIoY29udGV4dC5y ZWxlYXNlKCksIFVudGhyb3R0bGVkVXBsb2FkZXIpOwogICAgICAgICBpZiAoaW5pdGlhbGl6ZWQp IHsKICAgICAgICAgICAgIG1fUmVuZGVyZXJDYXBhYmlsaXRpZXNGb3JNYWluVGhyZWFkID0gbV9s YXllclRyZWVIb3N0SW1wbC0+cmVuZGVyZXJDYXBhYmlsaXRpZXMoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJl YWRQcm94eS5jcHAKaW5kZXggOTA3NDNmZDNjOTIxNDk5MzE1NjI5MjAxMzRkZjY4NDAyMjU1NDJi NS4uNTgzYzcwYzYwNDM2ZjUzN2VlODc4YjJkNzQwZGFmMjZjOTI5NzQ1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKQEAgLTg5Miw3ICs4OTIsOCBAQCB2b2lkIENDVGhyZWFkUHJveHk6 OnJlY3JlYXRlQ29udGV4dE9uSW1wbFRocmVhZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlv biwgQwogewogICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiQ0NUaHJlYWRQcm94eTo6cmVjcmVhdGVD b250ZXh0T25JbXBsVGhyZWFkIik7CiAgICAgQVNTRVJUKGlzSW1wbFRocmVhZCgpKTsKLSAgICBt X2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQobV9sYXll clRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICBpZiAoIW1fbGF5ZXJUcmVl SG9zdEltcGwtPmNvbnRlbnRzVGV4dHVyZXNQdXJnZWQoKSkKKyAgICAgICAgbV9sYXllclRyZWVI b3N0LT5kZWxldGVDb250ZW50c1RleHR1cmVzT25JbXBsVGhyZWFkKG1fbGF5ZXJUcmVlSG9zdElt cGwtPnJlc291cmNlUHJvdmlkZXIoKSk7CiAgICAgKnJlY3JlYXRlU3VjY2VlZGVkID0gbV9sYXll clRyZWVIb3N0SW1wbC0+aW5pdGlhbGl6ZVJlbmRlcmVyKGFkb3B0UHRyKGNvbnRleHRQdHIpLCB0 ZXh0dXJlVXBsb2FkZXIpOwogICAgIGlmICgqcmVjcmVhdGVTdWNjZWVkZWQpIHsKICAgICAgICAg KmNhcGFiaWxpdGllcyA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnJlbmRlcmVyQ2FwYWJpbGl0aWVz KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVl SG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcAppbmRleCA2YjlmOWIyYjUzODk0NWUwYmNmZmI5M2U3OTQzNmY3OGE0NGUyYzAy Li45ZDllZGRmZDFjYmJmZGI4NTU2NDQ3Nzk3NWQ1NTViY2IwZmQ5YTYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDQ0xheWVyVHJlZUhvc3RJbXBsLmgiCiAjaW5jbHVk ZSAiQ0NPY2NsdXNpb25UcmFja2VyVGVzdENvbW1vbi5oIgogI2luY2x1ZGUgIkNDU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJDQ1NpbmdsZVRocmVhZFByb3h5LmgiCiAjaW5jbHVkZSAiQ0NUZXh0dXJl VXBkYXRlUXVldWUuaCIKICNpbmNsdWRlICJDQ1RocmVhZGVkVGVzdC5oIgogI2luY2x1ZGUgIkND VGltaW5nRnVuY3Rpb24uaCIKQEAgLTI1OTQsNCArMjU5NSw5NyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0VGVzdEV2aWN0VGV4dHVyZXMsIHJ1bk11bHRpVGhyZWFkKQogICAgIHJ1blRlc3QodHJ1 ZSk7CiB9CiAKK2NsYXNzIENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RUZXN0IHsKK3B1YmxpYzoKKyAgICBDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMoKQorICAgICAgICA6 IG1fbGF5ZXIoRXZpY3Rpb25UZXN0TGF5ZXI6OmNyZWF0ZSgpKQorICAgICAgICAsIG1faW1wbEZv ckV2aWN0VGV4dHVyZXMoMCkKKyAgICAgICAgLCBtX251bUNvbW1pdHMoMCkKKyAgICB7CisgICAg fQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luVGVzdCgpIE9WRVJSSURFCisgICAgeworICAgICAg ICBtX2xheWVyVHJlZUhvc3QtPnNldFJvb3RMYXllcihtX2xheWVyKTsKKyAgICAgICAgbV9sYXll clRyZWVIb3N0LT5zZXRWaWV3cG9ydFNpemUoSW50U2l6ZSgxMCwgMjApLCBJbnRTaXplKDEwLCAy MCkpOworCisgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4Owor ICAgICAgICBzZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fbGF5ZXIuZ2V0KCksIDAsIGlk ZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXpl KDEwLCAyMCksIHRydWUpOworICAgIH0KKworICAgIGNsYXNzIEV2aWN0VGV4dHVyZXNUYXNrIDog cHVibGljIFdlYktpdDo6V2ViVGhyZWFkOjpUYXNrIHsKKyAgICBwdWJsaWM6CisgICAgICAgIEV2 aWN0VGV4dHVyZXNUYXNrKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyogdGVzdCkgOiBtX3Rlc3QodGVzdCkgeyB9CisgICAgICAgIHZpcnR1YWwgfkV2aWN0 VGV4dHVyZXNUYXNrKCkgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCBydW4oKSBPVkVSUklERQor ICAgICAgICB7CisgICAgICAgICAgICBtX3Rlc3QtPmV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQo KTsKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVz dExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzKiBtX3Rlc3Q7CisgICAgfTsKKworICAgIHZv aWQgcG9zdEV2aWN0VGV4dHVyZXMoKQorICAgIHsKKyAgICAgICAgaWYgKHdlYlRocmVhZCgpKQor ICAgICAgICAgICAgd2ViVGhyZWFkKCktPnBvc3RUYXNrKG5ldyBFdmljdFRleHR1cmVzVGFzayh0 aGlzKSk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgRGVidWdTY29wZWRTZXRJbXBsVGhy ZWFkIGltcGw7CisgICAgICAgICAgICBldmljdFRleHR1cmVzT25JbXBsVGhyZWFkKCk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICB2b2lkIGV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQoKQorICAg IHsKKyAgICAgICAgQVNTRVJUKG1faW1wbEZvckV2aWN0VGV4dHVyZXMpOworICAgICAgICBtX2lt cGxGb3JFdmljdFRleHR1cmVzLT5yZWxlYXNlQ29udGVudHNUZXh0dXJlcygpOworICAgIH0KKwor ICAgIC8vIENvbW1pdCAxOiBKdXN0IGNvbW1pdCBhbmQgZHJhdyBub3JtYWxseSwgdGhlbiBhdCB0 aGUgZW5kLCBzZXQgb3Vyc2VsdmVzCisgICAgLy8gaW52aXNpYmxlICh0byBwcmV2ZW50IGEgY29t bWl0IHRoYXQgd291bGQgcmVjcmVhdGUgdGV4dHVyZXMgYWZ0ZXIKKyAgICAvLyBldmljdGlvbiwg YmVmb3JlIHRoZSBjb250ZXh0IHJlY292ZXJ5KSwgYW5kIHBvc3QgYSB0YXNrIHRoYXQgd2lsbCBl dmljdAorICAgIC8vIHRleHR1cmVzLCB0aGVuIGNhdXNlIHRoZSBjb250ZXh0IHRvIGJlIGxvc3Qs IGFuZCB0aGVuIHNldCBvdXJzZWx2ZXMKKyAgICAvLyB2aXNpYmxlIGFnYWluICh0byBhbGxvdyBj b21taXRzLCBzaW5jZSB0aGF0J3Mgd2hhdCBjYXVzZXMgY29udGV4dAorICAgIC8vIHJlY292ZXJ5 IGluIHNpbmdsZSB0aHJlYWQpLgorICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJh bWUoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgKyttX251bUNvbW1pdHM7CisgICAgICAgIHN3 aXRjaCAobV9udW1Db21taXRzKSB7CisgICAgICAgIGNhc2UgMToKKyAgICAgICAgICAgIEVYUEVD VF9UUlVFKG1fbGF5ZXItPnVwZGF0ZWQoKSk7CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3Qt PnNldFZpc2libGUoZmFsc2UpOworICAgICAgICAgICAgcG9zdEV2aWN0VGV4dHVyZXMoKTsKKyAg ICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+bG9zZUNvbnRleHQoMSk7CisgICAgICAgICAgICBt X2xheWVyVHJlZUhvc3QtPnNldFZpc2libGUodHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisg ICAgdmlydHVhbCB2b2lkIGNvbW1pdENvbXBsZXRlT25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJ bXBsKiBpbXBsKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgbV9pbXBsRm9yRXZpY3RUZXh0dXJl cyA9IGltcGw7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGRpZFJlY3JlYXRlT3V0cHV0U3Vy ZmFjZShib29sIHN1Y2NlZWRlZCkgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIEVYUEVDVF9UUlVF KHN1Y2NlZWRlZCk7CisgICAgICAgIGVuZFRlc3QoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZv aWQgYWZ0ZXJUZXN0KCkgT1ZFUlJJREUKKyAgICB7CisgICAgfQorCitwcml2YXRlOgorICAgIE1v Y2tDb250ZW50TGF5ZXJEZWxlZ2F0ZSBtX2RlbGVnYXRlOworICAgIFJlZlB0cjxFdmljdGlvblRl c3RMYXllcj4gbV9sYXllcjsKKyAgICBDQ0xheWVyVHJlZUhvc3RJbXBsKiBtX2ltcGxGb3JFdmlj dFRleHR1cmVzOworICAgIGludCBtX251bUNvbW1pdHM7Cit9OworCitTSU5HTEVfQU5EX01VTFRJ X1RIUkVBRF9URVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRl eHR1cmVzKQorCiB9IC8vIG5hbWVzcGFjZQo= 160317 2012-08-23 21:00:30 -0700 2012-08-23 21:59:39 -0700 Patch for landing bug-94892-20120823210027.patch text/plain 8747 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyNTZlOWNjNDIzYTg3 MmFmNWVhMzE3YjM0MjAyMTZlYmE1NzJiMy4uZjc0Y2UwOTA5NGE3NjQ1Yzc1YWY4NjNjZjY4MDNk MGI0ZTc2NGFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTIzICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZp eCBsb3N0IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdl ZCBieSBKYW1lcyBSb2JpbnNvbi4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJp b3JpdGl6ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJl IGFsbCBpdHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVt IHdlIHdpbGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVz dDogQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpyZWNyZWF0ZUNvbnRleHRPbkltcGxU aHJlYWQpOgorCiAyMDEyLTA4LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1Y4XSBPd25IYW5kbGUgaXMgYSBiaXQgb2YgYSBtaXNub21lcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA1OThiOTIzNjEwMzU0M2FlNTUwMTU1MDJiMTEyN2Y0ZjNhZWU3 MWM1Li5mYzg3ODlmYTgyOGE4ZGFiZDY3Y2E4M2Q5YTBhN2QxNjUyMDIwM2U0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTIzICBBbnRvaW5lIExh Ym91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBsb3N0 IGNvbnRleHQgd2hlbiB0ZXh0dXJlcyBhcmUgZXZpY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4OTIKKworICAgICAgICBSZXZpZXdlZCBieSBK YW1lcyBSb2JpbnNvbi4KKworICAgICAgICBBZnRlciBldmljdGlvbiwgdGhlIENDUHJpb3JpdGl6 ZWRUZXh0dXJlTWFuYWdlciBpcyBpbiBhIGxpbWJvIHN0YXRlCisgICAgICAgIHdoZXJlIGFsbCBp dHMgcmVzb3VyY2VzIGFyZSBpbnZhbGlkLiBJZiB3ZSB0cnkgdG8gcmVsZWFzZSB0aGVtIHdlIHdp bGwKKyAgICAgICAgZG91YmxlLWRlc3Ryb3kgdGhlbS4KKworICAgICAgICBOZXcgdGVzdDogQ0NM YXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzLgorCisgICAgICAg ICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAgIChDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMpOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkNDTGF5ZXJUcmVl SG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlcyk6CisgICAgICAgIChXVEY6OkND TGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6YmVnaW5UZXN0 KToKKyAgICAgICAgKEV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2spOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OkV2 aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4 dFRhc2spOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRl ckV2aWN0VGV4dHVyZXM6OkV2aWN0VGV4dHVyZXNBbmRMb3NlQ29udGV4dFRhc2s6On5FdmljdFRl eHR1cmVzQW5kTG9zZUNvbnRleHRUYXNrKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0 VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzOjpFdmljdFRleHR1cmVzQW5kTG9zZUNv bnRleHRUYXNrOjpydW4pOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENv bnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OnBvc3RFdmljdFRleHR1cmVzQW5kTG9zZUNvbnRleHQp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0 VGV4dHVyZXM6OmRpZENvbW1pdEFuZERyYXdGcmFtZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0dXJlczo6Y29tbWl0Q29tcGxldGVP bkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0 QWZ0ZXJFdmljdFRleHR1cmVzOjpkaWRSZWNyZWF0ZU91dHB1dFN1cmZhY2UpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXM6OmFm dGVyVGVzdCk6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpURVNUX0YpOgorCiAyMDEy LTA4LTIzICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gQ3JlYXRlIHNoYXJlZFF1YWRTdGF0ZSBhdCBzYW1lIHRpbWUgYXMgY3JlYXRpbmcg cXVhZHMgYW5kIGdpdmUgdGhlbSB0byB0aGUgcXVhZFNpbmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2luZ2xlVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKaW5kZXggZTg0ZWIzMzI1MmJiYWFjYzRlN2RlYjQ2NjM0OWQ0OGVj ZDM4YmJmYS4uNjg3NmVhMjE4OGJhZjY2NjhhMjlhYzM3YzFjZDM4YzhjYjQ0MWNlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTaW5nbGVUaHJlYWRQcm94eS5jcHAKQEAgLTE1Niw3ICsxNTYsOCBAQCBi b29sIENDU2luZ2xlVGhyZWFkUHJveHk6OnJlY3JlYXRlQ29udGV4dCgpCiAgICAgYm9vbCBpbml0 aWFsaXplZDsKICAgICB7CiAgICAgICAgIERlYnVnU2NvcGVkU2V0SW1wbFRocmVhZCBpbXBsOwot ICAgICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJl YWQobV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICAgICAgaWYg KCFtX2xheWVyVHJlZUhvc3RJbXBsLT5jb250ZW50c1RleHR1cmVzUHVyZ2VkKCkpCisgICAgICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQo bV9sYXllclRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKICAgICAgICAgaW5pdGlh bGl6ZWQgPSBtX2xheWVyVHJlZUhvc3RJbXBsLT5pbml0aWFsaXplUmVuZGVyZXIoY29udGV4dC5y ZWxlYXNlKCksIFVudGhyb3R0bGVkVXBsb2FkZXIpOwogICAgICAgICBpZiAoaW5pdGlhbGl6ZWQp IHsKICAgICAgICAgICAgIG1fUmVuZGVyZXJDYXBhYmlsaXRpZXNGb3JNYWluVGhyZWFkID0gbV9s YXllclRyZWVIb3N0SW1wbC0+cmVuZGVyZXJDYXBhYmlsaXRpZXMoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJl YWRQcm94eS5jcHAKaW5kZXggOTA3NDNmZDNjOTIxNDk5MzE1NjI5MjAxMzRkZjY4NDAyMjU1NDJi NS4uNTgzYzcwYzYwNDM2ZjUzN2VlODc4YjJkNzQwZGFmMjZjOTI5NzQ1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKQEAgLTg5Miw3ICs4OTIsOCBAQCB2b2lkIENDVGhyZWFkUHJveHk6 OnJlY3JlYXRlQ29udGV4dE9uSW1wbFRocmVhZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlv biwgQwogewogICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiQ0NUaHJlYWRQcm94eTo6cmVjcmVhdGVD b250ZXh0T25JbXBsVGhyZWFkIik7CiAgICAgQVNTRVJUKGlzSW1wbFRocmVhZCgpKTsKLSAgICBt X2xheWVyVHJlZUhvc3QtPmRlbGV0ZUNvbnRlbnRzVGV4dHVyZXNPbkltcGxUaHJlYWQobV9sYXll clRyZWVIb3N0SW1wbC0+cmVzb3VyY2VQcm92aWRlcigpKTsKKyAgICBpZiAoIW1fbGF5ZXJUcmVl SG9zdEltcGwtPmNvbnRlbnRzVGV4dHVyZXNQdXJnZWQoKSkKKyAgICAgICAgbV9sYXllclRyZWVI b3N0LT5kZWxldGVDb250ZW50c1RleHR1cmVzT25JbXBsVGhyZWFkKG1fbGF5ZXJUcmVlSG9zdElt cGwtPnJlc291cmNlUHJvdmlkZXIoKSk7CiAgICAgKnJlY3JlYXRlU3VjY2VlZGVkID0gbV9sYXll clRyZWVIb3N0SW1wbC0+aW5pdGlhbGl6ZVJlbmRlcmVyKGFkb3B0UHRyKGNvbnRleHRQdHIpLCB0 ZXh0dXJlVXBsb2FkZXIpOwogICAgIGlmICgqcmVjcmVhdGVTdWNjZWVkZWQpIHsKICAgICAgICAg KmNhcGFiaWxpdGllcyA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnJlbmRlcmVyQ2FwYWJpbGl0aWVz KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVl SG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcAppbmRleCA2YjlmOWIyYjUzODk0NWUwYmNmZmI5M2U3OTQzNmY3OGE0NGUyYzAy Li45ZDllZGRmZDFjYmJmZGI4NTU2NDQ3Nzk3NWQ1NTViY2IwZmQ5YTYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDQ0xheWVyVHJlZUhvc3RJbXBsLmgiCiAjaW5jbHVk ZSAiQ0NPY2NsdXNpb25UcmFja2VyVGVzdENvbW1vbi5oIgogI2luY2x1ZGUgIkNDU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJDQ1NpbmdsZVRocmVhZFByb3h5LmgiCiAjaW5jbHVkZSAiQ0NUZXh0dXJl VXBkYXRlUXVldWUuaCIKICNpbmNsdWRlICJDQ1RocmVhZGVkVGVzdC5oIgogI2luY2x1ZGUgIkND VGltaW5nRnVuY3Rpb24uaCIKQEAgLTI1OTQsNCArMjU5NSw5NyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0VGVzdEV2aWN0VGV4dHVyZXMsIHJ1bk11bHRpVGhyZWFkKQogICAgIHJ1blRlc3QodHJ1 ZSk7CiB9CiAKK2NsYXNzIENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RUZXN0IHsKK3B1YmxpYzoKKyAgICBDQ0xh eWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMoKQorICAgICAgICA6 IG1fbGF5ZXIoRXZpY3Rpb25UZXN0TGF5ZXI6OmNyZWF0ZSgpKQorICAgICAgICAsIG1faW1wbEZv ckV2aWN0VGV4dHVyZXMoMCkKKyAgICAgICAgLCBtX251bUNvbW1pdHMoMCkKKyAgICB7CisgICAg fQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luVGVzdCgpIE9WRVJSSURFCisgICAgeworICAgICAg ICBtX2xheWVyVHJlZUhvc3QtPnNldFJvb3RMYXllcihtX2xheWVyKTsKKyAgICAgICAgbV9sYXll clRyZWVIb3N0LT5zZXRWaWV3cG9ydFNpemUoSW50U2l6ZSgxMCwgMjApLCBJbnRTaXplKDEwLCAy MCkpOworCisgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4Owor ICAgICAgICBzZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fbGF5ZXIuZ2V0KCksIDAsIGlk ZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXpl KDEwLCAyMCksIHRydWUpOworICAgIH0KKworICAgIGNsYXNzIEV2aWN0VGV4dHVyZXNUYXNrIDog cHVibGljIFdlYktpdDo6V2ViVGhyZWFkOjpUYXNrIHsKKyAgICBwdWJsaWM6CisgICAgICAgIEV2 aWN0VGV4dHVyZXNUYXNrKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RU ZXh0dXJlcyogdGVzdCkgOiBtX3Rlc3QodGVzdCkgeyB9CisgICAgICAgIHZpcnR1YWwgfkV2aWN0 VGV4dHVyZXNUYXNrKCkgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCBydW4oKSBPVkVSUklERQor ICAgICAgICB7CisgICAgICAgICAgICBtX3Rlc3QtPmV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQo KTsKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVz dExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzKiBtX3Rlc3Q7CisgICAgfTsKKworICAgIHZv aWQgcG9zdEV2aWN0VGV4dHVyZXMoKQorICAgIHsKKyAgICAgICAgaWYgKHdlYlRocmVhZCgpKQor ICAgICAgICAgICAgd2ViVGhyZWFkKCktPnBvc3RUYXNrKG5ldyBFdmljdFRleHR1cmVzVGFzayh0 aGlzKSk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgRGVidWdTY29wZWRTZXRJbXBsVGhy ZWFkIGltcGw7CisgICAgICAgICAgICBldmljdFRleHR1cmVzT25JbXBsVGhyZWFkKCk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICB2b2lkIGV2aWN0VGV4dHVyZXNPbkltcGxUaHJlYWQoKQorICAg IHsKKyAgICAgICAgQVNTRVJUKG1faW1wbEZvckV2aWN0VGV4dHVyZXMpOworICAgICAgICBtX2lt cGxGb3JFdmljdFRleHR1cmVzLT5yZWxlYXNlQ29udGVudHNUZXh0dXJlcygpOworICAgIH0KKwor ICAgIC8vIENvbW1pdCAxOiBKdXN0IGNvbW1pdCBhbmQgZHJhdyBub3JtYWxseSwgdGhlbiBhdCB0 aGUgZW5kLCBzZXQgb3Vyc2VsdmVzCisgICAgLy8gaW52aXNpYmxlICh0byBwcmV2ZW50IGEgY29t bWl0IHRoYXQgd291bGQgcmVjcmVhdGUgdGV4dHVyZXMgYWZ0ZXIKKyAgICAvLyBldmljdGlvbiwg YmVmb3JlIHRoZSBjb250ZXh0IHJlY292ZXJ5KSwgYW5kIHBvc3QgYSB0YXNrIHRoYXQgd2lsbCBl dmljdAorICAgIC8vIHRleHR1cmVzLCB0aGVuIGNhdXNlIHRoZSBjb250ZXh0IHRvIGJlIGxvc3Qs IGFuZCB0aGVuIHNldCBvdXJzZWx2ZXMKKyAgICAvLyB2aXNpYmxlIGFnYWluICh0byBhbGxvdyBj b21taXRzLCBzaW5jZSB0aGF0J3Mgd2hhdCBjYXVzZXMgY29udGV4dAorICAgIC8vIHJlY292ZXJ5 IGluIHNpbmdsZSB0aHJlYWQpLgorICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJh bWUoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgKyttX251bUNvbW1pdHM7CisgICAgICAgIHN3 aXRjaCAobV9udW1Db21taXRzKSB7CisgICAgICAgIGNhc2UgMToKKyAgICAgICAgICAgIEVYUEVD VF9UUlVFKG1fbGF5ZXItPnVwZGF0ZWQoKSk7CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3Qt PnNldFZpc2libGUoZmFsc2UpOworICAgICAgICAgICAgcG9zdEV2aWN0VGV4dHVyZXMoKTsKKyAg ICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+bG9zZUNvbnRleHQoMSk7CisgICAgICAgICAgICBt X2xheWVyVHJlZUhvc3QtPnNldFZpc2libGUodHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisg ICAgdmlydHVhbCB2b2lkIGNvbW1pdENvbXBsZXRlT25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJ bXBsKiBpbXBsKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgbV9pbXBsRm9yRXZpY3RUZXh0dXJl cyA9IGltcGw7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGRpZFJlY3JlYXRlT3V0cHV0U3Vy ZmFjZShib29sIHN1Y2NlZWRlZCkgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIEVYUEVDVF9UUlVF KHN1Y2NlZWRlZCk7CisgICAgICAgIGVuZFRlc3QoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZv aWQgYWZ0ZXJUZXN0KCkgT1ZFUlJJREUKKyAgICB7CisgICAgfQorCitwcml2YXRlOgorICAgIE1v Y2tDb250ZW50TGF5ZXJEZWxlZ2F0ZSBtX2RlbGVnYXRlOworICAgIFJlZlB0cjxFdmljdGlvblRl c3RMYXllcj4gbV9sYXllcjsKKyAgICBDQ0xheWVyVHJlZUhvc3RJbXBsKiBtX2ltcGxGb3JFdmlj dFRleHR1cmVzOworICAgIGludCBtX251bUNvbW1pdHM7Cit9OworCitTSU5HTEVfQU5EX01VTFRJ X1RIUkVBRF9URVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRl eHR1cmVzKQorCiB9IC8vIG5hbWVzcGFjZQo=