131507 2014-04-10 13:16:31 -0700 Web Inspector: Remove unused ruler in overlay code 2014-04-10 16:59:58 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck thorton timothy webkit-bug-importer oldest_to_newest 999628 0 joepeck 2014-04-10 13:16:31 -0700 This code is unused, lets remove it. 999630 1 229073 joepeck 2014-04-10 13:20:11 -0700 Created attachment 229073 [PATCH] Proposed Fix 999641 2 229073 commit-queue 2014-04-10 13:58:09 -0700 Comment on attachment 229073 [PATCH] Proposed Fix Clearing flags on attachment: 229073 Committed r167086: <http://trac.webkit.org/changeset/167086> 999642 3 commit-queue 2014-04-10 13:58:12 -0700 All reviewed patches have been landed. Closing bug. 999700 4 webkit-bug-importer 2014-04-10 16:59:45 -0700 <rdar://problem/16585910> 999701 5 webkit-bug-importer 2014-04-10 16:59:58 -0700 <rdar://problem/16585915> 229073 2014-04-10 13:20:11 -0700 2014-04-10 13:58:09 -0700 [PATCH] Proposed Fix ruler.patch text/plain 11672 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMjVlYTc0Li4wMzMwNTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTQtMDQtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIHJ1bGVyIGluIG92ZXJsYXkgY29k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTA3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxk T2JqZWN0Rm9ySGlnaGxpZ2h0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yT3Zlcmxh eS5oOgorICAgICAgICAoV2ViQ29yZTo6SGlnaGxpZ2h0OjpIaWdobGlnaHQpOgorICAgICAgICAo V2ViQ29yZTo6SGlnaGxpZ2h0OjpzZXREYXRhRnJvbUNvbmZpZyk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXlQYWdlLmpzOgorICAgICAgICAoX2RyYXdGcmFnbWVudEhpZ2hs aWdodCk6CisgICAgICAgIChfZHJhd1JlZ2lvbk51bWJlcik6IERlbGV0ZWQuCisgICAgICAgIChx dWFkVG9QYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKGRyYXdPdXRsaW5lZFF1YWQpOiBEZWxldGVk LgorICAgICAgICAocGF0aENvbW1hbmQpOiBEZWxldGVkLgorICAgICAgICAoZHJhd1BhdGgpOiBE ZWxldGVkLgorICAgICAgICAoZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKTogRGVsZXRlZC4KKyAg ICAgICAgKHF1YWRFcXVhbHMpOiBEZWxldGVkLgorICAgICAgICAoZHJhd0d1dHRlcik6IERlbGV0 ZWQuCisgICAgICAgIChkcmF3Tm9kZUhpZ2hsaWdodCk6IERlbGV0ZWQuCisgICAgICAgIChkcmF3 UXVhZEhpZ2hsaWdodCk6IERlbGV0ZWQuCisgICAgICAgIChzZXRQbGF0Zm9ybSk6IERlbGV0ZWQu CisgICAgICAgIChkaXNwYXRjaCk6IERlbGV0ZWQuCisgICAgICAgIChsb2cpOiBEZWxldGVkLgor CiAyMDE0LTA0LTEwICBPd2VuIFRheWxvciAgPG90YXlsb3JAcmVkaGF0LmNvbT4KIAogICAgICAg ICBbR1RLXSBSZW1vdmUgYSBjb21tZW50IHRoYXQgd2FzIGluY29ycmVjdGx5IGN1dC1hbmQtcGFz dGVkIGZyb20gV2lkZ2V0QmFja2luZ1N0b3JlQ2Fpcm8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDcwM2YxNGUuLjgwZTEyMTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMTA0 Myw5ICsxMDQzLDYgQEAgc3RkOjp1bmlxdWVfcHRyPEhpZ2hsaWdodENvbmZpZz4gSW5zcGVjdG9y RE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3IKICAgICBib29sIHNob3dJbmZv ID0gZmFsc2U7IC8vIERlZmF1bHQ6IGZhbHNlIChkbyBub3Qgc2hvdyBhIHRvb2x0aXApLgogICAg IGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC0+Z2V0Qm9vbGVhbigic2hvd0luZm8iLCAmc2hvd0lu Zm8pOwogICAgIGhpZ2hsaWdodENvbmZpZy0+c2hvd0luZm8gPSBzaG93SW5mbzsKLSAgICBib29s IHNob3dSdWxlcnMgPSBmYWxzZTsgLy8gRGVmYXVsdDogZmFsc2UgKGRvIG5vdCBzaG93IHJ1bGVy cykuCi0gICAgaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0LT5nZXRCb29sZWFuKCJzaG93UnVsZXJz IiwgJnNob3dSdWxlcnMpOwotICAgIGhpZ2hsaWdodENvbmZpZy0+c2hvd1J1bGVycyA9IHNob3dS dWxlcnM7CiAgICAgaGlnaGxpZ2h0Q29uZmlnLT5jb250ZW50ID0gcGFyc2VDb25maWdDb2xvcigi Y29udGVudENvbG9yIiwgaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKICAgICBoaWdobGlnaHRD b25maWctPmNvbnRlbnRPdXRsaW5lID0gcGFyc2VDb25maWdDb2xvcigiY29udGVudE91dGxpbmVD b2xvciIsIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCk7CiAgICAgaGlnaGxpZ2h0Q29uZmlnLT5w YWRkaW5nID0gcGFyc2VDb25maWdDb2xvcigicGFkZGluZ0NvbG9yIiwgaGlnaGxpZ2h0SW5zcGVj dG9yT2JqZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5 LmNwcAppbmRleCA4Yjc5MGRhLi4wMWQxNjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC0zOTEsNyArMzkxLDYgQEAgc3RhdGljIFBhc3NS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckhpZ2hsaWdodChjb25zdCBIaWdo bGlnaHQmIGhpZ2gKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGhpZ2hsaWdodC5xdWFkcy5z aXplKCk7ICsraSkKICAgICAgICAgYXJyYXktPnB1c2hBcnJheShidWlsZEFycmF5Rm9yUXVhZCho aWdobGlnaHQucXVhZHNbaV0pKTsKICAgICBvYmplY3QtPnNldEFycmF5KCJxdWFkcyIsIGFycmF5 LnJlbGVhc2UoKSk7Ci0gICAgb2JqZWN0LT5zZXRCb29sZWFuKCJzaG93UnVsZXJzIiwgaGlnaGxp Z2h0LnNob3dSdWxlcnMpOwogICAgIG9iamVjdC0+c2V0U3RyaW5nKCJjb250ZW50Q29sb3IiLCBo aWdobGlnaHQuY29udGVudENvbG9yLnNlcmlhbGl6ZWQoKSk7CiAgICAgb2JqZWN0LT5zZXRTdHJp bmcoImNvbnRlbnRPdXRsaW5lQ29sb3IiLCBoaWdobGlnaHQuY29udGVudE91dGxpbmVDb2xvci5z ZXJpYWxpemVkKCkpOwogICAgIG9iamVjdC0+c2V0U3RyaW5nKCJwYWRkaW5nQ29sb3IiLCBoaWdo bGlnaHQucGFkZGluZ0NvbG9yLnNlcmlhbGl6ZWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXkuaAppbmRleCA3NTViMGE1Li4zZWMwN2RmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKQEAgLTU5LDcgKzU5LDYgQEAg cHVibGljOgogICAgIENvbG9yIGJvcmRlcjsKICAgICBDb2xvciBtYXJnaW47CiAgICAgYm9vbCBz aG93SW5mbzsKLSAgICBib29sIHNob3dSdWxlcnM7CiAgICAgYm9vbCB1c2VQYWdlQ29vcmRpbmF0 ZXM7CiB9OwogCkBAIC03MSw3ICs3MCw2IEBAIGVudW0gSGlnaGxpZ2h0VHlwZSB7CiBzdHJ1Y3Qg SGlnaGxpZ2h0IHsKICAgICBIaWdobGlnaHQoKQogICAgICAgICA6IHR5cGUoSGlnaGxpZ2h0VHlw ZU5vZGUpCi0gICAgICAgICwgc2hvd1J1bGVycyhmYWxzZSkKICAgICB7CiAgICAgfQogCkBAIC04 Miw3ICs4MCw2IEBAIHN0cnVjdCBIaWdobGlnaHQgewogICAgICAgICBwYWRkaW5nQ29sb3IgPSBo aWdobGlnaHRDb25maWcucGFkZGluZzsKICAgICAgICAgYm9yZGVyQ29sb3IgPSBoaWdobGlnaHRD b25maWcuYm9yZGVyOwogICAgICAgICBtYXJnaW5Db2xvciA9IGhpZ2hsaWdodENvbmZpZy5tYXJn aW47Ci0gICAgICAgIHNob3dSdWxlcnMgPSBoaWdobGlnaHRDb25maWcuc2hvd1J1bGVyczsKICAg ICAgICAgdXNlUGFnZUNvb3JkaW5hdGVzID0gaGlnaGxpZ2h0Q29uZmlnLnVzZVBhZ2VDb29yZGlu YXRlczsKICAgICB9CiAKQEAgLTk2LDcgKzkzLDYgQEAgc3RydWN0IEhpZ2hsaWdodCB7CiAgICAg Ly8gV2hlbiB0aGUgdHlwZSBpcyBSZWN0cywgdGhpcyBpcyBqdXN0IGEgbGlzdCBvZiBxdWFkcy4K ICAgICBIaWdobGlnaHRUeXBlIHR5cGU7CiAgICAgVmVjdG9yPEZsb2F0UXVhZD4gcXVhZHM7Ci0g ICAgYm9vbCBzaG93UnVsZXJzOwogICAgIGJvb2wgdXNlUGFnZUNvb3JkaW5hdGVzOwogfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXlQYWdl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXlQYWdlLmpzCmlu ZGV4IDcxYmQzNTguLmJkOTg1MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JPdmVybGF5UGFnZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yT3ZlcmxheVBhZ2UuanMKQEAgLTMwLDEyNCArMzAsNiBAQCBmdW5jdGlvbiBkcmF3 UGF1c2VkSW5EZWJ1Z2dlck1lc3NhZ2UobWVzc2FnZSkKICAgICBkb2N1bWVudC5ib2R5LmNsYXNz TGlzdC5hZGQoImRpbW1lZCIpOwogfQogCi1mdW5jdGlvbiBfZHJhd0dyaWQoaGlnaGxpZ2h0LCBy dWxlckF0UmlnaHQsIHJ1bGVyQXRCb3R0b20pCi17Ci0gICAgaWYgKCFoaWdobGlnaHQuc2hvd1J1 bGVycykKLSAgICAgICAgcmV0dXJuOwotICAgIGNvbnRleHQuc2F2ZSgpOwotCi0gICAgdmFyIHdp ZHRoID0gY2FudmFzLndpZHRoOwotICAgIHZhciBoZWlnaHQgPSBjYW52YXMuaGVpZ2h0OwotCi0g ICAgY29uc3QgZ3JpZFN1YlN0ZXAgPSA1OwotICAgIGNvbnN0IGdyaWRTdGVwID0gNTA7Ci0KLSAg ICB7Ci0gICAgICAgIC8vIERyYXcgWCBncmlkIGJhY2tncm91bmQKLSAgICAgICAgY29udGV4dC5z YXZlKCk7Ci0gICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gZ3JpZEJhY2tncm91bmRDb2xvcjsK LSAgICAgICAgaWYgKHJ1bGVyQXRCb3R0b20pCi0gICAgICAgICAgICBjb250ZXh0LmZpbGxSZWN0 KDAsIGhlaWdodCAtIDE1LCB3aWR0aCwgaGVpZ2h0KTsKLSAgICAgICAgZWxzZQotICAgICAgICAg ICAgY29udGV4dC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgMTUpOwotCi0gICAgICAgIC8vIENsaXAg b3V0IGJhY2tncm91bmRzIGludGVyc2VjdGlvbgotICAgICAgICBjb250ZXh0Lmdsb2JhbENvbXBv c2l0ZU9wZXJhdGlvbiA9ICJkZXN0aW5hdGlvbi1vdXQiOwotICAgICAgICBjb250ZXh0LmZpbGxT dHlsZSA9ICJyZWQiOwotICAgICAgICBpZiAocnVsZXJBdFJpZ2h0KQotICAgICAgICAgICAgY29u dGV4dC5maWxsUmVjdCh3aWR0aCAtIDE1LCAwLCB3aWR0aCwgaGVpZ2h0KTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgY29udGV4dC5maWxsUmVjdCgwLCAwLCAxNSwgaGVpZ2h0KTsKLSAgICAg ICAgY29udGV4dC5yZXN0b3JlKCk7Ci0KLSAgICAgICAgLy8gRHJhdyBZIGdyaWQgYmFja2dyb3Vu ZAotICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9IGdyaWRCYWNrZ3JvdW5kQ29sb3I7Ci0gICAg ICAgIGlmIChydWxlckF0UmlnaHQpCi0gICAgICAgICAgICBjb250ZXh0LmZpbGxSZWN0KHdpZHRo IC0gMTUsIDAsIHdpZHRoLCBoZWlnaHQpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb250 ZXh0LmZpbGxSZWN0KDAsIDAsIDE1LCBoZWlnaHQpOwotICAgIH0KLQotICAgIGNvbnRleHQubGlu ZVdpZHRoID0gMTsKLSAgICBjb250ZXh0LnN0cm9rZVN0eWxlID0gZGFya0dyaWRDb2xvcjsKLSAg ICBjb250ZXh0LmZpbGxTdHlsZSA9IGRhcmtHcmlkQ29sb3I7Ci0gICAgewotICAgICAgICAvLyBE cmF3IGxhYmVscy4KLSAgICAgICAgY29udGV4dC5zYXZlKCk7Ci0gICAgICAgIGNvbnRleHQudHJh bnNsYXRlKC1oaWdobGlnaHQuc2Nyb2xsWCwgMC41IC0gaGlnaGxpZ2h0LnNjcm9sbFkpOwotICAg ICAgICBmb3IgKHZhciB5ID0gMiAqIGdyaWRTdGVwOyB5IDwgaGVpZ2h0ICsgaGlnaGxpZ2h0LnNj cm9sbFk7IHkgKz0gMiAqIGdyaWRTdGVwKSB7Ci0gICAgICAgICAgICBjb250ZXh0LnNhdmUoKTsK LSAgICAgICAgICAgIGNvbnRleHQudHJhbnNsYXRlKGhpZ2hsaWdodC5zY3JvbGxYLCB5KTsKLSAg ICAgICAgICAgIGNvbnRleHQucm90YXRlKC1NYXRoLlBJIC8gMik7Ci0gICAgICAgICAgICBjb250 ZXh0LmZpbGxUZXh0KHksIDIsIHJ1bGVyQXRSaWdodCA/IHdpZHRoIC0gNyA6IDEzKTsKLSAgICAg ICAgICAgIGNvbnRleHQucmVzdG9yZSgpOwotICAgICAgICB9Ci0gICAgICAgIGNvbnRleHQudHJh bnNsYXRlKDAuNSwgLTAuNSk7Ci0gICAgICAgIGZvciAodmFyIHggPSAyICogZ3JpZFN0ZXA7IHgg PCB3aWR0aCArIGhpZ2hsaWdodC5zY3JvbGxYOyB4ICs9IDIgKiBncmlkU3RlcCkgewotICAgICAg ICAgICAgY29udGV4dC5zYXZlKCk7Ci0gICAgICAgICAgICBjb250ZXh0LmZpbGxUZXh0KHgsIHgg KyAyLCBydWxlckF0Qm90dG9tID8gaGlnaGxpZ2h0LnNjcm9sbFkgKyBoZWlnaHQgLSA3IDogaGln aGxpZ2h0LnNjcm9sbFkgKyAxMyk7Ci0gICAgICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKLSAg ICAgICAgfQotICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKLSAgICB9Ci0KLSAgICB7Ci0gICAg ICAgIC8vIERyYXcgdmVydGljYWwgZ3JpZAotICAgICAgICBjb250ZXh0LnNhdmUoKTsKLSAgICAg ICAgaWYgKHJ1bGVyQXRSaWdodCkgewotICAgICAgICAgICAgY29udGV4dC50cmFuc2xhdGUod2lk dGgsIDApOwotICAgICAgICAgICAgY29udGV4dC5zY2FsZSgtMSwgMSk7Ci0gICAgICAgIH0KLSAg ICAgICAgY29udGV4dC50cmFuc2xhdGUoLWhpZ2hsaWdodC5zY3JvbGxYLCAwLjUgLSBoaWdobGln aHQuc2Nyb2xsWSk7Ci0gICAgICAgIGZvciAodmFyIHkgPSBncmlkU3RlcDsgeSA8IGhlaWdodCAr IGhpZ2hsaWdodC5zY3JvbGxZOyB5ICs9IGdyaWRTdGVwKSB7Ci0gICAgICAgICAgICBjb250ZXh0 LmJlZ2luUGF0aCgpOwotICAgICAgICAgICAgY29udGV4dC5tb3ZlVG8oaGlnaGxpZ2h0LnNjcm9s bFgsIHkpOwotICAgICAgICAgICAgdmFyIG1hcmtMZW5ndGggPSAoeSAlIChncmlkU3RlcCAqIDIp KSA/IDUgOiA4OwotICAgICAgICAgICAgY29udGV4dC5saW5lVG8oaGlnaGxpZ2h0LnNjcm9sbFgg KyBtYXJrTGVuZ3RoLCB5KTsKLSAgICAgICAgICAgIGNvbnRleHQuc3Ryb2tlKCk7Ci0gICAgICAg IH0KLSAgICAgICAgY29udGV4dC5zdHJva2VTdHlsZSA9IGxpZ2h0R3JpZENvbG9yOwotICAgICAg ICBmb3IgKHZhciB5ID0gZ3JpZFN1YlN0ZXA7IHkgPCBoaWdobGlnaHQuc2Nyb2xsWSArIGhlaWdo dDsgeSArPSBncmlkU3ViU3RlcCkgewotICAgICAgICAgICAgaWYgKCEoeSAlIGdyaWRTdGVwKSkK LSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGNvbnRleHQuYmVnaW5QYXRo KCk7Ci0gICAgICAgICAgICBjb250ZXh0Lm1vdmVUbyhoaWdobGlnaHQuc2Nyb2xsWCwgeSk7Ci0g ICAgICAgICAgICBjb250ZXh0LmxpbmVUbyhoaWdobGlnaHQuc2Nyb2xsWCArIGdyaWRTdWJTdGVw LCB5KTsKLSAgICAgICAgICAgIGNvbnRleHQuc3Ryb2tlKCk7Ci0gICAgICAgIH0KLSAgICAgICAg Y29udGV4dC5yZXN0b3JlKCk7Ci0gICAgfQotCi0gICAgewotICAgICAgICAvLyBEcmF3IGhvcml6 b250YWwgZ3JpZAotICAgICAgICBjb250ZXh0LnNhdmUoKTsKLSAgICAgICAgaWYgKHJ1bGVyQXRC b3R0b20pIHsKLSAgICAgICAgICAgIGNvbnRleHQudHJhbnNsYXRlKDAsIGhlaWdodCk7Ci0gICAg ICAgICAgICBjb250ZXh0LnNjYWxlKDEsIC0xKTsKLSAgICAgICAgfQotICAgICAgICBjb250ZXh0 LnRyYW5zbGF0ZSgwLjUgLSBoaWdobGlnaHQuc2Nyb2xsWCwgLWhpZ2hsaWdodC5zY3JvbGxZKTsK LSAgICAgICAgZm9yICh2YXIgeCA9IGdyaWRTdGVwOyB4IDwgd2lkdGggKyBoaWdobGlnaHQuc2Ny b2xsWDsgeCArPSBncmlkU3RlcCkgewotICAgICAgICAgICAgY29udGV4dC5iZWdpblBhdGgoKTsK LSAgICAgICAgICAgIGNvbnRleHQubW92ZVRvKHgsIGhpZ2hsaWdodC5zY3JvbGxZKTsKLSAgICAg ICAgICAgIHZhciBtYXJrTGVuZ3RoID0gKHggJSAoZ3JpZFN0ZXAgKiAyKSkgPyA1IDogODsKLSAg ICAgICAgICAgIGNvbnRleHQubGluZVRvKHgsIGhpZ2hsaWdodC5zY3JvbGxZICsgbWFya0xlbmd0 aCk7Ci0gICAgICAgICAgICBjb250ZXh0LnN0cm9rZSgpOwotICAgICAgICB9Ci0gICAgICAgIGNv bnRleHQuc3Ryb2tlU3R5bGUgPSBsaWdodEdyaWRDb2xvcjsKLSAgICAgICAgZm9yICh2YXIgeCA9 IGdyaWRTdWJTdGVwOyB4IDwgaGlnaGxpZ2h0LnNjcm9sbFggKyB3aWR0aDsgeCArPSBncmlkU3Vi U3RlcCkgewotICAgICAgICAgICAgaWYgKCEoeCAlIGdyaWRTdGVwKSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIGNvbnRleHQuYmVnaW5QYXRoKCk7Ci0gICAgICAgICAg ICBjb250ZXh0Lm1vdmVUbyh4LCBoaWdobGlnaHQuc2Nyb2xsWSk7Ci0gICAgICAgICAgICBjb250 ZXh0LmxpbmVUbyh4LCBoaWdobGlnaHQuc2Nyb2xsWSArIGdyaWRTdWJTdGVwKTsKLSAgICAgICAg ICAgIGNvbnRleHQuc3Ryb2tlKCk7Ci0gICAgICAgIH0KLSAgICAgICAgY29udGV4dC5yZXN0b3Jl KCk7Ci0gICAgfQotCi0gICAgY29udGV4dC5yZXN0b3JlKCk7Ci19Ci0KIGZ1bmN0aW9uIF9kcmF3 UmVnaW9uTnVtYmVyKHF1YWQsIG51bWJlcikKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKQEAgLTQ1 OCw2OCArMzQwLDYgQEAgZnVuY3Rpb24gX2RyYXdFbGVtZW50VGl0bGUoZWxlbWVudEluZm8sIGZy YWdtZW50SGlnaGxpZ2h0LCBzY3JvbGwpCiAgICAgZWxlbWVudFRpdGxlLnN0eWxlLmxlZnQgPSAo Ym94WCArIDMpICsgInB4IjsKIH0KIAotZnVuY3Rpb24gX2RyYXdSdWxlcnMoaGlnaGxpZ2h0LCBy dWxlckF0UmlnaHQsIHJ1bGVyQXRCb3R0b20pCi17Ci0gICAgaWYgKCFoaWdobGlnaHQuc2hvd1J1 bGVycykKLSAgICAgICAgcmV0dXJuOwotICAgIGNvbnRleHQuc2F2ZSgpOwotICAgIHZhciB3aWR0 aCA9IGNhbnZhcy53aWR0aDsKLSAgICB2YXIgaGVpZ2h0ID0gY2FudmFzLmhlaWdodDsKLSAgICBj b250ZXh0LnN0cm9rZVN0eWxlID0gInJnYmEoMTI4LCAxMjgsIDEyOCwgMC4zKSI7Ci0gICAgY29u dGV4dC5saW5lV2lkdGggPSAxOwotICAgIGNvbnRleHQudHJhbnNsYXRlKDAuNSwgMC41KTsKLSAg ICB2YXIgbGVmdG1vc3RYRm9yWSA9IHt9OwotICAgIHZhciByaWdodG1vc3RYRm9yWSA9IHt9Owot ICAgIHZhciB0b3Btb3N0WUZvclggPSB7fTsKLSAgICB2YXIgYm90dG9tbW9zdFlGb3JYID0ge307 Ci0KLSAgICBmb3IgKHZhciBpID0gMDsgaSA8IGhpZ2hsaWdodC5xdWFkcy5sZW5ndGg7ICsraSkg ewotICAgICAgICB2YXIgcXVhZCA9IGhpZ2hsaWdodC5xdWFkc1tpXTsKLSAgICAgICAgZm9yICh2 YXIgaiA9IDA7IGogPCBxdWFkLmxlbmd0aDsgKytqKSB7Ci0gICAgICAgICAgICB2YXIgeCA9IHF1 YWRbal0ueDsKLSAgICAgICAgICAgIHZhciB5ID0gcXVhZFtqXS55OwotICAgICAgICAgICAgbGVm dG1vc3RYRm9yWVtNYXRoLnJvdW5kKHkpXSA9IE1hdGgubWluKGxlZnRtb3N0WEZvcllbeV0gfHwg TnVtYmVyLk1BWF9WQUxVRSwgTWF0aC5yb3VuZChxdWFkW2pdLngpKTsKLSAgICAgICAgICAgIHJp Z2h0bW9zdFhGb3JZW01hdGgucm91bmQoeSldID0gTWF0aC5tYXgocmlnaHRtb3N0WEZvcllbeV0g fHwgTnVtYmVyLk1JTl9WQUxVRSwgTWF0aC5yb3VuZChxdWFkW2pdLngpKTsKLSAgICAgICAgICAg IHRvcG1vc3RZRm9yWFtNYXRoLnJvdW5kKHgpXSA9IE1hdGgubWluKHRvcG1vc3RZRm9yWFt4XSB8 fCBOdW1iZXIuTUFYX1ZBTFVFLCBNYXRoLnJvdW5kKHF1YWRbal0ueSkpOwotICAgICAgICAgICAg Ym90dG9tbW9zdFlGb3JYW01hdGgucm91bmQoeCldID0gTWF0aC5tYXgoYm90dG9tbW9zdFlGb3JY W3hdIHx8IE51bWJlci5NSU5fVkFMVUUsIE1hdGgucm91bmQocXVhZFtqXS55KSk7Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICBpZiAocnVsZXJBdFJpZ2h0KSB7Ci0gICAgICAgIGZvciAodmFyIHkg aW4gcmlnaHRtb3N0WEZvclkpIHsKLSAgICAgICAgICAgIGNvbnRleHQuYmVnaW5QYXRoKCk7Ci0g ICAgICAgICAgICBjb250ZXh0Lm1vdmVUbyh3aWR0aCwgeSk7Ci0gICAgICAgICAgICBjb250ZXh0 LmxpbmVUbyhyaWdodG1vc3RYRm9yWVt5XSwgeSk7Ci0gICAgICAgICAgICBjb250ZXh0LnN0cm9r ZSgpOwotICAgICAgICB9Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgZm9yICh2YXIgeSBpbiBsZWZ0 bW9zdFhGb3JZKSB7Ci0gICAgICAgICAgICBjb250ZXh0LmJlZ2luUGF0aCgpOwotICAgICAgICAg ICAgY29udGV4dC5tb3ZlVG8oMCwgeSk7Ci0gICAgICAgICAgICBjb250ZXh0LmxpbmVUbyhsZWZ0 bW9zdFhGb3JZW3ldLCB5KTsKLSAgICAgICAgICAgIGNvbnRleHQuc3Ryb2tlKCk7Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICBpZiAocnVsZXJBdEJvdHRvbSkgewotICAgICAgICBmb3IgKHZhciB4 IGluIGJvdHRvbW1vc3RZRm9yWCkgewotICAgICAgICAgICAgY29udGV4dC5iZWdpblBhdGgoKTsK LSAgICAgICAgICAgIGNvbnRleHQubW92ZVRvKHgsIGhlaWdodCk7Ci0gICAgICAgICAgICBjb250 ZXh0LmxpbmVUbyh4LCB0b3Btb3N0WUZvclhbeF0pOwotICAgICAgICAgICAgY29udGV4dC5zdHJv a2UoKTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAodmFyIHggaW4gdG9w bW9zdFlGb3JYKSB7Ci0gICAgICAgICAgICBjb250ZXh0LmJlZ2luUGF0aCgpOwotICAgICAgICAg ICAgY29udGV4dC5tb3ZlVG8oeCwgMCk7Ci0gICAgICAgICAgICBjb250ZXh0LmxpbmVUbyh4LCB0 b3Btb3N0WUZvclhbeF0pOwotICAgICAgICAgICAgY29udGV4dC5zdHJva2UoKTsKLSAgICAgICAg fQotICAgIH0KLQotICAgIGNvbnRleHQucmVzdG9yZSgpOwotfQotCiBmdW5jdGlvbiBfcXVhZE1p ZFBvaW50KHF1YWQpCiB7CiAgICAgcmV0dXJuIHsKQEAgLTU3NiwxMCArMzk2LDggQEAgZnVuY3Rp b24gX2RyYXdTaGFwZUhpZ2hsaWdodChzaGFwZUluZm8pIHsKIAogZnVuY3Rpb24gX2RyYXdGcmFn bWVudEhpZ2hsaWdodChoaWdobGlnaHQpCiB7Ci0gICAgaWYgKCFoaWdobGlnaHQucXVhZHMubGVu Z3RoKSB7Ci0gICAgICAgIF9kcmF3R3JpZChoaWdobGlnaHQsIGZhbHNlLCBmYWxzZSk7CisgICAg aWYgKCFoaWdobGlnaHQucXVhZHMubGVuZ3RoKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAg ICAgY29udGV4dC5zYXZlKCk7CiAKQEAgLTYyOSwxMiArNDQ3LDYgQEAgZnVuY3Rpb24gX2RyYXdG cmFnbWVudEhpZ2hsaWdodChoaWdobGlnaHQpCiAgICAgfQogCiAgICAgY29udGV4dC5yZXN0b3Jl KCk7Ci0KLSAgICB2YXIgcnVsZXJBdFJpZ2h0ID0gbWluWCA8IDIwICYmIG1heFggKyAyMCA8IHdp ZHRoOwotICAgIHZhciBydWxlckF0Qm90dG9tID0gbWluWSA8IDIwICYmIG1heFkgKyAyMCA8IGhl aWdodDsKLQotICAgIF9kcmF3R3JpZChoaWdobGlnaHQsIHJ1bGVyQXRSaWdodCwgcnVsZXJBdEJv dHRvbSk7Ci0gICAgX2RyYXdSdWxlcnMoaGlnaGxpZ2h0LCBydWxlckF0UmlnaHQsIHJ1bGVyQXRC b3R0b20pOwogfQogCiBmdW5jdGlvbiBzaG93UGFnZUluZGljYXRpb24oKQo=