128280 2014-02-05 16:43:06 -0800 Add sourceFrame to WKNavigationAction 2014-02-05 17:44:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue mitz oldest_to_newest 977132 0 andersca 2014-02-05 16:43:06 -0800 Add sourceFrame to WKNavigationAction 977133 1 223279 andersca 2014-02-05 16:43:46 -0800 Created attachment 223279 Patch 977134 2 commit-queue 2014-02-05 16:45:31 -0800 Attachment 223279 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h:32: Missing spaces around = [whitespace/operators] [4] ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h:34: Missing spaces around = [whitespace/operators] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 977135 3 223279 mitz 2014-02-05 16:48:04 -0800 Comment on attachment 223279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223279&action=review > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:137 > +static RetainPtr<WKFrameInfo> frameInfoFromWebFrameProxy(WebFrameProxy& webFrameProxy) > +{ > + auto frameInfo = adoptNS([[WKFrameInfo alloc] init]); > + > + [frameInfo setMainFrame:webFrameProxy.isMainFrame()]; > + > + return frameInfo; > +} I would have made this an internal WKFrameInfo method (either an initializer or a class method) so that we don’t have to repeat it if we end up vending WKFrameInfo instances from other files. 977169 4 andersca 2014-02-05 17:44:12 -0800 Committed r163501: <http://trac.webkit.org/changeset/163501> 223279 2014-02-05 16:43:46 -0800 2014-02-05 16:48:04 -0800 Patch bug-128280-20140205164345.patch text/plain 18652 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2UxOTFmOGEzYzUzZTZh M2FhYTEzNjZjZGYwY2MwOGJhNjEwMzY3Ny4uM2VlN2JmYmEwNzgwMDhkZjZjNTIxMzg5MTlmZTY0 NjBkZGRjYzQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTAyLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIHNvdXJjZUZy YW1lIHRvIFdLTmF2aWdhdGlvbkFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MjgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLRnJhbWVJbmZvLmg6IENv cGllZCBmcm9tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9u QWN0aW9uSW50ZXJuYWwuaC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLRnJhbWVJ bmZvLm1tOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL TmF2aWdhdGlvbkFjdGlvbkludGVybmFsLmguCisgICAgICAgICgtW1dLRnJhbWVJbmZvIHJlcXVl c3RdKToKKyAgICAgICAgKC1bV0tGcmFtZUluZm8gc2V0UmVxdWVzdDpdKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLRnJhbWVJbmZvSW50ZXJuYWwuaDogQ29waWVkIGZyb20gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5h bC5oLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW06Cisg ICAgICAgICgtW1dLTmF2aWdhdGlvbkFjdGlvbiBzb3VyY2VGcmFtZV0pOgorICAgICAgICAoLVtX S05hdmlnYXRpb25BY3Rpb24gc2V0U291cmNlRnJhbWU6XSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6OmZyYW1lSW5m b0Zyb21XZWJGcmFtZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpQ b2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAq IFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworMjAxNC0wMi0wNSAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEdldCByaWQgb2YgV2Vi VUlDbGllbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyODI3NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLRnJhbWVJbmZvLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRnJh bWVJbmZvLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNzBhMzkwZGEwYWRmMzgzMTRkMTI0ZTM5NDhkZGRkNWM2MmE3 ODczMQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tGcmFtZUluZm8uaApAQCAtMCwwICsxLDM5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCA8 Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisjaW1wb3J0IDxXZWJLaXQyL1dLRm91bmRhdGlvbi5o PgorCisjaWYgV0tfQVBJX0VOQUJMRUQKKworV0tfQVBJX0NMQVNTCitAaW50ZXJmYWNlIFdLRnJh bWVJbmZvIDogTlNPYmplY3QKKworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0 ZXI9aXNNYWluRnJhbWUpIEJPT0wgbWFpbkZyYW1lOworQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBOU1VSTFJlcXVlc3QgKnJlcXVlc3Q7CisKK0BlbmQKKworI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRnJhbWVJbmZvLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0ZyYW1lSW5mby5tbQpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5hNjc1Nzg2MmZiYzVkY2E0ZTQ5N2Y1M2Y4ODg0NWQyZWQ3YzgzYTNhCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0ZyYW1lSW5mby5t bQpAQCAtMCwwICsxLDUwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICog YXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu IElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisjaW1w b3J0ICJXS0ZyYW1lSW5mb0ludGVybmFsLmgiCisKKyNpZiBXS19BUElfRU5BQkxFRAorCisjaW1w b3J0IDx3dGYvUmV0YWluUHRyLmg+CisKK0BpbXBsZW1lbnRhdGlvbiBXS0ZyYW1lSW5mbyB7Cisg ICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gX3JlcXVlc3Q7Cit9CisKKy0gKE5TVVJMUmVxdWVz dCAqKXJlcXVlc3QKK3sKKyAgICByZXR1cm4gX3JlcXVlc3QuZ2V0KCk7Cit9CisKKy0gKHZvaWQp c2V0UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdAoreworICAgIF9yZXF1ZXN0ID0gYWRv cHROUyhbcmVxdWVzdCBjb3B5XSk7Cit9CisKK0BlbmQKKworI2VuZGlmCisKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tGcmFtZUluZm9JbnRlcm5hbC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0ZyYW1lSW5mb0ludGVybmFs LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZGZhOTExOGUyYTE1MDFiYTAzZjZhYjA0ODZmY2MzOTI1ZTA1NTEzNAot LS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tG cmFtZUluZm9JbnRlcm5hbC5oCkBAIC0wLDAgKzEsMzcgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0 ICJXS0ZyYW1lSW5mby5oIgorCisjaWYgV0tfQVBJX0VOQUJMRUQKKworQGludGVyZmFjZSBXS0Zy YW1lSW5mbyAoKQorCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZHdyaXRlLCBnZXR0ZXI9aXNN YWluRnJhbWUpIEJPT0wgbWFpbkZyYW1lOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWR3cml0 ZSwgY29weSkgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0OworCitAZW5kCisKKyNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rp b24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0 aW9uLmgKaW5kZXggMzM1MTM4NWFlMWRlMGU4NDgzMTNlMzgxNGJlN2ZjZjI3NDg4NDFhNS4uY2E5 OTY2YzllMTQ5YjBlNGJlMDIxMDQ5NWNlMDMyN2MyNDhlYjgzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24uaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5oCkBA IC0yOCw2ICsyOCw4IEBACiAKICNpZiBXS19BUElfRU5BQkxFRAogCitAY2xhc3MgV0tGcmFtZUlu Zm87CisKIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdLTmF2aWdhdGlvblR5cGUpIHsKICAg ICBXS05hdmlnYXRpb25UeXBlTGlua0FjdGl2YXRlZCwKICAgICBXS05hdmlnYXRpb25UeXBlRm9y bVN1Ym1pdHRlZCwKQEAgLTQwLDYgKzQyLDggQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwg V0tOYXZpZ2F0aW9uVHlwZSkgewogV0tfQVBJX0NMQVNTCiBAaW50ZXJmYWNlIFdLTmF2aWdhdGlv bkFjdGlvbiA6IE5TT2JqZWN0CiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgV0tG cmFtZUluZm8gKnNvdXJjZUZyYW1lOworCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkp IFdLTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGU7CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0K aW5kZXggMDM5MjRjNjY0ODUzNjdmMWM3MmEwZTE0MGE5YjRhYjlhODQyNzI0My4uYmM1NDYxOTA3 ZmQ3MjJlZTkxZTRjNzE3NDAwMThkOWEzNWJhMTNkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KQEAgLTIz LDEyICsyMywyNiBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAK LSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJXS05hdmlnYXRpb25BY3Rpb24uaCIKKyNp bXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaCIK IAogI2lmIFdLX0FQSV9FTkFCTEVECiAKLUBpbXBsZW1lbnRhdGlvbiBXS05hdmlnYXRpb25BY3Rp b24KKyNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KKworQGltcGxlbWVudGF0aW9uIFdLTmF2aWdh dGlvbkFjdGlvbiB7CisgICAgUmV0YWluUHRyPFdLRnJhbWVJbmZvPiBfc291cmNlRnJhbWU7Cit9 CisKKy0gKFdLRnJhbWVJbmZvICopc291cmNlRnJhbWUKK3sKKyAgICByZXR1cm4gX3NvdXJjZUZy YW1lLmdldCgpOworfQorCistICh2b2lkKXNldFNvdXJjZUZyYW1lOihXS0ZyYW1lSW5mbyAqKXNv dXJjZUZyYW1lCit7CisgICAgX3NvdXJjZUZyYW1lID0gc291cmNlRnJhbWU7Cit9CiAKIEBlbmQK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmln YXRpb25BY3Rpb25JbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5oCmluZGV4IDJiNDM3ZWM3OWE5NTEzMTk2ODky YmY0MzQ4NTcwYWYzOTRkYWQ2ODUuLmY4YTQ0OGQ1ZjQ4ZjgzNjZmYThlZGMzNTE5ZjVlMDY1NmU1 OTY3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tO YXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbkludGVybmFsLmgKQEAgLTI5LDYgKzI5LDggQEAK IAogQGludGVyZmFjZSBXS05hdmlnYXRpb25BY3Rpb24gKCkKIAorQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWR3cml0ZSwgc3Ryb25nKSBXS0ZyYW1lSW5mbyAqc291cmNlRnJhbWU7CisKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUpIFdLTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5 cGU7CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLm1tCmluZGV4IDhkZTA4OTBlZGFhZGU1ZjcxNmYxZWQzYzljMWQ5M2MxNGM1NjFk YTcuLjQwMWVmMWY4NzRkMWMxMjZmMzVlMzdhMGQ4YWY4NDRlMmJkNDQzYTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQpAQCAtMzAs NiArMzAsNyBAQAogCiAjaW1wb3J0ICJOYXZpZ2F0aW9uQWN0aW9uRGF0YS5oIgogI2ltcG9ydCAi UGFnZUxvYWRTdGF0ZS5oIgorI2ltcG9ydCAiV0tGcmFtZUluZm9JbnRlcm5hbC5oIgogI2ltcG9y dCAiV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLTmF2aWdhdGlvbkRl bGVnYXRlLmgiCiAjaW1wb3J0ICJXS05hdmlnYXRpb25JbnRlcm5hbC5oIgpAQCAtMTI2LDYgKzEy NywxNSBAQCBzdGF0aWMgV0tOYXZpZ2F0aW9uVHlwZSB0b1dLTmF2aWdhdGlvblR5cGUoV2ViQ29y ZTo6TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cAogICAgIHJldHVybiBXS05hdmlnYXRpb25U eXBlT3RoZXI7CiB9CiAKK3N0YXRpYyBSZXRhaW5QdHI8V0tGcmFtZUluZm8+IGZyYW1lSW5mb0Zy b21XZWJGcmFtZVByb3h5KFdlYkZyYW1lUHJveHkmIHdlYkZyYW1lUHJveHkpCit7CisgICAgYXV0 byBmcmFtZUluZm8gPSBhZG9wdE5TKFtbV0tGcmFtZUluZm8gYWxsb2NdIGluaXRdKTsKKworICAg IFtmcmFtZUluZm8gc2V0TWFpbkZyYW1lOndlYkZyYW1lUHJveHkuaXNNYWluRnJhbWUoKV07CisK KyAgICByZXR1cm4gZnJhbWVJbmZvOworfQorCiB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6UG9saWN5 Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQcm94eSosIFdl YkZyYW1lUHJveHkqIGRlc3RpbmF0aW9uRnJhbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb25EYXRh JiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgV2ViRnJhbWVQcm94eSogc291cmNlRnJhbWUsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBSZWZQdHI8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiBs aXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmICghbV9uYXZpZ2F0aW9u U3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyKSB7CkBAIC0xNDEsNiArMTUxLDEyIEBAIHZv aWQgTmF2aWdhdGlvblN0YXRlOjpQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oV2ViUGFnZVByb3h5CiAgICAgLy8gRklYTUU6IFNldCB1cCB0aGUgbmF2aWdhdGlv biBhY3Rpb24gb2JqZWN0LgogICAgIGF1dG8gbmF2aWdhdGlvbkFjdGlvbiA9IGFkb3B0TlMoW1tX S05hdmlnYXRpb25BY3Rpb24gYWxsb2NdIGluaXRdKTsKIAorICAgIGlmIChzb3VyY2VGcmFtZSkg eworICAgICAgICBhdXRvIHNvdXJjZUZyYW1lSW5mbyA9IGZyYW1lSW5mb0Zyb21XZWJGcmFtZVBy b3h5KCpzb3VyY2VGcmFtZSk7CisgICAgICAgIFtzb3VyY2VGcmFtZUluZm8gc2V0UmVxdWVzdDpv cmlnaW5hbFJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OkRvTm90VXBkYXRlSFRUUEJvZHkp XTsKKyAgICAgICAgW25hdmlnYXRpb25BY3Rpb24gc2V0U291cmNlRnJhbWU6c291cmNlRnJhbWVJ bmZvLmdldCgpXTsKKyAgICB9CisKICAgICBbbmF2aWdhdGlvbkFjdGlvbiBzZXROYXZpZ2F0aW9u VHlwZTp0b1dLTmF2aWdhdGlvblR5cGUobmF2aWdhdGlvbkFjdGlvbkRhdGEubmF2aWdhdGlvblR5 cGUpXTsKIAogICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRpb25TdGF0 ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpuYXZpZ2F0aW9uQWN0 aW9uLmdldCgpIGRlY2lzaW9uSGFuZGxlcjpbbGlzdGVuZXJdKFdLTmF2aWdhdGlvblBvbGljeURl Y2lzaW9uIHBvbGljeURlY2lzaW9uKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJL aXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYTI0MDM4YTYzZjcxOTZiMDc5NGM5NGUxZWQw ZmFkOGVjMjJkZWJmNS4uMmU1ZmNlNjdjNWRjYjYzNjgxMWMxYzFjYzhhM2FlMDA5NjY4ZmJiZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtMTE4LDcgKzExOCw3IEBACiAJCTFBMjRCRUQ1MTIwODk0RDEwMEZCQjA1OSAvKiBTaGFy ZWRNZW1vcnkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBMjRCRUQzMTIwODk0RDEwMEZCQjA1OSAvKiBTaGFyZWRNZW1vcnkuaCAqLzsgfTsKIAkJMUEy NEJGM0ExMjA4OTZBNjAwRkJCMDU5IC8qIFNoYXJlZE1lbW9yeU1hYy5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTI0QkYzOTEyMDg5NkE2MDBGQkIw NTkgLyogU2hhcmVkTWVtb3J5TWFjLmNwcCAqLzsgfTsKIAkJMUEyNTZFMzcxOEExQTc4ODAwNkZC OTIyIC8qIFdLTmF2aWdhdGlvbkFjdGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDFBMjU2RTM1MThBMUE3ODgwMDZGQjkyMiAvKiBXS05hdmlnYXRp b25BY3Rpb24ubW0gKi87IH07Ci0JCTFBMjU2RTM4MThBMUE3ODgwMDZGQjkyMiAvKiBXS05hdmln YXRpb25BY3Rpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBMjU2RTM2MThBMUE3ODgwMDZGQjkyMiAvKiBXS05hdmlnYXRpb25BY3Rpb24uaCAqLzsg fTsKKwkJMUEyNTZFMzgxOEExQTc4ODAwNkZCOTIyIC8qIFdLTmF2aWdhdGlvbkFjdGlvbi5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyNTZFMzYxOEEx QTc4ODAwNkZCOTIyIC8qIFdLTmF2aWdhdGlvbkFjdGlvbi5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKIAkJMUEyNTZFM0ExOEExQTdERjAwNkZCOTIyIC8q IFdLTmF2aWdhdGlvbkFjdGlvbkludGVybmFsLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQTI1NkUzOTE4QTFBN0RGMDA2RkI5MjIgLyogV0tOYXZpZ2F0 aW9uQWN0aW9uSW50ZXJuYWwuaCAqLzsgfTsKIAkJMUEyQTRCMEUxNTg2QTIyNDAwOTBDOUU5IC8q IENvbG9yU3BhY2VEYXRhLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUEyQTRBRkQxNTg2OTM5MjAwOTBDOUU5IC8qIENvbG9yU3BhY2VEYXRhLm1tICov OyB9OwogCQkxQTJCQjZEMDE0MTE3QjREMDAwRjM1RDQgLyogUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rp b25NZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUEyQkI2Q0UxNDExN0I0RDAwMEYzNUQ0IC8qIFBsdWdpblByb2Nlc3NDb25u ZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsKQEAgLTE3OCw2ICsxNzgsOSBAQAogCQkx QTRBOUM5QTEyQjgyMUNEMDA4RkU5ODQgLyogTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTRBOUM5OTEyQjgy MUNEMDA4RkU5ODQgLyogTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0gKi87IH07CiAJCTFBNEE5 RjMzMTJCODQ0RTIwMDhGRTk4NCAvKiBQbHVnaW5RdWlya3MuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNEE5RjMxMTJCODQ0RTIwMDhGRTk4NCAvKiBQ bHVnaW5RdWlya3MuaCAqLzsgfTsKIAkJMUE0RDY2NDgxOEEyRDkxQTAwRDgyRTIxIC8qIEFQSVVJ Q2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QTRENjY0NzE4QTJEOTFBMDBEODJFMjEgLyogQVBJVUlDbGllbnQuaCAqLzsgfTsKKwkJMUE0RDY2 NEIxOEEzMDMwRTAwRDgyRTIxIC8qIFdLRnJhbWVJbmZvLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE0RDY2NDkxOEEzMDMwRTAwRDgyRTIxIC8qIFdL RnJhbWVJbmZvLm1tICovOyB9OworCQkxQTRENjY0QzE4QTMwMzBFMDBEODJFMjEgLyogV0tGcmFt ZUluZm8uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB NEQ2NjRBMThBMzAzMEUwMEQ4MkUyMSAvKiBXS0ZyYW1lSW5mby5oICovOyBzZXR0aW5ncyA9IHtB VFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKKwkJMUE0RDY2NEUxOEEzMDMxQjAwRDgyRTIx IC8qIFdLRnJhbWVJbmZvSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBNEQ2NjREMThBMzAzMUIwMEQ4MkUyMSAvKiBXS0ZyYW1lSW5mb0lu dGVybmFsLmggKi87IH07CiAJCTFBNTBEQjY2MTEwQTNENTcwMDBEM0ZFNSAvKiBXZWJQcm9jZXNz LmFwcCBpbiBDb3B5IEZpbGVzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB NTBEQjFFMTEwQTNCREMwMDBEM0ZFNSAvKiBXZWJQcm9jZXNzLmFwcCAqLzsgfTsKIAkJMUE1QjFD NTAxODk4NjA2RjAwNEZDRjlCIC8qIFdLTmF2aWdhdGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNUIxQzRFMTg5ODYwNkYwMDRGQ0Y5QiAvKiBX S05hdmlnYXRpb24ubW0gKi87IH07CiAJCTFBNUIxQzUxMTg5ODYwNkYwMDRGQ0Y5QiAvKiBXS05h dmlnYXRpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBNUIxQzRGMTg5ODYwNkYwMDRGQ0Y5QiAvKiBXS05hdmlnYXRpb24uaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQdWJsaWMsICk7IH07IH07CkBAIC0xODIyLDYgKzE4MjUsOSBAQAog CQkxQTRBOUM5OTEyQjgyMUNEMDA4RkU5ODQgLyogTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0g Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBOZXRzY2FwZVBsdWdpbk1v ZHVsZU1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE0QTlGMzExMkI4NDRF MjAwOEZFOTg0IC8qIFBsdWdpblF1aXJrcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBQbHVnaW5RdWlya3MuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE0RDY2 NDcxOEEyRDkxQTAwRDgyRTIxIC8qIEFQSVVJQ2xpZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEFQSVVJQ2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJ CTFBNEQ2NjQ5MThBMzAzMEUwMEQ4MkUyMSAvKiBXS0ZyYW1lSW5mby5tbSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLRnJhbWVJbmZvLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OworCQkxQTRENjY0QTE4QTMwMzBFMDBEODJFMjEgLyogV0tGcmFtZUluZm8u aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tGcmFtZUluZm8uaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUE0RDY2NEQxOEEzMDMxQjAwRDgyRTIxIC8qIFdLRnJh bWVJbmZvSW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tGcmFt ZUluZm9JbnRlcm5hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTRGOTc2QTEw MEU3QjY2MDA2MzdBMTggLyogQmFzZS54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7 IHBhdGggPSBCYXNlLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTRG OTc2QjEwMEU3QjY2MDA2MzdBMTggLyogRGVidWdSZWxlYXNlLnhjY29uZmlnICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g dGV4dC54Y2NvbmZpZzsgcGF0aCA9IERlYnVnUmVsZWFzZS54Y2NvbmZpZzsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUE0Rjk3NkMxMDBFN0I2NjAwNjM3QTE4IC8qIEZlYXR1cmVEZWZp bmVzLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsgcGF0aCA9IEZlYXR1cmVEZWZp bmVzLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDI4Nyw2ICs0Mjkz LDkgQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCiAJCQkJMUE0M0U4MjYx ODhGMzhFMjAwOUU0RDMwIC8qIERlcHJlY2F0ZWQgKi8sCisJCQkJMUE0RDY2NEExOEEzMDMwRTAw RDgyRTIxIC8qIFdLRnJhbWVJbmZvLmggKi8sCisJCQkJMUE0RDY2NDkxOEEzMDMwRTAwRDgyRTIx IC8qIFdLRnJhbWVJbmZvLm1tICovLAorCQkJCTFBNEQ2NjREMThBMzAzMUIwMEQ4MkUyMSAvKiBX S0ZyYW1lSW5mb0ludGVybmFsLmggKi8sCiAJCQkJMUE1QjFDNEYxODk4NjA2RjAwNEZDRjlCIC8q IFdLTmF2aWdhdGlvbi5oICovLAogCQkJCTFBNUIxQzRFMTg5ODYwNkYwMDRGQ0Y5QiAvKiBXS05h dmlnYXRpb24ubW0gKi8sCiAJCQkJMUEyNTZFMzYxOEExQTc4ODAwNkZCOTIyIC8qIFdLTmF2aWdh dGlvbkFjdGlvbi5oICovLApAQCAtNjQxOCw2ICs2NDI3LDcgQEAKIAkJCQk1MTRCREVEMzE2Qzk4 RUREMDBFNEUyNUUgLyogU3RhdGlzdGljc1JlcXVlc3QuaCBpbiBIZWFkZXJzICovLAogCQkJCTJE QTk0NDg3MTg4NEUzQjUwMEVEODZEQiAvKiBQYWdlQ2xpZW50SW1wbElPUy5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJMUFEMzMwNkYxNkIxRDk5MTAwNEY2MEU3IC8qIFN0b3JhZ2VBcmVhSW1wbC5oIGlu IEhlYWRlcnMgKi8sCisJCQkJMUE0RDY2NEUxOEEzMDMxQjAwRDgyRTIxIC8qIFdLRnJhbWVJbmZv SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBQ0VDRDI1MTcxNjJEQjEwMDFGQzlFRiAv KiBTdG9yYWdlQXJlYU1hcC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUEzMzRERUUxNkRFOEY4ODAw NkE4RTM4IC8qIFN0b3JhZ2VBcmVhTWFwTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTFB NDRCOTVDMTZCNzNGOUYwMEI3QkJEOCAvKiBTdG9yYWdlTWFuYWdlci5oIGluIEhlYWRlcnMgKi8s CkBAIC02NzMwLDYgKzY3NDAsNyBAQAogCQkJCUJDQzhCMzc0MTI1RkI2OTAwMERFNDZBNCAvKiBX S0dlb21ldHJ5LmggaW4gSGVhZGVycyAqLywKIAkJCQlCNjJFNzMxMjE0MzA0N0IwMDA2OUVDMzUg LyogV0tIaXRUZXN0UmVzdWx0LmggaW4gSGVhZGVycyAqLywKIAkJCQk1MTEwQUUwRDEzM0MxNkNC MDA3MjcxN0EgLyogV0tJY29uRGF0YWJhc2UuaCBpbiBIZWFkZXJzICovLAorCQkJCTFBNEQ2NjRD MThBMzAzMEUwMEQ4MkUyMSAvKiBXS0ZyYW1lSW5mby5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTEy M0NGMUMxMzNEMjYwQTAwNTZGODAwIC8qIFdLSWNvbkRhdGFiYXNlQ0cuaCBpbiBIZWFkZXJzICov LAogCQkJCTM3QzRDMDk0MTgxNEIzQUYwMDM2ODhCOSAvKiBXS05TQXJyYXkuaCBpbiBIZWFkZXJz ICovLAogCQkJCUJDQ0Y2QUMzMTJDOTFGMzQwMDhGOUMzNSAvKiBXS0ltYWdlLmggaW4gSGVhZGVy cyAqLywKQEAgLTc2MDksNiArNzYyMCw3IEBACiAJCQkJOTNGQzY3QkYxMkQzQ0NGMjAwQTYwNjEw IC8qIEVuY29kZXJBZGFwdGVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTJEQTk0NEFEMTg4NEU5 QkEwMEVEODZEQiAvKiBUZXh0Q2hlY2tlcklPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTJEQTk0 NEEyMTg4NEU0RjAwMEVEODZEQiAvKiBXZWJQbGF0Zm9ybVRvdWNoUG9pbnRJT1MuY3BwIGluIFNv dXJjZXMgKi8sCisJCQkJMUE0RDY2NEIxOEEzMDMwRTAwRDgyRTIxIC8qIFdLRnJhbWVJbmZvLm1t IGluIFNvdXJjZXMgKi8sCiAJCQkJMkQyOEYzRTUxODg1Q0NDMTAwNEI5RUFFIC8qIFdlYkRhdGFi YXNlTWFuYWdlcklPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTUxQjE1QTg0MTM4NDNBMzkwMDMy MUFEOCAvKiBFbnZpcm9ubWVudFV0aWxpdGllcy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQTQz RTgyOTE4OEYzQ0RDMDA5RTREMzAgLyogV0tQcm9jZXNzQ2xhc3NDb25maWd1cmF0aW9uLm1tIGlu IFNvdXJjZXMgKi8sCg==