83745 2012-04-11 21:29:58 -0700 Optimize non-rounded double border rendering to avoid transparency layers 2012-04-12 09:04:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71724 1 davidbarr davidbarr dglazkov simon.fraser webkit.review.bot oldest_to_newest 600865 0 davidbarr 2012-04-11 21:29:58 -0700 A simple case of borders, where all sides are the same color, are DOUBLE style, and don't have rounded corners, can easily be optimized to avoid using expensive transparency layers. 600916 1 136829 davidbarr 2012-04-11 23:11:38 -0700 Created attachment 136829 Patch 600919 2 136829 webkit.review.bot 2012-04-11 23:16:43 -0700 Comment on attachment 136829 Patch Attachment 136829 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12391249 600921 3 136831 davidbarr 2012-04-11 23:19:11 -0700 Created attachment 136831 Patch 601275 4 136831 webkit.review.bot 2012-04-12 09:04:24 -0700 Comment on attachment 136831 Patch Clearing flags on attachment: 136831 Committed r113991: <http://trac.webkit.org/changeset/113991> 601276 5 webkit.review.bot 2012-04-12 09:04:29 -0700 All reviewed patches have been landed. Closing bug. 136829 2012-04-11 23:11:38 -0700 2012-04-11 23:19:03 -0700 Patch bug-83745-20120412161136.patch text/plain 5524 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y2YmQ0ODMwZGUwNmE1 N2RiZDQ5ZTdiYTM4MTQ4MzgwOTI1OTUwZS4uZWU3MjFiZjlmNTgyYzhjMjhiZDY3MDY2Y2MwOTEz ZjEwOWI2MDM4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTEyICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBPcHRpbWl6ZSBub24t cm91bmRlZCBkb3VibGUgYm9yZGVyIHJlbmRlcmluZyB0byBhdm9pZCB0cmFuc3BhcmVuY3kgbGF5 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc0 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGZ1 bmN0aW9uYWwgY2hhbmdlLCBwYWludGluZyBvcHRpbWl6YXRpb24gb25seS4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIpOgorCiAyMDEyLTA0LTExICBSYXltb25k IExpdSAgPHJheW1vbmQubGl1QGludGVsLmNvbT4KIAogICAgICAgICBBdWRpb0NvbnRleHQgY3Jl YXRlQ2hhbm5lbFNwbGl0dGVyKCkgbWV0aG9kIHNob3VsZCBoYXZlIG9wdGlvbmFsIGFyZ3VtZW50 IGZvciBudW1iZXIgb2Ygb3V0cHV0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggNGIzYjhiN2FjMmExZDYxMzY4ZjBjYWU4ZGYx NGQ0MDFlZmI1MjAyYi4uOWQ0MDA1ZDE2MWM2M2YzYmI1OTViYjBhYWVlMjNjNmYyYzY0MGRhOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCkBAIC0xNzk0LDYgKzE3OTQsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWlu dEJvcmRlcihjb25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAKICAgICBi b29sIGhhdmVBbHBoYUNvbG9yID0gZmFsc2U7CiAgICAgYm9vbCBoYXZlQWxsU29saWRFZGdlcyA9 IHRydWU7CisgICAgYm9vbCBoYXZlQWxsRG91YmxlRWRnZXMgPSB0cnVlOwogICAgIGJvb2wgYWxs RWRnZXNWaXNpYmxlID0gdHJ1ZTsKICAgICBib29sIGFsbEVkZ2VzU2hhcmVDb2xvciA9IHRydWU7 CiAgICAgaW50IGZpcnN0VmlzaWJsZUVkZ2UgPSAtMTsKQEAgLTE4MjEsNiArMTgyMiw5IEBAIHZv aWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5m bywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgCiAgICAgICAgIGlmIChjdXJyRWRnZS5zdHls ZSAhPSBTT0xJRCkKICAgICAgICAgICAgIGhhdmVBbGxTb2xpZEVkZ2VzID0gZmFsc2U7CisKKyAg ICAgICAgaWYgKGN1cnJFZGdlLnN0eWxlICE9IERPVUJMRSkKKyAgICAgICAgICAgIGhhdmVBbGxE b3VibGVFZGdlcyA9IGZhbHNlOwogICAgIH0KIAogICAgIC8vIElmIG5vIGNvcm5lciBpbnRlcnNl Y3RzIHRoZSBjbGlwIHJlZ2lvbiwgd2UgY2FuIHByZXRlbmQgb3V0ZXJCb3JkZXIgaXMKQEAgLTE4 MjksOSArMTgzMywxMCBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcihj b25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAgICAgICAgIG91dGVyQm9y ZGVyLnNldFJhZGlpKFJvdW5kZWRSZWN0OjpSYWRpaSgpKTsKIAogICAgIC8vIGlzUmVuZGVyYWJs ZSgpIGNoZWNrIGF2b2lkcyBpc3N1ZSBkZXNjcmliZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM4Nzg3Ci0gICAgaWYgKGhhdmVBbGxTb2xpZEVkZ2VzICYmIGFs bEVkZ2VzU2hhcmVDb2xvciAmJiBpbm5lckJvcmRlci5pc1JlbmRlcmFibGUoKSkgewotICAgICAg ICAvLyBGYXN0IHBhdGggZm9yIGRyYXdpbmcgYWxsIHNvbGlkIGVkZ2VzLgotICAgICAgICBpZiAo YWxsRWRnZXNWaXNpYmxlICYmIChvdXRlckJvcmRlci5pc1JvdW5kZWQoKSB8fCBoYXZlQWxwaGFD b2xvcikpIHsKKyAgICBpZiAoKGhhdmVBbGxTb2xpZEVkZ2VzIHx8IGhhdmVBbGxEb3VibGVFZGdl cykgJiYgYWxsRWRnZXNTaGFyZUNvbG9yICYmIGlubmVyQm9yZGVyLmlzUmVuZGVyYWJsZSgpKSB7 CisgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgZHJhd2luZyBhbGwgc29saWQgZWRnZXMgYW5kIGFs bCB1bnJvdW5kZWQgZG91YmxlIGVkZ2VzCisgICAgICAgIGlmIChhbGxFZGdlc1Zpc2libGUgJiYg KG91dGVyQm9yZGVyLmlzUm91bmRlZCgpIHx8IGhhdmVBbHBoYUNvbG9yKQorICAgICAgICAgICAg JiYgKGhhdmVBbGxTb2xpZEVkZ2VzIHx8ICFvdXRlckJvcmRlci5pc1JvdW5kZWQoKSAmJiAhaW5u ZXJCb3JkZXIuaXNSb3VuZGVkKCkpKSB7CiAgICAgICAgICAgICBQYXRoIHBhdGg7CiAgICAgICAg ICAgICAKICAgICAgICAgICAgIGlmIChvdXRlckJvcmRlci5pc1JvdW5kZWQoKSAmJiBibGVlZEF2 b2lkYW5jZSAhPSBCYWNrZ3JvdW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKQEAgLTE4Mzks NiArMTg0NCw0NSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcihjb25z dCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KG91dGVyQm9yZGVyLnJlY3QoKSk7CiAKKyAgICAg ICAgICAgIGlmIChoYXZlQWxsRG91YmxlRWRnZXMpIHsKKyAgICAgICAgICAgICAgICBMYXlvdXRS ZWN0IGlubmVyVGhpcmRSZWN0ID0gb3V0ZXJCb3JkZXIucmVjdCgpOworICAgICAgICAgICAgICAg IExheW91dFJlY3Qgb3V0ZXJUaGlyZFJlY3QgPSBvdXRlckJvcmRlci5yZWN0KCk7CisgICAgICAg ICAgICAgICAgZm9yIChpbnQgc2lkZSA9IEJTVG9wOyBzaWRlIDw9IEJTTGVmdDsgKytzaWRlKSB7 CisgICAgICAgICAgICAgICAgICAgIGludCBvdXRlcldpZHRoOworICAgICAgICAgICAgICAgICAg ICBpbnQgaW5uZXJXaWR0aDsKKyAgICAgICAgICAgICAgICAgICAgZWRnZXNbc2lkZV0uZ2V0RG91 YmxlQm9yZGVyU3RyaXBlV2lkdGhzKG91dGVyV2lkdGgsIGlubmVyV2lkdGgpOworCisgICAgICAg ICAgICAgICAgICAgIGlmIChzaWRlID09IEJTVG9wKSB7CisgICAgICAgICAgICAgICAgICAgICAg ICBpbm5lclRoaXJkUmVjdC5zaGlmdFlFZGdlVG8oaW5uZXJUaGlyZFJlY3QueSgpICsgaW5uZXJX aWR0aCk7CisgICAgICAgICAgICAgICAgICAgICAgICBvdXRlclRoaXJkUmVjdC5zaGlmdFlFZGdl VG8ob3V0ZXJUaGlyZFJlY3QueSgpICsgb3V0ZXJXaWR0aCk7CisgICAgICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAoc2lkZSA9PSBCU0JvdHRvbSkgeworICAgICAgICAgICAgICAgICAgICAgICAg aW5uZXJUaGlyZFJlY3Quc2V0SGVpZ2h0KGlubmVyVGhpcmRSZWN0LmhlaWdodCgpIC0gaW5uZXJX aWR0aCk7CisgICAgICAgICAgICAgICAgICAgICAgICBvdXRlclRoaXJkUmVjdC5zZXRIZWlnaHQo b3V0ZXJUaGlyZFJlY3QuaGVpZ2h0KCkgLSBvdXRlcldpZHRoKTsKKyAgICAgICAgICAgICAgICAg ICAgfSBlbHNlIGlmIChzaWRlID09IEJTTGVmdCkgeworICAgICAgICAgICAgICAgICAgICAgICAg aW5uZXJUaGlyZFJlY3Quc2hpZnRYRWRnZVRvKGlubmVyVGhpcmRSZWN0LngoKSArIGlubmVyV2lk dGgpOworICAgICAgICAgICAgICAgICAgICAgICAgb3V0ZXJUaGlyZFJlY3Quc2hpZnRYRWRnZVRv KG91dGVyVGhpcmRSZWN0LngoKSArIG91dGVyV2lkdGgpOworICAgICAgICAgICAgICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgaW5uZXJUaGlyZFJlY3Quc2V0V2lkdGgo aW5uZXJUaGlyZFJlY3Qud2lkdGgoKSAtIGlubmVyV2lkdGgpOworICAgICAgICAgICAgICAgICAg ICAgICAgb3V0ZXJUaGlyZFJlY3Quc2V0V2lkdGgob3V0ZXJUaGlyZFJlY3Qud2lkdGgoKSAtIG91 dGVyV2lkdGgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAgICAgUm91bmRlZFJlY3Qgb3V0ZXJUaGlyZCA9IG91dGVyQm9yZGVyOworICAg ICAgICAgICAgICAgIFJvdW5kZWRSZWN0IGlubmVyVGhpcmQgPSBpbm5lckJvcmRlcjsKKyAgICAg ICAgICAgICAgICBpbm5lclRoaXJkLnNldFJlY3QoaW5uZXJUaGlyZFJlY3QpOworICAgICAgICAg ICAgICAgIG91dGVyVGhpcmQuc2V0UmVjdChvdXRlclRoaXJkUmVjdCk7CisKKyAgICAgICAgICAg ICAgICBpZiAob3V0ZXJUaGlyZC5pc1JvdW5kZWQoKSAmJiBibGVlZEF2b2lkYW5jZSAhPSBCYWNr Z3JvdW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKKyAgICAgICAgICAgICAgICAgICAgcGF0 aC5hZGRSb3VuZGVkUmVjdChvdXRlclRoaXJkKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChvdXRlclRoaXJkLnJlY3QoKSk7CisKKyAgICAg ICAgICAgICAgICBpZiAoaW5uZXJUaGlyZC5pc1JvdW5kZWQoKSAmJiBibGVlZEF2b2lkYW5jZSAh PSBCYWNrZ3JvdW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKKyAgICAgICAgICAgICAgICAg ICAgcGF0aC5hZGRSb3VuZGVkUmVjdChpbm5lclRoaXJkKTsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChpbm5lclRoaXJkLnJlY3QoKSk7Cisg ICAgICAgICAgICB9CisKICAgICAgICAgICAgIGlmIChpbm5lckJvcmRlci5pc1JvdW5kZWQoKSkK ICAgICAgICAgICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGlubmVyQm9yZGVyKTsKICAgICAg ICAgICAgIGVsc2UKQEAgLTE4NTAsNyArMTg5NCw3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmpl Y3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfSAKICAgICAgICAgLy8gQXZvaWQgY3JlYXRp bmcgdHJhbnNwYXJlbnQgbGF5ZXJzCi0gICAgICAgIGlmICghYWxsRWRnZXNWaXNpYmxlICYmICFv dXRlckJvcmRlci5pc1JvdW5kZWQoKSAmJiBoYXZlQWxwaGFDb2xvcikgeworICAgICAgICBpZiAo aGF2ZUFsbFNvbGlkRWRnZXMgJiYgIWFsbEVkZ2VzVmlzaWJsZSAmJiAhb3V0ZXJCb3JkZXIuaXNS b3VuZGVkKCkgJiYgaGF2ZUFscGhhQ29sb3IpIHsKICAgICAgICAgICAgIFBhdGggcGF0aDsKIAog ICAgICAgICAgICAgZm9yIChpbnQgaSA9IEJTVG9wOyBpIDw9IEJTTGVmdDsgKytpKSB7Cg== 136831 2012-04-11 23:19:11 -0700 2012-04-12 09:04:24 -0700 Patch bug-83745-20120412161909.patch text/plain 5526 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y2YmQ0ODMwZGUwNmE1 N2RiZDQ5ZTdiYTM4MTQ4MzgwOTI1OTUwZS4uZWU3MjFiZjlmNTgyYzhjMjhiZDY3MDY2Y2MwOTEz ZjEwOWI2MDM4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTEyICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBPcHRpbWl6ZSBub24t cm91bmRlZCBkb3VibGUgYm9yZGVyIHJlbmRlcmluZyB0byBhdm9pZCB0cmFuc3BhcmVuY3kgbGF5 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc0 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGZ1 bmN0aW9uYWwgY2hhbmdlLCBwYWludGluZyBvcHRpbWl6YXRpb24gb25seS4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIpOgorCiAyMDEyLTA0LTExICBSYXltb25k IExpdSAgPHJheW1vbmQubGl1QGludGVsLmNvbT4KIAogICAgICAgICBBdWRpb0NvbnRleHQgY3Jl YXRlQ2hhbm5lbFNwbGl0dGVyKCkgbWV0aG9kIHNob3VsZCBoYXZlIG9wdGlvbmFsIGFyZ3VtZW50 IGZvciBudW1iZXIgb2Ygb3V0cHV0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggNGIzYjhiN2FjMmExZDYxMzY4ZjBjYWU4ZGYx NGQ0MDFlZmI1MjAyYi4uNDgxNGQyMmJhNGM3ZTQ0YmE3OWEzNTBlODMxZjA3NzExNDFmMTM0MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCkBAIC0xNzk0LDYgKzE3OTQsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWlu dEJvcmRlcihjb25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAKICAgICBi b29sIGhhdmVBbHBoYUNvbG9yID0gZmFsc2U7CiAgICAgYm9vbCBoYXZlQWxsU29saWRFZGdlcyA9 IHRydWU7CisgICAgYm9vbCBoYXZlQWxsRG91YmxlRWRnZXMgPSB0cnVlOwogICAgIGJvb2wgYWxs RWRnZXNWaXNpYmxlID0gdHJ1ZTsKICAgICBib29sIGFsbEVkZ2VzU2hhcmVDb2xvciA9IHRydWU7 CiAgICAgaW50IGZpcnN0VmlzaWJsZUVkZ2UgPSAtMTsKQEAgLTE4MjEsNiArMTgyMiw5IEBAIHZv aWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5m bywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgCiAgICAgICAgIGlmIChjdXJyRWRnZS5zdHls ZSAhPSBTT0xJRCkKICAgICAgICAgICAgIGhhdmVBbGxTb2xpZEVkZ2VzID0gZmFsc2U7CisKKyAg ICAgICAgaWYgKGN1cnJFZGdlLnN0eWxlICE9IERPVUJMRSkKKyAgICAgICAgICAgIGhhdmVBbGxE b3VibGVFZGdlcyA9IGZhbHNlOwogICAgIH0KIAogICAgIC8vIElmIG5vIGNvcm5lciBpbnRlcnNl Y3RzIHRoZSBjbGlwIHJlZ2lvbiwgd2UgY2FuIHByZXRlbmQgb3V0ZXJCb3JkZXIgaXMKQEAgLTE4 MjksOSArMTgzMywxMCBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcihj b25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3QmCiAgICAgICAgIG91dGVyQm9y ZGVyLnNldFJhZGlpKFJvdW5kZWRSZWN0OjpSYWRpaSgpKTsKIAogICAgIC8vIGlzUmVuZGVyYWJs ZSgpIGNoZWNrIGF2b2lkcyBpc3N1ZSBkZXNjcmliZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM4Nzg3Ci0gICAgaWYgKGhhdmVBbGxTb2xpZEVkZ2VzICYmIGFs bEVkZ2VzU2hhcmVDb2xvciAmJiBpbm5lckJvcmRlci5pc1JlbmRlcmFibGUoKSkgewotICAgICAg ICAvLyBGYXN0IHBhdGggZm9yIGRyYXdpbmcgYWxsIHNvbGlkIGVkZ2VzLgotICAgICAgICBpZiAo YWxsRWRnZXNWaXNpYmxlICYmIChvdXRlckJvcmRlci5pc1JvdW5kZWQoKSB8fCBoYXZlQWxwaGFD b2xvcikpIHsKKyAgICBpZiAoKGhhdmVBbGxTb2xpZEVkZ2VzIHx8IGhhdmVBbGxEb3VibGVFZGdl cykgJiYgYWxsRWRnZXNTaGFyZUNvbG9yICYmIGlubmVyQm9yZGVyLmlzUmVuZGVyYWJsZSgpKSB7 CisgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgZHJhd2luZyBhbGwgc29saWQgZWRnZXMgYW5kIGFs bCB1bnJvdW5kZWQgZG91YmxlIGVkZ2VzCisgICAgICAgIGlmIChhbGxFZGdlc1Zpc2libGUgJiYg KG91dGVyQm9yZGVyLmlzUm91bmRlZCgpIHx8IGhhdmVBbHBoYUNvbG9yKQorICAgICAgICAgICAg JiYgKGhhdmVBbGxTb2xpZEVkZ2VzIHx8ICghb3V0ZXJCb3JkZXIuaXNSb3VuZGVkKCkgJiYgIWlu bmVyQm9yZGVyLmlzUm91bmRlZCgpKSkpIHsKICAgICAgICAgICAgIFBhdGggcGF0aDsKICAgICAg ICAgICAgIAogICAgICAgICAgICAgaWYgKG91dGVyQm9yZGVyLmlzUm91bmRlZCgpICYmIGJsZWVk QXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQpAQCAtMTgz OSw2ICsxODQ0LDQ1IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNv bnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qob3V0ZXJCb3JkZXIucmVjdCgpKTsKIAorICAg ICAgICAgICAgaWYgKGhhdmVBbGxEb3VibGVFZGdlcykgeworICAgICAgICAgICAgICAgIExheW91 dFJlY3QgaW5uZXJUaGlyZFJlY3QgPSBvdXRlckJvcmRlci5yZWN0KCk7CisgICAgICAgICAgICAg ICAgTGF5b3V0UmVjdCBvdXRlclRoaXJkUmVjdCA9IG91dGVyQm9yZGVyLnJlY3QoKTsKKyAgICAg ICAgICAgICAgICBmb3IgKGludCBzaWRlID0gQlNUb3A7IHNpZGUgPD0gQlNMZWZ0OyArK3NpZGUp IHsKKyAgICAgICAgICAgICAgICAgICAgaW50IG91dGVyV2lkdGg7CisgICAgICAgICAgICAgICAg ICAgIGludCBpbm5lcldpZHRoOworICAgICAgICAgICAgICAgICAgICBlZGdlc1tzaWRlXS5nZXRE b3VibGVCb3JkZXJTdHJpcGVXaWR0aHMob3V0ZXJXaWR0aCwgaW5uZXJXaWR0aCk7CisKKyAgICAg ICAgICAgICAgICAgICAgaWYgKHNpZGUgPT0gQlNUb3ApIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGlubmVyVGhpcmRSZWN0LnNoaWZ0WUVkZ2VUbyhpbm5lclRoaXJkUmVjdC55KCkgKyBpbm5l cldpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG91dGVyVGhpcmRSZWN0LnNoaWZ0WUVk Z2VUbyhvdXRlclRoaXJkUmVjdC55KCkgKyBvdXRlcldpZHRoKTsKKyAgICAgICAgICAgICAgICAg ICAgfSBlbHNlIGlmIChzaWRlID09IEJTQm90dG9tKSB7CisgICAgICAgICAgICAgICAgICAgICAg ICBpbm5lclRoaXJkUmVjdC5zZXRIZWlnaHQoaW5uZXJUaGlyZFJlY3QuaGVpZ2h0KCkgLSBpbm5l cldpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG91dGVyVGhpcmRSZWN0LnNldEhlaWdo dChvdXRlclRoaXJkUmVjdC5oZWlnaHQoKSAtIG91dGVyV2lkdGgpOworICAgICAgICAgICAgICAg ICAgICB9IGVsc2UgaWYgKHNpZGUgPT0gQlNMZWZ0KSB7CisgICAgICAgICAgICAgICAgICAgICAg ICBpbm5lclRoaXJkUmVjdC5zaGlmdFhFZGdlVG8oaW5uZXJUaGlyZFJlY3QueCgpICsgaW5uZXJX aWR0aCk7CisgICAgICAgICAgICAgICAgICAgICAgICBvdXRlclRoaXJkUmVjdC5zaGlmdFhFZGdl VG8ob3V0ZXJUaGlyZFJlY3QueCgpICsgb3V0ZXJXaWR0aCk7CisgICAgICAgICAgICAgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpbm5lclRoaXJkUmVjdC5zZXRXaWR0 aChpbm5lclRoaXJkUmVjdC53aWR0aCgpIC0gaW5uZXJXaWR0aCk7CisgICAgICAgICAgICAgICAg ICAgICAgICBvdXRlclRoaXJkUmVjdC5zZXRXaWR0aChvdXRlclRoaXJkUmVjdC53aWR0aCgpIC0g b3V0ZXJXaWR0aCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisK KyAgICAgICAgICAgICAgICBSb3VuZGVkUmVjdCBvdXRlclRoaXJkID0gb3V0ZXJCb3JkZXI7Cisg ICAgICAgICAgICAgICAgUm91bmRlZFJlY3QgaW5uZXJUaGlyZCA9IGlubmVyQm9yZGVyOworICAg ICAgICAgICAgICAgIGlubmVyVGhpcmQuc2V0UmVjdChpbm5lclRoaXJkUmVjdCk7CisgICAgICAg ICAgICAgICAgb3V0ZXJUaGlyZC5zZXRSZWN0KG91dGVyVGhpcmRSZWN0KTsKKworICAgICAgICAg ICAgICAgIGlmIChvdXRlclRoaXJkLmlzUm91bmRlZCgpICYmIGJsZWVkQXZvaWRhbmNlICE9IEJh Y2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQorICAgICAgICAgICAgICAgICAgICBw YXRoLmFkZFJvdW5kZWRSZWN0KG91dGVyVGhpcmQpOworICAgICAgICAgICAgICAgIGVsc2UKKyAg ICAgICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KG91dGVyVGhpcmQucmVjdCgpKTsKKworICAg ICAgICAgICAgICAgIGlmIChpbm5lclRoaXJkLmlzUm91bmRlZCgpICYmIGJsZWVkQXZvaWRhbmNl ICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQorICAgICAgICAgICAgICAg ICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGlubmVyVGhpcmQpOworICAgICAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KGlubmVyVGhpcmQucmVjdCgpKTsK KyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgaWYgKGlubmVyQm9yZGVyLmlzUm91bmRlZCgp KQogICAgICAgICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QoaW5uZXJCb3JkZXIpOwogICAg ICAgICAgICAgZWxzZQpAQCAtMTg1MCw3ICsxODk0LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9i amVjdDo6cGFpbnRCb3JkZXIoY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBMYXlvdXRSZWN0 JgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9IAogICAgICAgICAvLyBBdm9pZCBjcmVh dGluZyB0cmFuc3BhcmVudCBsYXllcnMKLSAgICAgICAgaWYgKCFhbGxFZGdlc1Zpc2libGUgJiYg IW91dGVyQm9yZGVyLmlzUm91bmRlZCgpICYmIGhhdmVBbHBoYUNvbG9yKSB7CisgICAgICAgIGlm IChoYXZlQWxsU29saWRFZGdlcyAmJiAhYWxsRWRnZXNWaXNpYmxlICYmICFvdXRlckJvcmRlci5p c1JvdW5kZWQoKSAmJiBoYXZlQWxwaGFDb2xvcikgewogICAgICAgICAgICAgUGF0aCBwYXRoOwog CiAgICAgICAgICAgICBmb3IgKGludCBpID0gQlNUb3A7IGkgPD0gQlNMZWZ0OyArK2kpIHsK