127834 2014-01-29 00:30:22 -0800 EventHandler::handleMouseReleaseEvent shouldn't call updateSelectionCachesIfSelectionIsInsideTextFormControl and selectFrameElementInParentIfFullySelected 2014-01-29 17:49:56 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127831 127832 1 rniwa rniwa ap darin enrica kling koivisto oldest_to_newest 973318 0 rniwa 2014-01-29 00:30:22 -0800 It's bogus to call notifyRendererOfSelectionChange and selectFrameElementInParentIfFullySelected in EventHandler::handleMouseReleaseEvent since setSelection should be calling those functions as needed. We do this because FrameSelection::setNonDirectionalSelectionIfNeeded doesn't call setSelection with EUserTriggered option :( 973324 1 222559 rniwa 2014-01-29 01:54:00 -0800 Created attachment 222559 Cleanup 973549 2 rniwa 2014-01-29 17:49:56 -0800 Committed r163056: <http://trac.webkit.org/changeset/163056> 222559 2014-01-29 01:54:00 -0800 2014-01-29 09:55:08 -0800 Cleanup bug-127834-20140129015359.patch text/plain 8298 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE0LTAxLTI5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50SGFuZGxlcjo6aGFuZGxl TW91c2VSZWxlYXNlRXZlbnQgc2hvdWxkbid0IGNhbGwgdXBkYXRlU2VsZWN0aW9uQ2FjaGVzSWZT ZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29udHJvbAorICAgICAgICBhbmQgc2VsZWN0RnJhbWVF bGVtZW50SW5QYXJlbnRJZkZ1bGx5U2VsZWN0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzgzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdGhlIGNhbGxzIGFuZCBtYWRlIHNldE5vbkRp cmVjdGlvbmFsU2VsZWN0aW9uSWZOZWVkZWQgcGFzcyBpbiBVc2VyVHJpZ2dlcmVkIG9wdGlvbi4K KworICAgICAgICBJbiBhZGRpdGlvbiwgcmVtb3ZlZCB0aGUgcmF0aGVyIGVycm9yLXByb25lIGZ1 bmN0aW9uIG92ZXJyaWRlIG9mIHNldFNlbGVjdGlvbiBzaW5jZSBUZXh0R3JhbnVsYXJpdHksCisg ICAgICAgIHdoaWNoIGlzIGFuIGVudW0sIGNvdWxkIGJlIGltcGxpY2l0bHkgY29lcmNlZCBpbnRv IFNldFNlbGVjdGlvbk9wdGlvbnMgd2hpY2ggaXMgYSB0eXBlZGVmZWQgdW5zaWduZWQgaW50Lgor CisgICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVNlbGVjdGlvbjo6c2V0U2VsZWN0aW9uQnlNb3VzZUlmRGlmZmVyZW50KTogUmVuYW1l ZCBmcm9tIHNldE5vbkRpcmVjdGlvbmFsU2VsZWN0aW9uSWZOZWVkZWQuCisgICAgICAgIFBhc3Mg aW4gRG9Ob3RSZXZlYWxTZWxlY3Rpb24gdG8gYXZvaWQgcmV2ZWFsaW5nIHRoZSBzZWxlY3Rpb24g dG8gcHJlc2VydmUgdGhlIGV4aXN0aW5nIGJlaGF2aW9yLgorICAgICAgICBUaGVyZSBhcmUgdHdv IGxheW91dCB0ZXN0cyB0aGF0IGZhaWwgd2l0aG91dCB0aGlzLgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVTZWxlY3Rpb246OnNldFNlbGVjdGlvbik6IENoZWNrIHRoZSBuZXdseSBhZGRlZWQgRG9O b3RSZXZlYWxTZWxlY3Rpb24gb3B0aW9uLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rp b246OndvcmRTZWxlY3Rpb25Db250YWluaW5nQ2FyZXRTZWxlY3Rpb24pOiBDYWxsCisKKyAgICAg ICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6IE1hZGUgdXBkYXRlU2VsZWN0aW9uQ2FjaGVz SWZTZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29udHJvbCBhbmQKKyAgICAgICAgc2VsZWN0RnJh bWVFbGVtZW50SW5QYXJlbnRJZkZ1bGx5U2VsZWN0ZWQgcHJpdmF0ZSBhcyB0aGV5IGFyZSBubyBs b25nZXIgY2FsbGVkIG91dHNpZGUgb2YgRnJhbWVTZWxlY3Rpb24uCisKKyAgICAgICAgKiBwYWdl L0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnVwZGF0 ZVNlbGVjdGlvbkZvck1vdXNlRG93bkRpc3BhdGNoaW5nU2VsZWN0U3RhcnQpOgorICAgICAgICAo V2ViQ29yZTo6RXZlbnRIYW5kbGVyOjp1cGRhdGVTZWxlY3Rpb25Gb3JNb3VzZURyYWcpOgorICAg ICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudCk6IFJl bW92ZWQgY2FsbHMgdG8gdGhlIGZ1bmN0aW9ucy4KKwogMjAxNC0wMS0yOSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZW5hbWUgbm90aWZ5UmVuZGVyZXJPZlNl bGVjdGlvbkNoYW5nZQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv bi5jcHAJKHJldmlzaW9uIDE2MzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjAsNyArMjIwLDcgQEAgc3RhdGljIHZv aWQgYWRqdXN0RW5kcG9pbnRzQXRCaWRpQm91bmRhcgogICAgIH0KIH0KIAotdm9pZCBGcmFtZVNl bGVjdGlvbjo6c2V0Tm9uRGlyZWN0aW9uYWxTZWxlY3Rpb25JZk5lZWRlZChjb25zdCBWaXNpYmxl U2VsZWN0aW9uJiBwYXNzZWROZXdTZWxlY3Rpb24sIFRleHRHcmFudWxhcml0eSBncmFudWxhcml0 eSwKK3ZvaWQgRnJhbWVTZWxlY3Rpb246OnNldFNlbGVjdGlvbkJ5TW91c2VJZkRpZmZlcmVudChj b25zdCBWaXNpYmxlU2VsZWN0aW9uJiBwYXNzZWROZXdTZWxlY3Rpb24sIFRleHRHcmFudWxhcml0 eSBncmFudWxhcml0eSwKICAgICBFbmRQb2ludHNBZGp1c3RtZW50TW9kZSBlbmRwb2ludHNBZGp1 c3RtZW50TW9kZSkKIHsKICAgICBWaXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbiA9IHBhc3Nl ZE5ld1NlbGVjdGlvbjsKQEAgLTI0Nyw3ICsyNDcsNyBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpz ZXROb25EaXJlY3Rpb25hbFNlCiAgICAgaWYgKG1fc2VsZWN0aW9uID09IG5ld1NlbGVjdGlvbiB8 fCAhc2hvdWxkQ2hhbmdlU2VsZWN0aW9uKG5ld1NlbGVjdGlvbikpCiAgICAgICAgIHJldHVybjsK IAotICAgIHNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24sIGdyYW51bGFyaXR5KTsKKyAgICBzZXRT ZWxlY3Rpb24obmV3U2VsZWN0aW9uLCBVc2VyVHJpZ2dlcmVkIHwgRG9Ob3RSZXZlYWxTZWxlY3Rp b24gfCBDbG9zZVR5cGluZyB8IENsZWFyVHlwaW5nU3R5bGUsIEFsaWduQ3Vyc29yT25TY3JvbGxJ Zk5lZWRlZCwgZ3JhbnVsYXJpdHkpOwogfQogCiB2b2lkIEZyYW1lU2VsZWN0aW9uOjpzZXRTZWxl Y3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgbmV3U2VsZWN0aW9uLCBTZXRTZWxlY3Rpb25P cHRpb25zIG9wdGlvbnMsIEN1cnNvckFsaWduT25TY3JvbGwgYWxpZ24sIFRleHRHcmFudWxhcml0 eSBncmFudWxhcml0eSkKQEAgLTMyMiw3ICszMjIsNyBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpz ZXRTZWxlY3Rpb24oY29uc3QgCiAgICAgc2VsZWN0RnJhbWVFbGVtZW50SW5QYXJlbnRJZkZ1bGx5 U2VsZWN0ZWQoKTsKICAgICB1cGRhdGVTZWxlY3Rpb25DYWNoZXNJZlNlbGVjdGlvbklzSW5zaWRl VGV4dEZvcm1Db250cm9sKHVzZXJUcmlnZ2VyZWQpOwogICAgIG1fZnJhbWUtPmVkaXRvcigpLnJl c3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24ob2xkU2VsZWN0aW9uLCBvcHRpb25zKTsKLSAgICBpZiAo dXNlclRyaWdnZXJlZCA9PSBVc2VyVHJpZ2dlcmVkKSB7CisgICAgaWYgKHVzZXJUcmlnZ2VyZWQg PT0gVXNlclRyaWdnZXJlZCAmJiAhKG9wdGlvbnMgJiBEb05vdFJldmVhbFNlbGVjdGlvbikpIHsK ICAgICAgICAgU2Nyb2xsQWxpZ25tZW50IGFsaWdubWVudDsKIAogICAgICAgICBpZiAobV9mcmFt ZS0+ZWRpdG9yKCkuYmVoYXZpb3IoKS5zaG91bGRDZW50ZXJBbGlnbldoZW5TZWxlY3Rpb25Jc1Jl dmVhbGVkKCkpCkBAIC0yNDI5LDcgKzI0MjksNyBAQCBWaXNpYmxlU2VsZWN0aW9uIEZyYW1lU2Vs ZWN0aW9uOjp3b3JkU2VsCiAKICAgICBWaXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbiA9IGZy YW1lU2VsZWN0aW9uLnNlbGVjdGlvbigpOwogICAgIG5ld1NlbGVjdGlvbi5leHBhbmRVc2luZ0dy YW51bGFyaXR5KFdvcmRHcmFudWxhcml0eSk7Ci0gICAgZnJhbWVTZWxlY3Rpb24uc2V0U2VsZWN0 aW9uKG5ld1NlbGVjdGlvbiwgZnJhbWVTZWxlY3Rpb24uZ3JhbnVsYXJpdHkoKSk7CisgICAgZnJh bWVTZWxlY3Rpb24uc2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgQ2xvc2VUeXBpbmcgfCBDbGVh clR5cGluZ1N0eWxlLCBBbGlnbkN1cnNvck9uU2Nyb2xsSWZOZWVkZWQsIGZyYW1lU2VsZWN0aW9u LmdyYW51bGFyaXR5KCkpOwogCiAgICAgUG9zaXRpb24gc3RhcnRQb3MoZnJhbWVTZWxlY3Rpb24u c2VsZWN0aW9uKCkuc3RhcnQoKSk7CiAgICAgUG9zaXRpb24gZW5kUG9zKGZyYW1lU2VsZWN0aW9u LnNlbGVjdGlvbigpLmVuZCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2Vs ZWN0aW9uLmgJKHJldmlzaW9uIDE2MzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJh bWVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTI1LDYgKzEyNSw3IEBAIHB1YmxpYzoK ICAgICAgICAgRG9Ob3RTZXRGb2N1cyA9IDEgPDwgNCwKICAgICAgICAgRGljdGF0aW9uVHJpZ2dl cmVkID0gMSA8PCA1LAogICAgICAgICBEb05vdFVwZGF0ZUFwcGVhcmFuY2UgPSAxIDw8IDYsCisg ICAgICAgIERvTm90UmV2ZWFsU2VsZWN0aW9uID0gMSA8PCA3LAogICAgIH07CiAgICAgdHlwZWRl ZiB1bnNpZ25lZCBTZXRTZWxlY3Rpb25PcHRpb25zOyAvLyBVbmlvbiBvZiB2YWx1ZXMgaW4gU2V0 U2VsZWN0aW9uT3B0aW9uIGFuZCBFVXNlclRyaWdnZXJlZAogICAgIHN0YXRpYyBpbmxpbmUgRVVz ZXJUcmlnZ2VyZWQgc2VsZWN0aW9uT3B0aW9uc1RvVXNlclRyaWdnZXJlZChTZXRTZWxlY3Rpb25P cHRpb25zIG9wdGlvbnMpCkBAIC0xNDksMTUgKzE1MCwxMSBAQCBwdWJsaWM6CiAKICAgICBjb25z dCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX3NlbGVjdGlv bjsgfQogICAgIHZvaWQgc2V0U2VsZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBTZXRT ZWxlY3Rpb25PcHRpb25zID0gQ2xvc2VUeXBpbmcgfCBDbGVhclR5cGluZ1N0eWxlLCBDdXJzb3JB bGlnbk9uU2Nyb2xsID0gQWxpZ25DdXJzb3JPblNjcm9sbElmTmVlZGVkLCBUZXh0R3JhbnVsYXJp dHkgPSBDaGFyYWN0ZXJHcmFudWxhcml0eSk7Ci0gICAgdm9pZCBzZXRTZWxlY3Rpb24oY29uc3Qg VmlzaWJsZVNlbGVjdGlvbiYgc2VsZWN0aW9uLCBUZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkp IHsgc2V0U2VsZWN0aW9uKHNlbGVjdGlvbiwgQ2xvc2VUeXBpbmcgfCBDbGVhclR5cGluZ1N0eWxl LCBBbGlnbkN1cnNvck9uU2Nyb2xsSWZOZWVkZWQsIGdyYW51bGFyaXR5KTsgfQogICAgIGJvb2wg c2V0U2VsZWN0ZWRSYW5nZShSYW5nZSosIEVBZmZpbml0eSwgYm9vbCBjbG9zZVR5cGluZyk7CiAg ICAgdm9pZCBzZWxlY3RBbGwoKTsKICAgICB2b2lkIGNsZWFyKCk7CiAgICAgdm9pZCBwcmVwYXJl Rm9yRGVzdHJ1Y3Rpb24oKTsKIAotICAgIC8vIENhbGwgdGhpcyBhZnRlciBkb2luZyB1c2VyLXRy aWdnZXJlZCBzZWxlY3Rpb25zIHRvIG1ha2UgaXQgZWFzeSB0byBkZWxldGUgdGhlIGZyYW1lIHlv dSBlbnRpcmVseSBzZWxlY3RlZC4KLSAgICB2b2lkIHNlbGVjdEZyYW1lRWxlbWVudEluUGFyZW50 SWZGdWxseVNlbGVjdGVkKCk7Ci0KICAgICBib29sIGNvbnRhaW5zKGNvbnN0IExheW91dFBvaW50 Jik7CiAKICAgICBWaXNpYmxlU2VsZWN0aW9uOjpTZWxlY3Rpb25UeXBlIHNlbGVjdGlvblR5cGUo KSBjb25zdCB7IHJldHVybiBtX3NlbGVjdGlvbi5zZWxlY3Rpb25UeXBlKCk7IH0KQEAgLTI3Miw4 ICsyNjksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzaG91bGRDaGFuZ2VTZWxlY3Rpb24oY29uc3Qg VmlzaWJsZVNlbGVjdGlvbiYpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkRGVsZXRlU2VsZWN0aW9u KGNvbnN0IFZpc2libGVTZWxlY3Rpb24mKSBjb25zdDsKICAgICBlbnVtIEVuZFBvaW50c0FkanVz dG1lbnRNb2RlIHsgQWRqdXN0RW5kcG9pbnRzQXRCaWRpQm91bmRhcnksIERvTm90QWRqc3V0RW5k cG9pbnRzIH07Ci0gICAgdm9pZCBzZXROb25EaXJlY3Rpb25hbFNlbGVjdGlvbklmTmVlZGVkKGNv bnN0IFZpc2libGVTZWxlY3Rpb24mLCBUZXh0R3JhbnVsYXJpdHksIEVuZFBvaW50c0FkanVzdG1l bnRNb2RlID0gRG9Ob3RBZGpzdXRFbmRwb2ludHMpOwotICAgIHZvaWQgdXBkYXRlU2VsZWN0aW9u Q2FjaGVzSWZTZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29udHJvbChFVXNlclRyaWdnZXJlZCk7 CisgICAgdm9pZCBzZXRTZWxlY3Rpb25CeU1vdXNlSWZEaWZmZXJlbnQoY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYsIFRleHRHcmFudWxhcml0eSwgRW5kUG9pbnRzQWRqdXN0bWVudE1vZGUgPSBEb05v dEFkanN1dEVuZHBvaW50cyk7CiAKICAgICB2b2lkIHBhaW50RHJhZ0NhcmV0KEdyYXBoaWNzQ29u dGV4dCosIGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3QpIGNv bnN0OwogCkBAIC0zMjEsNiArMzE3LDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBub3RpZnlBY2Nl c3NpYmlsaXR5Rm9yU2VsZWN0aW9uQ2hhbmdlKCk7CiAjZW5kaWYKIAorICAgIHZvaWQgdXBkYXRl U2VsZWN0aW9uQ2FjaGVzSWZTZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29udHJvbChFVXNlclRy aWdnZXJlZCk7CisKKyAgICB2b2lkIHNlbGVjdEZyYW1lRWxlbWVudEluUGFyZW50SWZGdWxseVNl bGVjdGVkKCk7CisKICAgICB2b2lkIHNldEZvY3VzZWRFbGVtZW50SWZOZWVkZWQoKTsKICAgICB2 b2lkIGZvY3VzZWRPckFjdGl2ZVN0YXRlQ2hhbmdlZCgpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiAxNjMwMTIpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwNSw3ICs1MDUsNyBAQCBi b29sIEV2ZW50SGFuZGxlcjo6dXBkYXRlU2VsZWN0aW9uRm9yTW91CiAgICAgICAgIG1fc2VsZWN0 aW9uSW5pdGlhdGlvblN0YXRlID0gUGxhY2VkQ2FyZXQ7CiAgICAgfQogCi0gICAgbV9mcmFtZS5z ZWxlY3Rpb24oKS5zZXROb25EaXJlY3Rpb25hbFNlbGVjdGlvbklmTmVlZGVkKHNlbGVjdGlvbiwg Z3JhbnVsYXJpdHkpOworICAgIG1fZnJhbWUuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uQnlNb3Vz ZUlmRGlmZmVyZW50KHNlbGVjdGlvbiwgZ3JhbnVsYXJpdHkpOwogCiAgICAgcmV0dXJuIHRydWU7 CiB9CkBAIC05MTcsNyArOTE3LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnVwZGF0ZVNlbGVjdGlv bkZvck1vdQogICAgIGlmIChtX2ZyYW1lLnNlbGVjdGlvbigpLmdyYW51bGFyaXR5KCkgIT0gQ2hh cmFjdGVyR3JhbnVsYXJpdHkpCiAgICAgICAgIG5ld1NlbGVjdGlvbi5leHBhbmRVc2luZ0dyYW51 bGFyaXR5KG1fZnJhbWUuc2VsZWN0aW9uKCkuZ3JhbnVsYXJpdHkoKSk7CiAKLSAgICBtX2ZyYW1l LnNlbGVjdGlvbigpLnNldE5vbkRpcmVjdGlvbmFsU2VsZWN0aW9uSWZOZWVkZWQobmV3U2VsZWN0 aW9uLCBtX2ZyYW1lLnNlbGVjdGlvbigpLmdyYW51bGFyaXR5KCksCisgICAgbV9mcmFtZS5zZWxl Y3Rpb24oKS5zZXRTZWxlY3Rpb25CeU1vdXNlSWZEaWZmZXJlbnQobmV3U2VsZWN0aW9uLCBtX2Zy YW1lLnNlbGVjdGlvbigpLmdyYW51bGFyaXR5KCksCiAgICAgICAgIEZyYW1lU2VsZWN0aW9uOjpB ZGp1c3RFbmRwb2ludHNBdEJpZGlCb3VuZGFyeSk7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKERSQUdf U1VQUE9SVCkKQEAgLTk4NCwxMCArOTg0LDYgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1v dXNlUmVsZWFzZUV2ZQogICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICB9CiAKLSAgICBtX2Zy YW1lLnNlbGVjdGlvbigpLnVwZGF0ZVNlbGVjdGlvbkNhY2hlc0lmU2VsZWN0aW9uSXNJbnNpZGVU ZXh0Rm9ybUNvbnRyb2woVXNlclRyaWdnZXJlZCk7Ci0KLSAgICBtX2ZyYW1lLnNlbGVjdGlvbigp LnNlbGVjdEZyYW1lRWxlbWVudEluUGFyZW50SWZGdWxseVNlbGVjdGVkKCk7Ci0KICAgICBpZiAo ZXZlbnQuZXZlbnQoKS5idXR0b24oKSA9PSBNaWRkbGVCdXR0b24pIHsKICAgICAgICAgLy8gSWdu b3JlIGhhbmRsZWQsIHNpbmNlIHdlIHdhbnQgdG8gcGFzdGUgdG8gd2hlcmUgdGhlIGNhcmV0IHdh cyBwbGFjZWQgYW55d2F5LgogICAgICAgICBoYW5kbGVkID0gaGFuZGxlUGFzdGVHbG9iYWxTZWxl Y3Rpb24oZXZlbnQuZXZlbnQoKSkgfHwgaGFuZGxlZDsK