28003 2009-08-04 15:42:55 -0700 Cleanup: ResourceResponse should be a class, not a struct 2009-11-18 15:33:40 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 30637 30670 1 michaeln fishd abarth ap eric fishd oldest_to_newest 137158 0 michaeln 2009-08-04 15:42:55 -0700 This 'struct' really should be a 'class'. Here's how things are defined for various ports... C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\cf\ResourceRequest.h(37): struct ResourceRequest : ResourceRequestBase { C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\curl\ResourceRequest.h(36): struct ResourceRequest : ResourceRequestBase { C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\qt\ResourceRequest.h(38): struct ResourceRequest : ResourceRequestBase { C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\soup\ResourceRequest.h(36): struct ResourceRequest : ResourceRequestBase { C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\chromium\ResourceRequest.h(38): struct ResourceRequest : public ResourceRequestBase { C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\mac\ResourceRequest.h(41): class ResourceRequest : public ResourceRequestBase { Here's how many of the forward declarations are declared... C:\chrome\1\src\third_party\WebKit\WebCore\history\HistoryItem.h(53):struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\inspector\InspectorController.h(67):struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\inspector\InspectorResource.h(54): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\appcache\ApplicationCache.h(45):struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\appcache\ApplicationCacheHost.h(51): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.h(42): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\FrameLoaderClient.h(65): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\MainResourceLoader.h(43): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\SubresourceLoader.h(36): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\SubresourceLoaderClient.h(36):struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\ThreadableLoader.h(41): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\loader\WorkerThreadableLoader.h(50): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\cf\ResourceRequestCFNet.h(33): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\ResourceHandleClient.h(53): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\platform\network\ResourceRequestBase.h(49): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\platform\CrossThreadCopier.h(44): struct ResourceRequest; C:\chrome\1\src\third_party\WebKit\WebCore\xml\XMLHttpRequest.h(37):struct ResourceRequest; 137457 1 34184 michaeln 2009-08-05 15:15:18 -0700 Created attachment 34184 struct -> class patch Not much here, just some house cleaning. I think I've got all of them in the webkit repository. There are a few in chrome's repository to get as well once this lands and rolls into view for us there. 137512 2 34184 fishd 2009-08-05 21:55:19 -0700 Comment on attachment 34184 struct -> class patch commit-queue- because I need to land this in conjunction with a chromium patch. 137514 3 eric 2009-08-05 22:09:34 -0700 I feel like we've changed *this particular class* back and forth like 3 times now, no? 137637 4 ap 2009-08-06 13:35:37 -0700 Several people landed build fixes for their ports without looking at the bigger picture, yes. This should resolve the problem for real. 138259 5 abarth 2009-08-07 18:53:39 -0700 Re-assigning to fishd per Comment #2. 141995 6 eric 2009-08-21 14:56:55 -0700 It's been 2 weeks, just wanted to check if this should still be open. 142035 7 ap 2009-08-21 16:04:58 -0700 This hasn't been landed yet. 143819 8 eric 2009-09-01 03:07:19 -0700 Just checking in again, seeing this is still in the to-be-committed list after another week and a half. :) Really not trying to be a pest... 145010 9 michaeln 2009-09-05 08:13:31 -0700 (In reply to comment #8) > Just checking in again, seeing this is still in the to-be-committed list after > another week and a half. :) Really not trying to be a pest... We're holding off until the chromium port is landed in webkit's svn to avoid the dreaded two-sided patch landing stunt maneuver. 148291 10 eric 2009-09-18 12:07:27 -0700 I suspect that this patch will be long out of date by the time that happens. We should probably mark this r- once this no longer applies and you can post a new patch once you're ready to land. 148295 11 34184 eric 2009-09-18 12:12:00 -0700 Comment on attachment 34184 struct -> class patch Yeah: 1 out of 1 hunk FAILED -- saving rejects to file WebCore/loader/DocumentThreadableLoader.h.rej I'm happy to r+ a patch once you're closer to ready to land. As is, seems silly to leave this in the queue. 148322 12 ap 2009-09-18 12:50:21 -0700 How much trouble will it be if this is landed separately, with Chromium changes to follow? It's been a long wait. 148326 13 michaeln 2009-09-18 13:04:44 -0700 Is there any pressing need to get this simple cosmetic change landed? Is having this sit in the Q really an issue? To answer your question, it's no more trouble than the average webkit patch that breaks our build for some relatively simple reason... our canary goes red shortly after things land, and the poor soul serving as webkit gardener has to figure out why... and when rolling DEPS (switching what revision we build the mainline against) to the revision with the breaking change, be sure to commit the chrome-side changes with that DEPS roll. That is the so called two-sided patch process. Now if there's nothing else snaking thru the system to resolve, its not a big deal. But if at the same time we're working thru some other build issues (internal or webkit related which can pop up at any time)... it can be not a lot of fun. We're working on getting the chromium port setup as a first class citizen which will make the dreaded two-sided patch a thing of the past (i hope). 148340 14 eric 2009-09-18 13:15:22 -0700 I don't think there is any rush on this patch, no. I don't think that it makes much sense for patches which do not apply to sit r+'d in the to-be-committed list. :) I try and look through the to-be-committed list about once a week and make sure that patches from 3rd parties aren't just rotting there waiting for commit, or that bugs aren't sitting open which have already been landed, etc. Having un-actionable patches there is just a distraction. 148348 15 michaeln 2009-09-18 13:24:15 -0700 (In reply to comment #14) > I don't think there is any rush on this patch, no. > > I don't think that it makes much sense for patches which do not apply to sit > r+'d in the to-be-committed list. :) I try and look through the > to-be-committed list about once a week and make sure that patches from 3rd > parties aren't just rotting there waiting for commit, or that bugs aren't > sitting open which have already been landed, etc. Having un-actionable patches > there is just a distraction. So w're ok to have this sit around with r- on it for a bit? 148358 16 eric 2009-09-18 13:32:31 -0700 There are lots and lots and lots of open bugs in bugzilla with r-'d patches on them. :) No one will notice. 156652 17 eric 2009-10-21 14:41:33 -0700 Sad that this is still in purgatory. bug 30637 was a dupe. 161427 18 eric 2009-11-08 10:39:25 -0800 This bug is being slowly done by other bugs anyway, it's soon going to be uneeded. bug 30670 is the latest one. 164771 19 michaeln 2009-11-18 15:33:40 -0800 Looks like this has been taken care of in a piecemeal fashion. Marking as RESOLVED/INVALID. 34184 2009-08-05 15:15:18 -0700 2009-09-18 12:12:00 -0700 struct -> class patch housecleaning.txt text/plain 13162 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjgxNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzcgQEAKKzIwMDktMDgtMDUgIE1pY2hhZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MDAzCisKKyAgICAg ICAgSG91c2UgY2xlYW5pbmcuIERlZmluZSBSZXNvdXJjZVJlcXVlc3QgYXMgYSAnY2xhc3MnIGlu c3RlYWQgb2YgYSAnc3RydWN0Jy4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAg KiBoaXN0b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuaDoKKyAg ICAgICAgKiBsb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmg6CisgICAgICAgICogbG9h ZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5oOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAq IGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlckNsaWVudC5oOgorICAgICAgICAqIGxvYWRlci9UaHJl YWRhYmxlTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIu aDoKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZS5oOgorICAgICAg ICAqIGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlSG9zdC5oOgorICAgICAgICAqIHBs YXRmb3JtL0Nyb3NzVGhyZWFkQ29waWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZUhhbmRsZS5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5k bGVDbGllbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJh c2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdC5oOgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKiB4bWwvWE1MSHR0 cFJlcXVlc3QuaDoKKwogMjAwOS0wOC0wNSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNv cmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaGlzdG9yeS9I aXN0b3J5SXRlbS5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvaGlzdG9yeS9IaXN0b3J5 SXRlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCw3IEBAIGNsYXNzIEZvcm1EYXRhOwog Y2xhc3MgSGlzdG9yeUl0ZW07CiBjbGFzcyBJbWFnZTsKIGNsYXNzIEtVUkw7Ci1zdHJ1Y3QgUmVz b3VyY2VSZXF1ZXN0OworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogCiB0eXBlZGVmIFZlY3RvcjxS ZWZQdHI8SGlzdG9yeUl0ZW0+ID4gSGlzdG9yeUl0ZW1WZWN0b3I7CiAKSW5kZXg6IFdlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgJKHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw3 ICs2Niw3IEBAIGNsYXNzIFN0b3JhZ2VBcmVhOwogY2xhc3MgS1VSTDsKIGNsYXNzIE5vZGU7CiBj bGFzcyBQYWdlOwotc3RydWN0IFJlc291cmNlUmVxdWVzdDsKK2NsYXNzIFJlc291cmNlUmVxdWVz dDsKIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3Mg U2NyaXB0Q2FsbFN0YWNrOwpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5o CShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl LmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDggKzUwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgIGNsYXNzIEluc3BlY3RvckZyb250ZW5kOwogICAgIGNsYXNzIEZyYW1lOwogICAgIGNsYXNz IFJlc291cmNlUmVzcG9uc2U7Ci0KLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworICAgIGNs YXNzIFJlc291cmNlUmVxdWVzdDsKIAogICAgIGNsYXNzIEluc3BlY3RvclJlc291cmNlIDogcHVi bGljIFJlZkNvdW50ZWQ8SW5zcGVjdG9yUmVzb3VyY2U+IHsKICAgICBwdWJsaWM6CkluZGV4OiBX ZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAkocmV2aXNpb24gNDY4MTYp CisrKyBXZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAkod29ya2luZyBj b3B5KQpAQCAtMzksNyArMzksNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3Mg RG9jdW1lbnQ7Ci0gICAgc3RydWN0IFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJj ZVJlcXVlc3Q7CiAgICAgY2xhc3MgVGhyZWFkYWJsZUxvYWRlckNsaWVudDsKIAogICAgIGNsYXNz IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlciA6IHB1YmxpYyBSZWZDb3VudGVkPERvY3VtZW50VGhy ZWFkYWJsZUxvYWRlcj4sIHB1YmxpYyBUaHJlYWRhYmxlTG9hZGVyLCBwcml2YXRlIFN1YnJlc291 cmNlTG9hZGVyQ2xpZW50ICB7CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHJl dmlzaW9uIDQ2ODE2KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkod29y a2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xh c3MgUmVzb3VyY2VFcnJvcjsKICAgICBjbGFzcyBSZXNvdXJjZUhhbmRsZTsKICAgICBjbGFzcyBS ZXNvdXJjZUxvYWRlcjsKLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworICAgIGNsYXNzIFJl c291cmNlUmVxdWVzdDsKICAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogICAgIGNsYXNzIFNj cmlwdFN0cmluZzsKICAgICBjbGFzcyBTaGFyZWRCdWZmZXI7CkluZGV4OiBXZWJDb3JlL2xvYWRl ci9NYWluUmVzb3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9NYWlu UmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gNDY4MTYpCisrKyBXZWJDb3JlL2xvYWRlci9NYWlu UmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQAogbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgRm9ybVN0YXRlOwotICAgIHN0cnVjdCBSZXNvdXJj ZVJlcXVlc3Q7CisgICAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogCiAgICAgY2xhc3MgTWFpblJl c291cmNlTG9hZGVyIDogcHVibGljIFJlc291cmNlTG9hZGVyIHsKICAgICBwdWJsaWM6CkluZGV4 OiBXZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgJKHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29y ZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMs NyBAQAogIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgc3RydWN0IFJlc291cmNlUmVxdWVz dDsKKyAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiAgICAgY2xhc3MgU3VicmVzb3VyY2VMb2Fk ZXJDbGllbnQ7CiAgICAgCiAgICAgY2xhc3MgU3VicmVzb3VyY2VMb2FkZXIgOiBwdWJsaWMgUmVz b3VyY2VMb2FkZXIgewpJbmRleDogV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXJDbGll bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlckNsaWVu dC5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiBjbGFzcyBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTsKIGNsYXNzIFJlc291cmNlRXJy b3I7Ci1zdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogY2xh c3MgUmVzb3VyY2VSZXNwb25zZTsKIGNsYXNzIFN1YnJlc291cmNlTG9hZGVyOwogICAgIApJbmRl eDogV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaAkocmV2aXNpb24gNDY4MTYpCisrKyBXZWJDb3Jl L2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcg QEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIFJlc291cmNlRXJyb3I7Ci0gICAg c3RydWN0IFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiAgICAg Y2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKICAgICBjbGFzcyBTY3JpcHRFeGVjdXRpb25Db250ZXh0 OwogICAgIGNsYXNzIFRocmVhZGFibGVMb2FkZXJDbGllbnQ7CkluZGV4OiBXZWJDb3JlL2xvYWRl ci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIv V29ya2VyVGhyZWFkYWJsZUxvYWRlci5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvbG9h ZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDcsNyArNDcs NyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgUmVzb3VyY2VFcnJvcjsKLSAg ICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKICAg ICBjbGFzcyBXb3JrZXJDb250ZXh0OwogICAgIGNsYXNzIFdvcmtlckxvYWRlclByb3h5OwogICAg IHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRhOwpJbmRleDogV2ViQ29yZS9s b2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGUuaAkocmV2aXNpb24gNDY4MTYpCisrKyBX ZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlLmgJKHdvcmtpbmcgY29weSkK QEAgLTQxLDggKzQxLDcgQEAgY2xhc3MgQXBwbGljYXRpb25DYWNoZUdyb3VwOwogY2xhc3MgQXBw bGljYXRpb25DYWNoZVJlc291cmNlOwogY2xhc3MgRG9jdW1lbnRMb2FkZXI7CiBjbGFzcyBLVVJM OwotCi1zdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogCiB0 eXBlZGVmIFZlY3RvcjxzdGQ6OnBhaXI8S1VSTCwgS1VSTD4gPiBGYWxsYmFja1VSTFZlY3RvcjsK IApJbmRleDogV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3QuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlSG9z dC5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0 aW9uQ2FjaGVIb3N0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgUmVzb3VyY2VMb2FkZXI7CiAg ICAgY2xhc3MgUmVzb3VyY2VFcnJvcjsKLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworICAg IGNsYXNzIFJlc291cmNlUmVxdWVzdDsKICAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogICAg IGNsYXNzIFN1YnN0aXR1dGVEYXRhOwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL0Nyb3NzVGhy ZWFkQ29waWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9Dcm9zc1RocmVhZENv cGllci5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vQ3Jvc3NUaHJlYWRD b3BpZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogCiAgICAgY2xhc3MgUmVzb3VyY2VFcnJvcjsKLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1 ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKICAgICBjbGFzcyBSZXNvdXJjZVJlc3Bv bnNlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBzdHJ1Y3QgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJl c3BvbnNlRGF0YTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRs ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRs ZS5oCShyZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJj ZUhhbmRsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3ICs4NCw3IEBAIGNsYXNzIEtVUkw7CiBj bGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3MgUmVzb3VyY2VIYW5kbGVDbGllbnQ7CiBjbGFzcyBS ZXNvdXJjZUhhbmRsZUludGVybmFsOwotc3RydWN0IFJlc291cmNlUmVxdWVzdDsKK2NsYXNzIFJl c291cmNlUmVxdWVzdDsKIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiBjbGFzcyBTY2hlZHVsZVBh aXI7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VIYW5kbGVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VIYW5kbGVDbGllbnQuaAkocmV2aXNpb24gNDY4MTYpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVDbGllbnQuaAkod29ya2luZyBjb3B5KQpA QCAtNTAsNyArNTAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgS1VSTDsKICAg ICBjbGFzcyBSZXNvdXJjZUhhbmRsZTsKICAgICBjbGFzcyBSZXNvdXJjZUVycm9yOwotICAgIHN0 cnVjdCBSZXNvdXJjZVJlcXVlc3Q7CisgICAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogICAgIGNs YXNzIFJlc291cmNlUmVzcG9uc2U7CiAKICAgICBlbnVtIENhY2hlU3RvcmFnZVBvbGljeSB7Cklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgJ KHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVx dWVzdEJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICBjb25zdCBpbnQgdW5zcGVjaWZpZWRUaW1lb3V0SW50ZXJ2YWwgPSBJTlRf TUFYOwogCi0gICAgc3RydWN0IFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7CiAgICAgc3RydWN0IENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YTsKIAogICAg IC8vIERvIG5vdCB1c2UgdGhpcyB0eXBlIGRpcmVjdGx5LiAgVXNlIFJlc291cmNlUmVxdWVzdCBp bnN0ZWFkLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVz dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJl cXVlc3QuaAkocmV2aXNpb24gNDY4MTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2Yv UmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgdHlwZWRl ZiBjb25zdCBzdHJ1Y3QgX0NGVVJMUmVxdWVzdCogQ0ZVUgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0IDogUmVzb3VyY2VSZXF1ZXN0QmFzZSB7Cisg ICAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0IDogcHVibGljIFJlc291cmNlUmVxdWVzdEJhc2Ugewog CiAgICAgICAgIFJlc291cmNlUmVxdWVzdChjb25zdCBTdHJpbmcmIHVybCkgCiAgICAgICAgICAg ICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VSTCh1cmwpLCBVc2VQcm90b2NvbENhY2hlUG9saWN5 KQpAQCAtNjQsNyArNjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIENGVVJMUmVx dWVzdFJlZiBjZlVSTFJlcXVlc3QoKSBjb25zdDsgICAgICAgCiAKICAgICBwcml2YXRlOgotICAg ICAgICBmcmllbmQgc3RydWN0IFJlc291cmNlUmVxdWVzdEJhc2U7CisgICAgICAgIGZyaWVuZCBj bGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlOwogCiAgICAgICAgIHZvaWQgZG9VcGRhdGVQbGF0Zm9y bVJlcXVlc3QoKTsKICAgICAgICAgdm9pZCBkb1VwZGF0ZVJlc291cmNlUmVxdWVzdCgpOwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENG TmV0LmgJKHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jl c291cmNlUmVxdWVzdENGTmV0LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcgQEAgdHlw ZWRlZiBjb25zdCBzdHJ1Y3QgX0NGVVJMUmVxdWVzdCogQ0ZVUgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLSAgICBzdHJ1Y3QgUmVzb3VyY2VSZXF1ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVx dWVzdDsKIAogICAgIHZvaWQgZ2V0UmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYsIENG VVJMUmVxdWVzdFJlZik7CiAgICAgQ0ZVUkxSZXF1ZXN0UmVmIGNmVVJMUmVxdWVzdChjb25zdCBS ZXNvdXJjZVJlcXVlc3QmKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1 bS9SZXNvdXJjZVJlcXVlc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCSh3b3JraW5nIGNv cHkpCkBAIC0zNSw3ICszNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIEZy YW1lOwogCi0gICAgc3RydWN0IFJlc291cmNlUmVxdWVzdCA6IHB1YmxpYyBSZXNvdXJjZVJlcXVl c3RCYXNlIHsKKyAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1 ZXN0QmFzZSB7CiAgICAgcHVibGljOgogICAgICAgICBlbnVtIFRhcmdldFR5cGUgewogICAgICAg ICAgICAgVGFyZ2V0SXNNYWluRnJhbWUsCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y3VybC9SZXNvdXJjZVJlcXVlc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNDY4MTYpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZVJlcXVlc3QuaAkod29ya2luZyBjb3B5KQpA QCAtMzMsNyArMzMsNyBAQCB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfQ0ZVUkxSZXF1ZXN0KiBDRlVS CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotICAgIHN0cnVjdCBSZXNvdXJjZVJlcXVlc3QgOiBS ZXNvdXJjZVJlcXVlc3RCYXNlIHsKKyAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMg UmVzb3VyY2VSZXF1ZXN0QmFzZSB7CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0 cmluZyYgdXJsKQogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKEtVUkwodXJsKSwg VXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9x dC9SZXNvdXJjZVJlcXVlc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvcXQvUmVzb3VyY2VSZXF1ZXN0LmgJKHJldmlzaW9uIDQ2ODE2KQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3 ICszNSw3IEBAIFFUX0VORF9OQU1FU1BBQ0UKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAg c3RydWN0IFJlc291cmNlUmVxdWVzdCA6IFJlc291cmNlUmVxdWVzdEJhc2UgeworICAgIGNsYXNz IFJlc291cmNlUmVxdWVzdCA6IHB1YmxpYyBSZXNvdXJjZVJlcXVlc3RCYXNlIHsKIAogICAgICAg ICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpIAogICAgICAgICAgICAgOiBSZXNv dXJjZVJlcXVlc3RCYXNlKEtVUkwodXJsKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5oCShy ZXZpc2lvbiA0NjgxNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotICAgIHN0cnVjdCBSZXNvdXJjZVJlcXVlc3QgOiBSZXNvdXJjZVJlcXVlc3RC YXNlIHsKKyAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0 QmFzZSB7CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKQogICAg ICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKEtVUkwodXJsKSwgVXNlUHJvdG9jb2xDYWNo ZVBvbGljeSkKQEAgLTY2LDcgKzY2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2 b2lkIHVwZGF0ZUZyb21Tb3VwTWVzc2FnZShTb3VwTWVzc2FnZSogc291cE1lc3NhZ2UpOwogCiAg ICAgcHJpdmF0ZToKLSAgICAgICAgZnJpZW5kIHN0cnVjdCBSZXNvdXJjZVJlcXVlc3RCYXNlOwor ICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0QmFzZTsKIAogICAgICAgICB2b2lk IGRvVXBkYXRlUGxhdGZvcm1SZXF1ZXN0KCkge307CiAgICAgICAgIHZvaWQgZG9VcGRhdGVSZXNv dXJjZVJlcXVlc3QoKSB7fTsKSW5kZXg6IFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuaAkocmV2aXNpb24gNDY4MTYp CisrKyBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3 ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBG aWxlOwotc3RydWN0IFJlc291cmNlUmVxdWVzdDsKK2NsYXNzIFJlc291cmNlUmVxdWVzdDsKIGNs YXNzIFRleHRSZXNvdXJjZURlY29kZXI7CiBjbGFzcyBUaHJlYWRhYmxlTG9hZGVyOwogCg==