77428 2012-01-31 05:42:56 -0800 Tap highlighting: Support better outlines for multiline inlines 2012-01-31 06:35:14 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann webkit.review.bot oldest_to_newest 545973 0 kenneth 2012-01-31 05:42:56 -0800 SSIA 545979 1 124714 kenneth 2012-01-31 05:49:12 -0800 Created attachment 124714 Patch 545980 2 webkit.review.bot 2012-01-31 05:51:03 -0800 Attachment 124714 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit 09fbdf8..3b3325c master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 106354 = 09fbdf8bc1525cf6c284e230088f23103db232bd r106355 = 3b3325cd5a20bf357b8fdad5c0c1dcb448125ec4 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 545984 3 124714 hausmann 2012-01-31 06:07:33 -0800 Comment on attachment 124714 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124714&action=review > Source/WebCore/page/GestureTapHighlighter.cpp:133 > +inline bool contains(LayoutRect rect, int x) missing "static" keyword? > Source/WebCore/page/GestureTapHighlighter.cpp:173 > + if (!first.isEmpty()) { > + addRectWithRoundedCorners(path, first, > + true, true, > + !contains(middle, first.x()) && !contains(last, first.x()), > + !contains(middle, first.maxX()) && !contains(last, first.maxX())); I wish there was a way to write this more readable, i.e. make it clearer what the meaning of the booleans here is. 545997 4 kenneth 2012-01-31 06:35:14 -0800 Corrected patch landed in 106357. 124714 2012-01-31 05:49:12 -0800 2012-01-31 06:07:33 -0800 Patch 0001-Tap-highlighting-Support-better-outlines-for-multili.patch text/plain 8209 kenneth RnJvbSBlNjYyNTdjZWQxMDQwMzYyNGRkOTZhNjA5YjJhOTY1YWJkYjI3YjZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBUdWUsIDMxIEphbiAyMDEyIDExOjA5OjI5ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gVGFwIGhpZ2hsaWdodGluZzogU3VwcG9ydCBiZXR0ZXIgb3V0bGluZXMgZm9yIG11 bHRpbGluZQogaW5saW5lcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzc0MjgKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKLjoKClVwZGF0ZSB0aGUgdGVzdCB0 byB1c2UgYSB0cmFuc2Zvcm0uCgoqIE1hbnVhbFRlc3RzL3F0L3RhcC1oaWdobGlnaHRpbmctaW5s aW5lcy5odG1sOgoKU291cmNlL1dlYkNvcmU6CgpDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0cy4KCkRv IG5vdCB1c2UgdGhlIGxpbmVzQm91bmRpbmdCb3ggYW55bW9yZSBidXQgZHJhdyBhIGN1c3RvbSBw YXRoCndpdGggcm91bmRlZCBjb3JuZXJzLiBJbmxpbmVzIGFyZSBkcmF3biBhcyBtYXggMyByZWN0 cywgZmlyc3QKbGluZSByZWN0LCBqb2luZWQgbWlkZGxlIHJlY3QgYW5kIHRoZSByZWN0IGZvciB0 aGUgbGFzdCBsaW5lLgoKKiBwYWdlL0dlc3R1cmVUYXBIaWdobGlnaHRlci5jcHA6CiogcGxhdGZv cm0vZ3JhcGhpY3MvUGF0aC5oOiBNYWtlIGFkZEJlemllcnNGb3JSb3VuZGVkUmVjdCBwdWJsaWMu Ci0tLQogQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx MSArKysKIE1hbnVhbFRlc3RzL3F0L3RhcC1oaWdobGlnaHRpbmctaW5saW5lcy5odG1sICB8ICAg IDIgKy0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8ICAg MTYgKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvR2VzdHVyZVRhcEhpZ2hsaWdodGVyLmNwcCB8 ICAgODggKysrKysrKysrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvUGF0aC5oICAgICAgIHwgICAgMiArLQogNSBmaWxlcyBjaGFuZ2VkLCAxMDQgaW5z ZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hh bmdlTG9nCmluZGV4IDY5MTk3MzQuLjA4ZjU0YTQgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysg Yi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wMS0zMSAgS2VubmV0aCBSb2hkZSBD aHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVGFwIGhpZ2hsaWdo dGluZzogU3VwcG9ydCBiZXR0ZXIgb3V0bGluZXMgZm9yIG11bHRpbGluZSBpbmxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzQyOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgdGVz dCB0byB1c2UgYSB0cmFuc2Zvcm0uCisKKyAgICAgICAgKiBNYW51YWxUZXN0cy9xdC90YXAtaGln aGxpZ2h0aW5nLWlubGluZXMuaHRtbDoKKwogMjAxMi0wMS0zMSAgTmF5YW4gS3VtYXIgSyAgPG5h eWFua2tAbW90b3JvbGEuY29tPgogCiAgICAgICAgIFtHVEtdIFJlbW92ZSBWOCBjb21waWxhdGlv biBvcHRpb24uCmRpZmYgLS1naXQgYS9NYW51YWxUZXN0cy9xdC90YXAtaGlnaGxpZ2h0aW5nLWlu bGluZXMuaHRtbCBiL01hbnVhbFRlc3RzL3F0L3RhcC1oaWdobGlnaHRpbmctaW5saW5lcy5odG1s CmluZGV4IGM0ODM5NTIuLjZiYjQ0ZGYgMTAwNjQ0Ci0tLSBhL01hbnVhbFRlc3RzL3F0L3RhcC1o aWdobGlnaHRpbmctaW5saW5lcy5odG1sCisrKyBiL01hbnVhbFRlc3RzL3F0L3RhcC1oaWdobGln aHRpbmctaW5saW5lcy5odG1sCkBAIC0xLDUgKzEsNSBAQAogPGJvZHk+Ci0gICAgPHAgc3R5bGU9 IndpZHRoOiAxMGVtOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5Ij4KKyAgICA8cCBzdHlsZT0icG9z aXRpb246YWJzb2x1dGU7IGxlZnQ6MTAwcHg7IHRvcDoyMHB4OyB3aWR0aDogMTBlbTsgLXdlYmtp dC10cmFuc2Zvcm06IHJvdGF0ZSgzMGRlZykiPgogICAgIDxhIGhyZWY9IiI+c29tZSBsaW5rPC9h Pjxicj48YnI+CiAgICAgPGEgaHJlZj0iIj5zb21lIGxpbmsgYnJlYWtpbmcgbGluZXM8L2E+PGJy Pjxicj4KICAgICBob2xhIG11bmRvISA8YSBocmVmPSIiPmEgc3BsaXQgdXAgbGluazwvYT48YnI+ PGJyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDYyNDFkMjkuLjM5MDU3MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOSBAQAorMjAxMi0wMS0zMSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRo QHdlYmtpdC5vcmc+CisKKyAgICAgICAgVGFwIGhpZ2hsaWdodGluZzogU3VwcG9ydCBiZXR0ZXIg b3V0bGluZXMgZm9yIG11bHRpbGluZSBpbmxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzQyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgbWFudWFsIHRlc3RzLgorCisgICAgICAg IERvIG5vdCB1c2UgdGhlIGxpbmVzQm91bmRpbmdCb3ggYW55bW9yZSBidXQgZHJhdyBhIGN1c3Rv bSBwYXRoCisgICAgICAgIHdpdGggcm91bmRlZCBjb3JuZXJzLiBJbmxpbmVzIGFyZSBkcmF3biBh cyBtYXggMyByZWN0cywgZmlyc3QKKyAgICAgICAgbGluZSByZWN0LCBqb2luZWQgbWlkZGxlIHJl Y3QgYW5kIHRoZSByZWN0IGZvciB0aGUgbGFzdCBsaW5lLgorCisgICAgICAgICogcGFnZS9HZXN0 dXJlVGFwSGlnaGxpZ2h0ZXIuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1BhdGgu aDogTWFrZSBhZGRCZXppZXJzRm9yUm91bmRlZFJlY3QgcHVibGljLgorCiAyMDEyLTAxLTMxICBQ YXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBET01EZWJ1Z2dlci5zZXRFdmVudExpc3RlbmVyQnJlYWtwb2ludCBzaG91bGQgYWNjZXB0 IHJlZ3VsYXIgRE9NIGV2ZW50IG5hbWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9HZXN0dXJlVGFwSGlnaGxpZ2h0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9HZXN0dXJl VGFwSGlnaGxpZ2h0ZXIuY3BwCmluZGV4IDAzYzY2YzAuLmQ3MGVlODQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvR2VzdHVyZVRhcEhpZ2hsaWdodGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0dlc3R1cmVUYXBIaWdobGlnaHRlci5jcHAKQEAgLTQ2LDE3ICs0NiwxNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSB7CiAKLWlubGluZSBMYXlvdXRTaXpl IG93bmVyRnJhbWVUb01haW5GcmFtZU9mZnNldChjb25zdCBSZW5kZXJPYmplY3QqIG8pCitpbmxp bmUgTGF5b3V0UG9pbnQgb3duZXJGcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KGNvbnN0IFJlbmRlck9i amVjdCogbykKIHsKICAgICBBU1NFUlQoby0+bm9kZSgpKTsKICAgICBGcmFtZSogY29udGFpbmlu Z0ZyYW1lID0gby0+ZnJhbWUoKTsKICAgICBpZiAoIWNvbnRhaW5pbmdGcmFtZSkKLSAgICAgICAg cmV0dXJuIExheW91dFNpemUoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFBvaW50KCk7CiAKICAg ICBGcmFtZSogbWFpbkZyYW1lID0gY29udGFpbmluZ0ZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgp OwogCiAgICAgTGF5b3V0UG9pbnQgbWFpbkZyYW1lUG9pbnQgPSBtYWluRnJhbWUtPnZpZXcoKS0+ cm9vdFZpZXdUb0NvbnRlbnRzKGNvbnRhaW5pbmdGcmFtZS0+dmlldygpLT5jb250ZW50c1RvUm9v dFZpZXcoTGF5b3V0UG9pbnQoKSkpOwotICAgIHJldHVybiB0b0xheW91dFNpemUobWFpbkZyYW1l UG9pbnQpOworICAgIHJldHVybiBtYWluRnJhbWVQb2ludDsKIH0KIAogQWZmaW5lVHJhbnNmb3Jt IGxvY2FsVG9BYnNvbHV0ZVRyYW5zZm9ybShjb25zdCBSZW5kZXJPYmplY3QqIG8pCkBAIC04NCw2 ICs4NCw3IEBAIEFmZmluZVRyYW5zZm9ybSBsb2NhbFRvQWJzb2x1dGVUcmFuc2Zvcm0oY29uc3Qg UmVuZGVyT2JqZWN0KiBvKQogUGF0aCBwYXRoRm9yUmVuZGVyQm94KFJlbmRlckJveCogbykKIHsK ICAgICBBU1NFUlQobyk7CisgICAgY29uc3QgaW50IHJvdW5kaW5nID0gNDsKIAogICAgIExheW91 dFJlY3QgY29udGVudEJveDsKICAgICBMYXlvdXRSZWN0IHBhZGRpbmdCb3g7CkBAIC0xMDIsMjgg KzEwMyw4OSBAQCBQYXRoIHBhdGhGb3JSZW5kZXJCb3goUmVuZGVyQm94KiBvKQogICAgICAgICAg ICAgcGFkZGluZ0JveC5oZWlnaHQoKSArIG8tPmJvcmRlclRvcCgpICsgby0+Ym9yZGVyQm90dG9t KCkpOwogCiAgICAgRmxvYXRSZWN0IHJlY3QoYm9yZGVyQm94KTsKLSAgICByZWN0LmluZmxhdGUo NSk7CisgICAgcmVjdC5pbmZsYXRlKHJvdW5kaW5nKTsKIAotICAgIHJlY3QubW92ZShvd25lckZy YW1lVG9NYWluRnJhbWVPZmZzZXQobykpOworICAgIHJlY3QubW92ZSh0b0xheW91dFNpemUob3du ZXJGcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KG8pKSk7CiAKICAgICBQYXRoIHBhdGg7Ci0gICAgcGF0 aC5hZGRSb3VuZGVkUmVjdChyZWN0LCBGbG9hdFNpemUoMTAsIDEwKSk7CisgICAgRmxvYXRTaXpl IHJvdW5kZWQocm91bmRpbmcgKiAxLjgsIHJvdW5kaW5nICogMS44KTsKKyAgICBwYXRoLmFkZFJv dW5kZWRSZWN0KHJlY3QsIHJvdW5kZWQpOwogCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLVBhdGgg cGF0aEZvclJlbmRlcklubGluZShSZW5kZXJJbmxpbmUqIG8pCit2b2lkIGFkZFJlY3RXaXRoUm91 bmRlZENvcm5lcnMoUGF0aCYgcGF0aCwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgYm9vbCB0b3BM ZWZ0LCBib29sIHRvcFJpZ2h0LCBib29sIGJvdHRvbUxlZnQsIGJvb2wgYm90dG9tUmlnaHQpCiB7 Ci0gICAgLy8gRklYTUU6IEFkYXB0IHRoaXMgdG8gbm90IGp1c3QgdXNlIHRoZSBib3VuZGluZyBi b3guCi0gICAgTGF5b3V0UmVjdCBib3JkZXJCb3ggPSBvLT5saW5lc0JvdW5kaW5nQm94KCk7Cisg ICAgY29uc3QgaW50IHJvdW5kaW5nID0gNDsKIAotICAgIEZsb2F0UmVjdCByZWN0KGJvcmRlckJv eCk7Ci0gICAgcmVjdC5pbmZsYXRlKDUpOworICAgIEZsb2F0UmVjdCBjb3B5KHJlY3QpOworICAg IGNvcHkuaW5mbGF0ZVgocm91bmRpbmcpOworICAgIGNvcHkuaW5mbGF0ZVkocm91bmRpbmcgLyAy KTsKIAotICAgIHJlY3QubW92ZShvd25lckZyYW1lVG9NYWluRnJhbWVPZmZzZXQobykpOworICAg IEZsb2F0U2l6ZSByb3VuZGVkKHJvdW5kaW5nICogMS44LCByb3VuZGluZyAqIDEuOCk7CisgICAg RmxvYXRTaXplIHNxdWFyZWQoMCwgMCk7CiAKKyAgICBwYXRoLmFkZEJlemllcnNGb3JSb3VuZGVk UmVjdChjb3B5LAorICAgICAgICAgICAgdG9wTGVmdCA/IHJvdW5kZWQgOiBzcXVhcmVkLCB0b3BS aWdodCA/IHJvdW5kZWQgOiBzcXVhcmVkLAorICAgICAgICAgICAgYm90dG9tTGVmdCA/IHJvdW5k ZWQgOiBzcXVhcmVkLCBib3R0b21SaWdodCA/IHJvdW5kZWQgOiBzcXVhcmVkKTsKK30KKworaW5s aW5lIGJvb2wgY29udGFpbnMoTGF5b3V0UmVjdCByZWN0LCBpbnQgeCkKK3sKKyAgICByZXR1cm4g IXJlY3QuaXNFbXB0eSgpICYmIHggPj0gcmVjdC54KCkgJiYgeCA8PSByZWN0Lm1heFgoKTsKK30K KworUGF0aCBwYXRoRm9yUmVuZGVySW5saW5lKFJlbmRlcklubGluZSogbykKK3sKKyAgICBBU1NF UlQobyk7CiAgICAgUGF0aCBwYXRoOwotICAgIHBhdGguYWRkUm91bmRlZFJlY3QocmVjdCwgRmxv YXRTaXplKDEwLCAxMCkpOworCisgICAgVmVjdG9yPExheW91dFJlY3Q+IHJlY3RzOworICAgIG8t PmFic29sdXRlUmVjdHMocmVjdHMsIC8qIGFjYy4gb2Zmc2V0ICovIG93bmVyRnJhbWVUb01haW5G cmFtZU9mZnNldChvKSk7CisKKyAgICBMYXlvdXRSZWN0IGZpcnN0ID0gcmVjdHMuc2l6ZSgpID8g cmVjdHMuZmlyc3QoKSA6IExheW91dFJlY3QoKTsKKyAgICBMYXlvdXRSZWN0IGxhc3QgPSByZWN0 cy5zaXplKCkgPiAxID8gcmVjdHMubGFzdCgpIDogTGF5b3V0UmVjdCgpOworICAgIExheW91dFJl Y3QgbWlkZGxlOworICAgIGZvciAoaW50IGkgPSAxOyBpIDwgcmVjdHMuc2l6ZSgpIC0gMTsgKytp KQorICAgICAgICBtaWRkbGUudW5pdGVJZk5vblplcm8ocmVjdHMuYXQoaSkpOworCisgICAgaWYg KCFtaWRkbGUuaXNFbXB0eSgpKSB7CisgICAgICAgIGludCBsZWZ0U2lkZSA9IG1pZGRsZS54KCk7 CisgICAgICAgIGludCByaWdodFNpZGUgPSBtaWRkbGUubWF4WCgpOworCisgICAgICAgIGlmICgh Zmlyc3QuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBsZWZ0U2lkZSA9IHN0ZDo6bWluKGxlZnRT aWRlLCBmaXJzdC54KCkpOworICAgICAgICAgICAgcmlnaHRTaWRlID0gc3RkOjptYXgocmlnaHRT aWRlLCBmaXJzdC5tYXhYKCkpOworICAgICAgICB9CisgICAgICAgIGlmICghbGFzdC5pc0VtcHR5 KCkpIHsKKyAgICAgICAgICAgIGxlZnRTaWRlID0gc3RkOjptaW4obGVmdFNpZGUsIGxhc3QueCgp KTsKKyAgICAgICAgICAgIHJpZ2h0U2lkZSA9IHN0ZDo6bWF4KHJpZ2h0U2lkZSwgbGFzdC5tYXhY KCkpOworICAgICAgICB9CisKKyAgICAgICAgbWlkZGxlLnNldFgobGVmdFNpZGUpOworICAgICAg ICBtaWRkbGUuc2V0V2lkdGgocmlnaHRTaWRlIC0gbGVmdFNpZGUpOworICAgIH0KKworICAgIGlm ICghZmlyc3QuaXNFbXB0eSgpKSB7CisgICAgICAgIGFkZFJlY3RXaXRoUm91bmRlZENvcm5lcnMo cGF0aCwgZmlyc3QsCisgICAgICAgICAgICAgICAgdHJ1ZSwgdHJ1ZSwKKyAgICAgICAgICAgICAg ICAhY29udGFpbnMobWlkZGxlLCBmaXJzdC54KCkpICYmICFjb250YWlucyhsYXN0LCBmaXJzdC54 KCkpLAorICAgICAgICAgICAgICAgICFjb250YWlucyhtaWRkbGUsIGZpcnN0Lm1heFgoKSkgJiYg IWNvbnRhaW5zKGxhc3QsIGZpcnN0Lm1heFgoKSkpOworICAgIH0KKworICAgIGlmICghbWlkZGxl LmlzRW1wdHkoKSkgeworICAgICAgICBhZGRSZWN0V2l0aFJvdW5kZWRDb3JuZXJzKHBhdGgsIG1p ZGRsZSwKKyAgICAgICAgICAgICAgICAhY29udGFpbnMoZmlyc3QsIG1pZGRsZS54KCkpLAorICAg ICAgICAgICAgICAgIGZhbHNlLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAhY29udGFpbnMobGFz dCwgbWlkZGxlLm1heFgoKSkpOworICAgIH0KKworICAgIGlmICghbGFzdC5pc0VtcHR5KCkpIHsK KyAgICAgICAgYWRkUmVjdFdpdGhSb3VuZGVkQ29ybmVycyhwYXRoLCBsYXN0LAorICAgICAgICAg ICAgICAgICFjb250YWlucyhtaWRkbGUsIGxhc3QueCgpKSAmJiAhY29udGFpbnMoZmlyc3QsIGxh c3QueCgpKSwKKyAgICAgICAgICAgICAgICAhY29udGFpbnMobWlkZGxlLCBsYXN0Lm1heFgoKSkg JiYgIWNvbnRhaW5zKGZpcnN0LCBsYXN0Lm1heFgoKSksCisgICAgICAgICAgICAgICAgdHJ1ZSwg dHJ1ZSk7CisgICAgfQogCiAgICAgcmV0dXJuIHBhdGg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9QYXRoLmgKaW5kZXggZDE0ZDkwOC4uNjliYTkzZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguaApAQCAtMTQ2LDkgKzE0Niw5IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgdm9pZCBhcHBseSh2b2lkKiBpbmZvLCBQYXRoQXBwbGllckZ1bmN0 aW9uKSBjb25zdDsKICAgICAgICAgdm9pZCB0cmFuc2Zvcm0oY29uc3QgQWZmaW5lVHJhbnNmb3Jt Jik7CiAKLSAgICBwcml2YXRlOgogICAgICAgICB2b2lkIGFkZEJlemllcnNGb3JSb3VuZGVkUmVj dChjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFNpemUmIHRvcExlZnRSYWRpdXMsIGNvbnN0 IEZsb2F0U2l6ZSYgdG9wUmlnaHRSYWRpdXMsIGNvbnN0IEZsb2F0U2l6ZSYgYm90dG9tTGVmdFJh ZGl1cywgY29uc3QgRmxvYXRTaXplJiBib3R0b21SaWdodFJhZGl1cyk7CiAKKyAgICBwcml2YXRl OgogICAgICAgICBQbGF0Zm9ybVBhdGhQdHIgbV9wYXRoOwogICAgIH07CiAKLS0gCjEuNy41LjQK Cg==