85840 2012-05-07 16:04:01 -0700 REGRESSION (r101575): Chinese input is broken when composing mail in iCloud using Safari 2012-05-10 01:17:37 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica rniwa oldest_to_newest 618050 0 enrica 2012-05-07 16:04:01 -0700 * STEPS TO REPRODUCE 1. login to iCloud using Safari 2. compose a new mail 3. choose Pinyin - Simplified as input source 4. type "jintian" in the mail body * RESULTS After step4, "jin ti" is committed directly and the candidate window shows the candidates for "an". <rdar://problem/11115520> 618061 1 140615 enrica 2012-05-07 16:11:07 -0700 Created attachment 140615 Patch 618064 2 140615 ap 2012-05-07 16:14:28 -0700 Comment on attachment 140615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140615&action=review Enrica and myself looked into making a regression test, and determined it impractical. We don't want adding new tests for DOM modification events, and simulating what the page does without mutation events cannot be tested because we don't have appropriate input context hooks. > Source/WebCore/editing/InsertTextCommand.cpp:119 > + deleteSelection(false, true, true, false, false); We should make this readable by using enums or a parameter struct. 618068 3 enrica 2012-05-07 16:19:19 -0700 (In reply to comment #2) > (From update of attachment 140615 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140615&action=review > > Enrica and myself looked into making a regression test, and determined it impractical. We don't want adding new tests for DOM modification events, and simulating what the page does without mutation events cannot be tested because we don't have appropriate input context hooks. > > > Source/WebCore/editing/InsertTextCommand.cpp:119 > > + deleteSelection(false, true, true, false, false); > > We should make this readable by using enums or a parameter struct. I agree. It was already very unreadable. I want to get rid of all these parameters and replace them with an enum whose values can be combined with an or. I will do that in a separate patch. Thanks for the review. 618077 4 enrica 2012-05-07 16:27:36 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 140615 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=140615&action=review > > > > Enrica and myself looked into making a regression test, and determined it impractical. We don't want adding new tests for DOM modification events, and simulating what the page does without mutation events cannot be tested because we don't have appropriate input context hooks. > > > > > Source/WebCore/editing/InsertTextCommand.cpp:119 > > > + deleteSelection(false, true, true, false, false); > > > > We should make this readable by using enums or a parameter struct. > > I agree. It was already very unreadable. I want to get rid of all these parameters and replace them with an enum whose values can be combined with an or. I will do that in a separate patch. > Thanks for the review. I want to cleanup deleteSelection in CompositeEditCommand and DeleteSelectionCommand, to avoid keeping separate member variables. 620363 5 rniwa 2012-05-10 01:17:37 -0700 Closing the bug since the patch appears to have been landed in http://trac.webkit.org/changeset/116368. 140615 2012-05-07 16:11:07 -0700 2012-05-07 16:14:27 -0700 Patch icloudpinyin.txt text/plain 10832 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjM2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTA3ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjEwMTU3 NSk6IENoaW5lc2UgaW5wdXQgaXMgYnJva2VuIHdoZW4gY29tcG9zaW5nIG1haWwgaW4gaUNsb3Vk IHVzaW5nIFNhZmFyaS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg1ODQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMTExNTUyMD4gCisgICAgICAg IAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcmV2 aXNpb24gdGhhdCBicm9rZSB0aGlzLCBpbnRyb2R1Y2VkIGEgd2F5IHRvIHNhbml0aXplIHRoZSBt YXJrdXAgd2hlbiBkZWxldGluZyBhIHJhbmdlIHNlbGVjdGlvbi4KKyAgICAgICAgaUNsb3VkIGxp c3RlbnMgZm9yIERPTSBtb2RpZmljYXRpb24gZXZlbnRzIGFuZCBjbGVhcnMgdGhlIHNlbGVjdGlv biwgYWx0ZXJpbmcgdGhlIGlucHV0IG1ldGhvZCBzdGF0ZS4KKyAgICAgICAgVGhlIGZpeCBjb25z aXN0cyBpbiBhZGRpbmcgYSBwYXJhbWVudGVyIHRvIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQgdG8g Y29udHJvbCB3aGVuIHdlIHNhbml0aXplIHRoZQorICAgICAgICBtYXJrdXAuCisgICAgICAgIAor ICAgICAgICAqIGVkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q29tcG9zaXRlRWRpdENvbW1hbmQ6OmRlbGV0ZVNlbGVjdGlvbik6CisgICAgICAgICog ZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5oOgorICAgICAgICAqIGVkaXRpbmcvRGVsZXRl U2VsZWN0aW9uQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZWxldGVTZWxlY3Rpb25D b21tYW5kOjpEZWxldGVTZWxlY3Rpb25Db21tYW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkRlbGV0 ZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkpOgorICAgICAgICAqIGVkaXRpbmcvRGVsZXRlU2Vs ZWN0aW9uQ29tbWFuZC5oOgorICAgICAgICAoV2ViQ29yZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFu ZDo6Y3JlYXRlKToKKyAgICAgICAgKiBlZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc2VydFRleHRDb21tYW5kOjpkb0FwcGx5KToKKwogMjAxMi0wNS0w NyAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAgICAgICAgW0NHXSBT ZXBhcmF0ZSBpbWFnZSBlbmNvZGluZyBmcm9tIGRhdGFVUkwgY29uc3RydWN0aW9uCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkocmV2 aXNpb24gMTE2MzMxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29t bWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU1MywxNiArNTUzLDE2IEBAIHZvaWQgQ29tcG9z aXRlRWRpdENvbW1hbmQ6Omluc2VydE5vZGVBdFQKICAgICBpbnNlcnROb2RlQXQobm9kZSwgcG9z aXRpb25PdXRzaWRlVGFiU3Bhbihwb3MpKTsKIH0KIAotdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFu ZDo6ZGVsZXRlU2VsZWN0aW9uKGJvb2wgc21hcnREZWxldGUsIGJvb2wgbWVyZ2VCbG9ja3NBZnRl ckRlbGV0ZSwgYm9vbCByZXBsYWNlLCBib29sIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50cykKK3Zv aWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmRlbGV0ZVNlbGVjdGlvbihib29sIHNtYXJ0RGVsZXRl LCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIGJvb2wgcmVwbGFjZSwgYm9vbCBleHBhbmRG b3JTcGVjaWFsRWxlbWVudHMsIGJvb2wgc2FuaXRpemVNYXJrdXApCiB7CiAgICAgaWYgKGVuZGlu Z1NlbGVjdGlvbigpLmlzUmFuZ2UoKSkKLSAgICAgICAgYXBwbHlDb21tYW5kVG9Db21wb3NpdGUo RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6Y3JlYXRlKGRvY3VtZW50KCksIHNtYXJ0RGVsZXRlLCBt ZXJnZUJsb2Nrc0FmdGVyRGVsZXRlLCByZXBsYWNlLCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMp KTsKKyAgICAgICAgYXBwbHlDb21tYW5kVG9Db21wb3NpdGUoRGVsZXRlU2VsZWN0aW9uQ29tbWFu ZDo6Y3JlYXRlKGRvY3VtZW50KCksIHNtYXJ0RGVsZXRlLCBtZXJnZUJsb2Nrc0FmdGVyRGVsZXRl LCByZXBsYWNlLCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMsIHNhbml0aXplTWFya3VwKSk7CiB9 CiAKLXZvaWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmRlbGV0ZVNlbGVjdGlvbihjb25zdCBWaXNp YmxlU2VsZWN0aW9uICZzZWxlY3Rpb24sIGJvb2wgc21hcnREZWxldGUsIGJvb2wgbWVyZ2VCbG9j a3NBZnRlckRlbGV0ZSwgYm9vbCByZXBsYWNlLCBib29sIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50 cykKK3ZvaWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmRlbGV0ZVNlbGVjdGlvbihjb25zdCBWaXNp YmxlU2VsZWN0aW9uICZzZWxlY3Rpb24sIGJvb2wgc21hcnREZWxldGUsIGJvb2wgbWVyZ2VCbG9j a3NBZnRlckRlbGV0ZSwgYm9vbCByZXBsYWNlLCBib29sIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50 cywgYm9vbCBzYW5pdGl6ZU1hcmt1cCkKIHsKICAgICBpZiAoc2VsZWN0aW9uLmlzUmFuZ2UoKSkK LSAgICAgICAgYXBwbHlDb21tYW5kVG9Db21wb3NpdGUoRGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6 Y3JlYXRlKHNlbGVjdGlvbiwgc21hcnREZWxldGUsIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIHJl cGxhY2UsIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50cykpOworICAgICAgICBhcHBseUNvbW1hbmRU b0NvbXBvc2l0ZShEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpjcmVhdGUoc2VsZWN0aW9uLCBzbWFy dERlbGV0ZSwgbWVyZ2VCbG9ja3NBZnRlckRlbGV0ZSwgcmVwbGFjZSwgZXhwYW5kRm9yU3BlY2lh bEVsZW1lbnRzLCBzYW5pdGl6ZU1hcmt1cCkpOwogfQogCiB2b2lkIENvbXBvc2l0ZUVkaXRDb21t YW5kOjpyZW1vdmVDU1NQcm9wZXJ0eShQYXNzUmVmUHRyPFN0eWxlZEVsZW1lbnQ+IGVsZW1lbnQs IENTU1Byb3BlcnR5SUQgcHJvcGVydHkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Nv bXBvc2l0ZUVkaXRDb21tYW5kLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9Db21wb3NpdGVFZGl0Q29tbWFuZC5oCShyZXZpc2lvbiAxMTYzMzEpCisrKyBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTEw MSw4ICsxMDEsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBhcHBseVN0eWxlKGNvbnN0IEVkaXRp bmdTdHlsZSosIGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRpb24mIGVuZCwgRWRp dEFjdGlvbiA9IEVkaXRBY3Rpb25DaGFuZ2VBdHRyaWJ1dGVzKTsKICAgICB2b2lkIGFwcGx5U3R5 bGVkRWxlbWVudChQYXNzUmVmUHRyPEVsZW1lbnQ+KTsKICAgICB2b2lkIHJlbW92ZVN0eWxlZEVs ZW1lbnQoUGFzc1JlZlB0cjxFbGVtZW50Pik7Ci0gICAgdm9pZCBkZWxldGVTZWxlY3Rpb24oYm9v bCBzbWFydERlbGV0ZSA9IGZhbHNlLCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUgPSB0cnVl LCBib29sIHJlcGxhY2UgPSBmYWxzZSwgYm9vbCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMgPSB0 cnVlKTsKLSAgICB2b2lkIGRlbGV0ZVNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiwg Ym9vbCBzbWFydERlbGV0ZSA9IGZhbHNlLCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUgPSB0 cnVlLCBib29sIHJlcGxhY2UgPSBmYWxzZSwgYm9vbCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMg PSB0cnVlKTsKKyAgICB2b2lkIGRlbGV0ZVNlbGVjdGlvbihib29sIHNtYXJ0RGVsZXRlID0gZmFs c2UsIGJvb2wgbWVyZ2VCbG9ja3NBZnRlckRlbGV0ZSA9IHRydWUsIGJvb2wgcmVwbGFjZSA9IGZh bHNlLCBib29sIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50cyA9IHRydWUsIGJvb2wgc2FuaXRpemVN YXJrdXAgPSB0cnVlKTsKKyAgICB2b2lkIGRlbGV0ZVNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2Vs ZWN0aW9uJiwgYm9vbCBzbWFydERlbGV0ZSA9IGZhbHNlLCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJE ZWxldGUgPSB0cnVlLCBib29sIHJlcGxhY2UgPSBmYWxzZSwgYm9vbCBleHBhbmRGb3JTcGVjaWFs RWxlbWVudHMgPSB0cnVlLCBib29sIHNhbml0aXplTWFya3VwID0gdHJ1ZSk7CiAgICAgdmlydHVh bCB2b2lkIGRlbGV0ZVRleHRGcm9tTm9kZShQYXNzUmVmUHRyPFRleHQ+LCB1bnNpZ25lZCBvZmZz ZXQsIHVuc2lnbmVkIGNvdW50KTsKICAgICBib29sIGlzUmVtb3ZhYmxlQmxvY2soY29uc3QgTm9k ZSopOwogICAgIHZvaWQgaW5zZXJ0Tm9kZUFmdGVyKFBhc3NSZWZQdHI8Tm9kZT4sIFBhc3NSZWZQ dHI8Tm9kZT4gcmVmQ2hpbGQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVT ZWxlY3Rpb25Db21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCShyZXZpc2lvbiAxMTYzMzEpCisrKyBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02OCw3ICs2OCw3IEBAIHN0YXRpYyBib29sIGlzVGFibGVSb3dFbXB0eShOb2RlKiByb3cp CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLURlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OkRlbGV0ZVNl bGVjdGlvbkNvbW1hbmQoRG9jdW1lbnQgKmRvY3VtZW50LCBib29sIHNtYXJ0RGVsZXRlLCBib29s IG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIGJvb2wgcmVwbGFjZSwgYm9vbCBleHBhbmRGb3JTcGVj aWFsRWxlbWVudHMpCitEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpEZWxldGVTZWxlY3Rpb25Db21t YW5kKERvY3VtZW50ICpkb2N1bWVudCwgYm9vbCBzbWFydERlbGV0ZSwgYm9vbCBtZXJnZUJsb2Nr c0FmdGVyRGVsZXRlLCBib29sIHJlcGxhY2UsIGJvb2wgZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRz LCBib29sIHNhbml0aXplTWFya3VwKQogICAgIDogQ29tcG9zaXRlRWRpdENvbW1hbmQoZG9jdW1l bnQpCiAgICAgLCBtX2hhc1NlbGVjdGlvblRvRGVsZXRlKGZhbHNlKQogICAgICwgbV9zbWFydERl bGV0ZShzbWFydERlbGV0ZSkKQEAgLTc4LDYgKzc4LDcgQEAgRGVsZXRlU2VsZWN0aW9uQ29tbWFu ZDo6RGVsZXRlU2VsZWN0aW9uQwogICAgICwgbV9leHBhbmRGb3JTcGVjaWFsRWxlbWVudHMoZXhw YW5kRm9yU3BlY2lhbEVsZW1lbnRzKQogICAgICwgbV9wcnVuZVN0YXJ0QmxvY2tJZk5lY2Vzc2Fy eShmYWxzZSkKICAgICAsIG1fc3RhcnRzQXRFbXB0eUxpbmUoZmFsc2UpCisgICAgLCBtX3Nhbml0 aXplTWFya3VwKHNhbml0aXplTWFya3VwKQogICAgICwgbV9zdGFydEJsb2NrKDApCiAgICAgLCBt X2VuZEJsb2NrKDApCiAgICAgLCBtX3R5cGluZ1N0eWxlKDApCkBAIC04NSw3ICs4Niw3IEBAIERl bGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OkRlbGV0ZVNlbGVjdGlvbkMKIHsKIH0KIAotRGVsZXRlU2Vs ZWN0aW9uQ29tbWFuZDo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZChjb25zdCBWaXNpYmxlU2VsZWN0 aW9uJiBzZWxlY3Rpb24sIGJvb2wgc21hcnREZWxldGUsIGJvb2wgbWVyZ2VCbG9ja3NBZnRlckRl bGV0ZSwgYm9vbCByZXBsYWNlLCBib29sIGV4cGFuZEZvclNwZWNpYWxFbGVtZW50cykKK0RlbGV0 ZVNlbGVjdGlvbkNvbW1hbmQ6OkRlbGV0ZVNlbGVjdGlvbkNvbW1hbmQoY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYgc2VsZWN0aW9uLCBib29sIHNtYXJ0RGVsZXRlLCBib29sIG1lcmdlQmxvY2tzQWZ0 ZXJEZWxldGUsIGJvb2wgcmVwbGFjZSwgYm9vbCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMsIGJv b2wgc2FuaXRpemVNYXJrdXApCiAgICAgOiBDb21wb3NpdGVFZGl0Q29tbWFuZChzZWxlY3Rpb24u c3RhcnQoKS5hbmNob3JOb2RlKCktPmRvY3VtZW50KCkpCiAgICAgLCBtX2hhc1NlbGVjdGlvblRv RGVsZXRlKHRydWUpCiAgICAgLCBtX3NtYXJ0RGVsZXRlKHNtYXJ0RGVsZXRlKQpAQCAtOTUsNiAr OTYsNyBAQCBEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpEZWxldGVTZWxlY3Rpb25DCiAgICAgLCBt X2V4cGFuZEZvclNwZWNpYWxFbGVtZW50cyhleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMpCiAgICAg LCBtX3BydW5lU3RhcnRCbG9ja0lmTmVjZXNzYXJ5KGZhbHNlKQogICAgICwgbV9zdGFydHNBdEVt cHR5TGluZShmYWxzZSkKKyAgICAsIG1fc2FuaXRpemVNYXJrdXAoc2FuaXRpemVNYXJrdXApCiAg ICAgLCBtX3NlbGVjdGlvblRvRGVsZXRlKHNlbGVjdGlvbikKICAgICAsIG1fc3RhcnRCbG9jaygw KQogICAgICwgbV9lbmRCbG9jaygwKQpAQCAtODE0LDcgKzgxNiw4IEBAIHZvaWQgRGVsZXRlU2Vs ZWN0aW9uQ29tbWFuZDo6ZG9BcHBseSgpCiAgICAgUmVmUHRyPE5vZGU+IHBsYWNlaG9sZGVyID0g bV9uZWVkUGxhY2Vob2xkZXIgPyBjcmVhdGVCcmVha0VsZW1lbnQoZG9jdW1lbnQoKSkuZ2V0KCkg OiAwOwogICAgIAogICAgIGlmIChwbGFjZWhvbGRlcikgewotICAgICAgICByZW1vdmVSZWR1bmRh bnRCbG9ja3MoKTsKKyAgICAgICAgaWYgKG1fc2FuaXRpemVNYXJrdXApCisgICAgICAgICAgICBy ZW1vdmVSZWR1bmRhbnRCbG9ja3MoKTsKICAgICAgICAgaW5zZXJ0Tm9kZUF0KHBsYWNlaG9sZGVy LmdldCgpLCBtX2VuZGluZ1Bvc2l0aW9uKTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5oCShyZXZpc2lvbiAxMTYzMzEp CisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuaAkod29y a2luZyBjb3B5KQpAQCAtMzQsMTggKzM0LDE4IEBAIGNsYXNzIEVkaXRpbmdTdHlsZTsKIAogY2xh c3MgRGVsZXRlU2VsZWN0aW9uQ29tbWFuZCA6IHB1YmxpYyBDb21wb3NpdGVFZGl0Q29tbWFuZCB7 IAogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ+ IGNyZWF0ZShEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgc21hcnREZWxldGUgPSBmYWxzZSwgYm9v bCBtZXJnZUJsb2Nrc0FmdGVyRGVsZXRlID0gdHJ1ZSwgYm9vbCByZXBsYWNlID0gZmFsc2UsIGJv b2wgZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRzID0gZmFsc2UpCisgICAgc3RhdGljIFBhc3NSZWZQ dHI8RGVsZXRlU2VsZWN0aW9uQ29tbWFuZD4gY3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCwgYm9v bCBzbWFydERlbGV0ZSA9IGZhbHNlLCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUgPSB0cnVl LCBib29sIHJlcGxhY2UgPSBmYWxzZSwgYm9vbCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMgPSBm YWxzZSwgYm9vbCBzYW5pdGl6ZU1hcmt1cCA9IHRydWUpCiAgICAgewotICAgICAgICByZXR1cm4g YWRvcHRSZWYobmV3IERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQoZG9jdW1lbnQsIHNtYXJ0RGVsZXRl LCBtZXJnZUJsb2Nrc0FmdGVyRGVsZXRlLCByZXBsYWNlLCBleHBhbmRGb3JTcGVjaWFsRWxlbWVu dHMpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBEZWxldGVTZWxlY3Rpb25Db21tYW5k KGRvY3VtZW50LCBzbWFydERlbGV0ZSwgbWVyZ2VCbG9ja3NBZnRlckRlbGV0ZSwgcmVwbGFjZSwg ZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRzLCBzYW5pdGl6ZU1hcmt1cCkpOwogICAgIH0KLSAgICBz dGF0aWMgUGFzc1JlZlB0cjxEZWxldGVTZWxlY3Rpb25Db21tYW5kPiBjcmVhdGUoY29uc3QgVmlz aWJsZVNlbGVjdGlvbiYgc2VsZWN0aW9uLCBib29sIHNtYXJ0RGVsZXRlID0gZmFsc2UsIGJvb2wg bWVyZ2VCbG9ja3NBZnRlckRlbGV0ZSA9IHRydWUsIGJvb2wgcmVwbGFjZSA9IGZhbHNlLCBib29s IGV4cGFuZEZvclNwZWNpYWxFbGVtZW50cyA9IGZhbHNlKQorICAgIHN0YXRpYyBQYXNzUmVmUHRy PERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ+IGNyZWF0ZShjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBz ZWxlY3Rpb24sIGJvb2wgc21hcnREZWxldGUgPSBmYWxzZSwgYm9vbCBtZXJnZUJsb2Nrc0FmdGVy RGVsZXRlID0gdHJ1ZSwgYm9vbCByZXBsYWNlID0gZmFsc2UsIGJvb2wgZXhwYW5kRm9yU3BlY2lh bEVsZW1lbnRzID0gZmFsc2UsIGJvb2wgc2FuaXRpemVNYXJrdXAgPSB0cnVlKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBEZWxldGVTZWxlY3Rpb25Db21tYW5kKHNlbGVjdGlv biwgc21hcnREZWxldGUsIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIHJlcGxhY2UsIGV4cGFuZEZv clNwZWNpYWxFbGVtZW50cykpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IERlbGV0ZVNl bGVjdGlvbkNvbW1hbmQoc2VsZWN0aW9uLCBzbWFydERlbGV0ZSwgbWVyZ2VCbG9ja3NBZnRlckRl bGV0ZSwgcmVwbGFjZSwgZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRzLCBzYW5pdGl6ZU1hcmt1cCkp OwogICAgIH0KIAogcHJpdmF0ZToKLSAgICBEZWxldGVTZWxlY3Rpb25Db21tYW5kKERvY3VtZW50 KiwgYm9vbCBzbWFydERlbGV0ZSwgYm9vbCBtZXJnZUJsb2Nrc0FmdGVyRGVsZXRlLCBib29sIHJl cGxhY2UsIGJvb2wgZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRzKTsKLSAgICBEZWxldGVTZWxlY3Rp b25Db21tYW5kKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBib29sIHNtYXJ0RGVsZXRlLCBib29s IG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIGJvb2wgcmVwbGFjZSwgYm9vbCBleHBhbmRGb3JTcGVj aWFsRWxlbWVudHMpOworICAgIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQoRG9jdW1lbnQqLCBib29s IHNtYXJ0RGVsZXRlLCBib29sIG1lcmdlQmxvY2tzQWZ0ZXJEZWxldGUsIGJvb2wgcmVwbGFjZSwg Ym9vbCBleHBhbmRGb3JTcGVjaWFsRWxlbWVudHMsIGJvb2wgc2FudGl6ZU1hcmt1cCk7CisgICAg RGVsZXRlU2VsZWN0aW9uQ29tbWFuZChjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiwgYm9vbCBzbWFy dERlbGV0ZSwgYm9vbCBtZXJnZUJsb2Nrc0FmdGVyRGVsZXRlLCBib29sIHJlcGxhY2UsIGJvb2wg ZXhwYW5kRm9yU3BlY2lhbEVsZW1lbnRzLCBib29sIHNhbml0aXplTWFya3VwKTsKIAogICAgIHZp cnR1YWwgdm9pZCBkb0FwcGx5KCk7CiAgICAgdmlydHVhbCBFZGl0QWN0aW9uIGVkaXRpbmdBY3Rp b24oKSBjb25zdDsKQEAgLTgwLDYgKzgwLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZXhwYW5k Rm9yU3BlY2lhbEVsZW1lbnRzOwogICAgIGJvb2wgbV9wcnVuZVN0YXJ0QmxvY2tJZk5lY2Vzc2Fy eTsKICAgICBib29sIG1fc3RhcnRzQXRFbXB0eUxpbmU7CisgICAgYm9vbCBtX3Nhbml0aXplTWFy a3VwOwogCiAgICAgLy8gVGhpcyBkYXRhIGlzIHRyYW5zaWVudCBhbmQgc2hvdWxkIGJlIGNsZWFy ZWQgYXQgdGhlIGVuZCBvZiB0aGUgZG9BcHBseSBmdW5jdGlvbi4KICAgICBWaXNpYmxlU2VsZWN0 aW9uIG1fc2VsZWN0aW9uVG9EZWxldGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0lu c2VydFRleHRDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0luc2VydFRleHRDb21tYW5kLmNwcAkocmV2aXNpb24gMTE2MzMxKQorKysgU291cmNlL1dlYkNv cmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw3 ICsxMTYsNyBAQCB2b2lkIEluc2VydFRleHRDb21tYW5kOjpkb0FwcGx5KCkKICAgICBpZiAoZW5k aW5nU2VsZWN0aW9uKCkuaXNSYW5nZSgpKSB7CiAgICAgICAgIGlmIChwZXJmb3JtVHJpdmlhbFJl cGxhY2UobV90ZXh0LCBtX3NlbGVjdEluc2VydGVkVGV4dCkpCiAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIGRlbGV0ZVNlbGVjdGlvbihmYWxzZSwgdHJ1ZSwgdHJ1ZSwgZmFsc2UpOworICAg ICAgICBkZWxldGVTZWxlY3Rpb24oZmFsc2UsIHRydWUsIHRydWUsIGZhbHNlLCBmYWxzZSk7CiAg ICAgICAgIC8vIGRlbGV0ZVNlbGVjdGlvbiBldmVudHVhbGx5IG1ha2VzIGEgbmV3IGVuZGluZ1Nl bGVjdGlvbiBvdXQgb2YgYSBQb3NpdGlvbi4gSWYgdGhhdCBQb3NpdGlvbiBkb2Vzbid0IGhhdmUK ICAgICAgICAgLy8gYSByZW5kZXJlciAoZS5nLiBpdCBpcyBvbiBhIDxmcmFtZXNldD4gaW4gdGhl IERPTSksIHRoZSBWaXNpYmxlU2VsZWN0aW9uIGNhbm5vdCBiZSBjYW5vbmljYWxpemVkIHRvIAog ICAgICAgICAvLyBhbnl0aGluZyBvdGhlciB0aGFuIE5vU2VsZWN0aW9uLiBUaGUgcmVzdCBvZiB0 aGlzIGZ1bmN0aW9uIHJlcXVpcmVzIGEgcmVhbCBlbmRpbmdTZWxlY3Rpb24sIHNvIGJhaWwgb3V0 Lgo=