118993 2013-07-22 15:53:56 -0700 Dictionary hotkey does not work on vertical text 2013-07-23 12:08:35 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 910853 0 207287 ap 2013-07-22 15:53:56 -0700 Created attachment 207287 test case Steps to reproduce: 1) Open attached test case. 2) Position the mouse pointer over some vertical text at the right hand side of the definition. 3) Three-finger tap the trackpad or press Command-Control-D EXPECTED: The text under the mouse pointer is highlighted and the Lookup popover appears ACTUAL: Nothing happens. Lookup fails silently. <rdar://problem/14478260> 911096 1 207340 ap 2013-07-23 11:20:42 -0700 Created attachment 207340 proposed fix 911104 2 207340 enrica 2013-07-23 11:45:36 -0700 Comment on attachment 207340 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=207340&action=review > Source/WebCore/editing/Editor.cpp:2694 > + bool startCaretIsVertical = startCaretRect.width() == caretWidth; I think it would be more clear if you named this variable to indicate the direction of the text rather than the caret. Here caret is vertical mean text is horizontal and that confused me. 911114 3 ap 2013-07-23 12:08:35 -0700 Committed <http://trac.webkit.org/r153060>. 207287 2013-07-22 15:53:56 -0700 2013-07-22 15:53:56 -0700 test case firstrectforcharacterrange-vertical.html text/html 1830 ap PGJvZHk+CjxwPlRlc3QgdGhhdCBmaXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5nZSByZXN1bHQgZm9y IHZlcnRpY2FsIHRleHQgaXMgcmVhc29uYWJsZSBpbiBhIHZlcnkgc2ltcGxlIGNhc2UuIFRvIHRl c3QgbWFudWFsbHksIGludm9rZSBEaWN0aW9uYXJ5IHBvcC11cCB3aXRoIEN0cmwrT3B0aW9uK0Qg Y29tYm8uPC9wPgo8cCBpZD1yZXN1bHQ+PC9wPgo8ZGl2IHN0eWxlPSItd2Via2l0LXdyaXRpbmct bW9kZTp2ZXJ0aWNhbC1scjsiIGNvbnRlbnRlZGl0YWJsZSBpZD10YXJnZXQ+TG9yZW0gaXBzdW0g ZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gSW50ZWdlciBwcmV0 aXVtIHF1aXMgb2RpbyBkYXBpYnVzIGludGVyZHVtLiBGdXNjZSB2ZWwgY29uc2VxdWF0IGFyY3Us IG5vbiBzdXNjaXBpdCBsZW8uIEluIGZhdWNpYnVzIG5lcXVlIG51bGxhLCBzb2RhbGVzIGx1Y3R1 cyBudWxsYSBzb2RhbGVzIGluLiBQcmFlc2VudCBsb2JvcnRpcyBlbmltIG5lYyBtYXVyaXMgYWxp cXVhbSwgZXQgdGluY2lkdW50IG51bGxhIGdyYXZpZGEuIEV0aWFtIGEgc2VtIHR1cnBpcy4gU3Vz cGVuZGlzc2Ugb2RpbyBlcmF0LCBzb2RhbGVzIGVnZXQgbnVuYyBhdCwgYWRpcGlzY2luZyBwb3N1 ZXJlIGRvbG9yLiBDcmFzIHNpdCBhbWV0IGxlbyBwdWx2aW5hciwgY29uZGltZW50dW0gYXVndWUg ZWdldCwgbWF0dGlzIGxhY3VzLiBJbnRlZ2VyIHZvbHV0cGF0IG51bGxhIG5lcXVlLCBmYXVjaWJ1 cyB2YXJpdXMgbWFzc2Egc2FnaXR0aXMgYXQuIFByYWVzZW50IG5vbiBtYXVyaXMgdmVsIGp1c3Rv IHRyaXN0aXF1ZSBwb3J0dGl0b3IuIENyYXMgZXQgdGVtcHVzIGVuaW0uIFNlZCBuZWMgY29uZGlt ZW50dW0gZGlhbS4gVml2YW11cyBiaWJlbmR1bSBhIG9kaW8gYXQgYmliZW5kdW0uIFBoYXNlbGx1 cyBpYWN1bGlzIGZhY2lsaXNpcyBhbnRlLCBhIHNhZ2l0dGlzIG1hZ25hIHNvbGxpY2l0dWRpbiBu b24uIEluIHByZXRpdW0gZXUgbGFjdXMgbmVjIHZ1bHB1dGF0ZS4gTW9yYmkgbGFjaW5pYSB0b3J0 b3IgYXJjdSwgcXVpcyB1bHRyaWNlcyByaXN1cyBkaWN0dW0gZXUuIFN1c3BlbmRpc3NlIHNlbXBl ciBtYXR0aXMgdG9ydG9yLCBlZ2V0IHByZXRpdW0gbmVxdWUgYWNjdW1zYW4gYWMuIE1vcmJpIGlt cGVyZGlldCB1bHRyaWNpZXMgYW50ZSwgc2l0IGFtZXQgZGFwaWJ1cyBpcHN1bSBtb2xsaXMgYXQu IEZ1c2NlIHBsYWNlcmF0IHRvcnRvciBhdCBlc3QgbWF0dGlzIG9ybmFyZS4gQWVuZWFuIHRyaXN0 aXF1ZSBlc3QgaWQgcG9zdWVyZS48L2Rpdj4KPHNjcmlwdD4KaWYgKHdpbmRvdy50ZXN0UnVubmVy KSB7CiAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKCiAgICB2YXIgdGFyZ2V0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOwoKICAgIHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5z ZXRQb3NpdGlvbih0YXJnZXQsIDApOwogICAgdmFyIHJlY3QgPSB0ZXh0SW5wdXRDb250cm9sbGVy LmZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlKDAsIDEpOwogICAgdmFyIHdpZHRoID0gcmVjdFsz XTsKICAgIHZhciBoZWlnaHQgPSByZWN0WzRdOwoKICAgIHZhciByZWN0U2l6ZUlzUmVhc29uYWJs ZSA9IHdpZHRoID4gNSAmJiB3aWR0aCA8IDIwICYmIGhlaWdodCA+IDUgJiYgaGVpZ2h0IDwgMjA7 CgogICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpLmlubmVySFRNTCA9IHJlY3RT aXplSXNSZWFzb25hYmxlID8gIlBBU1MiIDogKCJGQUlMOiAiICsgcmVjdCArICIgKHgsIHksIHdp ZHRoLCBoZWlnaHQpIik7CiAgICB0YXJnZXQuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKfQo8L3Nj cmlwdD4K 207340 2013-07-23 11:20:42 -0700 2013-07-23 11:45:36 -0700 proposed fix VerticalLookup.txt text/plain 13384 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzA1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA3LTIzICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIERpY3Rpb25hcnkgaG90a2V5 IGRvZXMgbm90IHdvcmsgb24gdmVydGljYWwgdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4OTkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NDQ3ODI2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUZXN0OiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9maXJzdHJlY3Rmb3JjaGFyYWN0ZXJy YW5nZS12ZXJ0aWNhbC5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjb2xsYXBzZUNhcmV0V2lkdGgpOiBBIGhlbHBlciBmdW5jdGlvbi4KKyAg ICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Zmlyc3RSZWN0Rm9yUmFuZ2UpOiBNYW55IGNoYW5nZXM6 CisgICAgICAgIC0gdXNlIFJlbmRlck9iamVjdDo6YWJzb2x1dGVCb3VuZGluZ0JveFJlY3RGb3JS YW5nZSgpIGluIHJlZ3VsYXIgY2FzZSwgYmVjYXVzZQorICAgICAgICB0aGF0J3MgbW9yZSBkaXJl Y3QgdGhhdCBnZXR0aW5nIGNhcmV0IHJlY3RzIGFuZCBjb21wdXRpbmcgYm91bmRpbmcgcmVjdCBm cm9tIHRob3NlLgorICAgICAgICAtIGhhbmRsZSBjb2xsYXBzZWQgcmFuZ2VzIHNlcGFyYXRlbHks IGJlY2F1c2UgYWJzb2x1dGVCb3VuZGluZ0JveFJlY3RGb3JSYW5nZSgpCisgICAgICAgIGRvZXNu J3QgcHJvdmlkZSB0aGUgbmVlZGVkIHJlc3VsdCwgYW5kIGJlY2F1c2UgaXQgY2FuIGJlIGRvbmUg ZmFzdGVyLgorICAgICAgICAtIHdoZXJldmVyIHdlIHVzZSBjYXJldHMgdG8gY29tcHV0ZSB0aGUg cmVzdWx0LCBhY2NvdW50IGZvciB2ZXJ0aWNhbCB0ZXh0IChpbiBhIGhhY2tpc2gKKyAgICAgICAg d2F5LCBhcyB3ZSBkb24ndCBoYXZlIGxheW91dCBpbmZvcm1hdGlvbiBhdCBFZGl0b3IgbGV2ZWwp LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDogKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpsb2NhbENhcmV0UmVjdCk6IFJlbW92ZWQKKyAgICAgICAgZGVhZCBjb2RlLgorCiAy MDEzLTA3LTIzICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29t PgogCiAgICAgICAgIFJlbW92ZSBkZXByZWNhdGVkIGFuZCB1bnVzZWQgY29tcG9zaXRpbmcgc2V0 dGluZ3MKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDE1MzA1MykK KysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjY1NiwzMyArMjY1Niw1MSBAQCBTdHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRleHQoVGV4dEl0ZXJh dG9yCiAgICAgcmV0dXJuIHBsYWluVGV4dChtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+dG9Ob3JtYWxp emVkUmFuZ2UoKS5nZXQoKSwgYmVoYXZpb3IpLnJlcGxhY2VXaXRoTGl0ZXJhbCgnXDAnLCAiIik7 CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBjb2xsYXBzZUNhcmV0V2lkdGgoSW50UmVjdCYgcmVj dCkKK3sKKyAgICAvLyBGSVhNRTogV2lkdGggYWRqdXN0bWVudCBkb2Vzbid0IHdvcmsgZm9yIHJv dGF0ZWQgdGV4dC4KKyAgICBpZiAocmVjdC53aWR0aCgpID09IGNhcmV0V2lkdGgpCisgICAgICAg IHJlY3Quc2V0V2lkdGgoMCk7CisgICAgZWxzZSBpZiAocmVjdC5oZWlnaHQoKSA9PSBjYXJldFdp ZHRoKQorICAgICAgICByZWN0LnNldEhlaWdodCgwKTsKK30KKwogSW50UmVjdCBFZGl0b3I6OmZp cnN0UmVjdEZvclJhbmdlKFJhbmdlKiByYW5nZSkgY29uc3QKIHsKLSAgICBMYXlvdXRVbml0IGV4 dHJhV2lkdGhUb0VuZE9mTGluZSA9IDA7CiAgICAgQVNTRVJUKHJhbmdlLT5zdGFydENvbnRhaW5l cigpKTsKICAgICBBU1NFUlQocmFuZ2UtPmVuZENvbnRhaW5lcigpKTsKIAotICAgIEludFJlY3Qg c3RhcnRDYXJldFJlY3QgPSBSZW5kZXJlZFBvc2l0aW9uKFZpc2libGVQb3NpdGlvbihyYW5nZS0+ c3RhcnRQb3NpdGlvbigpKS5kZWVwRXF1aXZhbGVudCgpLCBET1dOU1RSRUFNKS5hYnNvbHV0ZVJl Y3QoJmV4dHJhV2lkdGhUb0VuZE9mTGluZSk7Ci0gICAgaWYgKHN0YXJ0Q2FyZXRSZWN0ID09IExh eW91dFJlY3QoKSkKLSAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICBWaXNpYmxlUG9zaXRp b24gc3RhcnRWaXNpYmxlUG9zaXRpb24ocmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSwgRE9XTlNUUkVB TSk7CisKKyAgICBpZiAocmFuZ2UtPmNvbGxhcHNlZChBU1NFUlRfTk9fRVhDRVBUSU9OKSkgewor ICAgICAgICAvLyBGSVhNRTogR2V0dGluZyBjYXJldCByZWN0IGFuZCByZW1vdmluZyBjYXJldCB3 aWR0aCBpcyBhIHZlcnkgcm91bmRhYm91dCB3YXkgdG8gZ2V0IGNvbGxhcHNlZCByYW5nZSBsb2Nh dGlvbi4KKyAgICAgICAgLy8gSW4gcGFydGljdWxhciwgd2lkdGggYWRqdXN0bWVudCBkb2Vzbid0 IHdvcmsgZm9yIHJvdGF0ZWQgdGV4dC4KKyAgICAgICAgSW50UmVjdCBzdGFydENhcmV0UmVjdCA9 IFJlbmRlcmVkUG9zaXRpb24oc3RhcnRWaXNpYmxlUG9zaXRpb24pLmFic29sdXRlUmVjdCgpOwor ICAgICAgICBjb2xsYXBzZUNhcmV0V2lkdGgoc3RhcnRDYXJldFJlY3QpOworICAgICAgICByZXR1 cm4gc3RhcnRDYXJldFJlY3Q7CisgICAgfQogCi0gICAgSW50UmVjdCBlbmRDYXJldFJlY3QgPSBS ZW5kZXJlZFBvc2l0aW9uKFZpc2libGVQb3NpdGlvbihyYW5nZS0+ZW5kUG9zaXRpb24oKSkuZGVl cEVxdWl2YWxlbnQoKSwgVVBTVFJFQU0pLmFic29sdXRlUmVjdCgpOwotICAgIGlmIChlbmRDYXJl dFJlY3QgPT0gTGF5b3V0UmVjdCgpKQorICAgIFZpc2libGVQb3NpdGlvbiBlbmRWaXNpYmxlUG9z aXRpb24ocmFuZ2UtPmVuZFBvc2l0aW9uKCksIFVQU1RSRUFNKTsKKworICAgIGlmIChpblNhbWVM aW5lKHN0YXJ0VmlzaWJsZVBvc2l0aW9uLCBlbmRWaXNpYmxlUG9zaXRpb24pKQorICAgICAgICBy ZXR1cm4gZW5jbG9zaW5nSW50UmVjdChSZW5kZXJPYmplY3Q6OmFic29sdXRlQm91bmRpbmdCb3hS ZWN0Rm9yUmFuZ2UocmFuZ2UpKTsKKworICAgIExheW91dFVuaXQgZXh0cmFXaWR0aFRvRW5kT2ZM aW5lID0gMDsKKyAgICBJbnRSZWN0IHN0YXJ0Q2FyZXRSZWN0ID0gUmVuZGVyZWRQb3NpdGlvbihz dGFydFZpc2libGVQb3NpdGlvbikuYWJzb2x1dGVSZWN0KCZleHRyYVdpZHRoVG9FbmRPZkxpbmUp OworICAgIGlmIChzdGFydENhcmV0UmVjdCA9PSBJbnRSZWN0KCkpCiAgICAgICAgIHJldHVybiBJ bnRSZWN0KCk7CiAKLSAgICBpZiAoc3RhcnRDYXJldFJlY3QueSgpID09IGVuZENhcmV0UmVjdC55 KCkpIHsKLSAgICAgICAgLy8gc3RhcnQgYW5kIGVuZCBhcmUgb24gdGhlIHNhbWUgbGluZQotICAg ICAgICByZXR1cm4gSW50UmVjdChtaW4oc3RhcnRDYXJldFJlY3QueCgpLCBlbmRDYXJldFJlY3Qu eCgpKSwKKyAgICAvLyBXaGVuIHN0YXJ0IGFuZCBlbmQgYXJlbid0IG9uIHRoZSBzYW1lIGxpbmUs IHdlIHdhbnQgdG8gZ28gZnJvbSBzdGFydCB0byB0aGUgZW5kIG9mIGl0cyBsaW5lLgorICAgIGJv b2wgc3RhcnRDYXJldElzVmVydGljYWwgPSBzdGFydENhcmV0UmVjdC53aWR0aCgpID09IGNhcmV0 V2lkdGg7CisgICAgcmV0dXJuIHN0YXJ0Q2FyZXRJc1ZlcnRpY2FsID8KKyAgICAgICAgSW50UmVj dChzdGFydENhcmV0UmVjdC54KCksCiAgICAgICAgICAgICBzdGFydENhcmV0UmVjdC55KCksCi0g ICAgICAgICAgICBhYnMoZW5kQ2FyZXRSZWN0LngoKSAtIHN0YXJ0Q2FyZXRSZWN0LngoKSksCi0g ICAgICAgICAgICBtYXgoc3RhcnRDYXJldFJlY3QuaGVpZ2h0KCksIGVuZENhcmV0UmVjdC5oZWln aHQoKSkpOwotICAgIH0KLQotICAgIC8vIHN0YXJ0IGFuZCBlbmQgYXJlbid0IG9uIHRoZSBzYW1l IGxpbmUsIHNvIGdvIGZyb20gc3RhcnQgdG8gdGhlIGVuZCBvZiBpdHMgbGluZQotICAgIHJldHVy biBJbnRSZWN0KHN0YXJ0Q2FyZXRSZWN0LngoKSwKLSAgICAgICAgc3RhcnRDYXJldFJlY3QueSgp LAotICAgICAgICBzdGFydENhcmV0UmVjdC53aWR0aCgpICsgZXh0cmFXaWR0aFRvRW5kT2ZMaW5l LAotICAgICAgICBzdGFydENhcmV0UmVjdC5oZWlnaHQoKSk7CisgICAgICAgICAgICBzdGFydENh cmV0UmVjdC53aWR0aCgpICsgZXh0cmFXaWR0aFRvRW5kT2ZMaW5lLAorICAgICAgICAgICAgc3Rh cnRDYXJldFJlY3QuaGVpZ2h0KCkpIDoKKyAgICAgICAgSW50UmVjdChzdGFydENhcmV0UmVjdC54 KCksCisgICAgICAgICAgICBzdGFydENhcmV0UmVjdC55KCksCisgICAgICAgICAgICBzdGFydENh cmV0UmVjdC53aWR0aCgpLAorICAgICAgICAgICAgc3RhcnRDYXJldFJlY3QuaGVpZ2h0KCkgKyBl eHRyYVdpZHRoVG9FbmRPZkxpbmUpOwogfQogCiBib29sIEVkaXRvcjo6c2hvdWxkQ2hhbmdlU2Vs ZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIG9sZFNlbGVjdGlvbiwgY29uc3QgVmlzaWJs ZVNlbGVjdGlvbiYgbmV3U2VsZWN0aW9uLCBFQWZmaW5pdHkgYWZmaW5pdHksIGJvb2wgc3RpbGxT ZWxlY3RpbmcpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAJKHJldmlzaW9uIDE1MzA1MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczMjksMjQgKzczMjksOSBAQCBMYXlvdXRS ZWN0IFJlbmRlckJsb2NrOjpsb2NhbENhcmV0UmVjdChJCiAKICAgICBMYXlvdXRSZWN0IGNhcmV0 UmVjdCA9IGxvY2FsQ2FyZXRSZWN0Rm9yRW1wdHlFbGVtZW50KHdpZHRoKCksIHRleHRJbmRlbnRP ZmZzZXQoKSk7CiAKLSAgICBpZiAoZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKSB7Ci0gICAgICAgIGlm IChpc1JlbmRlckJsb2NrKCkpIHsKLSAgICAgICAgICAgICpleHRyYVdpZHRoVG9FbmRPZkxpbmUg PSB3aWR0aCgpIC0gY2FyZXRSZWN0Lm1heFgoKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIC8vIEZJWE1FOiBUaGlzIGNvZGUgbG9va3Mgd3JvbmcuCi0gICAgICAgICAgICAvLyBteVJp Z2h0IGFuZCBjb250YWluZXJSaWdodCBhcmUgc2V0IHVwLCBidXQgdGhlbiBjbG9iYmVyZWQuCi0g ICAgICAgICAgICAvLyBTbyAqZXh0cmFXaWR0aFRvRW5kT2ZMaW5lIHdpbGwgYWx3YXlzIGJlIDAg aGVyZS4KLQotICAgICAgICAgICAgTGF5b3V0VW5pdCBteVJpZ2h0ID0gY2FyZXRSZWN0Lm1heFgo KTsKLSAgICAgICAgICAgIC8vIEZJWE1FOiB3aHkgY2FsbCBsb2NhbFRvQWJzb2x1dGVGb3JDb250 ZW50KCkgdHdpY2UgaGVyZSwgdG9vPwotICAgICAgICAgICAgRmxvYXRQb2ludCBhYnNSaWdodFBv aW50ID0gbG9jYWxUb0Fic29sdXRlKEZsb2F0UG9pbnQobXlSaWdodCwgMCkpOwotCi0gICAgICAg ICAgICBMYXlvdXRVbml0IGNvbnRhaW5lclJpZ2h0ID0gY29udGFpbmluZ0Jsb2NrKCktPngoKSAr IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKLSAgICAgICAgICAgIEZs b2F0UG9pbnQgYWJzQ29udGFpbmVyUG9pbnQgPSBsb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludChj b250YWluZXJSaWdodCwgMCkpOwotCi0gICAgICAgICAgICAqZXh0cmFXaWR0aFRvRW5kT2ZMaW5l ID0gYWJzQ29udGFpbmVyUG9pbnQueCgpIC0gYWJzUmlnaHRQb2ludC54KCk7Ci0gICAgICAgIH0K LSAgICB9CisgICAgLy8gRklYTUU6IERvZXMgdGhpcyBuZWVkIHRvIGFkanVzdCBmb3IgdmVydGlj YWwgb3JpZW50YXRpb24/CisgICAgaWYgKGV4dHJhV2lkdGhUb0VuZE9mTGluZSkKKyAgICAgICAg KmV4dHJhV2lkdGhUb0VuZE9mTGluZSA9IHdpZHRoKCkgLSBjYXJldFJlY3QubWF4WCgpOwogCiAg ICAgcmV0dXJuIGNhcmV0UmVjdDsKIH0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzA1NykKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEz LTA3LTIzICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIERp Y3Rpb25hcnkgaG90a2V5IGRvZXMgbm90IHdvcmsgb24gdmVydGljYWwgdGV4dAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4OTkzCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNDQ3ODI2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L2NhcmV0LXByaW1h cnktYmlkaS1leHBlY3RlZC50eHQ6IE9sZCByZXN1bHRzIGhhZAorICAgICAgICBzb21lIGNvbGxh cHNlZCBwb3NpdGlvbnMgaGF2ZSBhIHJlY3Qgb2Ygd2lkdGggMS4gTm93IHRoZXkgYXJlIGFsbCBj b25zaXN0ZW50bHkgMC4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L2Zp cnN0cmVjdGZvcmNoYXJhY3RlcnJhbmdlLXZlcnRpY2FsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvZmlyc3RyZWN0Zm9yY2hhcmFjdGVy cmFuZ2UtdmVydGljYWwuaHRtbDogQWRkZWQuCisKIDIwMTMtMDctMjMgIEFuZHJlaSBCdWN1ciAg PGFidWN1ckBhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBSZWdpb25zXSBDb252ZXJ0IHBlcmNl bnRhZ2UtbWFyZ2lucy0qIHRlc3RzIHRvIHJlZi10ZXN0cwpJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvY2FyZXQtcHJpbWFyeS1iaWRpLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9jYXJl dC1wcmltYXJ5LWJpZGktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxNTMwNTMpCisrKyBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9jYXJldC1wcmltYXJ5LWJpZGktZXhwZWN0 ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBAQAogMDogMTI0LDUwOCwwLDI4CiAx OiAyMSw1NjQsMCwyOAogMjogMzYsNTY0LDAsMjgKLTM6IDQ4LDU2NCwxLDI4CiszOiA0OCw1NjQs MCwyOAogNDogMTU0LDU2NCwwLDI4CiA1OiAxNDAsNTY0LDAsMjgKIDY6IDg1LDU2NCwwLDI4CkBA IC0xMCw3ICsxMCw3IEBACiA5OiAxMzEsNTY0LDAsMjgKIDEwOiA3Myw1NjQsMCwyOAogMTE6IDU2 LDU2NCwwLDI4Ci0xMjogMTY5LDU2NCwxLDI4CisxMjogMTcwLDU2NCwwLDI4CiAxMzogMTg1LDU2 NCwwLDI4CiAxNDogMTk4LDU2NCwwLDI4CiAxNTogMjA3LDU2NCwwLDI4CkBAIC0zNyw3ICszNyw3 IEBACiAzNjogNDcsNDc4LDAsMjgKIDM3OiA2MCw0NzgsMCwyOAogMzg6IDc1LDQ3OCwwLDI4Ci0z OTogODcsNDc4LDEsMjgKKzM5OiA4Nyw0NzgsMCwyOAogNDA6IDExMiw0NzgsMCwyOAogNDE6IDk1 LDQ3OCwwLDI4CiA0MjogMTI0LDQ3OCwwLDI4CkBAIC02MCw3ICs2MCw3IEBACiA1OTogNzkxLDQy MiwwLDI4CiA2MDogNzc2LDQyMiwwLDI4CiA2MTogNzYyLDQyMiwwLDI4Ci02MjogNzUyLDQyMiwx LDI4Cis2MjogNzUzLDQyMiwwLDI4CiA2MzogNzIyLDQyMiwwLDI4CiA2NDogNzM3LDQyMiwwLDI4 CiA2NTogNzA3LDQyMiwwLDI4CkBAIC04MCw3ICs4MCw3IEBACiA3OTogNzUxLDM2NCwwLDI4CiA4 MDogNzM2LDM2NCwwLDI4CiA4MTogNzIyLDM2NCwwLDI4Ci04MjogNzExLDM2NCwxLDI4Cis4Mjog NzExLDM2NCwwLDI4CiA4MzogNjg5LDM2NCwwLDI4CiA4NDogNzAyLDM2NCwwLDI4CiA4NTogNjc0 LDM2NCwwLDI4CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9m aXJzdHJlY3Rmb3JjaGFyYWN0ZXJyYW5nZS12ZXJ0aWNhbC1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvZmlyc3RyZWN0Zm9y Y2hhcmFjdGVycmFuZ2UtdmVydGljYWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvZmlyc3RyZWN0Zm9yY2hhcmFjdGVy cmFuZ2UtdmVydGljYWwtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsOSBA QAorVGVzdCB0aGF0IGZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlIHJlc3VsdCBmb3IgdmVydGlj YWwgdGV4dCBpcyByZWFzb25hYmxlIGluIGEgdmVyeSBzaW1wbGUgY2FzZS4gVG8gdGVzdCBtYW51 YWxseSwgaW52b2tlIERpY3Rpb25hcnkgcG9wLXVwIHdpdGggQ3RybCtPcHRpb24rRCBjb21iby4K KworUEFTUyB0ZXh0SW5wdXRDb250cm9sbGVyLmZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlKDAs IDEpIGlzIHJlYXNvbmFibGUKK1BBU1MgdGV4dElucHV0Q29udHJvbGxlci5maXJzdFJlY3RGb3JD aGFyYWN0ZXJSYW5nZSgxLCAwKSBpcyByZWFzb25hYmxlCitQQVNTIHRleHRJbnB1dENvbnRyb2xs ZXIuZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoMSwgMjAwKSBpcyByZWFzb25hYmxlCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwoKUHJvcGVydHkg Y2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvZmlyc3Ry ZWN0Zm9yY2hhcmFjdGVycmFuZ2UtdmVydGljYWwtZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRk ZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAjIwordGV4dC9wbGFpbgpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25h dGl2ZQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9maXJzdHJlY3Rmb3JjaGFyYWN0ZXJyYW5nZS12ZXJ0 aWNhbC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5n L2lucHV0L2ZpcnN0cmVjdGZvcmNoYXJhY3RlcnJhbmdlLXZlcnRpY2FsLmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9maXJzdHJlY3Rm b3JjaGFyYWN0ZXJyYW5nZS12ZXJ0aWNhbC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEs NjEgQEAKKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGVzdCB0aGF0 IGZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlIHJlc3VsdCBmb3IgdmVydGljYWwgdGV4dCBpcyBy ZWFzb25hYmxlIGluIGEgdmVyeSBzaW1wbGUgY2FzZS4gVG8gdGVzdCBtYW51YWxseSwgaW52b2tl IERpY3Rpb25hcnkgcG9wLXVwIHdpdGggQ3RybCtPcHRpb24rRCBjb21iby48L3A+Cis8cCBpZD0i Y29uc29sZSI+PC9wPgorPGRpdiBzdHlsZT0iLXdlYmtpdC13cml0aW5nLW1vZGU6dmVydGljYWwt bHI7IiBjb250ZW50ZWRpdGFibGUgaWQ9dGFyZ2V0PkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0 LCBjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuIEludGVnZXIgcHJldGl1bSBxdWlzIG9kaW8g ZGFwaWJ1cyBpbnRlcmR1bS4gRnVzY2UgdmVsIGNvbnNlcXVhdCBhcmN1LCBub24gc3VzY2lwaXQg bGVvLiBJbiBmYXVjaWJ1cyBuZXF1ZSBudWxsYSwgc29kYWxlcyBsdWN0dXMgbnVsbGEgc29kYWxl cyBpbi4gUHJhZXNlbnQgbG9ib3J0aXMgZW5pbSBuZWMgbWF1cmlzIGFsaXF1YW0sIGV0IHRpbmNp ZHVudCBudWxsYSBncmF2aWRhLiBFdGlhbSBhIHNlbSB0dXJwaXMuIFN1c3BlbmRpc3NlIG9kaW8g ZXJhdCwgc29kYWxlcyBlZ2V0IG51bmMgYXQsIGFkaXBpc2NpbmcgcG9zdWVyZSBkb2xvci4gQ3Jh cyBzaXQgYW1ldCBsZW8gcHVsdmluYXIsIGNvbmRpbWVudHVtIGF1Z3VlIGVnZXQsIG1hdHRpcyBs YWN1cy4gSW50ZWdlciB2b2x1dHBhdCBudWxsYSBuZXF1ZSwgZmF1Y2lidXMgdmFyaXVzIG1hc3Nh IHNhZ2l0dGlzIGF0LiBQcmFlc2VudCBub24gbWF1cmlzIHZlbCBqdXN0byB0cmlzdGlxdWUgcG9y dHRpdG9yLiBDcmFzIGV0IHRlbXB1cyBlbmltLiBTZWQgbmVjIGNvbmRpbWVudHVtIGRpYW0uIFZp dmFtdXMgYmliZW5kdW0gYSBvZGlvIGF0IGJpYmVuZHVtLiBQaGFzZWxsdXMgaWFjdWxpcyBmYWNp bGlzaXMgYW50ZSwgYSBzYWdpdHRpcyBtYWduYSBzb2xsaWNpdHVkaW4gbm9uLiBJbiBwcmV0aXVt IGV1IGxhY3VzIG5lYyB2dWxwdXRhdGUuIE1vcmJpIGxhY2luaWEgdG9ydG9yIGFyY3UsIHF1aXMg dWx0cmljZXMgcmlzdXMgZGljdHVtIGV1LiBTdXNwZW5kaXNzZSBzZW1wZXIgbWF0dGlzIHRvcnRv ciwgZWdldCBwcmV0aXVtIG5lcXVlIGFjY3Vtc2FuIGFjLiBNb3JiaSBpbXBlcmRpZXQgdWx0cmlj aWVzIGFudGUsIHNpdCBhbWV0IGRhcGlidXMgaXBzdW0gbW9sbGlzIGF0LiBGdXNjZSBwbGFjZXJh dCB0b3J0b3IgYXQgZXN0IG1hdHRpcyBvcm5hcmUuIEFlbmVhbiB0cmlzdGlxdWUgZXN0IGlkIHBv c3VlcmUuPC9kaXY+Cis8c2NyaXB0PgorZnVuY3Rpb24gc2luZ2xlQ2hhcmFjdGVyUmVjdElzUmVh c29uYWJsZShyZWN0KQoreworICAgIHZhciB3aWR0aCA9IHJlY3RbMl07CisgICAgdmFyIGhlaWdo dCA9IHJlY3RbM107CisKKyAgICByZXR1cm4gd2lkdGggPiA1ICYmIHdpZHRoIDwgMjAgJiYgaGVp Z2h0ID4gNSAmJiBoZWlnaHQgPCAyMDsKK30KKworZnVuY3Rpb24gZW1wdHlSYW5nZVJlY3RJc1Jl YXNvbmFibGUocmVjdCkKK3sKKyAgICB2YXIgd2lkdGggPSByZWN0WzJdOworICAgIHZhciBoZWln aHQgPSByZWN0WzNdOworCisgICAgcmV0dXJuIHdpZHRoID4gNSAmJiB3aWR0aCA8IDIwICYmIGhl aWdodCA9PSAwOworfQorCitmdW5jdGlvbiBtdWx0aWxpbmVSYW5nZVJlY3RJc1JlYXNvbmFibGUo cmVjdCkKK3sKKyAgICB2YXIgd2lkdGggPSByZWN0WzJdOworICAgIHZhciBoZWlnaHQgPSByZWN0 WzNdOworCisgICAgcmV0dXJuIHdpZHRoID4gNSAmJiB3aWR0aCA8IDIwICYmIGhlaWdodCA+IDEw MDsKK30KKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7CisKKyAgICB2YXIgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdl dCIpOworCisgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNldFBvc2l0aW9uKHRhcmdldCwgMCk7 CisgICAgdmFyIHNpbmdsZUNoYXJhY3RlclJlY3QgPSB0ZXh0SW5wdXRDb250cm9sbGVyLmZpcnN0 UmVjdEZvckNoYXJhY3RlclJhbmdlKDAsIDEpOworICAgIGlmIChzaW5nbGVDaGFyYWN0ZXJSZWN0 SXNSZWFzb25hYmxlKHNpbmdsZUNoYXJhY3RlclJlY3QpKQorICAgICAgICB0ZXN0UGFzc2VkKCJ0 ZXh0SW5wdXRDb250cm9sbGVyLmZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlKDAsIDEpIGlzIHJl YXNvbmFibGUiKTsKKyAgICBlbHNlCisgICAgICAgIHRlc3RGYWlsZWQoInRleHRJbnB1dENvbnRy b2xsZXIuZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoMCwgMSkgaXMgbm90IHJlYXNvbmFibGU6 ICIgKyBzaW5nbGVDaGFyYWN0ZXJSZWN0KTsKKworICAgIHZhciBlbXB0eVJhbmdlUmVjdCA9IHRl eHRJbnB1dENvbnRyb2xsZXIuZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoMSwgMCk7CisgICAg aWYgKGVtcHR5UmFuZ2VSZWN0SXNSZWFzb25hYmxlKGVtcHR5UmFuZ2VSZWN0KSkKKyAgICAgICAg dGVzdFBhc3NlZCgidGV4dElucHV0Q29udHJvbGxlci5maXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5n ZSgxLCAwKSBpcyByZWFzb25hYmxlIik7CisgICAgZWxzZQorICAgICAgICB0ZXN0RmFpbGVkKCJ0 ZXh0SW5wdXRDb250cm9sbGVyLmZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlKDEsIDApIGlzIG5v dCByZWFzb25hYmxlOiAiICsgZW1wdHlSYW5nZVJlY3QpOworCisgICAgdmFyIG11bHRpbGluZVJh bmdlUmVjdCA9IHRleHRJbnB1dENvbnRyb2xsZXIuZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2Uo MSwgMjAwKTsKKyAgICBpZiAobXVsdGlsaW5lUmFuZ2VSZWN0SXNSZWFzb25hYmxlKG11bHRpbGlu ZVJhbmdlUmVjdCkpCisgICAgICAgIHRlc3RQYXNzZWQoInRleHRJbnB1dENvbnRyb2xsZXIuZmly c3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoMSwgMjAwKSBpcyByZWFzb25hYmxlIik7CisgICAgZWxz ZQorICAgICAgICB0ZXN0RmFpbGVkKCJ0ZXh0SW5wdXRDb250cm9sbGVyLmZpcnN0UmVjdEZvckNo YXJhY3RlclJhbmdlKDEsIDIwMCkgaXMgbm90IHJlYXNvbmFibGU6ICIgKyBtdWx0aWxpbmVSYW5n ZVJlY3QpOworCisgICAgdGFyZ2V0LnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7Cit9Cis8L3Njcmlw dD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvZmlyc3RyZWN0Zm9yY2hhcmFjdGVycmFuZ2Ut dmVydGljYWwuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAgKzEg IyMKK3RleHQvaHRtbApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5Cg==