138943 2014-11-20 16:47:16 -0800 Preview popover needs minimum and maximum sizes 2014-11-20 18:10:58 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue conrad_shultz thorton oldest_to_newest 1050311 0 bdakin 2014-11-20 16:47:16 -0800 Preview popover needs minimum and maximum sizes rdar://problem/18904651 1050329 1 242009 bdakin 2014-11-20 17:45:35 -0800 Created attachment 242009 Patch 1050331 2 commit-queue 2014-11-20 17:47:01 -0800 Attachment 242009 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:398: Missing space after , [whitespace/comma] [3] ERROR: Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:405: Missing space after , [whitespace/comma] [3] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1050333 3 242009 thorton 2014-11-20 17:51:05 -0800 Comment on attachment 242009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242009&action=review > Source/WebKit2/ChangeLog:12 > + _hitTestResult, so we should computer a new origin rect based on the original computer!! > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:398 > + if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnYEdge) && targetSizeFitsInAvailableSpace(targetSize,largestPopoverSize)) you're missing some spaces after your commas 1050334 4 bdakin 2014-11-20 17:53:04 -0800 Thank you! http://trac.webkit.org/changeset/176429 1050335 5 242009 conrad_shultz 2014-11-20 17:59:50 -0800 Comment on attachment 242009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242009&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:363 > + NSSize screenSize = [[NSScreen mainScreen] frame].size; I'm not sure this will do what you want in all multi-screen cases. Is it guaranteed that keyboard focus is on the same screen as the presenting WKView? 1050338 6 bdakin 2014-11-20 18:10:58 -0800 http://trac.webkit.org/changeset/176430 Good call, Conrad! 242009 2014-11-20 17:45:35 -0800 2014-11-20 17:51:05 -0800 Patch for-review.txt text/plain 9952 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjQyOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE0LTExLTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2aWV3IHBvcG92ZXIgbmVlZHMg bWluaW11bSBhbmQgbWF4aW11bSBzaXplcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4OTQzCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAg ICAgICAgcmRhcjovL3Byb2JsZW0vMTg5MDQ2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGVuZm9yY2VzIG1pbmltdW0gYW5kIG1h eGltdW0gcG9wb3ZlciBzaXplcy4gSWYgdGhlIHBvcG92ZXIgbmVlZHMgdG8gYmUgCisgICAgICAg IHNpemVkIHVwIHRvIGJlIGFib3ZlIHRoZSBtaW5pbXVtLCBpdCB3aWxsIGVuZCB1cCBjb3Zlcmlu ZyBzb21lIG9mIHRoZSAKKyAgICAgICAgX2hpdFRlc3RSZXN1bHQsIHNvIHdlIHNob3VsZCBjb21w dXRlciBhIG5ldyBvcmlnaW4gcmVjdCBiYXNlZCBvbiB0aGUgb3JpZ2luYWwgCisgICAgICAgIGV2 ZW50IGxvY2F0aW9uLiAKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRy b2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIu bW06CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgcHJlcGFyZUZvck1lbnU6d2l0 aEV2ZW50Ol0pOgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmV2aWV3VVJM RnJvbUFjdGlvbk1lbnU6XSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2Ny ZWF0ZVByZXZpZXdQb3BvdmVyXSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIg bGFyZ2VzdFBvcG92ZXJTaXplXSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIg X3ByZWZlcnJlZFBvcG92ZXJTaXplXSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xs ZXIgX3ByZWZlcnJlZFNpemVGb3JQb3BvdmVyUHJlc2VudGVkRnJvbU9yaWdpblJlY3Q6XSk6IERl bGV0ZWQuCisKIDIwMTQtMTEtMjAgIENvbnJhZCBTaHVsdHogIDxjb25yYWRfc2h1bHR6QGFwcGxl LmNvbT4KIAogICAgICAgICBDbGlja3Mgb24gcHJldmlld3MgY2FuIGJlIHJlY29nbml6ZWQgbXVs dGlwbGUgdGltZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25N ZW51Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5oCShyZXZpc2lvbiAxNzY0MDUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIuaAkod29ya2luZyBj b3B5KQpAQCAtNjEsNyArNjEsMTAgQEAgQGludGVyZmFjZSBXS0FjdGlvbk1lbnVDb250cm9sbGVy IDogTlNPYgogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gX3VzZXJEYXRhOwogICAgIF9XS0FjdGlv bk1lbnVUeXBlIF90eXBlOwogICAgIFJldGFpblB0cjxOU1NoYXJpbmdTZXJ2aWNlUGlja2VyPiBf c2hhcmluZ1NlcnZpY2VQaWNrZXI7CisKICAgICBSZXRhaW5QdHI8TlNQb3BvdmVyPiBfcHJldmll d1BvcG92ZXI7CisgICAgTlNQb2ludCBfZXZlbnRMb2NhdGlvbkluVmlldzsKKyAgICBOU1JlY3Qg X3BvcG92ZXJPcmlnaW5SZWN0OwogCiAgICAgQk9PTCBfaXNTaG93aW5nVGV4dEluZGljYXRvcjsK ICAgICBCT09MIF9zaG91bGRLZWVwUHJldmlld1BvcG92ZXJPcGVuOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5t bQkocmV2aXNpb24gMTc2NDA1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Fj dGlvbk1lbnVDb250cm9sbGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQsNyArMTc0LDggQEAg LSAodm9pZClwcmVwYXJlRm9yTWVudTooTlNNZW51ICopbWVudSB3aQogCiAgICAgW3NlbGYgZGlz bWlzc0FjdGlvbk1lbnVQb3BvdmVyc107CiAKLSAgICBfcGFnZS0+cGVyZm9ybUFjdGlvbk1lbnVI aXRUZXN0QXRMb2NhdGlvbihbX3drVmlldyBjb252ZXJ0UG9pbnQ6ZXZlbnQubG9jYXRpb25Jbldp bmRvdyBmcm9tVmlldzpuaWxdKTsKKyAgICBfZXZlbnRMb2NhdGlvbkluVmlldyA9IFtfd2tWaWV3 IGNvbnZlcnRQb2ludDpldmVudC5sb2NhdGlvbkluV2luZG93IGZyb21WaWV3Om5pbF07CisgICAg X3BhZ2UtPnBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdEF0TG9jYXRpb24oX2V2ZW50TG9jYXRpb25J blZpZXcpOwogCiAgICAgX3N0YXRlID0gQWN0aW9uTWVudVN0YXRlOjpQZW5kaW5nOwogICAgIFtz ZWxmIF91cGRhdGVBY3Rpb25NZW51SXRlbXNdOwpAQCAtMzMwLDE3ICszMzEsMTYgQEAgLSAodm9p ZClfcHJldmlld1VSTEZyb21BY3Rpb25NZW51OihpZClzZQogICAgICAgICByZXR1cm47CiAKICAg ICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJIaXRU ZXN0UmVzdWx0XTsKLSAgICBOU1JlY3Qgb3JpZ2luUmVjdCA9IGhpdFRlc3RSZXN1bHQtPmVsZW1l bnRCb3VuZGluZ0JveCgpOwotICAgIFtfcHJldmlld1BvcG92ZXIgc2hvd1JlbGF0aXZlVG9SZWN0 Om9yaWdpblJlY3Qgb2ZWaWV3Ol93a1ZpZXcgcHJlZmVycmVkRWRnZTpOU01heFlFZGdlXTsKKyAg ICBbX3ByZXZpZXdQb3BvdmVyIHNob3dSZWxhdGl2ZVRvUmVjdDpfcG9wb3Zlck9yaWdpblJlY3Qg b2ZWaWV3Ol93a1ZpZXcgcHJlZmVycmVkRWRnZTpOU01heFlFZGdlXTsKIH0KIAogLSAodm9pZClf Y3JlYXRlUHJldmlld1BvcG92ZXIKIHsKICAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0 VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJIaXRUZXN0UmVzdWx0XTsKICAgICBOU1VSTCAqdXJsID0g W05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpoaXRUZXN0UmVzdWx0LT5hYnNvbHV0ZUxpbmtV UkwoKV07Ci0gICAgTlNSZWN0IG9yaWdpblJlY3QgPSBoaXRUZXN0UmVzdWx0LT5lbGVtZW50Qm91 bmRpbmdCb3goKTsKKyAgICBfcG9wb3Zlck9yaWdpblJlY3QgPSBoaXRUZXN0UmVzdWx0LT5lbGVt ZW50Qm91bmRpbmdCb3goKTsKIAotICAgIE5TU2l6ZSBwb3BvdmVyU2l6ZSA9IFtzZWxmIF9wcmVm ZXJyZWRTaXplRm9yUG9wb3ZlclByZXNlbnRlZEZyb21PcmlnaW5SZWN0Om9yaWdpblJlY3RdOwor ICAgIE5TU2l6ZSBwb3BvdmVyU2l6ZSA9IFtzZWxmIF9wcmVmZXJyZWRQb3BvdmVyU2l6ZV07CiAg ICAgQ0dGbG9hdCBhY3R1YWxQb3BvdmVyVG9WaWV3U2NhbGUgPSBwb3BvdmVyU2l6ZS53aWR0aCAv IE5TV2lkdGgoX3drVmlldy5ib3VuZHMpOwogICAgIF9wcmV2aWV3Vmlld0NvbnRyb2xsZXIgPSBh ZG9wdE5TKFtbV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFBhZ2VV Ukw6dXJsIG1haW5WaWV3U2l6ZTpfd2tWaWV3LmJvdW5kcy5zaXplIHBvcG92ZXJUb1ZpZXdTY2Fs ZTphY3R1YWxQb3BvdmVyVG9WaWV3U2NhbGVdKTsKICAgICBfcHJldmlld1ZpZXdDb250cm9sbGVy LT5fZGVsZWdhdGUgPSBzZWxmOwpAQCAtMzU4LDMyICszNTgsNTkgQEAgc3RhdGljIGJvb2wgdGFy Z2V0U2l6ZUZpdHNJbkF2YWlsYWJsZVNwYQogICAgIHJldHVybiB0YXJnZXRTaXplLndpZHRoIDw9 IGF2YWlsYWJsZVNwYWNlLndpZHRoICYmIHRhcmdldFNpemUuaGVpZ2h0IDw9IGF2YWlsYWJsZVNw YWNlLmhlaWdodDsKIH0KIAotLSAoTlNTaXplKV9wcmVmZXJyZWRTaXplRm9yUG9wb3ZlclByZXNl bnRlZEZyb21PcmlnaW5SZWN0OihOU1JlY3Qpb3JpZ2luUmVjdAorLSAoTlNTaXplKWxhcmdlc3RQ b3BvdmVyU2l6ZQoreworICAgIE5TU2l6ZSBzY3JlZW5TaXplID0gW1tOU1NjcmVlbiBtYWluU2Ny ZWVuXSBmcmFtZV0uc2l6ZTsKKworICAgIGlmIChzY3JlZW5TaXplLndpZHRoID09IDEyODAgJiYg c2NyZWVuU2l6ZS5oZWlnaHQgPT0gODAwKQorICAgICAgICByZXR1cm4gTlNNYWtlU2l6ZSgxMjQw LCA2NzQpOworCisgICAgaWYgKHNjcmVlblNpemUud2lkdGggPT0gMTM2NiAmJiBzY3JlZW5TaXpl LmhlaWdodCA9PSA3NjgpCisgICAgICAgIHJldHVybiBOU01ha2VTaXplKDEyNjQsIDY0Mik7CisK KyAgICBpZiAoc2NyZWVuU2l6ZS53aWR0aCA9PSAxNDQwICYmIHNjcmVlblNpemUuaGVpZ2h0ID09 IDkwMCkKKyAgICAgICAgcmV0dXJuIE5TTWFrZVNpemUoMTI2NCwgNzYwKTsKKworICAgIGlmIChz Y3JlZW5TaXplLndpZHRoID09IDE2ODAgJiYgc2NyZWVuU2l6ZS5oZWlnaHQgPT0gMTA1MCkKKyAg ICAgICAgcmV0dXJuIE5TTWFrZVNpemUoMTMyNCwgOTEwKTsKKworICAgIHJldHVybiBOU01ha2VT aXplKDEzMjQsIDk0MCk7Cit9CisKKy0gKE5TU2l6ZSlfcHJlZmVycmVkUG9wb3ZlclNpemUKIHsK ICAgICBzdGF0aWMgY29uc3QgQ0dGbG9hdCBwcmVmZXJyZWRQb3BvdmVyVG9WaWV3U2NhbGUgPSAw Ljc1OwogICAgIHN0YXRpYyBjb25zdCBDR0Zsb2F0IHNjcmVlblBhZGRpbmcgPSA0MDsKKyAgICBz dGF0aWMgY29uc3QgTlNTaXplIHNtYWxsZXN0UG9wb3ZlclNpemUgPSBOU01ha2VTaXplKDUwMCwg MzAwKTsKIAogICAgIE5TV2luZG93ICp3aW5kb3cgPSBfd2tWaWV3LndpbmRvdzsKLSAgICBOU1Jl Y3Qgb3JpZ2luU2NyZWVuUmVjdCA9IFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpbX3drVmll dyBjb252ZXJ0UmVjdDpvcmlnaW5SZWN0IHRvVmlldzpuaWxdXTsKKyAgICBOU1JlY3Qgb3JpZ2lu U2NyZWVuUmVjdCA9IFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpbX3drVmlldyBjb252ZXJ0 UmVjdDpfcG9wb3Zlck9yaWdpblJlY3QgdG9WaWV3Om5pbF1dOwogICAgIE5TUmVjdCBzY3JlZW5G cmFtZSA9IHdpbmRvdy5zY3JlZW4udmlzaWJsZUZyYW1lOwogCiAgICAgTlNSZWN0IHdrVmlld0Jv dW5kcyA9IF93a1ZpZXcuYm91bmRzOwogICAgIE5TU2l6ZSB0YXJnZXRTaXplID0gTlNNYWtlU2l6 ZShOU1dpZHRoKHdrVmlld0JvdW5kcykgKiBwcmVmZXJyZWRQb3BvdmVyVG9WaWV3U2NhbGUsIE5T SGVpZ2h0KHdrVmlld0JvdW5kcykgKiBwcmVmZXJyZWRQb3BvdmVyVG9WaWV3U2NhbGUpOworICAg IE5TU2l6ZSBsYXJnZXN0UG9wb3ZlclNpemUgPSBbc2VsZiBsYXJnZXN0UG9wb3ZlclNpemVdOwog CiAgICAgQ0dGbG9hdCBhdmFpbGFibGVTcGFjZUFib3ZlID0gTlNNYXhZKHNjcmVlbkZyYW1lKSAt IE5TTWF4WShvcmlnaW5TY3JlZW5SZWN0KTsKICAgICBDR0Zsb2F0IGF2YWlsYWJsZVNwYWNlQmVs b3cgPSBOU01pblkob3JpZ2luU2NyZWVuUmVjdCkgLSBOU01pblkoc2NyZWVuRnJhbWUpOwogICAg IENHRmxvYXQgbWF4QXZhaWxhYmxlVmVydGljYWxTcGFjZSA9IGZtYXgoYXZhaWxhYmxlU3BhY2VB Ym92ZSwgYXZhaWxhYmxlU3BhY2VCZWxvdykgLSBzY3JlZW5QYWRkaW5nOwogICAgIE5TU2l6ZSBt YXhTcGFjZUF2YWlsYWJsZU9uWUVkZ2UgPSBOU01ha2VTaXplKHNjcmVlbkZyYW1lLnNpemUud2lk dGggLSBzY3JlZW5QYWRkaW5nLCBtYXhBdmFpbGFibGVWZXJ0aWNhbFNwYWNlKTsKLSAgICBpZiAo dGFyZ2V0U2l6ZUZpdHNJbkF2YWlsYWJsZVNwYWNlKHRhcmdldFNpemUsIG1heFNwYWNlQXZhaWxh YmxlT25ZRWRnZSkpCisgICAgaWYgKHRhcmdldFNpemVGaXRzSW5BdmFpbGFibGVTcGFjZSh0YXJn ZXRTaXplLCBtYXhTcGFjZUF2YWlsYWJsZU9uWUVkZ2UpICYmIHRhcmdldFNpemVGaXRzSW5BdmFp bGFibGVTcGFjZSh0YXJnZXRTaXplLGxhcmdlc3RQb3BvdmVyU2l6ZSkpCiAgICAgICAgIHJldHVy biB0YXJnZXRTaXplOwogCiAgICAgQ0dGbG9hdCBhdmFpbGFibGVTcGFjZUF0TGVmdCA9IE5TTWlu WChvcmlnaW5TY3JlZW5SZWN0KSAtIE5TTWluWChzY3JlZW5GcmFtZSk7CiAgICAgQ0dGbG9hdCBh dmFpbGFibGVTcGFjZUF0UmlnaHQgPSBOU01heFgoc2NyZWVuRnJhbWUpIC0gTlNNYXhYKG9yaWdp blNjcmVlblJlY3QpOwogICAgIENHRmxvYXQgbWF4QXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlID0g Zm1heChhdmFpbGFibGVTcGFjZUF0TGVmdCwgYXZhaWxhYmxlU3BhY2VBdFJpZ2h0KSAtIHNjcmVl blBhZGRpbmc7CiAgICAgTlNTaXplIG1heFNwYWNlQXZhaWxhYmxlT25YRWRnZSA9IE5TTWFrZVNp emUobWF4QXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlLCBzY3JlZW5GcmFtZS5zaXplLmhlaWdodCAt IHNjcmVlblBhZGRpbmcpOwotICAgIGlmICh0YXJnZXRTaXplRml0c0luQXZhaWxhYmxlU3BhY2Uo dGFyZ2V0U2l6ZSwgbWF4U3BhY2VBdmFpbGFibGVPblhFZGdlKSkKKyAgICBpZiAodGFyZ2V0U2l6 ZUZpdHNJbkF2YWlsYWJsZVNwYWNlKHRhcmdldFNpemUsIG1heFNwYWNlQXZhaWxhYmxlT25YRWRn ZSkgJiYgdGFyZ2V0U2l6ZUZpdHNJbkF2YWlsYWJsZVNwYWNlKHRhcmdldFNpemUsbGFyZ2VzdFBv cG92ZXJTaXplKSkKICAgICAgICAgcmV0dXJuIHRhcmdldFNpemU7CiAKKyAgICAvLyBBZGp1c3Qg dGhlIG1heGltdW0gc3BhY2UgYXZhaWxhYmxlIGlmIGl0IGlzIGxhcmdlciB0aGFuIHRoZSBsYXJn ZXN0IHBvcG92ZXIgc2l6ZS4KKyAgICBpZiAobWF4U3BhY2VBdmFpbGFibGVPbllFZGdlLndpZHRo ID4gbGFyZ2VzdFBvcG92ZXJTaXplLndpZHRoICYmIG1heFNwYWNlQXZhaWxhYmxlT25ZRWRnZS5o ZWlnaHQgPiBsYXJnZXN0UG9wb3ZlclNpemUuaGVpZ2h0KQorICAgICAgICBtYXhTcGFjZUF2YWls YWJsZU9uWUVkZ2UgPSBsYXJnZXN0UG9wb3ZlclNpemU7CisgICAgaWYgKG1heFNwYWNlQXZhaWxh YmxlT25YRWRnZS53aWR0aCA+IGxhcmdlc3RQb3BvdmVyU2l6ZS53aWR0aCAmJiBtYXhTcGFjZUF2 YWlsYWJsZU9uWEVkZ2UuaGVpZ2h0ID4gbGFyZ2VzdFBvcG92ZXJTaXplLmhlaWdodCkKKyAgICAg ICAgbWF4U3BhY2VBdmFpbGFibGVPblhFZGdlID0gbGFyZ2VzdFBvcG92ZXJTaXplOworCiAgICAg Ly8gSWYgdGhlIHRhcmdldCBzaXplIGRvZXNuJ3QgZml0IGFueXdoZXJlLCB3ZSdsbCBmaW5kIHRo ZSBsYXJnZXN0IHJlY3QgdGhhdCBkb2VzIGZpdCB0aGF0IGFsc28gbWFpbnRhaW5zIHRoZSBvcmln aW5hbCB2aWV3J3MgYXNwZWN0IHJhdGlvLgogICAgIENHRmxvYXQgYXNwZWN0UmF0aW8gPSB3a1Zp ZXdCb3VuZHMuc2l6ZS53aWR0aCAvIHdrVmlld0JvdW5kcy5zaXplLmhlaWdodDsKICAgICBGbG9h dFJlY3QgbWF4VmVydGljYWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvUmVjdCA9IGxh cmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdChhc3BlY3RSYXRpbywgRmxvYXRSZWN0 KDAsIDAsIG1heFNwYWNlQXZhaWxhYmxlT25ZRWRnZS53aWR0aCwgbWF4U3BhY2VBdmFpbGFibGVP bllFZGdlLmhlaWdodCkpOwpAQCAtMzkyLDkgKzQxOSwyNiBAQCAtIChOU1NpemUpX3ByZWZlcnJl ZFNpemVGb3JQb3BvdmVyUHJlc2VuCiAgICAgTlNTaXplIG1heFZlcnRpY2FsVGFyZ2V0U2l6ZVBy ZXNlcnZpbmdBc3BlY3RSYXRpbyA9IE5TTWFrZVNpemUobWF4VmVydGljYWxUYXJnZXRTaXplUHJl c2VydmluZ0FzcGVjdFJhdGlvUmVjdC53aWR0aCgpLCBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVz ZXJ2aW5nQXNwZWN0UmF0aW9SZWN0LmhlaWdodCgpKTsKICAgICBOU1NpemUgbWF4SG9ydGl6b250 YWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvID0gTlNNYWtlU2l6ZShtYXhIb3Jpem9u dGFsVGFyZ2V0U2l6ZVByZXNlcnZpbmdBc3BlY3RSYXRpb1JlY3Qud2lkdGgoKSwgbWF4SG9yaXpv bnRhbFRhcmdldFNpemVQcmVzZXJ2aW5nQXNwZWN0UmF0aW9SZWN0LmhlaWdodCgpKTsKIAorICAg IE5TU2l6ZSBjb21wdXRlZFRhcmdldFNpemU7CiAgICAgaWYgKChtYXhWZXJ0aWNhbFRhcmdldFNp emVQcmVzZXJ2aW5nQXNwZWN0UmF0aW8ud2lkdGggKiBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVz ZXJ2aW5nQXNwZWN0UmF0aW8uaGVpZ2h0KSA+IChtYXhIb3J0aXpvbnRhbFRhcmdldFNpemVQcmVz ZXJ2aW5nQXNwZWN0UmF0aW8ud2lkdGggKiBtYXhIb3J0aXpvbnRhbFRhcmdldFNpemVQcmVzZXJ2 aW5nQXNwZWN0UmF0aW8uaGVpZ2h0KSkKLSAgICAgICAgcmV0dXJuIG1heFZlcnRpY2FsVGFyZ2V0 U2l6ZVByZXNlcnZpbmdBc3BlY3RSYXRpbzsKLSAgICByZXR1cm4gbWF4SG9ydGl6b250YWxUYXJn ZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvOworICAgICAgICBjb21wdXRlZFRhcmdldFNpemUg PSBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVzZXJ2aW5nQXNwZWN0UmF0aW87CisgICAgY29tcHV0 ZWRUYXJnZXRTaXplID0gbWF4SG9ydGl6b250YWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJh dGlvOworCisgICAgLy8gTm93IG1ha2Ugc3VyZSB3aGF0IHdlJ3ZlIGNvbXB1dGVkIGlzbid0IHRv byBzbWFsbC4KKyAgICBpZiAoY29tcHV0ZWRUYXJnZXRTaXplLndpZHRoIDwgc21hbGxlc3RQb3Bv dmVyU2l6ZS53aWR0aCAmJiBjb21wdXRlZFRhcmdldFNpemUuaGVpZ2h0IDwgc21hbGxlc3RQb3Bv dmVyU2l6ZS5oZWlnaHQpIHsKKyAgICAgICAgZmxvYXQgbGltaXRXaWR0aCA9IHNtYWxsZXN0UG9w b3ZlclNpemUud2lkdGggPiBjb21wdXRlZFRhcmdldFNpemUud2lkdGggPyBzbWFsbGVzdFBvcG92 ZXJTaXplLndpZHRoIDogY29tcHV0ZWRUYXJnZXRTaXplLndpZHRoOworICAgICAgICBmbG9hdCBs aW1pdEhlaWdodCA9IHNtYWxsZXN0UG9wb3ZlclNpemUuaGVpZ2h0ID4gY29tcHV0ZWRUYXJnZXRT aXplLmhlaWdodCA/IHNtYWxsZXN0UG9wb3ZlclNpemUuaGVpZ2h0IDogY29tcHV0ZWRUYXJnZXRT aXplLmhlaWdodDsKKyAgICAgICAgRmxvYXRSZWN0IHRhcmdldFJlY3RMYXJnZXJUaGFuTWluU2l6 ZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdChhc3BlY3RSYXRpbywgRmxv YXRSZWN0KDAsIDAsIGxpbWl0V2lkdGgsIGxpbWl0SGVpZ2h0KSk7CisgICAgICAgIGNvbXB1dGVk VGFyZ2V0U2l6ZSA9IE5TTWFrZVNpemUodGFyZ2V0UmVjdExhcmdlclRoYW5NaW5TaXplLnNpemUo KS53aWR0aCgpLCB0YXJnZXRSZWN0TGFyZ2VyVGhhbk1pblNpemUuc2l6ZSgpLmhlaWdodCgpKTsK KworICAgICAgICAvLyBJZiBvdXIgb3JpZ25hbCBjb21wdXRlZFRhcmdldFNpemUgd2FzIHNvIHNt YWxsIHRoYXQgd2UgaGFkIHRvIGdldCBoZXJlIGFuZCBtYWtlIGEgbmV3IGNvbXB1dGVkVGFyZ2V0 U2l6ZSB0aGF0IGlzCisgICAgICAgIC8vIGxhcmdlciB0aGFuIHRoZSBtaW5pbXVtLCB0aGVuIHRo ZSBlbGVtZW50Qm91bmRpbmdCb3ggb2YgdGhlIF9oaXRUZXN0UmVzdWx0IGlzIHByb2JhYmx5IGh1 Z2UuIFNvIHdlIHNob3VsZCB1c2UKKyAgICAgICAgLy8gdGhlIGV2ZW50IG9yaWdpbiBhcyB0aGUg cG9wb3ZlciBvcmlnaW4gaW4gdGhpcyBjYXNlIGFuZCBub3Qgd29ycnkgYWJvdXQgb2JzY3VyaW5n IHRoZSBfaGl0VGVzdFJlc3VsdC4KKyAgICAgICAgX3BvcG92ZXJPcmlnaW5SZWN0Lm9yaWdpbiA9 IF9ldmVudExvY2F0aW9uSW5WaWV3OworICAgICAgICBfcG9wb3Zlck9yaWdpblJlY3Quc2l6ZSA9 IE5TTWFrZVNpemUoMSwgMSk7CisgICAgfQorCisgICAgcmV0dXJuIGNvbXB1dGVkVGFyZ2V0U2l6 ZTsKIH0KIAogI2VuZGlmIC8vIFdLX0FQSV9FTkFCTEVECg==