16884 2008-01-15 11:18:26 -0800 Circular Dependency between PluginPackageWin and PluginDatabaseWin 2008-01-16 13:16:21 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 dobey webkit-unassigned jhoneycutt oldest_to_newest 67308 0 dobey 2008-01-15 11:18:26 -0800 There is a circular dependency between these too classes. The attached patch removes this dependency by moving the isPluginBlacklisted class method to a static internal method in PluginPackageWin.cpp, as the method does not appear to require any other parts of the PluginDatabaseWin code. 67309 1 18460 dobey 2008-01-15 11:19:11 -0800 Created attachment 18460 Patch to remove circular dependency 67311 2 jhoneycutt 2008-01-15 12:21:58 -0800 (In reply to comment #1) > Created an attachment (id=18460) [edit] > Patch to remove circular dependency > Looks good, but I think you could make isPluginBlacklisted a private member method of PluginPackageWin. Then you could remove the getFileVersion method, as this is its only caller. 67325 3 18462 dobey 2008-01-15 15:11:50 -0800 Created attachment 18462 Updated patch to clean up as per comments 67336 4 18462 jhoneycutt 2008-01-15 17:51:23 -0800 Comment on attachment 18462 Updated patch to clean up as per comments I think your ChangeLog entry could use some punctuation. I think you could also put the Silverlight version constants inside the function body. Otherwise looks great. Thanks for working on this! r=me 67360 5 18472 dobey 2008-01-16 07:37:12 -0800 Created attachment 18472 Updated patch to move constants into fuction and add punctuation to ChangeLog 67409 6 18472 jhoneycutt 2008-01-16 13:15:45 -0800 Comment on attachment 18472 Updated patch to move constants into fuction and add punctuation to ChangeLog Submitted in r29532. Thanks! 18460 2008-01-15 11:19:11 -0800 2008-01-15 15:11:50 -0800 Patch to remove circular dependency webkit-pluginwin-dep-circle.patch text/plain 4846 dobey SW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCShyZXZpc2lv biAyOTQ4OSkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNCw5ICszNCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RhdGljIGNvbnN0IERXT1JEIHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNE V09SRCA9IDB4MDAwMTAwMDA7Ci1zdGF0aWMgY29uc3QgRFdPUkQgc2lsdmVybGlnaHRQbHVnaW5N aW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEID0gMHg1MUJFMDAwMDsKLQogUGx1Z2luRGF0YWJhc2VX aW4qIFBsdWdpbkRhdGFiYXNlV2luOjppbnN0YWxsZWRQbHVnaW5zKCkKIHsKICAgICBzdGF0aWMg UGx1Z2luRGF0YWJhc2VXaW4qIHBsdWdpbnMgPSAwOwpAQCAtNDQ4LDI1ICs0NDUsNiBAQCBib29s IFBsdWdpbkRhdGFiYXNlV2luOjppc01JTUVUeXBlUmVnaXN0CiAgICAgcmV0dXJuIChyZWZyZXNo KCkgJiYgbV9yZWdpc3RlcmVkTUlNRVR5cGVzLmNvbnRhaW5zKG1pbWVUeXBlKSk7CiB9CiAKLWJv b2wgUGx1Z2luRGF0YWJhc2VXaW46OmlzUGx1Z2luQmxhY2tsaXN0ZWQoUGx1Z2luUGFja2FnZVdp biogcGx1Z2luKQotewotICAgIGlmIChwbHVnaW4tPm5hbWUoKSA9PSAiU2lsdmVybGlnaHQgUGx1 Zy1JbiIpIHsKLSAgICAgICAgLy8gd29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly81NTU3Mzc5PiBDcmFz aCBpbiBTaWx2ZXJsaWdodCB3aGVuIG9wZW5pbmcgbWljcm9zb2Z0LmNvbS4KLSAgICAgICAgLy8g dGhlIGxhdGVzdCAxLjAgdmVyc2lvbiBvZiBTaWx2ZXJsaWdodCBkb2VzIG5vdCByZXByb2R1Y2Ug dGhpcyBjcmFzaCwgc28gYWxsb3cgaXQKLSAgICAgICAgLy8gYW5kIGFueSBuZXdlciB2ZXJzaW9u cwotICAgICAgICBEV09SRCBmaWxlVmVyc2lvbk1TOwotICAgICAgICBEV09SRCBmaWxlVmVyc2lv bkxTOwotICAgICAgICBwbHVnaW4tPmdldEZpbGVWZXJzaW9uKGZpbGVWZXJzaW9uTVMsIGZpbGVW ZXJzaW9uTFMpOwotICAgICAgICBpZiAoZmlsZVZlcnNpb25NUyA8IHNpbHZlcmxpZ2h0UGx1Z2lu TWluUmVxdWlyZWRWZXJzaW9uTVNEV09SRCB8fAotICAgICAgICAgICAgKGZpbGVWZXJzaW9uTVMg PT0gc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25NU0RXT1JEICYmIGZpbGVWZXJz aW9uTFMgPCBzaWx2ZXJsaWdodFBsdWdpbk1pblJlcXVpcmVkVmVyc2lvbkxTRFdPUkQpKQotICAg ICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSBlbHNlIGlmIChwbHVnaW4tPmZpbGVOYW1lKCkg PT0gIm5wbW96YXguZGxsIikKLSAgICAgICAgLy8gQnVnIDE1MjE3OiBNb3ppbGxhIEFjdGl2ZVgg Y29udHJvbCBjb21wbGFpbnMgYWJvdXQgbWlzc2luZyB4cGNvbV9jb3JlLmRsbAotICAgICAgICBy ZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogUGx1Z2luUGFja2FnZVdpbiog UGx1Z2luRGF0YWJhc2VXaW46OnBsdWdpbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUpCiB7CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKSW5kZXg6IFdlYkNvcmUvcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMv d2luL1BsdWdpbkRhdGFiYXNlV2luLmgJKHJldmlzaW9uIDI5NDg5KQorKysgV2ViQ29yZS9wbHVn aW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgVmVjdG9yPFBsdWdpblBhY2thZ2VXaW4q PiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNNSU1FVHlwZVJlZ2lzdGVyZWQoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQgYWRkRXh0cmFQbHVnaW5QYXRoKGNv bnN0IFN0cmluZyYpOwotICAgICAgICBzdGF0aWMgYm9vbCBpc1BsdWdpbkJsYWNrbGlzdGVkKFBs dWdpblBhY2thZ2VXaW4qIHBsdWdpbik7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRQ bHVnaW5QYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpIHsgbV9wbHVnaW5QYXRocyA9 IHBhdGhzOyB9CiAgICAgICAgIFBsdWdpblNldCBnZXRQbHVnaW5zSW5QYXRocygpIGNvbnN0OwpJ bmRleDogV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwCShyZXZpc2lvbiAy OTQ4OSkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIlBsdWdpblBhY2thZ2VXaW4uaCIKLSNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZVdpbi5oIgog CiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlICJEZXByZWNhdGVkU3RyaW5nLmgiCkBAIC0x MzIsNiArMTMxLDI4IEBAIHZvaWQgUGx1Z2luUGFja2FnZVdpbjo6c3RvcmVGaWxlVmVyc2lvbigK ICAgICBtX2ZpbGVWZXJzaW9uTVMgPSBpbmZvLT5kd0ZpbGVWZXJzaW9uTVM7CiB9CiAKK3N0YXRp YyBjb25zdCBEV09SRCBzaWx2ZXJsaWdodFBsdWdpbk1pblJlcXVpcmVkVmVyc2lvbk1TRFdPUkQg PSAweDAwMDEwMDAwOworc3RhdGljIGNvbnN0IERXT1JEIHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVx dWlyZWRWZXJzaW9uTFNEV09SRCA9IDB4NTFCRTAwMDA7CisKK3N0YXRpYyBib29sIGlzUGx1Z2lu QmxhY2tsaXN0ZWQoUGx1Z2luUGFja2FnZVdpbiogcGx1Z2luKQoreworICAgIGlmIChwbHVnaW4t Pm5hbWUoKSA9PSAiU2lsdmVybGlnaHQgUGx1Zy1JbiIpIHsKKyAgICAgICAgLy8gd29ya2Fyb3Vu ZCBmb3IgPHJkYXI6Ly81NTU3Mzc5PiBDcmFzaCBpbiBTaWx2ZXJsaWdodCB3aGVuIG9wZW5pbmcg bWljcm9zb2Z0LmNvbS4KKyAgICAgICAgLy8gdGhlIGxhdGVzdCAxLjAgdmVyc2lvbiBvZiBTaWx2 ZXJsaWdodCBkb2VzIG5vdCByZXByb2R1Y2UgdGhpcyBjcmFzaCwgc28gYWxsb3cgaXQKKyAgICAg ICAgLy8gYW5kIGFueSBuZXdlciB2ZXJzaW9ucworICAgICAgICBEV09SRCBmaWxlVmVyc2lvbk1T OworICAgICAgICBEV09SRCBmaWxlVmVyc2lvbkxTOworICAgICAgICBwbHVnaW4tPmdldEZpbGVW ZXJzaW9uKGZpbGVWZXJzaW9uTVMsIGZpbGVWZXJzaW9uTFMpOworICAgICAgICBpZiAoZmlsZVZl cnNpb25NUyA8IHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNEV09SRCB8fAor ICAgICAgICAgICAgKGZpbGVWZXJzaW9uTVMgPT0gc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJl ZFZlcnNpb25NU0RXT1JEICYmIGZpbGVWZXJzaW9uTFMgPCBzaWx2ZXJsaWdodFBsdWdpbk1pblJl cXVpcmVkVmVyc2lvbkxTRFdPUkQpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSBl bHNlIGlmIChwbHVnaW4tPmZpbGVOYW1lKCkgPT0gIm5wbW96YXguZGxsIikKKyAgICAgICAgLy8g QnVnIDE1MjE3OiBNb3ppbGxhIEFjdGl2ZVggY29udHJvbCBjb21wbGFpbnMgYWJvdXQgbWlzc2lu ZyB4cGNvbV9jb3JlLmRsbAorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxz ZTsKK30KKwogYm9vbCBQbHVnaW5QYWNrYWdlV2luOjpmZXRjaEluZm8oKQogewogICAgIERXT1JE IHZlcnNpb25JbmZvU2l6ZSwgemVyb0hhbmRsZTsKQEAgLTE1Nyw3ICsxNzgsNyBAQCBib29sIFBs dWdpblBhY2thZ2VXaW46OmZldGNoSW5mbygpCiAKICAgICBzdG9yZUZpbGVWZXJzaW9uKHZlcnNp b25JbmZvRGF0YSk7CiAKLSAgICBpZiAoUGx1Z2luRGF0YWJhc2VXaW46OmlzUGx1Z2luQmxhY2ts aXN0ZWQodGhpcykpIHsKKyAgICBpZiAoaXNQbHVnaW5CbGFja2xpc3RlZCh0aGlzKSkgewogICAg ICAgICBmYXN0RnJlZSh2ZXJzaW9uSW5mb0RhdGEpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFu Z2VMb2cJKHJldmlzaW9uIDI5NDg5KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOC0wMS0xNSAgUm9kbmV5IERhd2VzICA8ZG9iZXlAd2F5 b2Z0aGVtb25rZXkuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEhKQor CisgICAgICAgIE1vdmUgaXNQbHVnaW5CbGFja2xpc3RlZCB0byBQbHVnaW5QYWNrYWdlV2luLmNw cCB0byBhdm9pZAorICAgICAgICBhIGNpcmN1bGFyIGRlcGVuZGVuY3kgb24gUGx1Z2luRGF0YWJh c2VXaW4KKworICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcDoKKyAg ICAgICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5oOgorICAgICAgICAqIHBsdWdp bnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwOgorCiAyMDA4LTAxLTE1ICBBbGV4ZXkgUHJvc2t1 cnlha292ICA8YXBAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2Uu Cg== 18462 2008-01-15 15:11:50 -0800 2008-01-16 07:37:12 -0800 Updated patch to clean up as per comments webkit-pluginwin-dep-circle.patch text/plain 6384 dobey SW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCShyZXZpc2lv biAyOTQ4OSkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNCw5ICszNCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RhdGljIGNvbnN0IERXT1JEIHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNE V09SRCA9IDB4MDAwMTAwMDA7Ci1zdGF0aWMgY29uc3QgRFdPUkQgc2lsdmVybGlnaHRQbHVnaW5N aW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEID0gMHg1MUJFMDAwMDsKLQogUGx1Z2luRGF0YWJhc2VX aW4qIFBsdWdpbkRhdGFiYXNlV2luOjppbnN0YWxsZWRQbHVnaW5zKCkKIHsKICAgICBzdGF0aWMg UGx1Z2luRGF0YWJhc2VXaW4qIHBsdWdpbnMgPSAwOwpAQCAtNDQ4LDI1ICs0NDUsNiBAQCBib29s IFBsdWdpbkRhdGFiYXNlV2luOjppc01JTUVUeXBlUmVnaXN0CiAgICAgcmV0dXJuIChyZWZyZXNo KCkgJiYgbV9yZWdpc3RlcmVkTUlNRVR5cGVzLmNvbnRhaW5zKG1pbWVUeXBlKSk7CiB9CiAKLWJv b2wgUGx1Z2luRGF0YWJhc2VXaW46OmlzUGx1Z2luQmxhY2tsaXN0ZWQoUGx1Z2luUGFja2FnZVdp biogcGx1Z2luKQotewotICAgIGlmIChwbHVnaW4tPm5hbWUoKSA9PSAiU2lsdmVybGlnaHQgUGx1 Zy1JbiIpIHsKLSAgICAgICAgLy8gd29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly81NTU3Mzc5PiBDcmFz aCBpbiBTaWx2ZXJsaWdodCB3aGVuIG9wZW5pbmcgbWljcm9zb2Z0LmNvbS4KLSAgICAgICAgLy8g dGhlIGxhdGVzdCAxLjAgdmVyc2lvbiBvZiBTaWx2ZXJsaWdodCBkb2VzIG5vdCByZXByb2R1Y2Ug dGhpcyBjcmFzaCwgc28gYWxsb3cgaXQKLSAgICAgICAgLy8gYW5kIGFueSBuZXdlciB2ZXJzaW9u cwotICAgICAgICBEV09SRCBmaWxlVmVyc2lvbk1TOwotICAgICAgICBEV09SRCBmaWxlVmVyc2lv bkxTOwotICAgICAgICBwbHVnaW4tPmdldEZpbGVWZXJzaW9uKGZpbGVWZXJzaW9uTVMsIGZpbGVW ZXJzaW9uTFMpOwotICAgICAgICBpZiAoZmlsZVZlcnNpb25NUyA8IHNpbHZlcmxpZ2h0UGx1Z2lu TWluUmVxdWlyZWRWZXJzaW9uTVNEV09SRCB8fAotICAgICAgICAgICAgKGZpbGVWZXJzaW9uTVMg PT0gc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25NU0RXT1JEICYmIGZpbGVWZXJz aW9uTFMgPCBzaWx2ZXJsaWdodFBsdWdpbk1pblJlcXVpcmVkVmVyc2lvbkxTRFdPUkQpKQotICAg ICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSBlbHNlIGlmIChwbHVnaW4tPmZpbGVOYW1lKCkg PT0gIm5wbW96YXguZGxsIikKLSAgICAgICAgLy8gQnVnIDE1MjE3OiBNb3ppbGxhIEFjdGl2ZVgg Y29udHJvbCBjb21wbGFpbnMgYWJvdXQgbWlzc2luZyB4cGNvbV9jb3JlLmRsbAotICAgICAgICBy ZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogUGx1Z2luUGFja2FnZVdpbiog UGx1Z2luRGF0YWJhc2VXaW46OnBsdWdpbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUpCiB7CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKSW5kZXg6IFdlYkNvcmUvcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMv d2luL1BsdWdpbkRhdGFiYXNlV2luLmgJKHJldmlzaW9uIDI5NDg5KQorKysgV2ViQ29yZS9wbHVn aW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgVmVjdG9yPFBsdWdpblBhY2thZ2VXaW4q PiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNNSU1FVHlwZVJlZ2lzdGVyZWQoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQgYWRkRXh0cmFQbHVnaW5QYXRoKGNv bnN0IFN0cmluZyYpOwotICAgICAgICBzdGF0aWMgYm9vbCBpc1BsdWdpbkJsYWNrbGlzdGVkKFBs dWdpblBhY2thZ2VXaW4qIHBsdWdpbik7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRQ bHVnaW5QYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpIHsgbV9wbHVnaW5QYXRocyA9 IHBhdGhzOyB9CiAgICAgICAgIFBsdWdpblNldCBnZXRQbHVnaW5zSW5QYXRocygpIGNvbnN0OwpJ bmRleDogV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwCShyZXZpc2lvbiAy OTQ4OSkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIlBsdWdpblBhY2thZ2VXaW4uaCIKLSNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZVdpbi5oIgog CiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlICJEZXByZWNhdGVkU3RyaW5nLmgiCkBAIC0x MTYsMTIgKzExNSw2IEBAIFBsdWdpblBhY2thZ2VXaW46OlBsdWdpblBhY2thZ2VXaW4oY29uc3QK ICAgICBtX3BhcmVudERpcmVjdG9yeSA9IG1fcGF0aC5sZWZ0KG1fcGF0aC5sZW5ndGgoKSAtIG1f ZmlsZU5hbWUubGVuZ3RoKCkgLSAxKTsKIH0KIAotdm9pZCBQbHVnaW5QYWNrYWdlV2luOjpnZXRG aWxlVmVyc2lvbihEV09SRCYgbW9zdFNpZ25pZmljYW50LCBEV09SRCYgbGVhc3RTaWduaWZpY2Fu dCkgY29uc3QKLXsKLSAgICBtb3N0U2lnbmlmaWNhbnQgPSBtX2ZpbGVWZXJzaW9uTVM7Ci0gICAg bGVhc3RTaWduaWZpY2FudCA9IG1fZmlsZVZlcnNpb25MUzsKLX0KLQogdm9pZCBQbHVnaW5QYWNr YWdlV2luOjpzdG9yZUZpbGVWZXJzaW9uKExQVk9JRCB2ZXJzaW9uSW5mb0RhdGEpCiB7CiAgICAg VlNfRklYRURGSUxFSU5GTyogaW5mbzsKQEAgLTEzMiw2ICsxMjUsMjUgQEAgdm9pZCBQbHVnaW5Q YWNrYWdlV2luOjpzdG9yZUZpbGVWZXJzaW9uKAogICAgIG1fZmlsZVZlcnNpb25NUyA9IGluZm8t PmR3RmlsZVZlcnNpb25NUzsKIH0KIAorc3RhdGljIGNvbnN0IERXT1JEIHNpbHZlcmxpZ2h0UGx1 Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNEV09SRCA9IDB4MDAwMTAwMDA7CitzdGF0aWMgY29uc3Qg RFdPUkQgc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEID0gMHg1MUJF MDAwMDsKKworYm9vbCBQbHVnaW5QYWNrYWdlV2luOjppc1BsdWdpbkJsYWNrbGlzdGVkKCkKK3sK KyAgICBpZiAobmFtZSgpID09ICJTaWx2ZXJsaWdodCBQbHVnLUluIikgeworICAgICAgICAvLyB3 b3JrYXJvdW5kIGZvciA8cmRhcjovLzU1NTczNzk+IENyYXNoIGluIFNpbHZlcmxpZ2h0IHdoZW4g b3BlbmluZyBtaWNyb3NvZnQuY29tLgorICAgICAgICAvLyB0aGUgbGF0ZXN0IDEuMCB2ZXJzaW9u IG9mIFNpbHZlcmxpZ2h0IGRvZXMgbm90IHJlcHJvZHVjZSB0aGlzIGNyYXNoLCBzbyBhbGxvdyBp dAorICAgICAgICAvLyBhbmQgYW55IG5ld2VyIHZlcnNpb25zCisgICAgICAgIGlmIChtX2ZpbGVW ZXJzaW9uTVMgPCBzaWx2ZXJsaWdodFBsdWdpbk1pblJlcXVpcmVkVmVyc2lvbk1TRFdPUkQgfHwK KyAgICAgICAgICAgIChtX2ZpbGVWZXJzaW9uTVMgPT0gc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1 aXJlZFZlcnNpb25NU0RXT1JEICYmIG1fZmlsZVZlcnNpb25MUyA8IHNpbHZlcmxpZ2h0UGx1Z2lu TWluUmVxdWlyZWRWZXJzaW9uTFNEV09SRCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9IGVsc2UgaWYgKGZpbGVOYW1lKCkgPT0gIm5wbW96YXguZGxsIikKKyAgICAgICAgLy8gQnVn IDE1MjE3OiBNb3ppbGxhIEFjdGl2ZVggY29udHJvbCBjb21wbGFpbnMgYWJvdXQgbWlzc2luZyB4 cGNvbV9jb3JlLmRsbAorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsK K30KKwogYm9vbCBQbHVnaW5QYWNrYWdlV2luOjpmZXRjaEluZm8oKQogewogICAgIERXT1JEIHZl cnNpb25JbmZvU2l6ZSwgemVyb0hhbmRsZTsKQEAgLTE1Nyw3ICsxNjksNyBAQCBib29sIFBsdWdp blBhY2thZ2VXaW46OmZldGNoSW5mbygpCiAKICAgICBzdG9yZUZpbGVWZXJzaW9uKHZlcnNpb25J bmZvRGF0YSk7CiAKLSAgICBpZiAoUGx1Z2luRGF0YWJhc2VXaW46OmlzUGx1Z2luQmxhY2tsaXN0 ZWQodGhpcykpIHsKKyAgICBpZiAoaXNQbHVnaW5CbGFja2xpc3RlZCgpKSB7CiAgICAgICAgIGZh c3RGcmVlKHZlcnNpb25JbmZvRGF0YSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Cklu ZGV4OiBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uaAkocmV2aXNpb24gMjk0ODkp CisrKyBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uaAkod29ya2luZyBjb3B5 KQpAQCAtNDksNyArNDksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFN0cmluZyBk ZXNjcmlwdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fZGVzY3JpcHRpb247IH0KICAgICAgICAgU3Ry aW5nIGZpbGVOYW1lKCkgY29uc3QgeyByZXR1cm4gbV9maWxlTmFtZTsgfQogICAgICAgICBTdHJp bmcgcGFyZW50RGlyZWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnREaXJlY3Rvcnk7IH0K LSAgICAgICAgdm9pZCBnZXRGaWxlVmVyc2lvbihEV09SRCYgbW9zdFNpZ25pZmljYW50LCBEV09S RCYgbGVhc3RTaWduaWZpY2FudCkgY29uc3Q7CiAKICAgICAgICAgY29uc3QgTUlNRVRvRGVzY3Jp cHRpb25zTWFwJiBtaW1lVG9EZXNjcmlwdGlvbnMoKSBjb25zdCB7IHJldHVybiBtX21pbWVUb0Rl c2NyaXB0aW9uczsgfQogICAgICAgICBjb25zdCBNSU1FVG9FeHRlbnNpb25zTWFwJiBtaW1lVG9F eHRlbnNpb25zKCkgY29uc3QgeyByZXR1cm4gbV9taW1lVG9FeHRlbnNpb25zOyB9CkBAIC02Niw2 ICs2NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUGx1Z2luUGFja2FnZVdpbihj b25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IEZJTEVUSU1FJiBsYXN0TW9kaWZpZWQpOwogICAgICAg ICBib29sIGZldGNoSW5mbygpOwogICAgICAgICB2b2lkIHN0b3JlRmlsZVZlcnNpb24oTFBWT0lE IHZlcnNpb25JbmZvRGF0YSk7CisgICAgICAgIGJvb2wgaXNQbHVnaW5CbGFja2xpc3RlZCgpOwog CiAgICAgICAgIGJvb2wgbV9pc0xvYWRlZDsKICAgICAgICAgaW50IG1fbG9hZENvdW50OwpJbmRl eDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI5NDg5KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOSBAQAorMjAwOC0wMS0xNSAgUm9kbmV5IERhd2VzICA8ZG9iZXlAd2F5b2Z0aGVtb25r ZXkuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEhKQorCisgICAgICAg IE1vdmUgaXNQbHVnaW5CbGFja2xpc3RlZCB0byBQbHVnaW5QYWNrYWdlV2luLmNwcCB0byBhdm9p ZAorICAgICAgICBhIGNpcmN1bGFyIGRlcGVuZGVuY3kgb24gUGx1Z2luRGF0YWJhc2VXaW4KKyAg ICAgICAgUmVtb3ZlIHRoZSBnZXRGaWxlVmVyc2lvbiBtZXRob2QgYW5kIGp1c3QgY2hlY2sgdGhl IHZlcnNpb25zIGRpcmVjdGx5CisgICAgICAgIGluIGlzUGx1Z2luQmxhY2tsaXN0ZWQgYXMgaXQg d2FzIHRoZSBvbmx5IGNhbGxlcgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2ODg0CisKKyAgICAgICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFz ZVdpbi5jcHA6CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uaDoKKyAg ICAgICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmNwcDoKKyAgICAgICAgKiBwbHVn aW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmg6CisKIDIwMDgtMDEtMTUgIEFsZXhleSBQcm9za3Vy eWFrb3YgIDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K 18472 2008-01-16 07:37:12 -0800 2008-01-16 13:15:45 -0800 Updated patch to move constants into fuction and add punctuation to ChangeLog webkit-pluginwin-dep-circle.patch text/plain 6411 dobey SW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCShyZXZpc2lv biAyOTUzMCkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNCw5ICszNCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RhdGljIGNvbnN0IERXT1JEIHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNE V09SRCA9IDB4MDAwMTAwMDA7Ci1zdGF0aWMgY29uc3QgRFdPUkQgc2lsdmVybGlnaHRQbHVnaW5N aW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEID0gMHg1MUJFMDAwMDsKLQogUGx1Z2luRGF0YWJhc2VX aW4qIFBsdWdpbkRhdGFiYXNlV2luOjppbnN0YWxsZWRQbHVnaW5zKCkKIHsKICAgICBzdGF0aWMg UGx1Z2luRGF0YWJhc2VXaW4qIHBsdWdpbnMgPSAwOwpAQCAtNDQ4LDI1ICs0NDUsNiBAQCBib29s IFBsdWdpbkRhdGFiYXNlV2luOjppc01JTUVUeXBlUmVnaXN0CiAgICAgcmV0dXJuIChyZWZyZXNo KCkgJiYgbV9yZWdpc3RlcmVkTUlNRVR5cGVzLmNvbnRhaW5zKG1pbWVUeXBlKSk7CiB9CiAKLWJv b2wgUGx1Z2luRGF0YWJhc2VXaW46OmlzUGx1Z2luQmxhY2tsaXN0ZWQoUGx1Z2luUGFja2FnZVdp biogcGx1Z2luKQotewotICAgIGlmIChwbHVnaW4tPm5hbWUoKSA9PSAiU2lsdmVybGlnaHQgUGx1 Zy1JbiIpIHsKLSAgICAgICAgLy8gd29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly81NTU3Mzc5PiBDcmFz aCBpbiBTaWx2ZXJsaWdodCB3aGVuIG9wZW5pbmcgbWljcm9zb2Z0LmNvbS4KLSAgICAgICAgLy8g dGhlIGxhdGVzdCAxLjAgdmVyc2lvbiBvZiBTaWx2ZXJsaWdodCBkb2VzIG5vdCByZXByb2R1Y2Ug dGhpcyBjcmFzaCwgc28gYWxsb3cgaXQKLSAgICAgICAgLy8gYW5kIGFueSBuZXdlciB2ZXJzaW9u cwotICAgICAgICBEV09SRCBmaWxlVmVyc2lvbk1TOwotICAgICAgICBEV09SRCBmaWxlVmVyc2lv bkxTOwotICAgICAgICBwbHVnaW4tPmdldEZpbGVWZXJzaW9uKGZpbGVWZXJzaW9uTVMsIGZpbGVW ZXJzaW9uTFMpOwotICAgICAgICBpZiAoZmlsZVZlcnNpb25NUyA8IHNpbHZlcmxpZ2h0UGx1Z2lu TWluUmVxdWlyZWRWZXJzaW9uTVNEV09SRCB8fAotICAgICAgICAgICAgKGZpbGVWZXJzaW9uTVMg PT0gc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25NU0RXT1JEICYmIGZpbGVWZXJz aW9uTFMgPCBzaWx2ZXJsaWdodFBsdWdpbk1pblJlcXVpcmVkVmVyc2lvbkxTRFdPUkQpKQotICAg ICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSBlbHNlIGlmIChwbHVnaW4tPmZpbGVOYW1lKCkg PT0gIm5wbW96YXguZGxsIikKLSAgICAgICAgLy8gQnVnIDE1MjE3OiBNb3ppbGxhIEFjdGl2ZVgg Y29udHJvbCBjb21wbGFpbnMgYWJvdXQgbWlzc2luZyB4cGNvbV9jb3JlLmRsbAotICAgICAgICBy ZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogUGx1Z2luUGFja2FnZVdpbiog UGx1Z2luRGF0YWJhc2VXaW46OnBsdWdpbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUpCiB7CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKSW5kZXg6IFdlYkNvcmUvcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMv d2luL1BsdWdpbkRhdGFiYXNlV2luLmgJKHJldmlzaW9uIDI5NTMwKQorKysgV2ViQ29yZS9wbHVn aW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgVmVjdG9yPFBsdWdpblBhY2thZ2VXaW4q PiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNNSU1FVHlwZVJlZ2lzdGVyZWQoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQgYWRkRXh0cmFQbHVnaW5QYXRoKGNv bnN0IFN0cmluZyYpOwotICAgICAgICBzdGF0aWMgYm9vbCBpc1BsdWdpbkJsYWNrbGlzdGVkKFBs dWdpblBhY2thZ2VXaW4qIHBsdWdpbik7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRQ bHVnaW5QYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpIHsgbV9wbHVnaW5QYXRocyA9 IHBhdGhzOyB9CiAgICAgICAgIFBsdWdpblNldCBnZXRQbHVnaW5zSW5QYXRocygpIGNvbnN0OwpJ bmRleDogV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwCShyZXZpc2lvbiAy OTUzMCkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIlBsdWdpblBhY2thZ2VXaW4uaCIKLSNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZVdpbi5oIgog CiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlICJEZXByZWNhdGVkU3RyaW5nLmgiCkBAIC0x MTYsMTIgKzExNSw2IEBAIFBsdWdpblBhY2thZ2VXaW46OlBsdWdpblBhY2thZ2VXaW4oY29uc3QK ICAgICBtX3BhcmVudERpcmVjdG9yeSA9IG1fcGF0aC5sZWZ0KG1fcGF0aC5sZW5ndGgoKSAtIG1f ZmlsZU5hbWUubGVuZ3RoKCkgLSAxKTsKIH0KIAotdm9pZCBQbHVnaW5QYWNrYWdlV2luOjpnZXRG aWxlVmVyc2lvbihEV09SRCYgbW9zdFNpZ25pZmljYW50LCBEV09SRCYgbGVhc3RTaWduaWZpY2Fu dCkgY29uc3QKLXsKLSAgICBtb3N0U2lnbmlmaWNhbnQgPSBtX2ZpbGVWZXJzaW9uTVM7Ci0gICAg bGVhc3RTaWduaWZpY2FudCA9IG1fZmlsZVZlcnNpb25MUzsKLX0KLQogdm9pZCBQbHVnaW5QYWNr YWdlV2luOjpzdG9yZUZpbGVWZXJzaW9uKExQVk9JRCB2ZXJzaW9uSW5mb0RhdGEpCiB7CiAgICAg VlNfRklYRURGSUxFSU5GTyogaW5mbzsKQEAgLTEzMiw2ICsxMjUsMjUgQEAgdm9pZCBQbHVnaW5Q YWNrYWdlV2luOjpzdG9yZUZpbGVWZXJzaW9uKAogICAgIG1fZmlsZVZlcnNpb25NUyA9IGluZm8t PmR3RmlsZVZlcnNpb25NUzsKIH0KIAorYm9vbCBQbHVnaW5QYWNrYWdlV2luOjppc1BsdWdpbkJs YWNrbGlzdGVkKCkKK3sKKyAgICBzdGF0aWMgY29uc3QgRFdPUkQgc2lsdmVybGlnaHRQbHVnaW5N aW5SZXF1aXJlZFZlcnNpb25NU0RXT1JEID0gMHgwMDAxMDAwMDsKKyAgICBzdGF0aWMgY29uc3Qg RFdPUkQgc2lsdmVybGlnaHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEID0gMHg1MUJF MDAwMDsKKworICAgIGlmIChuYW1lKCkgPT0gIlNpbHZlcmxpZ2h0IFBsdWctSW4iKSB7CisgICAg ICAgIC8vIHdvcmthcm91bmQgZm9yIDxyZGFyOi8vNTU1NzM3OT4gQ3Jhc2ggaW4gU2lsdmVybGln aHQgd2hlbiBvcGVuaW5nIG1pY3Jvc29mdC5jb20uCisgICAgICAgIC8vIHRoZSBsYXRlc3QgMS4w IHZlcnNpb24gb2YgU2lsdmVybGlnaHQgZG9lcyBub3QgcmVwcm9kdWNlIHRoaXMgY3Jhc2gsIHNv IGFsbG93IGl0CisgICAgICAgIC8vIGFuZCBhbnkgbmV3ZXIgdmVyc2lvbnMKKyAgICAgICAgaWYg KG1fZmlsZVZlcnNpb25NUyA8IHNpbHZlcmxpZ2h0UGx1Z2luTWluUmVxdWlyZWRWZXJzaW9uTVNE V09SRCB8fAorICAgICAgICAgICAgKG1fZmlsZVZlcnNpb25NUyA9PSBzaWx2ZXJsaWdodFBsdWdp bk1pblJlcXVpcmVkVmVyc2lvbk1TRFdPUkQgJiYgbV9maWxlVmVyc2lvbkxTIDwgc2lsdmVybGln aHRQbHVnaW5NaW5SZXF1aXJlZFZlcnNpb25MU0RXT1JEKSkKKyAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0gZWxzZSBpZiAoZmlsZU5hbWUoKSA9PSAibnBtb3pheC5kbGwiKQorICAgICAg ICAvLyBCdWcgMTUyMTc6IE1vemlsbGEgQWN0aXZlWCBjb250cm9sIGNvbXBsYWlucyBhYm91dCBt aXNzaW5nIHhwY29tX2NvcmUuZGxsCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJu IGZhbHNlOworfQorCiBib29sIFBsdWdpblBhY2thZ2VXaW46OmZldGNoSW5mbygpCiB7CiAgICAg RFdPUkQgdmVyc2lvbkluZm9TaXplLCB6ZXJvSGFuZGxlOwpAQCAtMTU3LDcgKzE2OSw3IEBAIGJv b2wgUGx1Z2luUGFja2FnZVdpbjo6ZmV0Y2hJbmZvKCkKIAogICAgIHN0b3JlRmlsZVZlcnNpb24o dmVyc2lvbkluZm9EYXRhKTsKIAotICAgIGlmIChQbHVnaW5EYXRhYmFzZVdpbjo6aXNQbHVnaW5C bGFja2xpc3RlZCh0aGlzKSkgeworICAgIGlmIChpc1BsdWdpbkJsYWNrbGlzdGVkKCkpIHsKICAg ICAgICAgZmFzdEZyZWUodmVyc2lvbkluZm9EYXRhKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5oCShyZXZpc2lv biAyOTUzMCkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luUGFja2FnZVdpbi5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00OSw3ICs0OSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg U3RyaW5nIGRlc2NyaXB0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9kZXNjcmlwdGlvbjsgfQogICAg ICAgICBTdHJpbmcgZmlsZU5hbWUoKSBjb25zdCB7IHJldHVybiBtX2ZpbGVOYW1lOyB9CiAgICAg ICAgIFN0cmluZyBwYXJlbnREaXJlY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudERpcmVj dG9yeTsgfQotICAgICAgICB2b2lkIGdldEZpbGVWZXJzaW9uKERXT1JEJiBtb3N0U2lnbmlmaWNh bnQsIERXT1JEJiBsZWFzdFNpZ25pZmljYW50KSBjb25zdDsKIAogICAgICAgICBjb25zdCBNSU1F VG9EZXNjcmlwdGlvbnNNYXAmIG1pbWVUb0Rlc2NyaXB0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1f bWltZVRvRGVzY3JpcHRpb25zOyB9CiAgICAgICAgIGNvbnN0IE1JTUVUb0V4dGVuc2lvbnNNYXAm IG1pbWVUb0V4dGVuc2lvbnMoKSBjb25zdCB7IHJldHVybiBtX21pbWVUb0V4dGVuc2lvbnM7IH0K QEAgLTY2LDYgKzY1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBQbHVnaW5QYWNr YWdlV2luKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgRklMRVRJTUUmIGxhc3RNb2RpZmllZCk7 CiAgICAgICAgIGJvb2wgZmV0Y2hJbmZvKCk7CiAgICAgICAgIHZvaWQgc3RvcmVGaWxlVmVyc2lv bihMUFZPSUQgdmVyc2lvbkluZm9EYXRhKTsKKyAgICAgICAgYm9vbCBpc1BsdWdpbkJsYWNrbGlz dGVkKCk7CiAKICAgICAgICAgYm9vbCBtX2lzTG9hZGVkOwogICAgICAgICBpbnQgbV9sb2FkQ291 bnQ7CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5n ZUxvZwkocmV2aXNpb24gMjk1MzApCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDA4LTAxLTE2ICBSb2RuZXkgRGF3ZXMgIDxkb2JleUB3YXlv ZnRoZW1vbmtleS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9uIEhvbmV5Y3V0dAorCisg ICAgICAgIE1vdmUgaXNQbHVnaW5CbGFja2xpc3RlZCB0byBQbHVnaW5QYWNrYWdlV2luLmNwcCwg dG8gYXZvaWQKKyAgICAgICAgYSBjaXJjdWxhciBkZXBlbmRlbmN5IG9uIFBsdWdpbkRhdGFiYXNl V2luCisgICAgICAgIFJlbW92ZSB0aGUgZ2V0RmlsZVZlcnNpb24gbWV0aG9kLCBhbmQganVzdCBj aGVjayB0aGUgdmVyc2lvbnMgZGlyZWN0bHkKKyAgICAgICAgaW4gaXNQbHVnaW5CbGFja2xpc3Rl ZCwgYXMgaXQgd2FzIHRoZSBvbmx5IGNhbGxlcgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODg0CisKKyAgICAgICAgKiBwbHVnaW5zL3dpbi9QbHVn aW5EYXRhYmFzZVdpbi5jcHA6CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VX aW4uaDoKKyAgICAgICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmNwcDoKKyAgICAg ICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5QYWNrYWdlV2luLmg6CisKIDIwMDgtMDEtMTYgIEhvbGdl ciBIYW5zIFBldGVyIEZyZXl0aGVyICA8aG9sZ2VyLmZyZXl0aGVyQHRyb2xsdGVjaC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTGFycy4K