127884 2014-01-29 18:12:51 -0800 Add a NavigationState object to keep track of the navigations for a given page 2014-01-29 18:44:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 973573 0 andersca 2014-01-29 18:12:51 -0800 Add a NavigationState object to keep track of the navigations for a given page 973574 1 222618 andersca 2014-01-29 18:13:34 -0800 Created attachment 222618 Patch 973578 2 andersca 2014-01-29 18:44:46 -0800 Committed r163062: <http://trac.webkit.org/changeset/163062> 222618 2014-01-29 18:13:34 -0800 2014-01-29 18:16:50 -0800 Patch bug-127884-20140129181333.patch text/plain 16658 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzFjM2FlNWM0MDYwNGFl ZmVjZTU2NzhkYzI4ZmFkNTQxZGExYjM3YS4uZTBlNDgwZTM1MGMzZGYwNzcyMTEyMGJiYzRkMTc3 Y2VmNDY3OWMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTAxLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgTmF2aWdh dGlvblN0YXRlIG9iamVjdCB0byBrZWVwIHRyYWNrIG9mIHRoZSBuYXZpZ2F0aW9ucyBmb3IgYSBn aXZlbiBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjc4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uLm1tOgorICAgICAgICAoLVtXS05h dmlnYXRpb24gcmVxdWVzdF0pOgorICAgICAgICAoLVtXS05hdmlnYXRpb24gc2V0UmVxdWVzdDpd KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkludGVybmFsLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgt W1dLV2ViVmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICgtW1dL V2ViVmlldyBsb2FkUmVxdWVzdDpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLmg6IENvcGllZCBmcm9tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tOYXZpZ2F0aW9uLm1tLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW06IENvcGllZCBmcm9tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tOYXZpZ2F0aW9uLm1tLgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmln YXRpb25TdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6fk5hdmlnYXRp b25TdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlTG9hZFJl cXVlc3ROYXZpZ2F0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvajoKKworMjAxNC0wMS0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgorCiAgICAgICAgIFBhc3MgbmF2aWdhdGlvbiBJRHMgYWxvbmcgdG8gTG9hZFJl cXVlc3QgYW5kIFJlbG9hZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI3ODgzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tOYXZpZ2F0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS05hdmlnYXRpb24ubW0KaW5kZXggOTA3MWNlMDZlNTZhZTYzYWNjNDFmM2VjMDVjNmQy ZDMyNmZjZGIyNy4uMTZlZDIxMjhkYmFlMjUzZmY0ZWZmN2E4NzBmMjQ4OGUxNDdhZGFjYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb24u bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb24u bW0KQEAgLTM0LDE5ICszNCwxNCBAQAogICAgIFJldGFpblB0cjxOU1VSTFJlcXVlc3Q+IF9yZXF1 ZXN0OwogfQogCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhSZXF1ZXN0OihOU1VSTFJlcXVlc3Qg KilyZXF1ZXN0CistIChOU1VSTFJlcXVlc3QgKilyZXF1ZXN0CiB7Ci0gICAgaWYgKCEoc2VsZiA9 IFtzdXBlciBpbml0XSkpCi0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBfcmVxdWVzdCA9IGFk b3B0TlMoW3JlcXVlc3QgY29weV0pOwotCi0gICAgcmV0dXJuIHNlbGY7CisgICAgcmV0dXJuIF9y ZXF1ZXN0LmdldCgpOwogfQogCi0tIChOU1VSTFJlcXVlc3QgKilyZXF1ZXN0CistICh2b2lkKXNl dFJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QKIHsKLSAgICByZXR1cm4gX3JlcXVlc3Qu Z2V0KCk7CisgICAgX3JlcXVlc3QgPSBhZG9wdE5TKFtyZXF1ZXN0IGNvcHldKTsKIH0KIAogQGVu ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmln YXRpb25JbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05h dmlnYXRpb25JbnRlcm5hbC5oCmluZGV4IGUzZjA3NjI2YjBkZTYzNjVmNjNiYmZkZmY4MzI1MGJi NTAwZDY4YzkuLmVhY2VmMWZmMGI5NzBiYjkzNGY0M2E2OTA4Njc3OWI4Mzk5NGRiN2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uSW50 ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdh dGlvbkludGVybmFsLmgKQEAgLTI5LDcgKzI5LDcgQEAKIAogQGludGVyZmFjZSBXS05hdmlnYXRp b24gKCkKIAotLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICop cmVxdWVzdDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUsIGNvcHkpIE5TVVJMUmVx dWVzdCAqcmVxdWVzdDsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDZiMzQyNzM5Y2M1ZjdlYWNhNGQ3YzZjMzc4ZTdi YTgxMjFlMTczNWQuLjA4NzI3MWE3NTZjMzM0NDc3NGFjZjYyODAxYjNjYWI3NGViMzYwNjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBA IC0yOCw2ICsyOCw3IEBACiAKICNpZiBXS19BUElfRU5BQkxFRAogCisjaW1wb3J0ICJOYXZpZ2F0 aW9uU3RhdGUuaCIKICNpbXBvcnQgIldLTmF2aWdhdGlvbkludGVybmFsLmgiCiAjaW1wb3J0ICJX S1Byb2Nlc3NDbGFzcy5oIgogI2ltcG9ydCAiV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oIgpAQCAt NTUsNiArNTYsOCBAQCBzdGF0aWMgX1VJV2ViVmlld3BvcnRDb25maWd1cmF0aW9uIHN0YW5kYXJk Vmlld3BvcnRDb25maWd1cmF0aW9uID0geyB7IFVJV2ViVmlldwogCiBAaW1wbGVtZW50YXRpb24g V0tXZWJWaWV3IHsKICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gX2NvbmZp Z3VyYXRpb247CisgICAgc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6TmF2aWdhdGlvblN0YXRlPiBf bmF2aWdhdGlvblN0YXRlOworCiAgICAgUmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBfcGFn ZTsKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTg1LDYgKzg4LDggQEAgc3RhdGljIF9VSVdlYlZp ZXdwb3J0Q29uZmlndXJhdGlvbiBzdGFuZGFyZFZpZXdwb3J0Q29uZmlndXJhdGlvbiA9IHsgeyBV SVdlYlZpZXcKICAgICBpZiAoIVtfY29uZmlndXJhdGlvbiBwcm9jZXNzQ2xhc3NdKQogICAgICAg ICBbX2NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc0NsYXNzOmFkb3B0TlMoW1tXS1Byb2Nlc3NDbGFz cyBhbGxvY10gaW5pdF0pLmdldCgpXTsKIAorICAgIF9uYXZpZ2F0aW9uU3RhdGUgPSBzdGQ6Om1h a2VfdW5pcXVlPFdlYktpdDo6TmF2aWdhdGlvblN0YXRlPihzZWxmKTsKKwogICAgIENHUmVjdCBi b3VuZHMgPSBzZWxmLmJvdW5kczsKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTEyMyw5ICsxMjgs MTAgQEAgc3RhdGljIF9VSVdlYlZpZXdwb3J0Q29uZmlndXJhdGlvbiBzdGFuZGFyZFZpZXdwb3J0 Q29uZmlndXJhdGlvbiA9IHsgeyBVSVdlYlZpZXcKIAogLSAoV0tOYXZpZ2F0aW9uICopbG9hZFJl cXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QKIHsKLSAgICBfcGFnZS0+bG9hZFJlcXVlc3Qo cmVxdWVzdCk7CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEID0gX3BhZ2UtPmxvYWRSZXF1ZXN0 KHJlcXVlc3QpOworICAgIGF1dG8gbmF2aWdhdGlvbiA9IF9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0 ZUxvYWRSZXF1ZXN0TmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQsIHJlcXVlc3QpOwogCi0gICAgcmV0 dXJuIFtbW1dLTmF2aWdhdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0OnJlcXVlc3RdIGF1dG9y ZWxlYXNlXTsKKyAgICByZXR1cm4gW25hdmlnYXRpb24ubGVha1JlZigpIGF1dG9yZWxlYXNlXTsK IH0KIAogI3ByYWdtYSBtYXJrIGlPUy1zcGVjaWZpYyBtZXRob2RzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2IzNTk0 OTcyZTk4ZGM1NzVkNTI5MjIxMjFmNjVjZjlhOGI0MDVlZQotLS0gL2Rldi9udWxsCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaApAQCAtMCwwICsx LDUwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAq IDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgor ICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAq IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBOYXZpZ2F0aW9uU3RhdGVfaAorI2RlZmluZSBO YXZpZ2F0aW9uU3RhdGVfaAorCisjaW1wb3J0IDx3dGYvSGFzaE1hcC5oPgorI2ltcG9ydCA8d3Rm L1JldGFpblB0ci5oPgorCitPQkpDX0NMQVNTIFdLTmF2aWdhdGlvbjsKK09CSkNfQ0xBU1MgV0tX ZWJWaWV3OworCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgTmF2aWdhdGlvblN0YXRlIHsK K3B1YmxpYzoKKyAgICBleHBsaWNpdCBOYXZpZ2F0aW9uU3RhdGUoV0tXZWJWaWV3ICopOworICAg IH5OYXZpZ2F0aW9uU3RhdGUoKTsKKworICAgIFJldGFpblB0cjxXS05hdmlnYXRpb24+IGNyZWF0 ZUxvYWRSZXF1ZXN0TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5TVVJMUmVxdWVz dCAqKTsKKworcHJpdmF0ZToKKyAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZXRhaW5QdHI8V0tOYXZp Z2F0aW9uPj4gbV9uYXZpZ2F0aW9uczsKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisj ZW5kaWYgLy8gTmF2aWdhdGlvblN0YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjlkNGY3M2JjMzVmMWVhZDU4 NGQ0MmVjMzNmOWE3MTA2NmZlYTMyMDUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC0wLDAgKzEsNTQgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBB TkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQ TEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO VCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisjaW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQgIk5hdmlnYXRpb25TdGF0ZS5o IgorCisjaW1wb3J0ICJXS05hdmlnYXRpb25JbnRlcm5hbC5oIgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uU3RhdGUoV0tXZWJWaWV3ICp3ZWJWaWV3 KQoreworfQorCitOYXZpZ2F0aW9uU3RhdGU6On5OYXZpZ2F0aW9uU3RhdGUoKQoreworfQorCitS ZXRhaW5QdHI8V0tOYXZpZ2F0aW9uPiBOYXZpZ2F0aW9uU3RhdGU6OmNyZWF0ZUxvYWRSZXF1ZXN0 TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkK K3sKKyAgICBBU1NFUlQoIW1fbmF2aWdhdGlvbnMuY29udGFpbnMobmF2aWdhdGlvbklEKSk7CisK KyAgICBSZXRhaW5QdHI8V0tOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gYWRvcHROUyhbW1dLTmF2 aWdhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtuYXZpZ2F0aW9uIHNldFJlcXVlc3Q6cmVxdWVz dF07CisKKyAgICAvLyBGSVhNRTogV2UgbmVlZCB0byByZW1vdmUgdGhlIG5hdmlnYXRpb24gd2hl biB3ZSdyZSBkb25lIHdpdGggaXQhCisgICAgbV9uYXZpZ2F0aW9ucy5zZXQobmF2aWdhdGlvbklE LCBuYXZpZ2F0aW9uKTsKKworICAgIHJldHVybiBuYXZpZ2F0aW9uOworfQorCit9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5k ZXggZDU3MWE0YTMxYmY5ZmQzNjU3MWNlNTEyZTk1NjZiYTE1ZDBlZmMyZC4uMTZjMGIxZjdkYTA1 MjVjYmRmYTIxMzc2NzVjMDdkMTkwY2QxYTI2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKQEAgLTYwOCw4ICs2MDgsMTAgQEAgYm9vbCBXZWJQYWdlUHJveHk6 Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgVVJMJiB1cmwsIFNh bmRib3gKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgQVBJOjpPYmplY3QqIHVzZXJEYXRh KQordWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKIHsKKyAgICB1aW50NjRfdCBuYXZp Z2F0aW9uSUQgPSBnZW5lcmF0ZU5hdmlnYXRpb25JRCgpOworCiAgICAgYXV0byB0cmFuc2FjdGlv biA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgbV9wYWdlTG9hZFN0YXRl LnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCByZXF1ZXN0LnVybCgpKTsKQEAg LTYyMSw4ICs2MjMsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCwgQVBJOjpPYmplY3QqIHVzZXIKICAgICBib29sIGNyZWF0 ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHJlcXVl c3QudXJsKCksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIGlmIChjcmVhdGVkRXh0ZW5z aW9uKQogICAgICAgICBtX3Byb2Nlc3MtPndpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5k Ym94RXh0ZW5zaW9uKCk7Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpM b2FkUmVxdWVzdChnZW5lcmF0ZU5hdmlnYXRpb25JRCgpLCByZXF1ZXN0LCBzYW5kYm94RXh0ZW5z aW9uSGFuZGxlLCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNz KCkpKSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 TG9hZFJlcXVlc3QobmF2aWdhdGlvbklELCByZXF1ZXN0LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxl LCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9w YWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwor CisgICAgcmV0dXJuIG5hdmlnYXRpb25JRDsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRG aWxlKGNvbnN0IFN0cmluZyYgZmlsZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiByZXNvdXJjZURp cmVjdG9yeVVSTFN0cmluZywgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGE4YmU2MTM1ZjM4NzUyYTQ1NDNhODA2YTFmNjRh ZTlmNjc3M2FkMjIuLmE2YmY4ZjQ5ZDk5Yjc2ZjRhZWQyMTU3NWUwM2JjYjFhNjg0ZjA5NWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTM4MCw3ICszODAsNyBA QCBwdWJsaWM6CiAgICAgYm9vbCB0cnlDbG9zZSgpOwogICAgIGJvb2wgaXNDbG9zZWQoKSBjb25z dCB7IHJldHVybiBtX2lzQ2xvc2VkOyB9CiAKLSAgICB2b2lkIGxvYWRSZXF1ZXN0KGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIp OworICAgIHVpbnQ2NF90IGxvYWRSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHZvaWQgbG9hZEZpbGUo Y29uc3QgU3RyaW5nJiBmaWxlVVJMLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGlyZWN0b3J5VVJM LCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB2b2lkIGxvYWREYXRhKEFQ STo6RGF0YSosIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2Rpbmcs IGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7 CiAgICAgdm9pZCBsb2FkSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2og Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXgg MzM1MmVhMzFlMDA4ZTE3MjEwN2IwNWY4ZDE4ZjI3MTQwZjI1NWM1OS4uNDdmNzVjMGMyZGQzZmUy N2NlNDNkMmI3MTYxMzQ0OTk1MzIyNDQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktp dDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjkxLDYgKzI5MSw4IEBACiAJCTFBQjhB MUY2MTg0MDBCOUQwMEU5QUU2OSAvKiBXS1BhZ2VGaW5kTWF0Y2hlc0NsaWVudC5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFCOEExRjUxODQwMEI5RDAw RTlBRTY5IC8qIFdLUGFnZUZpbmRNYXRjaGVzQ2xpZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJ QlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFCOEExRjgxODQwMEJCODAwRTlBRTY5IC8q IFdLUGFnZUNvbnRleHRNZW51Q2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQUI4QTFGNzE4NDAwQkI4MDBFOUFFNjkgLyogV0tQYWdlQ29udGV4 dE1lbnVDbGllbnQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQkxQUJDM0RGMTE4OTlDNkI2MDA0RjA2MjYgLyogV0tOYXZpZ2F0aW9uSW50ZXJuYWwu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQkMzREYw MTg5OUM2QjYwMDRGMDYyNiAvKiBXS05hdmlnYXRpb25JbnRlcm5hbC5oICovOyB9OworCQkxQUJD M0RGNTE4OTlFNDM3MDA0RjA2MjYgLyogTmF2aWdhdGlvblN0YXRlLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFCQzNERjMxODk5RTQzNzAwNEYwNjI2 IC8qIE5hdmlnYXRpb25TdGF0ZS5tbSAqLzsgfTsKKwkJMUFCQzNERjYxODk5RTQzNzAwNEYwNjI2 IC8qIE5hdmlnYXRpb25TdGF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUFCQzNERjQxODk5RTQzNzAwNEYwNjI2IC8qIE5hdmlnYXRpb25TdGF0ZS5o ICovOyB9OwogCQkxQUMxMzM2NzE4NTY1QjU3MDBGM0VDMDUgLyogVXNlckRhdGEuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFDMTMzNjUxODU2NUI1 NzAwRjNFQzA1IC8qIFVzZXJEYXRhLmNwcCAqLzsgfTsKIAkJMUFDMTMzNjgxODU2NUI1NzAwRjNF QzA1IC8qIFVzZXJEYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQUMxMzM2NjE4NTY1QjU3MDBGM0VDMDUgLyogVXNlckRhdGEuaCAqLzsgfTsKIAkJ MUFDMTMzNkMxODU2NUM3QTAwRjNFQzA1IC8qIEFQSVBhZ2VIYW5kbGUuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQzEzMzZCMTg1NjVDN0EwMEYzRUMw NSAvKiBBUElQYWdlSGFuZGxlLmggKi87IH07CkBAIC0xOTM2LDYgKzE5MzgsOCBAQAogCQkxQUI4 QTFGNTE4NDAwQjlEMDBFOUFFNjkgLyogV0tQYWdlRmluZE1hdGNoZXNDbGllbnQuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tQYWdlRmluZE1hdGNoZXNDbGllbnQuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFCOEExRjcxODQwMEJCODAwRTlBRTY5IC8qIFdL UGFnZUNvbnRleHRNZW51Q2xpZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFdLUGFnZUNvbnRleHRNZW51Q2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTFBQkMzREYwMTg5OUM2QjYwMDRGMDYyNiAvKiBXS05hdmlnYXRpb25JbnRlcm5hbC5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS05hdmlnYXRpb25JbnRlcm5hbC5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUJDM0RGMzE4OTlFNDM3MDA0RjA2MjYgLyogTmF2 aWdhdGlvblN0YXRlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g TmF2aWdhdGlvblN0YXRlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUJDM0RG NDE4OTlFNDM3MDA0RjA2MjYgLyogTmF2aWdhdGlvblN0YXRlLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IE5hdmlnYXRpb25TdGF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkxQUMxMzM2NTE4NTY1QjU3MDBGM0VDMDUgLyogVXNlckRhdGEuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVXNlckRhdGEuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxQUMxMzM2NjE4NTY1QjU3MDBGM0VDMDUgLyogVXNlckRhdGEuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVXNlckRhdGEuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUFDMTMzNkIxODU2NUM3QTAwRjNFQzA1IC8qIEFQSVBhZ2VIYW5k bGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQVBJUGFnZUhhbmRsZS5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMzk1MCw2ICszOTU0LDE1IEBACiAJCQlwYXRo ID0gRG93bmxvYWRzOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKIAkJfTsKKwkJMUFCQzNE RjIxODk5RTQxNTAwNEYwNjI2IC8qIENvY29hICovID0geworCQkJaXNhID0gUEJYR3JvdXA7CisJ CQljaGlsZHJlbiA9ICgKKwkJCQkxQUJDM0RGNDE4OTlFNDM3MDA0RjA2MjYgLyogTmF2aWdhdGlv blN0YXRlLmggKi8sCisJCQkJMUFCQzNERjMxODk5RTQzNzAwNEYwNjI2IC8qIE5hdmlnYXRpb25T dGF0ZS5tbSAqLywKKwkJCSk7CisJCQlwYXRoID0gQ29jb2E7CisJCQlzb3VyY2VUcmVlID0gIjxn cm91cD4iOworCQl9OwogCQkxQUUwMEQ2ODE4MzI3QzEyMDAwODdERDcgLyogSVBDICovID0gewog CQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKQEAgLTQ4NzcsNiArNDg5MCw3IEBA CiAJCQkJQkMwMzJEQzQxMEY0Mzg3QzAwNThDMTVBIC8qIEFQSSAqLywKIAkJCQk1MTJGNTg4RDEy QTg4MzZGMDA2Mjk1MzAgLyogQXV0aGVudGljYXRpb24gKi8sCiAJCQkJNTFCMzAwNEQxMjUyOUNG NTAwMEI1Q0EwIC8qIGNmICovLAorCQkJCTFBQkMzREYyMTg5OUU0MTUwMDRGMDYyNiAvKiBDb2Nv YSAqLywKIAkJCQk1MTdERDVCQjE4MERBN0M0MDA4MTY2MEIgLyogRGF0YWJhc2VzICovLAogCQkJ CTFBQjdENEM3MTI4OEFBOUEwMENGRDA4QyAvKiBEb3dubG9hZHMgKi8sCiAJCQkJQkMxMTFCMTgx MTJGNUZCNDAwMzM3QkFCIC8qIExhdW5jaGVyICovLApAQCAtNjE3Miw2ICs2MTg2LDcgQEAKIAkJ CQkyRDg5NDlGMTE4MjA0NEY2MDBFODk4QUEgLyogUGxhdGZvcm1DQUxheWVyUmVtb3RlVGlsZWRC YWNraW5nLmggaW4gSGVhZGVycyAqLywKIAkJCQkwRkI2NTkyMzEyMDhCNERCMDA0NDgxNkMgLyog RHJhd2luZ0FyZWFJbmZvLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTY0MjI5QTEyREQwMjkyMDBD QUFFMkMgLyogRHJhd2luZ0FyZWFNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8sCisJCQkJMUFCQzNE RjYxODk5RTQzNzAwNEYwNjI2IC8qIE5hdmlnYXRpb25TdGF0ZS5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJQkMyNjUyMTcxMTgyNjA4MTAwMjQzRTEyIC8qIERyYXdpbmdBcmVhUHJveHkuaCBpbiBIZWFk ZXJzICovLAogCQkJCTFBNjQyMzA5MTJERDA5RUIwMENBQUUyQyAvKiBEcmF3aW5nQXJlYVByb3h5 TWVzc2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTVEQTZFRDBBMTQ5MDYwNjkwMEI0MUQxMiAv KiBEeW5hbWljTGlua2VyRW52aXJvbm1lbnRFeHRyYWN0b3IuaCBpbiBIZWFkZXJzICovLApAQCAt ODA2Myw2ICs4MDc4LDcgQEAKIAkJCQkxQUQwOUYyQjE3NDNGOEU2MDBBOTVFNTAgLyogV0tOUEFQ SVBsdWdJbkNvbnRhaW5lci5tbSBpbiBTb3VyY2VzICovLAogCQkJCUJDNDA3NjAxMTI0RkYwMjcw MDY4RjIwQSAvKiBXS051bWJlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3Q0Q1RUJCODE3NDZB MTVCMDAwQzFDNDUgLyogV0tPYmpDVHlwZVdyYXBwZXJSZWYubW0gaW4gU291cmNlcyAqLywKKwkJ CQkxQUJDM0RGNTE4OTlFNDM3MDA0RjA2MjYgLyogTmF2aWdhdGlvblN0YXRlLm1tIGluIFNvdXJj ZXMgKi8sCiAJCQkJQkM4NTgwNjMxMkI4NTA1NzAwRURFQjJFIC8qIFdLT3BlblBhbmVsUGFyYW1l dGVycy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCQzg1ODA2MjEyQjg1MDU3MDBFREVCMkUgLyog V0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk1MUZDQjE4 ODE3QkJGRTAzMDAzOTRDRDggLyogU3luY2hyb25vdXNOZXR3b3JrTG9hZGVyQ2xpZW50LmNwcCBp biBTb3VyY2VzICovLAo=