138353 2014-11-03 23:28:32 -0800 Dictionary lookup panel pops up at random when clicking on selected text 2014-11-04 00:20:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin sam simon.fraser oldest_to_newest 1046007 0 thorton 2014-11-03 23:28:32 -0800 Dictionary lookup panel pops up at random when clicking on selected text 1046008 1 240915 thorton 2014-11-03 23:29:35 -0800 Created attachment 240915 Patch 1046009 2 240916 thorton 2014-11-03 23:31:30 -0800 Created attachment 240916 Patch 1046010 3 thorton 2014-11-03 23:31:50 -0800 <rdar://problem/18861406> 1046013 4 240916 kling 2014-11-03 23:44:27 -0800 Comment on attachment 240916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240916&action=review r=me > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:525 > +static PassRefPtr<Range> rangeForDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection, NSDictionary **options) 'frame' is not used for anything here. 1046014 5 240916 thorton 2014-11-03 23:45:15 -0800 Comment on attachment 240916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240916&action=review >> Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:525 >> +static PassRefPtr<Range> rangeForDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection, NSDictionary **options) > > 'frame' is not used for anything here. Quite! Thanks for your review. 1046019 6 thorton 2014-11-04 00:05:41 -0800 http://trac.webkit.org/changeset/175517 1046020 7 thorton 2014-11-04 00:20:58 -0800 Follow up fix in http://trac.webkit.org/changeset/175524 240915 2014-11-03 23:29:35 -0800 2014-11-03 23:31:27 -0800 Patch bug-138353-20141103232945.patch text/plain 7226 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uNDNjYjhjM2E1ZmY2NDRlZmFlMjMwOTA2NmY5YjNl YmIxMWMzODI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTExLTAzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIERpY3Rpb25hcnkg bG9va3VwIHBhbmVsIHBvcHMgdXAgYXQgcmFuZG9tIHdoZW4gY2xpY2tpbmcgb24gc2VsZWN0ZWQg dGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4 MzUzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODg2MTQwNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgor ICAgICAgICAoV2ViS2l0OjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24pOgor ICAgICAgICAoV2ViS2l0OjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBBdEhpdFRlc3RSZXN1bHQp OgorICAgICAgICBGYWN0b3IgcmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uIG91 dCBvZiBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvclNlbGVjdGlvbi4KKworICAgICAgICBNYWtl IHVzZSBvZiByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24gaW4gcmFuZ2VGb3JE aWN0aW9uYXJ5TG9va3VwQXRIaXRUZXN0UmVzdWx0LAorICAgICAgICByZXR1cm5pbmcgdGhlIHNl bGVjdGlvbi1iYXNlZCByYW5nZSBpZiB0aGUgaGl0IHRlc3QgaW50ZXJzZWN0cyB0aGUgc2VsZWN0 ZWQgdGV4dC4KKworICAgICAgICBNYWtlIHJhbmdlRm9yRGljdGlvbmFyeUxvb2t1cCogc3RhdGlj LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9y U2VsZWN0aW9uKToKKyAgICAgICAgTWFrZSB1c2Ugb2YgcmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3Vw Rm9yU2VsZWN0aW9uLgorCiAyMDE0LTExLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEV4cG9zZSB2aXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucyBw cmVmIHZpYSB0aGUgV0syIEMgU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaAppbmRleCA4MzRkMzE4N2E2ZTgyNzUzMzk4MThkNWI4NTUxZmIwNDcyMTJjMDdm Li4wYWZjMDJiYTk0YjY1MjU1OWM1YzMwYmNhOTJlMmYzY2UxZjViNTk2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY1Miw4ICs2NTIsNiBAQCBw dWJsaWM6CiAgICAgdm9pZCBkdW1teShib29sJik7CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAg ICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uKFdlYkNvcmU6OkZyYW1l KiwgY29uc3QgV2ViQ29yZTo6VmlzaWJsZVNlbGVjdGlvbiYpOwotCiAgICAgYm9vbCBpc1NwZWFr aW5nKCk7CiAgICAgdm9pZCBzcGVhayhjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHN0b3BTcGVh a2luZygpOwpAQCAtOTcyLDkgKzk3MCw5IEBAIHByaXZhdGU6CiAKICNpZiBQTEFURk9STShDT0NP QSkKICAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbihjb25zdCBXZWJD b3JlOjpGbG9hdFBvaW50Jik7Ci0gICAgdm9pZCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvclJh bmdlKFdlYkNvcmU6OkZyYW1lKiwgV2ViQ29yZTo6UmFuZ2UmLCBOU0RpY3Rpb25hcnkgKm9wdGlv bnMpOwotICAgIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IHJhbmdlRm9yRGljdGlvbmFyeUxv b2t1cEF0SGl0VGVzdFJlc3VsdChjb25zdCBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0JiwgTlNEaWN0 aW9uYXJ5ICoqKTsKICAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwT2ZDdXJyZW50U2Vs ZWN0aW9uKCk7CisgICAgdm9pZCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvclNlbGVjdGlvbihX ZWJDb3JlOjpGcmFtZSosIGNvbnN0IFdlYkNvcmU6OlZpc2libGVTZWxlY3Rpb24mKTsKKyAgICB2 b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9yUmFuZ2UoV2ViQ29yZTo6RnJhbWUqLCBXZWJD b3JlOjpSYW5nZSYsIE5TRGljdGlvbmFyeSAqb3B0aW9ucyk7CiAKICAgICB2b2lkIHdpbmRvd0Fu ZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgd2luZG93RnJhbWVJ blNjcmVlbkNvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHdpbmRvd0ZyYW1l SW5VbmZsaXBwZWRTY3JlZW5Db29yZGluYXRlcywgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB2 aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBh Y2Nlc3NpYmlsaXR5Vmlld0Nvb3JkaW5hdGVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IDRiYjJlMjUzZDM5MzE3 OGZjNDAwNjY0OWE1ZmE0NGM2ZmE0NTQ5OTUuLjc3OTdhNWFiNDlhM2Q0NmY1MDg2ZDUyYmE4Njg4 NjM2YmE2NzA5YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTUyMiw3ICs1MjIsMzIgQEAgc3RhdGljIFBhc3NSZWZQ dHI8UmFuZ2U+IHJhbmdlRXhwYW5kZWRBcm91bmRQb3NpdGlvbkJ5Q2hhcmFjdGVycyhjb25zdCBW aXNpYmxlUG8KICAgICByZXR1cm4gbWFrZVJhbmdlKHN0YXJ0LCBlbmQpOwogfQogCi1QYXNzUmVm UHRyPFJhbmdlPiBXZWJQYWdlOjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBBdEhpdFRlc3RSZXN1 bHQoY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCYgaGl0VGVzdFJlc3VsdCwgTlNEaWN0aW9u YXJ5ICoqb3B0aW9ucykKK3N0YXRpYyBQYXNzUmVmUHRyPFJhbmdlPiByYW5nZUZvckRpY3Rpb25h cnlMb29rdXBGb3JTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9u JiBzZWxlY3Rpb24sIE5TRGljdGlvbmFyeSAqKm9wdGlvbnMpCit7CisgICAgUmVmUHRyPFJhbmdl PiBzZWxlY3RlZFJhbmdlID0gc2VsZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdlKCk7CisgICAgaWYg KCFzZWxlY3RlZFJhbmdlKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIFZpc2libGVQ b3NpdGlvbiBzZWxlY3Rpb25TdGFydCA9IHNlbGVjdGlvbi52aXNpYmxlU3RhcnQoKTsKKyAgICBW aXNpYmxlUG9zaXRpb24gc2VsZWN0aW9uRW5kID0gc2VsZWN0aW9uLnZpc2libGVFbmQoKTsKKwor ICAgIC8vIEFzIGNvbnRleHQsIHdlIGFyZSBnb2luZyB0byB1c2UgdGhlIHN1cnJvdW5kaW5nIHBh cmFncmFwaHMgb2YgdGV4dC4KKyAgICBWaXNpYmxlUG9zaXRpb24gcGFyYWdyYXBoU3RhcnQgPSBz dGFydE9mUGFyYWdyYXBoKHNlbGVjdGlvblN0YXJ0KTsKKyAgICBWaXNpYmxlUG9zaXRpb24gcGFy YWdyYXBoRW5kID0gZW5kT2ZQYXJhZ3JhcGgoc2VsZWN0aW9uRW5kKTsKKworICAgIGludCBsZW5n dGhUb1NlbGVjdGlvblN0YXJ0ID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2Uo cGFyYWdyYXBoU3RhcnQsIHNlbGVjdGlvblN0YXJ0KS5nZXQoKSk7CisgICAgaW50IGxlbmd0aFRv U2VsZWN0aW9uRW5kID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFyYWdy YXBoU3RhcnQsIHNlbGVjdGlvbkVuZCkuZ2V0KCkpOworICAgIE5TUmFuZ2UgcmFuZ2VUb1Bhc3Mg PSBOU01ha2VSYW5nZShsZW5ndGhUb1NlbGVjdGlvblN0YXJ0LCBsZW5ndGhUb1NlbGVjdGlvbkVu ZCAtIGxlbmd0aFRvU2VsZWN0aW9uU3RhcnQpOworCisgICAgU3RyaW5nIGZ1bGxQbGFpblRleHRT dHJpbmcgPSBwbGFpblRleHQobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBwYXJhZ3JhcGhFbmQp LmdldCgpKTsKKworICAgIC8vIFNpbmNlIHdlIGFscmVhZHkgaGF2ZSB0aGUgcmFuZ2Ugd2Ugd2Fu dCwgd2UganVzdCBuZWVkIHRvIGdyYWIgdGhlIHJldHVybmVkIG9wdGlvbnMuCisgICAgV0tFeHRy YWN0V29yZERlZmluaXRpb25Ub2tlblJhbmdlRnJvbUNvbnRleHR1YWxTdHJpbmcoZnVsbFBsYWlu VGV4dFN0cmluZywgcmFuZ2VUb1Bhc3MsIG9wdGlvbnMpOworICAgIAorICAgIHJldHVybiBzZWxl Y3RlZFJhbmdlLnJlbGVhc2UoKTsKK30KKworc3RhdGljIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdl Rm9yRGljdGlvbmFyeUxvb2t1cEF0SGl0VGVzdFJlc3VsdChjb25zdCBIaXRUZXN0UmVzdWx0JiBo aXRUZXN0UmVzdWx0LCBOU0RpY3Rpb25hcnkgKipvcHRpb25zKQogewogICAgIE5vZGUqIG5vZGUg PSBoaXRUZXN0UmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpOwogICAgIGlmICghbm9kZSkKQEAg LTU0NCwxMSArNTY5LDkgQEAgUGFzc1JlZlB0cjxSYW5nZT4gV2ViUGFnZTo6cmFuZ2VGb3JEaWN0 aW9uYXJ5TG9va3VwQXRIaXRUZXN0UmVzdWx0KGNvbnN0IFdlYkNvcmUKICAgICBpZiAocG9zaXRp b24uaXNOdWxsKCkpCiAgICAgICAgIHBvc2l0aW9uID0gZmlyc3RQb3NpdGlvbkluT3JCZWZvcmVO b2RlKG5vZGUpOwogCi0gICAgVmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rpb24gPSBtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlv bigpOwotICAgIGlmIChzaG91bGRVc2VTZWxlY3Rpb24ocG9zaXRpb24sIHNlbGVjdGlvbikpIHsK LSAgICAgICAgcGVyZm9ybURpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oZnJhbWUsIHNlbGVj dGlvbik7Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIH0KKyAgICBWaXNpYmxlU2VsZWN0 aW9uIHNlbGVjdGlvbiA9IGZyYW1lLT5wYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRP ck1haW5GcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOworICAgIGlmIChzaG91bGRVc2VT ZWxlY3Rpb24ocG9zaXRpb24sIHNlbGVjdGlvbikpCisgICAgICAgIHJldHVybiByYW5nZUZvckRp Y3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oZnJhbWUsIGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxl Y3Rpb24oKSwgb3B0aW9ucyk7CiAKICAgICAvLyBBcyBjb250ZXh0LCB3ZSBhcmUgZ29pbmcgdG8g dXNlIDI1MCBjaGFyYWN0ZXJzIG9mIHRleHQgYmVmb3JlIGFuZCBhZnRlciB0aGUgcG9pbnQuCiAg ICAgUmVmUHRyPFJhbmdlPiBmdWxsQ2hhcmFjdGVyUmFuZ2UgPSByYW5nZUV4cGFuZGVkQXJvdW5k UG9zaXRpb25CeUNoYXJhY3RlcnMocG9zaXRpb24sIDI1MCk7CkBAIC01ODYsMjggKzYwOSw4IEBA IHZvaWQgV2ViUGFnZTo6cGVyZm9ybURpY3Rpb25hcnlMb29rdXBBdExvY2F0aW9uKGNvbnN0IEZs b2F0UG9pbnQmIGZsb2F0UG9pbnQpCiAKIHZvaWQgV2ViUGFnZTo6cGVyZm9ybURpY3Rpb25hcnlM b29rdXBGb3JTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBz ZWxlY3Rpb24pCiB7Ci0gICAgUmVmUHRyPFJhbmdlPiBzZWxlY3RlZFJhbmdlID0gc2VsZWN0aW9u LnRvTm9ybWFsaXplZFJhbmdlKCk7Ci0gICAgaWYgKCFzZWxlY3RlZFJhbmdlKQotICAgICAgICBy ZXR1cm47Ci0KICAgICBOU0RpY3Rpb25hcnkgKm9wdGlvbnMgPSBuaWw7Ci0KLSAgICBWaXNpYmxl UG9zaXRpb24gc2VsZWN0aW9uU3RhcnQgPSBzZWxlY3Rpb24udmlzaWJsZVN0YXJ0KCk7Ci0gICAg VmlzaWJsZVBvc2l0aW9uIHNlbGVjdGlvbkVuZCA9IHNlbGVjdGlvbi52aXNpYmxlRW5kKCk7Ci0K LSAgICAvLyBBcyBjb250ZXh0LCB3ZSBhcmUgZ29pbmcgdG8gdXNlIHRoZSBzdXJyb3VuZGluZyBw YXJhZ3JhcGhzIG9mIHRleHQuCi0gICAgVmlzaWJsZVBvc2l0aW9uIHBhcmFncmFwaFN0YXJ0ID0g c3RhcnRPZlBhcmFncmFwaChzZWxlY3Rpb25TdGFydCk7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIHBh cmFncmFwaEVuZCA9IGVuZE9mUGFyYWdyYXBoKHNlbGVjdGlvbkVuZCk7Ci0KLSAgICBpbnQgbGVu Z3RoVG9TZWxlY3Rpb25TdGFydCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdl KHBhcmFncmFwaFN0YXJ0LCBzZWxlY3Rpb25TdGFydCkuZ2V0KCkpOwotICAgIGludCBsZW5ndGhU b1NlbGVjdGlvbkVuZCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdlKHBhcmFn cmFwaFN0YXJ0LCBzZWxlY3Rpb25FbmQpLmdldCgpKTsKLSAgICBOU1JhbmdlIHJhbmdlVG9QYXNz ID0gTlNNYWtlUmFuZ2UobGVuZ3RoVG9TZWxlY3Rpb25TdGFydCwgbGVuZ3RoVG9TZWxlY3Rpb25F bmQgLSBsZW5ndGhUb1NlbGVjdGlvblN0YXJ0KTsKLQotICAgIFN0cmluZyBmdWxsUGxhaW5UZXh0 U3RyaW5nID0gcGxhaW5UZXh0KG1ha2VSYW5nZShwYXJhZ3JhcGhTdGFydCwgcGFyYWdyYXBoRW5k KS5nZXQoKSk7Ci0KLSAgICAvLyBTaW5jZSB3ZSBhbHJlYWR5IGhhdmUgdGhlIHJhbmdlIHdlIHdh bnQsIHdlIGp1c3QgbmVlZCB0byBncmFiIHRoZSByZXR1cm5lZCBvcHRpb25zLgotICAgIFdLRXh0 cmFjdFdvcmREZWZpbml0aW9uVG9rZW5SYW5nZUZyb21Db250ZXh0dWFsU3RyaW5nKGZ1bGxQbGFp blRleHRTdHJpbmcsIHJhbmdlVG9QYXNzLCAmb3B0aW9ucyk7Ci0KKyAgICBSZWZQdHI8UmFuZ2U+ IHNlbGVjdGVkUmFuZ2UgPSByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oZnJh bWUsIHNlbGVjdGlvbiwgJm9wdGlvbnMpOwogICAgIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9y UmFuZ2UoZnJhbWUsICpzZWxlY3RlZFJhbmdlLCBvcHRpb25zKTsKIH0KIAo= 240916 2014-11-03 23:31:30 -0800 2014-11-03 23:44:27 -0800 Patch bug-138353-20141103233140.patch text/plain 7409 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uYzNhMTcyMzBhNzRhNDZjMzZiOTc5MDMzYjNkZjA4 YTI4NWUzMmI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTExLTAzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIERpY3Rpb25hcnkg bG9va3VwIHBhbmVsIHBvcHMgdXAgYXQgcmFuZG9tIHdoZW4gY2xpY2tpbmcgb24gc2VsZWN0ZWQg dGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4 MzUzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODg2MTQwNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgor ICAgICAgICAoV2ViS2l0OjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24pOgor ICAgICAgICAoV2ViS2l0OjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBBdEhpdFRlc3RSZXN1bHQp OgorICAgICAgICBGYWN0b3IgcmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uIG91 dCBvZiBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvclNlbGVjdGlvbi4KKworICAgICAgICBNYWtl IHVzZSBvZiByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24gaW4gcmFuZ2VGb3JE aWN0aW9uYXJ5TG9va3VwQXRIaXRUZXN0UmVzdWx0LAorICAgICAgICByZXR1cm5pbmcgdGhlIHNl bGVjdGlvbi1iYXNlZCByYW5nZSBpZiB0aGUgaGl0IHRlc3QgaW50ZXJzZWN0cyB0aGUgc2VsZWN0 ZWQgdGV4dC4KKyAgICAgICAgUHJldmlvdXNseSwgd2Ugd2VyZSBqdXN0IGdvaW5nIGZvcndhcmQg d2l0aCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvclNlbGVjdGlvbiwKKyAgICAgICAgd2hpY2gg d291bGQgYWN0dWFsbHkgKmRvKiB0aGUgbG9va3VwLCBldmVuIGlmIHdlIGp1c3Qgd2FudGVkIHRv IHJldHJpZXZlIHRoZSByYW5nZS4KKworICAgICAgICBNYWtlIHJhbmdlRm9yRGljdGlvbmFyeUxv b2t1cCogc3RhdGljLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1EaWN0aW9u YXJ5TG9va3VwRm9yU2VsZWN0aW9uKToKKyAgICAgICAgTWFrZSB1c2Ugb2YgcmFuZ2VGb3JEaWN0 aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uLgorCiAyMDE0LTExLTAzICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEV4cG9zZSB2aXNpYmxlRGVidWdPdmVy bGF5UmVnaW9ucyBwcmVmIHZpYSB0aGUgV0syIEMgU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA4MzRkMzE4N2E2ZTgyNzUzMzk4MThkNWI4NTUx ZmIwNDcyMTJjMDdmLi4wYWZjMDJiYTk0YjY1MjU1OWM1YzMwYmNhOTJlMmYzY2UxZjViNTk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY1Miw4 ICs2NTIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBkdW1teShib29sJik7CiAKICNpZiBQTEFURk9S TShDT0NPQSkKLSAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uKFdl YkNvcmU6OkZyYW1lKiwgY29uc3QgV2ViQ29yZTo6VmlzaWJsZVNlbGVjdGlvbiYpOwotCiAgICAg Ym9vbCBpc1NwZWFraW5nKCk7CiAgICAgdm9pZCBzcGVhayhjb25zdCBTdHJpbmcmKTsKICAgICB2 b2lkIHN0b3BTcGVha2luZygpOwpAQCAtOTcyLDkgKzk3MCw5IEBAIHByaXZhdGU6CiAKICNpZiBQ TEFURk9STShDT0NPQSkKICAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlv bihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jik7Ci0gICAgdm9pZCBwZXJmb3JtRGljdGlvbmFy eUxvb2t1cEZvclJhbmdlKFdlYkNvcmU6OkZyYW1lKiwgV2ViQ29yZTo6UmFuZ2UmLCBOU0RpY3Rp b25hcnkgKm9wdGlvbnMpOwotICAgIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IHJhbmdlRm9y RGljdGlvbmFyeUxvb2t1cEF0SGl0VGVzdFJlc3VsdChjb25zdCBXZWJDb3JlOjpIaXRUZXN0UmVz dWx0JiwgTlNEaWN0aW9uYXJ5ICoqKTsKICAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3Vw T2ZDdXJyZW50U2VsZWN0aW9uKCk7CisgICAgdm9pZCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZv clNlbGVjdGlvbihXZWJDb3JlOjpGcmFtZSosIGNvbnN0IFdlYkNvcmU6OlZpc2libGVTZWxlY3Rp b24mKTsKKyAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9yUmFuZ2UoV2ViQ29yZTo6 RnJhbWUqLCBXZWJDb3JlOjpSYW5nZSYsIE5TRGljdGlvbmFyeSAqb3B0aW9ucyk7CiAKICAgICB2 b2lkIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYg d2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm IHdpbmRvd0ZyYW1lSW5VbmZsaXBwZWRTY3JlZW5Db29yZGluYXRlcywgY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpG bG9hdFBvaW50JiBhY2Nlc3NpYmlsaXR5Vmlld0Nvb3JkaW5hdGVzKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IDRi YjJlMjUzZDM5MzE3OGZjNDAwNjY0OWE1ZmE0NGM2ZmE0NTQ5OTUuLjc3OTdhNWFiNDlhM2Q0NmY1 MDg2ZDUyYmE4Njg4NjM2YmE2NzA5YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTUyMiw3ICs1MjIsMzIgQEAgc3Rh dGljIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdlRXhwYW5kZWRBcm91bmRQb3NpdGlvbkJ5Q2hhcmFj dGVycyhjb25zdCBWaXNpYmxlUG8KICAgICByZXR1cm4gbWFrZVJhbmdlKHN0YXJ0LCBlbmQpOwog fQogCi1QYXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdlOjpyYW5nZUZvckRpY3Rpb25hcnlMb29rdXBB dEhpdFRlc3RSZXN1bHQoY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCYgaGl0VGVzdFJlc3Vs dCwgTlNEaWN0aW9uYXJ5ICoqb3B0aW9ucykKK3N0YXRpYyBQYXNzUmVmUHRyPFJhbmdlPiByYW5n ZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBWaXNp YmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24sIE5TRGljdGlvbmFyeSAqKm9wdGlvbnMpCit7CisgICAg UmVmUHRyPFJhbmdlPiBzZWxlY3RlZFJhbmdlID0gc2VsZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdl KCk7CisgICAgaWYgKCFzZWxlY3RlZFJhbmdlKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKwor ICAgIFZpc2libGVQb3NpdGlvbiBzZWxlY3Rpb25TdGFydCA9IHNlbGVjdGlvbi52aXNpYmxlU3Rh cnQoKTsKKyAgICBWaXNpYmxlUG9zaXRpb24gc2VsZWN0aW9uRW5kID0gc2VsZWN0aW9uLnZpc2li bGVFbmQoKTsKKworICAgIC8vIEFzIGNvbnRleHQsIHdlIGFyZSBnb2luZyB0byB1c2UgdGhlIHN1 cnJvdW5kaW5nIHBhcmFncmFwaHMgb2YgdGV4dC4KKyAgICBWaXNpYmxlUG9zaXRpb24gcGFyYWdy YXBoU3RhcnQgPSBzdGFydE9mUGFyYWdyYXBoKHNlbGVjdGlvblN0YXJ0KTsKKyAgICBWaXNpYmxl UG9zaXRpb24gcGFyYWdyYXBoRW5kID0gZW5kT2ZQYXJhZ3JhcGgoc2VsZWN0aW9uRW5kKTsKKwor ICAgIGludCBsZW5ndGhUb1NlbGVjdGlvblN0YXJ0ID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0 aChtYWtlUmFuZ2UocGFyYWdyYXBoU3RhcnQsIHNlbGVjdGlvblN0YXJ0KS5nZXQoKSk7CisgICAg aW50IGxlbmd0aFRvU2VsZWN0aW9uRW5kID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtl UmFuZ2UocGFyYWdyYXBoU3RhcnQsIHNlbGVjdGlvbkVuZCkuZ2V0KCkpOworICAgIE5TUmFuZ2Ug cmFuZ2VUb1Bhc3MgPSBOU01ha2VSYW5nZShsZW5ndGhUb1NlbGVjdGlvblN0YXJ0LCBsZW5ndGhU b1NlbGVjdGlvbkVuZCAtIGxlbmd0aFRvU2VsZWN0aW9uU3RhcnQpOworCisgICAgU3RyaW5nIGZ1 bGxQbGFpblRleHRTdHJpbmcgPSBwbGFpblRleHQobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBw YXJhZ3JhcGhFbmQpLmdldCgpKTsKKworICAgIC8vIFNpbmNlIHdlIGFscmVhZHkgaGF2ZSB0aGUg cmFuZ2Ugd2Ugd2FudCwgd2UganVzdCBuZWVkIHRvIGdyYWIgdGhlIHJldHVybmVkIG9wdGlvbnMu CisgICAgV0tFeHRyYWN0V29yZERlZmluaXRpb25Ub2tlblJhbmdlRnJvbUNvbnRleHR1YWxTdHJp bmcoZnVsbFBsYWluVGV4dFN0cmluZywgcmFuZ2VUb1Bhc3MsIG9wdGlvbnMpOworICAgIAorICAg IHJldHVybiBzZWxlY3RlZFJhbmdlLnJlbGVhc2UoKTsKK30KKworc3RhdGljIFBhc3NSZWZQdHI8 UmFuZ2U+IHJhbmdlRm9yRGljdGlvbmFyeUxvb2t1cEF0SGl0VGVzdFJlc3VsdChjb25zdCBIaXRU ZXN0UmVzdWx0JiBoaXRUZXN0UmVzdWx0LCBOU0RpY3Rpb25hcnkgKipvcHRpb25zKQogewogICAg IE5vZGUqIG5vZGUgPSBoaXRUZXN0UmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpOwogICAgIGlm ICghbm9kZSkKQEAgLTU0NCwxMSArNTY5LDkgQEAgUGFzc1JlZlB0cjxSYW5nZT4gV2ViUGFnZTo6 cmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3VwQXRIaXRUZXN0UmVzdWx0KGNvbnN0IFdlYkNvcmUKICAg ICBpZiAocG9zaXRpb24uaXNOdWxsKCkpCiAgICAgICAgIHBvc2l0aW9uID0gZmlyc3RQb3NpdGlv bkluT3JCZWZvcmVOb2RlKG5vZGUpOwogCi0gICAgVmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rpb24g PSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVjdGlv bigpLnNlbGVjdGlvbigpOwotICAgIGlmIChzaG91bGRVc2VTZWxlY3Rpb24ocG9zaXRpb24sIHNl bGVjdGlvbikpIHsKLSAgICAgICAgcGVyZm9ybURpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24o ZnJhbWUsIHNlbGVjdGlvbik7Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIH0KKyAgICBW aXNpYmxlU2VsZWN0aW9uIHNlbGVjdGlvbiA9IGZyYW1lLT5wYWdlKCktPmZvY3VzQ29udHJvbGxl cigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOworICAgIGlm IChzaG91bGRVc2VTZWxlY3Rpb24ocG9zaXRpb24sIHNlbGVjdGlvbikpCisgICAgICAgIHJldHVy biByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oZnJhbWUsIGZyYW1lLT5zZWxl Y3Rpb24oKS5zZWxlY3Rpb24oKSwgb3B0aW9ucyk7CiAKICAgICAvLyBBcyBjb250ZXh0LCB3ZSBh cmUgZ29pbmcgdG8gdXNlIDI1MCBjaGFyYWN0ZXJzIG9mIHRleHQgYmVmb3JlIGFuZCBhZnRlciB0 aGUgcG9pbnQuCiAgICAgUmVmUHRyPFJhbmdlPiBmdWxsQ2hhcmFjdGVyUmFuZ2UgPSByYW5nZUV4 cGFuZGVkQXJvdW5kUG9zaXRpb25CeUNoYXJhY3RlcnMocG9zaXRpb24sIDI1MCk7CkBAIC01ODYs MjggKzYwOSw4IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9ybURpY3Rpb25hcnlMb29rdXBBdExvY2F0 aW9uKGNvbnN0IEZsb2F0UG9pbnQmIGZsb2F0UG9pbnQpCiAKIHZvaWQgV2ViUGFnZTo6cGVyZm9y bURpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBWaXNpYmxl U2VsZWN0aW9uJiBzZWxlY3Rpb24pCiB7Ci0gICAgUmVmUHRyPFJhbmdlPiBzZWxlY3RlZFJhbmdl ID0gc2VsZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdlKCk7Ci0gICAgaWYgKCFzZWxlY3RlZFJhbmdl KQotICAgICAgICByZXR1cm47Ci0KICAgICBOU0RpY3Rpb25hcnkgKm9wdGlvbnMgPSBuaWw7Ci0K LSAgICBWaXNpYmxlUG9zaXRpb24gc2VsZWN0aW9uU3RhcnQgPSBzZWxlY3Rpb24udmlzaWJsZVN0 YXJ0KCk7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIHNlbGVjdGlvbkVuZCA9IHNlbGVjdGlvbi52aXNp YmxlRW5kKCk7Ci0KLSAgICAvLyBBcyBjb250ZXh0LCB3ZSBhcmUgZ29pbmcgdG8gdXNlIHRoZSBz dXJyb3VuZGluZyBwYXJhZ3JhcGhzIG9mIHRleHQuCi0gICAgVmlzaWJsZVBvc2l0aW9uIHBhcmFn cmFwaFN0YXJ0ID0gc3RhcnRPZlBhcmFncmFwaChzZWxlY3Rpb25TdGFydCk7Ci0gICAgVmlzaWJs ZVBvc2l0aW9uIHBhcmFncmFwaEVuZCA9IGVuZE9mUGFyYWdyYXBoKHNlbGVjdGlvbkVuZCk7Ci0K LSAgICBpbnQgbGVuZ3RoVG9TZWxlY3Rpb25TdGFydCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5n dGgobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBzZWxlY3Rpb25TdGFydCkuZ2V0KCkpOwotICAg IGludCBsZW5ndGhUb1NlbGVjdGlvbkVuZCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFr ZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBzZWxlY3Rpb25FbmQpLmdldCgpKTsKLSAgICBOU1Jhbmdl IHJhbmdlVG9QYXNzID0gTlNNYWtlUmFuZ2UobGVuZ3RoVG9TZWxlY3Rpb25TdGFydCwgbGVuZ3Ro VG9TZWxlY3Rpb25FbmQgLSBsZW5ndGhUb1NlbGVjdGlvblN0YXJ0KTsKLQotICAgIFN0cmluZyBm dWxsUGxhaW5UZXh0U3RyaW5nID0gcGxhaW5UZXh0KG1ha2VSYW5nZShwYXJhZ3JhcGhTdGFydCwg cGFyYWdyYXBoRW5kKS5nZXQoKSk7Ci0KLSAgICAvLyBTaW5jZSB3ZSBhbHJlYWR5IGhhdmUgdGhl IHJhbmdlIHdlIHdhbnQsIHdlIGp1c3QgbmVlZCB0byBncmFiIHRoZSByZXR1cm5lZCBvcHRpb25z LgotICAgIFdLRXh0cmFjdFdvcmREZWZpbml0aW9uVG9rZW5SYW5nZUZyb21Db250ZXh0dWFsU3Ry aW5nKGZ1bGxQbGFpblRleHRTdHJpbmcsIHJhbmdlVG9QYXNzLCAmb3B0aW9ucyk7Ci0KKyAgICBS ZWZQdHI8UmFuZ2U+IHNlbGVjdGVkUmFuZ2UgPSByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBGb3JT ZWxlY3Rpb24oZnJhbWUsIHNlbGVjdGlvbiwgJm9wdGlvbnMpOwogICAgIHBlcmZvcm1EaWN0aW9u YXJ5TG9va3VwRm9yUmFuZ2UoZnJhbWUsICpzZWxlY3RlZFJhbmdlLCBvcHRpb25zKTsKIH0KIAo=