122496 2013-10-08 00:15:16 -0700 Remove use of deprecatedDeleteAllValues in NPRemoteObjectMap::pluginDestroyed 2014-04-17 09:59:19 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 122504 122547 73757 1 darin darin andersca ap commit-queue gustavo oldest_to_newest 937420 0 darin 2013-10-08 00:15:16 -0700 Remove use of deleteAllValues in NPRemoteObjectMap::pluginDestroyed 937421 1 213668 darin 2013-10-08 00:17:01 -0700 Created attachment 213668 Patch 937431 2 213668 kling 2013-10-08 00:33:18 -0700 Comment on attachment 213668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213668&action=review r=me, this is much nicer than the old code. Thought: Do you think it would be cool to have a function that yanks items matching a [lambda] predicate out of a collection and returns them in a Vector? > Source/WebKit2/ChangeLog:9 > + (WebKit::NPRemoteObjectMap::registerNPObject): Don't call release when puttin objects Typo, putting. > Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp:200 > + for (auto it = m_registeredNPObjects.begin(), end = m_registeredNPObjects.end(); it != end; ++it) { You can use range-based for in WebKit2. > Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp:209 > + for (auto it = m_npObjectProxies.begin(), end = m_npObjectProxies.end(); it != end; ++it) { Same here. 937437 3 darin 2013-10-08 00:50:53 -0700 (In reply to comment #2) > Thought: Do you think it would be cool to have a function that yanks items matching a [lambda] predicate out of a collection and returns them in a Vector? Probably. It would use the word “take” in its name. 937439 4 darin 2013-10-08 00:57:01 -0700 Committed r157090: <http://trac.webkit.org/changeset/157090> 937517 5 ap 2013-10-08 08:18:49 -0700 This caused crashes all over the place in plug-in tests. Darin, are you around to take a look? 937519 6 commit-queue 2013-10-08 08:24:18 -0700 Re-opened since this is blocked by bug 122504 937525 7 ap 2013-10-08 08:28:24 -0700 Rolled out in <http://trac.webkit.org/changeset/157105>. Test results: <http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK2%20(Tests)/r157090%20(12401)/results.html>. Unfortunately, there are no crash logs (might be that they are actually freezes incorrectly detected as crashes). 937555 8 darin 2013-10-08 09:44:23 -0700 Were the crashes only on Mountain Lion, or were they on Lion too? 937561 9 ap 2013-10-08 09:56:22 -0700 Crashing on Lion too. Actually, that bot has crash logs - http://build.webkit.org/results/Apple%20Lion%20Debug%20WK2%20(Tests)/r157104%20(11972)/plugins/netscape-plugin-map-data-to-src-crash-log.txt 937820 10 darin 2013-10-08 22:24:50 -0700 Committed r157157: <http://trac.webkit.org/changeset/157157> 937882 11 gustavo 2013-10-09 05:09:29 -0700 Looks like the crashes came back with the new commit =( 937887 12 commit-queue 2013-10-09 05:45:02 -0700 Re-opened since this is blocked by bug 122547 937928 13 ap 2013-10-09 08:38:22 -0700 http://build.webkit.org/results/Apple%20Lion%20Debug%20WK2%20(Tests)/r157161%20(11989)/plugins/embed-prefers-plugins-for-images-crash-log.txt 937952 14 darin 2013-10-09 09:39:22 -0700 Really? I did lots of testing locally and saw no crashes. I guess I am testing this wrong. Anders, can you help? 937954 15 213786 darin 2013-10-09 09:41:05 -0700 Created attachment 213786 Patch 937956 16 darin 2013-10-09 09:41:38 -0700 Anders, any ideas on why this second version of the patch still caused all those crashes on the bots, but not on my Mavericks development machine? 1001560 17 229547 darin 2014-04-17 08:44:28 -0700 Created attachment 229547 Patch 1001592 18 darin 2014-04-17 09:59:02 -0700 Committed r167431: <http://trac.webkit.org/changeset/167431> 213668 2013-10-08 00:17:01 -0700 2014-04-17 08:44:05 -0700 Patch bug-122496-20131008001700.patch text/plain 4908 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmExMWRmMDQ2OWUzYTc3 YjhkMTgxZTQ1YzJiODYwOWU3YWRiNWQ1MS4uNTJhNzgyNDI5NWM0MTJkODU1MzIzM2UyYTEzYTUy YmNjOWFhMDQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTA4ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdXNlIG9mIGRlbGV0 ZUFsbFZhbHVlcyBpbiBOUFJlbW90ZU9iamVjdE1hcDo6cGx1Z2luRGVzdHJveWVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0OTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5z L05QUmVtb3RlT2JqZWN0TWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBSZW1vdGVPYmplY3RN YXA6OnJlZ2lzdGVyTlBPYmplY3QpOiBEb24ndCBjYWxsIHJlbGVhc2Ugd2hlbiBwdXR0aW4gb2Jq ZWN0cworICAgICAgICBpbnRvIHRoZSBtYXAuCisgICAgICAgIChXZWJLaXQ6Ok5QUmVtb3RlT2Jq ZWN0TWFwOjpwbHVnaW5EZXN0cm95ZWQpOiBJbnN0ZWFkIG9mIG1ha2luZyBhbiBhcnJheSBvZiBy ZWNlaXZlcnMKKyAgICAgICAgYW5kIGRlbGV0aW5nIHRoZW0gYWxsLCByZW1vdmUgYWxsIG9mIHRo ZSByZWNlaXZlcnMgZnJvbSB0aGUgbWFwLCB3aGljaCB3aWxsIHRha2UgY2FyZQorICAgICAgICBv ZiBkZWxldGluZyB0aGVtLiBBbHNvIGNoYW5nZSB0aGUgb3RoZXIgbG9vcCB0byB1c2UgYSBzaW1p bGFyIGNvZGluZyBzdHlsZS4KKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2Jq ZWN0TWFwLmg6IENoYW5nZSB0aGUgdmFsdWUgdHlwZSBvZiBtX3JlZ2lzdGVyZWROUE9iamVjdHMK KyAgICAgICAgdG8gYmUgdW5pcXVlX3B0ciBpbnN0ZWFkIG9mIGEgcmF3IHBvaW50ZXIuCisKIDIw MTMtMTAtMDcgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJv cmEuY28udWs+CiAKICAgICAgICAgUmVkdWNlIGR1cGxpY2F0ZWQgY29kZSBpbiBXZWJQYWdlUHJv eHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2Jq ZWN0TWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0 TWFwLmNwcAppbmRleCA3NWE1ZTczZTI0NzhmM2IwODEwMDdiNzFjMWRlOTI3YzM2MzQxYjNmLi5h MmZhZjhhZDBkYTRhOTJmMDIxNzdiMDg1MTcxNDFlMzkxZDRmYzc4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuY3BwCkBAIC03OCw4 ICs3OCw3IEBAIHZvaWQgTlBSZW1vdGVPYmplY3RNYXA6Om5wT2JqZWN0UHJveHlEZXN0cm95ZWQo TlBPYmplY3QqIG5wT2JqZWN0KQogdWludDY0X3QgTlBSZW1vdGVPYmplY3RNYXA6OnJlZ2lzdGVy TlBPYmplY3QoTlBPYmplY3QqIG5wT2JqZWN0LCBQbHVnaW4qIHBsdWdpbikKIHsKICAgICB1aW50 NjRfdCBucE9iamVjdElEID0gZ2VuZXJhdGVOUE9iamVjdElEKCk7Ci0gICAgbV9yZWdpc3RlcmVk TlBPYmplY3RzLnNldChucE9iamVjdElELCBzdGQ6Om1ha2VfdW5pcXVlPE5QT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyPih0aGlzLCBwbHVnaW4sIG5wT2JqZWN0SUQsIG5wT2JqZWN0KS5yZWxlYXNlKCkp OwotCisgICAgbV9yZWdpc3RlcmVkTlBPYmplY3RzLmFkZChucE9iamVjdElELCBzdGQ6Om1ha2Vf dW5pcXVlPE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyPih0aGlzLCBwbHVnaW4sIG5wT2JqZWN0SUQs IG5wT2JqZWN0KSk7CiAgICAgcmV0dXJuIG5wT2JqZWN0SUQ7CiB9CiAKQEAgLTE5NiwzNCArMTk1 LDI0IEBAIE5QVmFyaWFudCBOUFJlbW90ZU9iamVjdE1hcDo6bnBWYXJpYW50RGF0YVRvTlBWYXJp YW50KGNvbnN0IE5QVmFyaWFudERhdGEmIG5wVmFyCiAKIHZvaWQgTlBSZW1vdGVPYmplY3RNYXA6 OnBsdWdpbkRlc3Ryb3llZChQbHVnaW4qIHBsdWdpbikKIHsKLSAgICBWZWN0b3I8TlBPYmplY3RN ZXNzYWdlUmVjZWl2ZXIqPiBtZXNzYWdlUmVjZWl2ZXJzOwotCi0gICAgLy8gR2F0aGVyIHRoZSBy ZWNlaXZlcnMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgcGx1Zy1pbi4KLSAgICBmb3IgKEhhc2hNYXA8 dWludDY0X3QsIE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0g bV9yZWdpc3RlcmVkTlBPYmplY3RzLmJlZ2luKCksIGVuZCA9IG1fcmVnaXN0ZXJlZE5QT2JqZWN0 cy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIE5QT2JqZWN0TWVzc2FnZVJlY2Vp dmVyKiBucE9iamVjdE1lc3NhZ2VSZWNlaXZlciA9IGl0LT52YWx1ZTsKLSAgICAgICAgaWYgKG5w T2JqZWN0TWVzc2FnZVJlY2VpdmVyLT5wbHVnaW4oKSA9PSBwbHVnaW4pCi0gICAgICAgICAgICBt ZXNzYWdlUmVjZWl2ZXJzLmFwcGVuZChucE9iamVjdE1lc3NhZ2VSZWNlaXZlcik7Ci0gICAgfQot Ci0gICAgLy8gTm93IGRlbGV0ZSBhbGwgdGhlIHJlY2VpdmVycy4KLSAgICBkZWxldGVBbGxWYWx1 ZXMobWVzc2FnZVJlY2VpdmVycyk7Ci0KLSAgICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IG9iamVj dFByb3hpZXM7Ci0gICAgZm9yIChIYXNoU2V0PE5QT2JqZWN0UHJveHkqPjo6Y29uc3RfaXRlcmF0 b3IgaXQgPSBtX25wT2JqZWN0UHJveGllcy5iZWdpbigpLCBlbmQgPSBtX25wT2JqZWN0UHJveGll cy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIE5QT2JqZWN0UHJveHkqIG5wT2Jq ZWN0UHJveHkgPSAqaXQ7Ci0KLSAgICAgICAgaWYgKG5wT2JqZWN0UHJveHktPnBsdWdpbigpID09 IHBsdWdpbikKLSAgICAgICAgICAgIG9iamVjdFByb3hpZXMuYXBwZW5kKG5wT2JqZWN0UHJveHkp OworICAgIC8vIFJlbW92ZSBhbGwgcmVjZWl2ZXJzIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHBsdWct aW4uCisgICAgVmVjdG9yPHVpbnQ2NF90PiBrZXlzOworICAgIGZvciAoYXV0byBpdCA9IG1fcmVn aXN0ZXJlZE5QT2JqZWN0cy5iZWdpbigpLCBlbmQgPSBtX3JlZ2lzdGVyZWROUE9iamVjdHMuZW5k KCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBpZiAoaXQtPnZhbHVlLT5wbHVnaW4oKSA9 PSBwbHVnaW4pCisgICAgICAgICAgICBrZXlzLmFwcGVuZChpdC0+a2V5KTsKICAgICB9CisgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGtleXMuc2l6ZSgpOyArK2kpCisgICAgICAgIG1fcmVn aXN0ZXJlZE5QT2JqZWN0cy5yZW1vdmUoa2V5c1tpXSk7CiAKICAgICAvLyBJbnZhbGlkYXRlIGFu ZCByZW1vdmUgYWxsIHByb3hpZXMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgcGx1Zy1pbi4KLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IG9iamVjdFByb3hpZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAg ICAgTlBPYmplY3RQcm94eSogbnBPYmplY3RQcm94eSA9IG9iamVjdFByb3hpZXNbaV07Ci0KLSAg ICAgICAgbnBPYmplY3RQcm94eS0+aW52YWxpZGF0ZSgpOwotCi0gICAgICAgIEFTU0VSVChtX25w T2JqZWN0UHJveGllcy5jb250YWlucyhucE9iamVjdFByb3h5KSk7Ci0gICAgICAgIG1fbnBPYmpl Y3RQcm94aWVzLnJlbW92ZShucE9iamVjdFByb3h5KTsKKyAgICBWZWN0b3I8TlBPYmplY3RQcm94 eSo+IHByb3hpZXM7CisgICAgZm9yIChhdXRvIGl0ID0gbV9ucE9iamVjdFByb3hpZXMuYmVnaW4o KSwgZW5kID0gbV9ucE9iamVjdFByb3hpZXMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAg ICAgICBpZiAoKCppdCktPnBsdWdpbigpID09IHBsdWdpbikKKyAgICAgICAgICAgIHByb3hpZXMu YXBwZW5kKCppdCk7CisgICAgfQorICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcHJveGllcy5z aXplKCk7ICsraSkgeworICAgICAgICBwcm94aWVzW2ldLT5pbnZhbGlkYXRlKCk7CisgICAgICAg IG1fbnBPYmplY3RQcm94aWVzLnJlbW92ZShwcm94aWVzW2ldKTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5oCmluZGV4 IDVjOGE0NzMyYWJiYzZmZjE1MGUwOWM3MzgzMzhiODYyMzU3ZWQxM2YuLmNkYjVkNzczMjQyNThj YmZmM2ZkZDE0NjkyMGNmNDFlNGEzNGU5YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuaApAQCAtNzIsNyArNzIsNyBAQCBwcml2YXRl OgogCiAgICAgLy8gQSBtYXAgb2YgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIgY2xhc3Nlcywgd3Jh cHBpbmcgb2JqZWN0cyB0aGF0IHdlIGV4cG9ydCB0byB0aGUKICAgICAvLyBvdGhlciBlbmQgb2Yg dGhlIGNvbm5lY3Rpb24uCi0gICAgSGFzaE1hcDx1aW50NjRfdCwgTlBPYmplY3RNZXNzYWdlUmVj ZWl2ZXIqPiBtX3JlZ2lzdGVyZWROUE9iamVjdHM7CisgICAgSGFzaE1hcDx1aW50NjRfdCwgc3Rk Ojp1bmlxdWVfcHRyPE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyPj4gbV9yZWdpc3RlcmVkTlBPYmpl Y3RzOwogCiAgICAgLy8gQSBzZXQgb2YgTlBPYmplY3RQcm94eSBvYmplY3RzIGFzc29jaWF0ZWQg d2l0aCB0aGlzIG1hcC4KICAgICBIYXNoU2V0PE5QT2JqZWN0UHJveHkqPiBtX25wT2JqZWN0UHJv eGllczsK 213786 2013-10-09 09:41:05 -0700 2014-04-17 08:44:16 -0700 Patch bug-122496-20131009094103.patch text/plain 5132 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjNiNjc1NDI2OTZjYjE5 YzVhMmExM2M1Y2ZkNGY3NjUzOWE4OTM3NS4uZWNlYWU3ODdiOWFlOWYwZjU1NWIwYWVhMzQ3MTQ4 NzA1ZjNmNGFkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTA4ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdXNlIG9mIGRlbGV0 ZUFsbFZhbHVlcyBpbiBOUFJlbW90ZU9iamVjdE1hcDo6cGx1Z2luRGVzdHJveWVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0OTYKKworICAgICAg ICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMv TlBSZW1vdGVPYmplY3RNYXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUFJlbW90ZU9iamVjdE1h cDo6cmVnaXN0ZXJOUE9iamVjdCk6IERvbid0IGNhbGwgcmVsZWFzZSB3aGVuIHB1dHRpbiBvYmpl Y3RzCisgICAgICAgIGludG8gdGhlIG1hcC4KKyAgICAgICAgKFdlYktpdDo6TlBSZW1vdGVPYmpl Y3RNYXA6OnBsdWdpbkRlc3Ryb3llZCk6IEluc3RlYWQgb2YgbWFraW5nIGFuIGFycmF5IG9mIHJl Y2VpdmVycworICAgICAgICBhbmQgZGVsZXRpbmcgdGhlbSBhbGwsIHJlbW92ZSBhbGwgb2YgdGhl IHJlY2VpdmVycyBmcm9tIHRoZSBtYXAsIHdoaWNoIHdpbGwgdGFrZSBjYXJlCisgICAgICAgIG9m IGRlbGV0aW5nIHRoZW0uIEFsc28gY2hhbmdlIHRoZSBvdGhlciBsb29wIHRvIHVzZSBhIHNpbWls YXIgY29kaW5nIHN0eWxlLgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvTlBSZW1vdGVPYmpl Y3RNYXAuaDogQ2hhbmdlIHRoZSB2YWx1ZSB0eXBlIG9mIG1fcmVnaXN0ZXJlZE5QT2JqZWN0cwor ICAgICAgICB0byBiZSB1bmlxdWVfcHRyIGluc3RlYWQgb2YgYSByYXcgcG9pbnRlci4KKwogMjAx My0xMC0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE1NzE1Ny4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcAppbmRleCA3NWE1ZTczZTI0 NzhmM2IwODEwMDdiNzFjMWRlOTI3YzM2MzQxYjNmLi42YzcyNmIzMGY5Y2U2ZmQ4MmUwNjlmZWMw NDZkZGQwNzIxNDY0YTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lu cy9OUFJlbW90ZU9iamVjdE1hcC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdp bnMvTlBSZW1vdGVPYmplY3RNYXAuY3BwCkBAIC03OCw4ICs3OCw3IEBAIHZvaWQgTlBSZW1vdGVP YmplY3RNYXA6Om5wT2JqZWN0UHJveHlEZXN0cm95ZWQoTlBPYmplY3QqIG5wT2JqZWN0KQogdWlu dDY0X3QgTlBSZW1vdGVPYmplY3RNYXA6OnJlZ2lzdGVyTlBPYmplY3QoTlBPYmplY3QqIG5wT2Jq ZWN0LCBQbHVnaW4qIHBsdWdpbikKIHsKICAgICB1aW50NjRfdCBucE9iamVjdElEID0gZ2VuZXJh dGVOUE9iamVjdElEKCk7Ci0gICAgbV9yZWdpc3RlcmVkTlBPYmplY3RzLnNldChucE9iamVjdElE LCBzdGQ6Om1ha2VfdW5pcXVlPE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyPih0aGlzLCBwbHVnaW4s IG5wT2JqZWN0SUQsIG5wT2JqZWN0KS5yZWxlYXNlKCkpOwotCisgICAgbV9yZWdpc3RlcmVkTlBP YmplY3RzLmFkZChucE9iamVjdElELCBzdGQ6Om1ha2VfdW5pcXVlPE5QT2JqZWN0TWVzc2FnZVJl Y2VpdmVyPih0aGlzLCBwbHVnaW4sIG5wT2JqZWN0SUQsIG5wT2JqZWN0KSk7CiAgICAgcmV0dXJu IG5wT2JqZWN0SUQ7CiB9CiAKQEAgLTE5NiwzNCArMTk1LDI2IEBAIE5QVmFyaWFudCBOUFJlbW90 ZU9iamVjdE1hcDo6bnBWYXJpYW50RGF0YVRvTlBWYXJpYW50KGNvbnN0IE5QVmFyaWFudERhdGEm IG5wVmFyCiAKIHZvaWQgTlBSZW1vdGVPYmplY3RNYXA6OnBsdWdpbkRlc3Ryb3llZChQbHVnaW4q IHBsdWdpbikKIHsKLSAgICBWZWN0b3I8TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPiBtZXNzYWdl UmVjZWl2ZXJzOwotCi0gICAgLy8gR2F0aGVyIHRoZSByZWNlaXZlcnMgYXNzb2NpYXRlZCB3aXRo IHRoaXMgcGx1Zy1pbi4KLSAgICBmb3IgKEhhc2hNYXA8dWludDY0X3QsIE5QT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9yZWdpc3RlcmVkTlBPYmplY3RzLmJl Z2luKCksIGVuZCA9IG1fcmVnaXN0ZXJlZE5QT2JqZWN0cy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0 KSB7Ci0gICAgICAgIE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyKiBucE9iamVjdE1lc3NhZ2VSZWNl aXZlciA9IGl0LT52YWx1ZTsKLSAgICAgICAgaWYgKG5wT2JqZWN0TWVzc2FnZVJlY2VpdmVyLT5w bHVnaW4oKSA9PSBwbHVnaW4pCi0gICAgICAgICAgICBtZXNzYWdlUmVjZWl2ZXJzLmFwcGVuZChu cE9iamVjdE1lc3NhZ2VSZWNlaXZlcik7Ci0gICAgfQotCi0gICAgLy8gTm93IGRlbGV0ZSBhbGwg dGhlIHJlY2VpdmVycy4KLSAgICBkZWxldGVBbGxWYWx1ZXMobWVzc2FnZVJlY2VpdmVycyk7Ci0K LSAgICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IG9iamVjdFByb3hpZXM7Ci0gICAgZm9yIChIYXNo U2V0PE5QT2JqZWN0UHJveHkqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX25wT2JqZWN0UHJveGll cy5iZWdpbigpLCBlbmQgPSBtX25wT2JqZWN0UHJveGllcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0 KSB7Ci0gICAgICAgIE5QT2JqZWN0UHJveHkqIG5wT2JqZWN0UHJveHkgPSAqaXQ7Ci0KLSAgICAg ICAgaWYgKG5wT2JqZWN0UHJveHktPnBsdWdpbigpID09IHBsdWdpbikKLSAgICAgICAgICAgIG9i amVjdFByb3hpZXMuYXBwZW5kKG5wT2JqZWN0UHJveHkpOworICAgIC8vIERlbGV0ZSBhbGwgcmVj ZWl2ZXJzIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHBsdWctaW4uCisgICAgVmVjdG9yPHN0ZDo6dW5p cXVlX3B0cjxOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcj4+IHJlY2VpdmVyczsKKyAgICBmb3IgKGF1 dG8gaXQgPSBtX3JlZ2lzdGVyZWROUE9iamVjdHMudmFsdWVzKCkuYmVnaW4oKSwgZW5kID0gbV9y ZWdpc3RlcmVkTlBPYmplY3RzLnZhbHVlcygpLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAg ICAgICAgaWYgKCgqaXQpLT5wbHVnaW4oKSA9PSBwbHVnaW4pIHsKKyAgICAgICAgICAgIC8vIE1v dmUgZWFjaCByZWNlaXZlciB0byB0aGUgdmVjdG9yIHNvIHdlIGRvbid0IGRlc3Ryb3kgdGhlIHJl Y2VpdmVyIGluc2lkZSB0aGlzIGxvb3AsCisgICAgICAgICAgICAvLyB3aGljaCB3b3VsZCByaXNr IHJlZW50ZXJpbmcgYW5kIG1vZGlmeWluZyBtX3JlZ2lzdGVyZWROUE9iamVjdHMuIFdoZW4gdGhl IHZlY3RvciBpcworICAgICAgICAgICAgLy8gZGVzdHJveWVkLCBhbGwgdGhlIHJlY2VpdmVycyB3 aWxsIGJlIGRlc3Ryb3llZCB0b28uCisgICAgICAgICAgICByZWNlaXZlcnMuYXBwZW5kKHN0ZDo6 bW92ZSgqaXQpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIEludmFsaWRhdGUgYW5kIHJl bW92ZSBhbGwgcHJveGllcyBhc3NvY2lhdGVkIHdpdGggdGhpcyBwbHVnLWluLgotICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgb2JqZWN0UHJveGllcy5zaXplKCk7ICsraSkgewotICAgICAgICBO UE9iamVjdFByb3h5KiBucE9iamVjdFByb3h5ID0gb2JqZWN0UHJveGllc1tpXTsKLQotICAgICAg ICBucE9iamVjdFByb3h5LT5pbnZhbGlkYXRlKCk7Ci0KLSAgICAgICAgQVNTRVJUKG1fbnBPYmpl Y3RQcm94aWVzLmNvbnRhaW5zKG5wT2JqZWN0UHJveHkpKTsKLSAgICAgICAgbV9ucE9iamVjdFBy b3hpZXMucmVtb3ZlKG5wT2JqZWN0UHJveHkpOworICAgIFZlY3RvcjxOUE9iamVjdFByb3h5Kj4g cHJveGllczsKKyAgICBmb3IgKGF1dG8gaXQgPSBtX25wT2JqZWN0UHJveGllcy5iZWdpbigpLCBl bmQgPSBtX25wT2JqZWN0UHJveGllcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAg IGlmICgoKml0KS0+cGx1Z2luKCkgPT0gcGx1Z2luKQorICAgICAgICAgICAgcHJveGllcy5hcHBl bmQoKml0KTsKKyAgICB9CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwcm94aWVzLnNpemUo KTsgKytpKSB7CisgICAgICAgIHByb3hpZXNbaV0tPmludmFsaWRhdGUoKTsKKyAgICAgICAgbV9u cE9iamVjdFByb3hpZXMucmVtb3ZlKHByb3hpZXNbaV0pOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuaCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmgKaW5kZXggNWM4 YTQ3MzJhYmJjNmZmMTUwZTA5YzczODMzOGI4NjIzNTdlZDEzZi4uY2RiNWQ3NzMyNDI1OGNiZmYz ZmRkMTQ2OTIwY2Y0MWU0YTM0ZTlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv UGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5oCkBAIC03Miw3ICs3Miw3IEBAIHByaXZhdGU6CiAK ICAgICAvLyBBIG1hcCBvZiBOUE9iamVjdE1lc3NhZ2VSZWNlaXZlciBjbGFzc2VzLCB3cmFwcGlu ZyBvYmplY3RzIHRoYXQgd2UgZXhwb3J0IHRvIHRoZQogICAgIC8vIG90aGVyIGVuZCBvZiB0aGUg Y29ubmVjdGlvbi4KLSAgICBIYXNoTWFwPHVpbnQ2NF90LCBOUE9iamVjdE1lc3NhZ2VSZWNlaXZl cio+IG1fcmVnaXN0ZXJlZE5QT2JqZWN0czsKKyAgICBIYXNoTWFwPHVpbnQ2NF90LCBzdGQ6OnVu aXF1ZV9wdHI8TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI+PiBtX3JlZ2lzdGVyZWROUE9iamVjdHM7 CiAKICAgICAvLyBBIHNldCBvZiBOUE9iamVjdFByb3h5IG9iamVjdHMgYXNzb2NpYXRlZCB3aXRo IHRoaXMgbWFwLgogICAgIEhhc2hTZXQ8TlBPYmplY3RQcm94eSo+IG1fbnBPYmplY3RQcm94aWVz Owo= 229547 2014-04-17 08:44:28 -0700 2014-04-17 09:59:19 -0700 Patch bug-122496-20140417084414.patch text/plain 3495 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWJjZGU2ZDdkZjY2Mzdi YTQ0ZDc2ODRkOWY4YjRjMjFjMDBiMWU0Ni4uYzE0MTcyY2VhZTYzZDliYzFhYTA2MDYxYmQ1OWIy NDk3OTRkY2QyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE0LTA0LTE3ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgdXNlIG9mIGRlcHJl Y2F0ZWREZWxldGVBbGxWYWx1ZXMgaW4gTlBSZW1vdGVPYmplY3RNYXA6OnBsdWdpbkRlc3Ryb3ll ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNDk2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFy ZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5QUmVt b3RlT2JqZWN0TWFwOjpwbHVnaW5EZXN0cm95ZWQpOiBVc2UgbmV3LXN0eWxlIGNvZGUgYW5kIHdy aXRlIHRoZQorICAgICAgICBkZXByZWNhdGVkRGVsZXRlQWxsVmFsdWVzIGZ1bmN0aW9uIG91dCB1 c2luZyBhIGxvb3AuIE1pZ2h0IGJlIG5pY2UgdG8gcmV0dXJuIGhlcmUKKyAgICAgICAgYW5kIHVz ZSB1bmlxdWVfcHRyIGluc3RlYWQgc29tZSBkYXksIGJ1dCBJIHRyaWVkIHRoYXQgYmVmb3JlIGFu ZCBnb3QgaXQgd3JvbmcsIHNvCisgICAgICAgIGxldHMgZG8gdGhhdCBhbm90aGVyIHRpbWUuCisK KzIwMTQtMDQtMTcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAgICAgICAgIEFk ZCBzZXBhcmF0ZSBmbGFnIGZvciBJbmRleGVkRGF0YWJhc2UgaW4gd29ya2VycyBzaW5jZSB0aGUg Y3VycmVudCBpbXBsZW1lbnRhdGlvbiBpcyBub3QgdGhyZWFkc2FmZQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNzg1CiAgICAgICAgIHJkYXI6Ly9w cm9ibGVtLzE2MDAzMTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lu cy9OUFJlbW90ZU9iamVjdE1hcC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9O UFJlbW90ZU9iamVjdE1hcC5jcHAKaW5kZXggODEzOGMyZmY3YjBkMTRlNjUzMmVhYjkwMmM4YjI4 M2QxZTA1YTM1MS4uOTcxMTAyMzZiOWUyY2YzYWRjMjY1MzQ5MzYyZWEwZTcyOTU1MTdiYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFw LmNwcApAQCAtMTk2LDM0ICsxOTYsMjUgQEAgTlBWYXJpYW50IE5QUmVtb3RlT2JqZWN0TWFwOjpu cFZhcmlhbnREYXRhVG9OUFZhcmlhbnQoY29uc3QgTlBWYXJpYW50RGF0YSYgbnBWYXIKIAogdm9p ZCBOUFJlbW90ZU9iamVjdE1hcDo6cGx1Z2luRGVzdHJveWVkKFBsdWdpbiogcGx1Z2luKQogewot ICAgIFZlY3RvcjxOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcio+IG1lc3NhZ2VSZWNlaXZlcnM7Ci0K LSAgICAvLyBHYXRoZXIgdGhlIHJlY2VpdmVycyBhc3NvY2lhdGVkIHdpdGggdGhpcyBwbHVnLWlu LgotICAgIGZvciAoSGFzaE1hcDx1aW50NjRfdCwgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPjo6 Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3JlZ2lzdGVyZWROUE9iamVjdHMuYmVnaW4oKSwgZW5kID0g bV9yZWdpc3RlcmVkTlBPYmplY3RzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAg TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqIG5wT2JqZWN0TWVzc2FnZVJlY2VpdmVyID0gaXQtPnZh bHVlOwotICAgICAgICBpZiAobnBPYmplY3RNZXNzYWdlUmVjZWl2ZXItPnBsdWdpbigpID09IHBs dWdpbikKLSAgICAgICAgICAgIG1lc3NhZ2VSZWNlaXZlcnMuYXBwZW5kKG5wT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyKTsKLSAgICB9Ci0KLSAgICAvLyBOb3cgZGVsZXRlIGFsbCB0aGUgcmVjZWl2ZXJz LgotICAgIGRlcHJlY2F0ZWREZWxldGVBbGxWYWx1ZXMobWVzc2FnZVJlY2VpdmVycyk7Ci0KLSAg ICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IG9iamVjdFByb3hpZXM7Ci0gICAgZm9yIChIYXNoU2V0 PE5QT2JqZWN0UHJveHkqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX25wT2JqZWN0UHJveGllcy5i ZWdpbigpLCBlbmQgPSBtX25wT2JqZWN0UHJveGllcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7 Ci0gICAgICAgIE5QT2JqZWN0UHJveHkqIG5wT2JqZWN0UHJveHkgPSAqaXQ7Ci0KLSAgICAgICAg aWYgKG5wT2JqZWN0UHJveHktPnBsdWdpbigpID09IHBsdWdpbikKLSAgICAgICAgICAgIG9iamVj dFByb3hpZXMuYXBwZW5kKG5wT2JqZWN0UHJveHkpOworICAgIC8vIEdhdGhlciBhbmQgZGVsZXRl IHRoZSByZWNlaXZlcnMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgcGx1Zy1pbi4KKyAgICBWZWN0b3I8 TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPiByZWNlaXZlcnM7CisgICAgZm9yIChhdXRvKiByZWNl aXZlciA6IG1fcmVnaXN0ZXJlZE5QT2JqZWN0cy52YWx1ZXMoKSkgeworICAgICAgICBpZiAocmVj ZWl2ZXItPnBsdWdpbigpID09IHBsdWdpbikKKyAgICAgICAgICAgIHJlY2VpdmVycy5hcHBlbmQo cmVjZWl2ZXIpOwogICAgIH0KKyAgICBmb3IgKGF1dG8qIHJlY2VpdmVyIDogcmVjZWl2ZXJzKQor ICAgICAgICBkZWxldGUgcmVjZWl2ZXI7CiAKICAgICAvLyBJbnZhbGlkYXRlIGFuZCByZW1vdmUg YWxsIHByb3hpZXMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgcGx1Zy1pbi4KLSAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG9iamVjdFByb3hpZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgTlBPYmpl Y3RQcm94eSogbnBPYmplY3RQcm94eSA9IG9iamVjdFByb3hpZXNbaV07Ci0KLSAgICAgICAgbnBP YmplY3RQcm94eS0+aW52YWxpZGF0ZSgpOwotCi0gICAgICAgIEFTU0VSVChtX25wT2JqZWN0UHJv eGllcy5jb250YWlucyhucE9iamVjdFByb3h5KSk7Ci0gICAgICAgIG1fbnBPYmplY3RQcm94aWVz LnJlbW92ZShucE9iamVjdFByb3h5KTsKKyAgICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IHByb3hp ZXM7CisgICAgZm9yIChhdXRvKiBwcm94eSA6IG1fbnBPYmplY3RQcm94aWVzKSB7CisgICAgICAg IGlmIChwcm94eS0+cGx1Z2luKCkgPT0gcGx1Z2luKQorICAgICAgICAgICAgcHJveGllcy5hcHBl bmQocHJveHkpOworICAgIH0KKyAgICBmb3IgKGF1dG8qIHByb3h5IDogcHJveGllcykgeworICAg ICAgICBwcm94eS0+aW52YWxpZGF0ZSgpOworICAgICAgICBBU1NFUlQobV9ucE9iamVjdFByb3hp ZXMuY29udGFpbnMocHJveHkpKTsKKyAgICAgICAgbV9ucE9iamVjdFByb3hpZXMucmVtb3ZlKHBy b3h5KTsKICAgICB9CiB9CiAK