138472 2014-11-06 12:50:45 -0800 Preview views often misplaced inside popover 2014-11-06 13:03:55 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin conrad_shultz thorton oldest_to_newest 1046880 0 bdakin 2014-11-06 12:50:45 -0800 Preview views often misplaced inside popover 1046881 1 241126 bdakin 2014-11-06 12:54:03 -0800 Created attachment 241126 Patch 1046882 2 bdakin 2014-11-06 12:57:09 -0800 rdar://problem/18898712 1046883 3 241126 thorton 2014-11-06 12:57:55 -0800 Comment on attachment 241126 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241126&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:366 > + return maxHortizontalTargetSizePreservingAspectRatio; horizontal is spelled wrong here. 1046886 4 andersca 2014-11-06 12:59:06 -0800 > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:328 > +- (BOOL)_targetSize:(NSSize)targetSize fitsInAvailableSpace:(NSSize)availableSpace > +{ > + return targetSize.width <= availableSpace.width && targetSize.height <= availableSpace.height; > +} I think this should just be a static C function bool targetSizeFitsInAvailableSpace(NSSize targetSize, NSSize availableSpace) { } > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:359 > + FloatRect maxHortizontalTargetSizePreservingAspectRatioRect = largestRectWithAspectRatioInsideRect(aspectRatio, FloatRect(0, 0, maxSpaceAvailableOnXEdge.width, maxSpaceAvailableOnXEdge.height)); Hortizontal! (Tim Hortizontal) 1046887 5 bdakin 2014-11-06 13:03:55 -0800 http://trac.webkit.org/changeset/175710 241126 2014-11-06 12:54:03 -0800 2014-11-06 12:57:55 -0800 Patch for-review.txt text/plain 9427 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTcwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE0LTExLTA2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2aWV3IHZpZXdzIG9mdGVuIG1p c3BsYWNlZCBpbnNpZGUgcG9wb3ZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxNC0xMS0wNiAgTWljaGFlbCBT YWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTc0OTg1 LTE3NDk4Nik6IFNpdGUgZGlzcGxheSBkaXNhcHBlYXJzIApJbmRleDogU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4JKHJldmlzaW9uIDE3NTY5OSkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDg4LDYgKzEwODgsNyBAQCBfX1pON1dlYkNvcmUzMUNyb3NzT3Jp Z2luUHJlZmxpZ2h0UmVzdWx0CiBfX1pON1dlYkNvcmUzMWVxdWFsSWdub3JpbmdGcmFnbWVudElk ZW50aWZpZXJFUktOU18zVVJMRVMyXwogX19aTjdXZWJDb3JlMzNkZWxldGVBbGxDb29raWVzTW9k aWZpZWRBZnRlckRhdGVFUktOU18yMU5ldHdvcmtTdG9yYWdlU2Vzc2lvbkVkCiBfX1pON1dlYkNv cmUzM3N0cmlwTGVhZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlc0VSS04zV1RGNlN0cmluZ0UKK19f Wk43V2ViQ29yZTM2bGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNpZGVSZWN0RWZSS05TXzlG bG9hdFJlY3RFCiBfX1pON1dlYkNvcmUzNnN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9u TmFtZUVSS04zV1RGNlN0cmluZ0VTM18KIF9fWk43V2ViQ29yZTM3V2lkZ2V0SGllcmFyY2h5VXBk YXRlc1N1c3BlbnNpb25TY29wZTExbW92ZVdpZGdldHNFdgogX19aTjdXZWJDb3JlMzdXaWRnZXRI aWVyYXJjaHlVcGRhdGVzU3VzcGVuc2lvblNjb3BlMzVzX3dpZGdldEhpZXJhcmNoeVVwZGF0ZVN1 c3BlbmRDb3VudEUKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTcwOSkKKysrIFNvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTEx LTA2ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2aWV3IHZp ZXdzIG9mdGVuIG1pc3BsYWNlZCBpbnNpZGUgcG9wb3ZlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgcG9wb3ZlciBt YWludGFpbiBhc3BlY3QgcmF0aW8sIGFuZCBpdCB1c2VzIHRoZSBmaW5hbCBzY2FsZSBvZiAKKyAg ICAgICAgdGhhdCBwb3BvdmVyIHRvIHNjYWxlIHRoZSBwcmV2aWV3IHZpZXcgYXMgd2VsbC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbToKKyAgICAg ICAgKC1bV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIGluaXRXaXRoUGFnZVVSTDptYWluVmll d1NpemU6cG9wb3ZlclRvVmlld1NjYWxlOl0pOgorICAgICAgICAoLVtXS1BhZ2VQcmV2aWV3Vmll d0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxl ciBfY3JlYXRlUHJldmlld1BvcG92ZXJGb3JVUkw6b3JpZ2luUmVjdDpdKToKKyAgICAgICAgKC1b V0tBY3Rpb25NZW51Q29udHJvbGxlciBfdGFyZ2V0U2l6ZTpmaXRzSW5BdmFpbGFibGVTcGFjZTpd KToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfcHJlZmVycmVkU2l6ZUZvclBv cG92ZXJQcmVzZW50ZWRGcm9tT3JpZ2luUmVjdDpdKToKKyAgICAgICAgKC1bV0tQYWdlUHJldmll d1ZpZXdDb250cm9sbGVyIGluaXRXaXRoUGFnZVVSTDpdKTogRGVsZXRlZC4KKwogMjAxNC0xMS0w NiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0 SW5kaWNhdG9yV2luZG93J3MgYm91bmNlIGFuaW1hdGlvbiBpcyBsb3BzaWRlZCB3aGVuIGluZGlj YXRpbmcgdHdvIHNob3J0IGxpbmVzIG9mIHRleHQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0JKHJldmlzaW9u IDE3NTY5OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29u dHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQAogI2ltcG9ydCA8SW1h Z2VJTy9JbWFnZUlPLmg+CiAjaW1wb3J0IDxJbWFnZUtpdC9JbWFnZUtpdC5oPgogI2ltcG9ydCA8 V2ViQ29yZS9EYXRhRGV0ZWN0b3JzU1BJLmg+CisjaW1wb3J0IDxXZWJDb3JlL0dlb21ldHJ5VXRp bGl0aWVzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL05TU2hhcmluZ1NlcnZpY2VTUEkuaD4KICNpbXBv cnQgPFdlYkNvcmUvTlNTaGFyaW5nU2VydmljZVBpY2tlclNQSS5oPgogI2ltcG9ydCA8V2ViQ29y ZS9OU1ZpZXdTUEkuaD4KQEAgLTczLDggKzc0LDYgQEAgLSAoTlNBcnJheSAqKV9hY3Rpb25NZW51 SXRlbXNGb3JIaXRUZXN0UgogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAotc3RhdGljIGNvbnN0IENH RmxvYXQgcG9wb3ZlclRvVmlld1NjYWxlID0gMC43NTsKLQogQGNsYXNzIFdLUGFnZVByZXZpZXdW aWV3Q29udHJvbGxlcjsKIAogQHByb3RvY29sIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlckRl bGVnYXRlIDxOU09iamVjdD4KQEAgLTg2LDIxICs4NSwyMyBAQCBAaW50ZXJmYWNlIFdLUGFnZVBy ZXZpZXdWaWV3Q29udHJvbGxlciA6CiAgICAgTlNTaXplIF9tYWluVmlld1NpemU7CiAgICAgUmV0 YWluUHRyPE5TVVJMPiBfdXJsOwogICAgIGlkIDxXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJE ZWxlZ2F0ZT4gX2RlbGVnYXRlOworICAgIENHRmxvYXQgX3BvcG92ZXJUb1ZpZXdTY2FsZTsKIH0K IAotLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZVVSTDooTlNVUkwgKilVUkw7CistIChpbnN0 YW5jZXR5cGUpaW5pdFdpdGhQYWdlVVJMOihOU1VSTCAqKVVSTCBtYWluVmlld1NpemU6KE5TU2l6 ZSlzaXplIHBvcG92ZXJUb1ZpZXdTY2FsZTooQ0dGbG9hdClzY2FsZTsKIAogQGVuZAogCiBAaW1w bGVtZW50YXRpb24gV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyCiAKLS0gKGluc3RhbmNldHlw ZSlpbml0V2l0aFBhZ2VVUkw6KE5TVVJMICopVVJMCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQ YWdlVVJMOihOU1VSTCAqKVVSTCBtYWluVmlld1NpemU6KE5TU2l6ZSlzaXplIHBvcG92ZXJUb1Zp ZXdTY2FsZTooQ0dGbG9hdClzY2FsZQogewogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0p KQogICAgICAgICByZXR1cm4gbmlsOwogCiAgICAgX3VybCA9IFVSTDsKLSAgICBfbWFpblZpZXdT aXplID0gTlNNYWtlU2l6ZSgzMjAsIDU2OCk7CisgICAgX21haW5WaWV3U2l6ZSA9IHNpemU7Cisg ICAgX3BvcG92ZXJUb1ZpZXdTY2FsZSA9IHNjYWxlOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBA IC0xMTUsNyArMTE2LDcgQEAgLSAodm9pZClsb2FkVmlldwogICAgIH0KIAogICAgIC8vIFNldHRp bmcgdGhlIHdlYlZpZXcgYm91bmRzIHdpbGwgc2NhbGUgaXQgdG8gNzUlIG9mIHRoZSBfbWFpblZp ZXdTaXplLiAKLSAgICBbd2ViVmlldyBzZXRCb3VuZHM6TlNNYWtlUmVjdCgwLCAwLCBfbWFpblZp ZXdTaXplLndpZHRoIC8gcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFpblZpZXdTaXplLmhlaWdodCAv IHBvcG92ZXJUb1ZpZXdTY2FsZSldOworICAgIFt3ZWJWaWV3IHNldEJvdW5kczpOU01ha2VSZWN0 KDAsIDAsIF9tYWluVmlld1NpemUud2lkdGggLyBfcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFpblZp ZXdTaXplLmhlaWdodCAvIF9wb3BvdmVyVG9WaWV3U2NhbGUpXTsKIAogICAgIFJldGFpblB0cjxO U0NsaWNrR2VzdHVyZVJlY29nbml6ZXI+IGNsaWNrUmVjb2duaXplciA9IGFkb3B0TlMoW1tOU0Ns aWNrR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnNlbGYgYWN0aW9uOkBz ZWxlY3RvcihfY2xpY2tSZWNvZ25pemVkOildKTsKICAgICBbd2ViVmlldyBhZGRHZXN0dXJlUmVj b2duaXplcjpjbGlja1JlY29nbml6ZXIuZ2V0KCldOwpAQCAtMzA5LDM4ICszMTAsNjAgQEAgLSAo dm9pZClfcHJldmlld1VSTEZyb21BY3Rpb25NZW51OihpZClzZQogCiAtICh2b2lkKV9jcmVhdGVQ cmV2aWV3UG9wb3ZlckZvclVSTDooTlNVUkwgKil1cmwgb3JpZ2luUmVjdDooTlNSZWN0KW9yaWdp blJlY3QKIHsKLSAgICBSZXRhaW5QdHI8V0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyPiBwcmV2 aWV3Vmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVy IGFsbG9jXSBpbml0V2l0aFBhZ2VVUkw6dXJsXSk7Ci0gICAgcHJldmlld1ZpZXdDb250cm9sbGVy LT5fbWFpblZpZXdTaXplID0gX3drVmlldy5ib3VuZHMuc2l6ZTsKKyAgICBOU1NpemUgcG9wb3Zl clNpemUgPSBbc2VsZiBfcHJlZmVycmVkU2l6ZUZvclBvcG92ZXJQcmVzZW50ZWRGcm9tT3JpZ2lu UmVjdDpvcmlnaW5SZWN0XTsKKyAgICBDR0Zsb2F0IGFjdHVhbFBvcG92ZXJUb1ZpZXdTY2FsZSA9 IHBvcG92ZXJTaXplLndpZHRoIC8gTlNXaWR0aChfd2tWaWV3LmJvdW5kcyk7CisgICAgUmV0YWlu UHRyPFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcj4gcHJldmlld1ZpZXdDb250cm9sbGVyID0g YWRvcHROUyhbW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhQYWdl VVJMOnVybCBtYWluVmlld1NpemU6X3drVmlldy5ib3VuZHMuc2l6ZSBwb3BvdmVyVG9WaWV3U2Nh bGU6YWN0dWFsUG9wb3ZlclRvVmlld1NjYWxlXSk7CiAgICAgcHJldmlld1ZpZXdDb250cm9sbGVy LT5fZGVsZWdhdGUgPSBzZWxmOwogCiAgICAgX3ByZXZpZXdQb3BvdmVyID0gYWRvcHROUyhbW05T UG9wb3ZlciBhbGxvY10gaW5pdF0pOwogICAgIFtfcHJldmlld1BvcG92ZXIgc2V0QmVoYXZpb3I6 TlNQb3BvdmVyQmVoYXZpb3JUcmFuc2llbnRdOwotICAgIFtfcHJldmlld1BvcG92ZXIgc2V0Q29u dGVudFNpemU6W3NlbGYgX3ByZWZlcnJlZFNpemVGb3JQb3BvdmVyUHJlc2VudGVkRnJvbU9yaWdp blJlY3Q6b3JpZ2luUmVjdF1dOworICAgIFtfcHJldmlld1BvcG92ZXIgc2V0Q29udGVudFNpemU6 cG9wb3ZlclNpemVdOwogICAgIFtfcHJldmlld1BvcG92ZXIgc2V0Q29udGVudFZpZXdDb250cm9s bGVyOnByZXZpZXdWaWV3Q29udHJvbGxlci5nZXQoKV07CiAgICAgW19wcmV2aWV3UG9wb3ZlciBz ZXREZWxlZ2F0ZTpzZWxmXTsKIH0KIAorLSAoQk9PTClfdGFyZ2V0U2l6ZTooTlNTaXplKXRhcmdl dFNpemUgZml0c0luQXZhaWxhYmxlU3BhY2U6KE5TU2l6ZSlhdmFpbGFibGVTcGFjZQoreworICAg IHJldHVybiB0YXJnZXRTaXplLndpZHRoIDw9IGF2YWlsYWJsZVNwYWNlLndpZHRoICYmIHRhcmdl dFNpemUuaGVpZ2h0IDw9IGF2YWlsYWJsZVNwYWNlLmhlaWdodDsKK30KKwogLSAoTlNTaXplKV9w cmVmZXJyZWRTaXplRm9yUG9wb3ZlclByZXNlbnRlZEZyb21PcmlnaW5SZWN0OihOU1JlY3Qpb3Jp Z2luUmVjdAogeworICAgIHN0YXRpYyBjb25zdCBDR0Zsb2F0IHByZWZlcnJlZFBvcG92ZXJUb1Zp ZXdTY2FsZSA9IDAuNzU7CiAgICAgc3RhdGljIGNvbnN0IENHRmxvYXQgc2NyZWVuUGFkZGluZyA9 IDQwOwogCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IF93a1ZpZXcud2luZG93OwogICAgIE5TUmVj dCBvcmlnaW5TY3JlZW5SZWN0ID0gW3dpbmRvdyBjb252ZXJ0UmVjdFRvU2NyZWVuOltfd2tWaWV3 IGNvbnZlcnRSZWN0Om9yaWdpblJlY3QgdG9WaWV3Om5pbF1dOwogICAgIE5TUmVjdCBzY3JlZW5G cmFtZSA9IHdpbmRvdy5zY3JlZW4udmlzaWJsZUZyYW1lOwogCisgICAgTlNSZWN0IHdrVmlld0Jv dW5kcyA9IF93a1ZpZXcuYm91bmRzOworICAgIE5TU2l6ZSB0YXJnZXRTaXplID0gTlNNYWtlU2l6 ZShOU1dpZHRoKHdrVmlld0JvdW5kcykgKiBwcmVmZXJyZWRQb3BvdmVyVG9WaWV3U2NhbGUsIE5T SGVpZ2h0KHdrVmlld0JvdW5kcykgKiBwcmVmZXJyZWRQb3BvdmVyVG9WaWV3U2NhbGUpOworCiAg ICAgQ0dGbG9hdCBhdmFpbGFibGVTcGFjZUFib3ZlID0gTlNNYXhZKHNjcmVlbkZyYW1lKSAtIE5T TWF4WShvcmlnaW5TY3JlZW5SZWN0KTsKICAgICBDR0Zsb2F0IGF2YWlsYWJsZVNwYWNlQmVsb3cg PSBOU01pblkob3JpZ2luU2NyZWVuUmVjdCkgLSBOU01pblkoc2NyZWVuRnJhbWUpOwogICAgIENH RmxvYXQgbWF4QXZhaWxhYmxlVmVydGljYWxTcGFjZSA9IGZtYXgoYXZhaWxhYmxlU3BhY2VBYm92 ZSwgYXZhaWxhYmxlU3BhY2VCZWxvdykgLSBzY3JlZW5QYWRkaW5nOworICAgIE5TU2l6ZSBtYXhT cGFjZUF2YWlsYWJsZU9uWUVkZ2UgPSBOU01ha2VTaXplKHNjcmVlbkZyYW1lLnNpemUud2lkdGgg LSBzY3JlZW5QYWRkaW5nLCBtYXhBdmFpbGFibGVWZXJ0aWNhbFNwYWNlKTsKKyAgICBpZiAoW3Nl bGYgX3RhcmdldFNpemU6dGFyZ2V0U2l6ZSBmaXRzSW5BdmFpbGFibGVTcGFjZTptYXhTcGFjZUF2 YWlsYWJsZU9uWUVkZ2VdKQorICAgICAgICByZXR1cm4gdGFyZ2V0U2l6ZTsKIAogICAgIENHRmxv YXQgYXZhaWxhYmxlU3BhY2VBdExlZnQgPSBOU01pblgob3JpZ2luU2NyZWVuUmVjdCkgLSBOU01p blgoc2NyZWVuRnJhbWUpOwogICAgIENHRmxvYXQgYXZhaWxhYmxlU3BhY2VBdFJpZ2h0ID0gTlNN YXhYKHNjcmVlbkZyYW1lKSAtIE5TTWF4WChvcmlnaW5TY3JlZW5SZWN0KTsKICAgICBDR0Zsb2F0 IG1heEF2YWlsYWJsZUhvcml6b250YWxTcGFjZSA9IGZtYXgoYXZhaWxhYmxlU3BhY2VBdExlZnQs IGF2YWlsYWJsZVNwYWNlQXRSaWdodCkgLSBzY3JlZW5QYWRkaW5nOwotCi0gICAgTlNSZWN0IHdr Vmlld0JvdW5kcyA9IF93a1ZpZXcuYm91bmRzOwotICAgIE5TU2l6ZSBwcmVmZXJyZWRTaXplID0g TlNNYWtlU2l6ZShOU1dpZHRoKHdrVmlld0JvdW5kcykgKiBwb3BvdmVyVG9WaWV3U2NhbGUsIE5T SGVpZ2h0KHdrVmlld0JvdW5kcykgKiBwb3BvdmVyVG9WaWV3U2NhbGUpOwotICAgIHByZWZlcnJl ZFNpemUud2lkdGggPSBmbWluKHByZWZlcnJlZFNpemUud2lkdGgsIG1heEF2YWlsYWJsZUhvcml6 b250YWxTcGFjZSk7Ci0gICAgcHJlZmVycmVkU2l6ZS5oZWlnaHQgPSBmbWluKHByZWZlcnJlZFNp emUuaGVpZ2h0LCBtYXhBdmFpbGFibGVWZXJ0aWNhbFNwYWNlKTsKLSAgICByZXR1cm4gcHJlZmVy cmVkU2l6ZTsKKyAgICBOU1NpemUgbWF4U3BhY2VBdmFpbGFibGVPblhFZGdlID0gTlNNYWtlU2l6 ZShtYXhBdmFpbGFibGVIb3Jpem9udGFsU3BhY2UsIHNjcmVlbkZyYW1lLnNpemUuaGVpZ2h0IC0g c2NyZWVuUGFkZGluZyk7CisgICAgaWYgKFtzZWxmIF90YXJnZXRTaXplOnRhcmdldFNpemUgZml0 c0luQXZhaWxhYmxlU3BhY2U6bWF4U3BhY2VBdmFpbGFibGVPblhFZGdlXSkKKyAgICAgICAgcmV0 dXJuIHRhcmdldFNpemU7CisKKyAgICAvLyBJZiB0aGUgdGFyZ2V0IHNpemUgZG9lc24ndCBmaXQg YW55d2hlcmUsIHdlJ2xsIGZpbmQgdGhlIGxhcmdlc3QgcmVjdCB0aGF0IGRvZXMgZml0IHRoYXQg YWxzbyBtYWludGFpbnMgdGhlIG9yaWdpbmFsIHZpZXcncyBhc3BlY3QgcmF0aW8uCisgICAgQ0dG bG9hdCBhc3BlY3RSYXRpbyA9IHdrVmlld0JvdW5kcy5zaXplLndpZHRoIC8gd2tWaWV3Qm91bmRz LnNpemUuaGVpZ2h0OworICAgIEZsb2F0UmVjdCBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVzZXJ2 aW5nQXNwZWN0UmF0aW9SZWN0ID0gbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNpZGVSZWN0 KGFzcGVjdFJhdGlvLCBGbG9hdFJlY3QoMCwgMCwgbWF4U3BhY2VBdmFpbGFibGVPbllFZGdlLndp ZHRoLCBtYXhTcGFjZUF2YWlsYWJsZU9uWUVkZ2UuaGVpZ2h0KSk7CisgICAgRmxvYXRSZWN0IG1h eEhvcnRpem9udGFsVGFyZ2V0U2l6ZVByZXNlcnZpbmdBc3BlY3RSYXRpb1JlY3QgPSBsYXJnZXN0 UmVjdFdpdGhBc3BlY3RSYXRpb0luc2lkZVJlY3QoYXNwZWN0UmF0aW8sIEZsb2F0UmVjdCgwLCAw LCBtYXhTcGFjZUF2YWlsYWJsZU9uWEVkZ2Uud2lkdGgsIG1heFNwYWNlQXZhaWxhYmxlT25YRWRn ZS5oZWlnaHQpKTsKKworICAgIE5TU2l6ZSBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVzZXJ2aW5n QXNwZWN0UmF0aW8gPSBOU01ha2VTaXplKG1heFZlcnRpY2FsVGFyZ2V0U2l6ZVByZXNlcnZpbmdB c3BlY3RSYXRpb1JlY3Qud2lkdGgoKSwgbWF4VmVydGljYWxUYXJnZXRTaXplUHJlc2VydmluZ0Fz cGVjdFJhdGlvUmVjdC5oZWlnaHQoKSk7CisgICAgTlNTaXplIG1heEhvcnRpem9udGFsVGFyZ2V0 U2l6ZVByZXNlcnZpbmdBc3BlY3RSYXRpbyA9IE5TTWFrZVNpemUobWF4SG9ydGl6b250YWxUYXJn ZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvUmVjdC53aWR0aCgpLCBtYXhIb3J0aXpvbnRhbFRh cmdldFNpemVQcmVzZXJ2aW5nQXNwZWN0UmF0aW9SZWN0LmhlaWdodCgpKTsKKworICAgIGlmICgo bWF4VmVydGljYWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvLndpZHRoICogbWF4VmVy dGljYWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvLmhlaWdodCkgPiAobWF4SG9ydGl6 b250YWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvLndpZHRoICogbWF4SG9ydGl6b250 YWxUYXJnZXRTaXplUHJlc2VydmluZ0FzcGVjdFJhdGlvLmhlaWdodCkpCisgICAgICAgIHJldHVy biBtYXhWZXJ0aWNhbFRhcmdldFNpemVQcmVzZXJ2aW5nQXNwZWN0UmF0aW87CisgICAgcmV0dXJu IG1heEhvcnRpem9udGFsVGFyZ2V0U2l6ZVByZXNlcnZpbmdBc3BlY3RSYXRpbzsKIH0KIAogI2Vu ZGlmIC8vIFdLX0FQSV9FTkFCTEVECg==