133989 2014-06-17 11:51:10 -0700 Only show telephone number highlights if only one number is selected 2014-06-17 12:18:30 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson thorton oldest_to_newest 1016185 0 beidson 2014-06-17 11:51:10 -0700 Only show telephone number highlights if only one number is selected <rdar://problem/16874568> 1016186 1 beidson 2014-06-17 11:52:06 -0700 Also only while the mouse is over the phone number. 1016192 2 233246 beidson 2014-06-17 12:03:30 -0700 Created attachment 233246 Patch v1 1016197 3 233246 thorton 2014-06-17 12:07:21 -0700 Comment on attachment 233246 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=233246&action=review > Source/WebKit2/WebProcess/WebPage/TelephoneNumberOverlayController.h:54 > DDHighlightRef highlight() const { return m_highlight.get(); } Weird that this isn't in a mac/ subdirectory. > Source/WebKit2/WebProcess/WebPage/TelephoneNumberOverlayController.h:56 > + bool hovered() const { return m_hovered; } isHovered. 1016200 4 beidson 2014-06-17 12:18:30 -0700 http://trac.webkit.org/changeset/170067 233246 2014-06-17 12:03:30 -0700 2014-06-17 12:07:21 -0700 Patch v1 patch text/plain 13956 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxNTQ3YTdiLi41NDBiMTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTQtMDYtMTcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE9ubHkgc2hvdyB0ZWxlcGhvbmUgbnVtYmVyIGhpZ2hsaWdodHMgaWYgb25seSBvbmUgbnVt YmVyIGlzIHNlbGVjdGVkCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg3NDU2OD4gYW5kIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM5ODkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmbGFnIHRvIFRlbGVw aG9uZU51bWJlckRhdGEgdG8gcmVtZW1iZXIgaWYgaXQgd2FzIGhvdmVyZWQgb3ZlcjoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvVGVsZXBob25lTnVtYmVyT3ZlcmxheUNvbnRyb2xsZXIu aDoKKyAgICAgICAgKFdlYktpdDo6VGVsZXBob25lTnVtYmVyRGF0YTo6aG92ZXJlZCk6CisgICAg ICAgIChXZWJLaXQ6OlRlbGVwaG9uZU51bWJlckRhdGE6OnNldEhvdmVyZWQpOgorICAgICAgICAo V2ViS2l0OjpUZWxlcGhvbmVOdW1iZXJEYXRhOjpUZWxlcGhvbmVOdW1iZXJEYXRhKToKKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGVsZXBob25lTnVtYmVyT3ZlcmxheUNvbnRy b2xsZXJNYWMubW06CisgICAgICAgIChXZWJLaXQ6OlRlbGVwaG9uZU51bWJlck92ZXJsYXlDb250 cm9sbGVyOjpkcmF3UmVjdCk6IE9ubHkgZHJhdyB0aGUgaGlnaGxpZ2h0IGlmIG9uZQorICAgICAg ICAgIHBob25lIG51bWJlciBpcyBzZWxlY3RlZC4KKyAgICAgICAgKFdlYktpdDo6VGVsZXBob25l TnVtYmVyT3ZlcmxheUNvbnRyb2xsZXI6Om1vdXNlRXZlbnQpOiBVcGRhdGUgdGhlIGhvdmVyIHN0 YXRlIG9mIHRoZQorICAgICAgICAgIGN1cnJlbnQgcGhvbmUgbnVtYmVyLCBhbmQgc2V0TmVlZHNE aXNwbGF5IGlmIHRoZSBob3ZlciBzdGF0ZSBjaGFuZ2VzLgorICAgICAgICAoV2ViS2l0OjpUZWxl cGhvbmVOdW1iZXJPdmVybGF5Q29udHJvbGxlcjo6Y2xlYXJIaWdobGlnaHRzKToKKwogMjAxNC0w Ni0xNiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXhlcyBmb3IgdGhlIEVGTCBhbmQgR1RLKyBwb3J0cyBhZnRlciByMTY5 OTk0IGFuZCAxNzAwMDAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvVGVsZXBob25lTnVtYmVyT3ZlcmxheUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9UZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJvbGxlci5oCmlu ZGV4IGUxMGNkYjkuLjU5ZThlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9UZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJvbGxlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJv bGxlci5oCkBAIC01MywxMyArNTMsMTggQEAgcHVibGljOgogICAgIFdlYkNvcmU6OlJhbmdlKiBy YW5nZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmFuZ2UuZ2V0KCk7IH0KICAgICBEREhpZ2hsaWdodFJl ZiBoaWdobGlnaHQoKSBjb25zdCB7IHJldHVybiBtX2hpZ2hsaWdodC5nZXQoKTsgfQogCisgICAg Ym9vbCBob3ZlcmVkKCkgY29uc3QgeyByZXR1cm4gbV9ob3ZlcmVkOyB9CisgICAgdm9pZCBzZXRI b3ZlcmVkKGJvb2wgaG92ZXJlZCkgeyBtX2hvdmVyZWQgPSBob3ZlcmVkOyB9CisKIHByaXZhdGU6 CiAgICAgVGVsZXBob25lTnVtYmVyRGF0YShXZWJDb3JlOjpSYW5nZSogcmFuZ2UsIERESGlnaGxp Z2h0UmVmIGhpZ2hsaWdodCkKLSAgICAgICAgOiBtX3JhbmdlKHJhbmdlKQorICAgICAgICA6IG1f aG92ZXJlZChmYWxzZSkKKyAgICAgICAgLCBtX3JhbmdlKHJhbmdlKQogICAgICAgICAsIG1faGln aGxpZ2h0KGhpZ2hsaWdodCkKICAgICB7CiAgICAgfQogCisgICAgYm9vbCBtX2hvdmVyZWQ7CiAg ICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBtX3JhbmdlOwogICAgIFJldGFpblB0cjxEREhpZ2hs aWdodFJlZj4gbV9oaWdobGlnaHQ7CiB9OwpAQCAtOTksMTAgKzEwNCwxMSBAQCBwcml2YXRlOgog ICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+PiBtX2N1cnJlbnRTZWxlY3Rpb25SYW5n ZXM7CiAgICAgCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFZlY3RvcjxSZWZQdHI8VGVsZXBob25l TnVtYmVyRGF0YT4+IG1fdGVsZXBob25lTnVtYmVyRGF0YXM7CisgICAgUmVmUHRyPFRlbGVwaG9u ZU51bWJlckRhdGE+IG1faGlnaGxpZ2h0ZWRUZWxlcGhvbmVOdW1iZXJEYXRhOwogICAgIFJlZlB0 cjxUZWxlcGhvbmVOdW1iZXJEYXRhPiBtX2N1cnJlbnRNb3VzZURvd25OdW1iZXI7CiAjZW5kaWYK LSAgICAKKworICAgIFdlYkNvcmU6OkludFBvaW50IG1fbGFzdE1vdXNlTW92ZVBvc2l0aW9uOwog ICAgIFdlYkNvcmU6OkludFBvaW50IG1fbW91c2VEb3duUG9zaXRpb247CiB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RlbGVwaG9uZU51bWJl ck92ZXJsYXlDb250cm9sbGVyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJvbGxlck1hYy5tbQppbmRleCA3Y2Fj NmQ1Li5iYTRkYzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RlbGVwaG9uZU51bWJlck92ZXJsYXlDb250cm9sbGVyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGVsZXBob25lTnVtYmVyT3ZlcmxheUNv bnRyb2xsZXJNYWMubW0KQEAgLTUwLDcgKzUwLDYgQEAgU09GVF9MSU5LKERhdGFEZXRlY3RvcnMs IERESGlnaGxpZ2h0Q3JlYXRlV2l0aFJlY3RzSW5WaXNpYmxlUmVjdCwgRERIaWdobGlnaHRSZWYK IFNPRlRfTElOSyhEYXRhRGV0ZWN0b3JzLCBEREhpZ2hsaWdodEdldExheWVyV2l0aENvbnRleHQs IENHTGF5ZXJSZWYsIChEREhpZ2hsaWdodFJlZiBoaWdobGlnaHQsIENHQ29udGV4dFJlZiBjb250 ZXh0KSwgKGhpZ2hsaWdodCwgY29udGV4dCkpCiBTT0ZUX0xJTksoRGF0YURldGVjdG9ycywgRERI aWdobGlnaHRHZXRCb3VuZGluZ1JlY3QsIENHUmVjdCwgKERESGlnaGxpZ2h0UmVmIGhpZ2hsaWdo dCksIChoaWdobGlnaHQpKQogU09GVF9MSU5LKERhdGFEZXRlY3RvcnMsIERESGlnaGxpZ2h0UG9p bnRJc09uSGlnaGxpZ2h0LCBCb29sZWFuLCAoRERIaWdobGlnaHRSZWYgaGlnaGxpZ2h0LCBDR1Bv aW50IHBvaW50LCBCb29sZWFuKiBvbkJ1dHRvbiksIChoaWdobGlnaHQsIHBvaW50LCBvbkJ1dHRv bikpCi1TT0ZUX0xJTksoRGF0YURldGVjdG9ycywgRERIaWdobGlnaHRTZXRCdXR0b25QcmVzc2Vk LCB2b2lkLCAoRERIaWdobGlnaHRSZWYgaGlnaGxpZ2h0LCBCb29sZWFuIGJ1dHRvblByZXNzZWQp LCAoaGlnaGxpZ2h0LCBidXR0b25QcmVzc2VkKSkKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CiAKQEAgLTY4LDY2ICs2Nyw2NSBAQCBzdGF0aWMgSW50UmVjdCB0ZXh0UXVhZHNUb0JvdW5kaW5n UmVjdEZvclJhbmdlKFJhbmdlJiByYW5nZSkKIAogdm9pZCBUZWxlcGhvbmVOdW1iZXJPdmVybGF5 Q29udHJvbGxlcjo6ZHJhd1JlY3QoUGFnZU92ZXJsYXkqIG92ZXJsYXksIFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0 eVJlY3QpCiB7Ci0gICAgaWYgKG1fY3VycmVudFNlbGVjdGlvblJhbmdlcy5pc0VtcHR5KCkpIHsK KyAgICAvLyBPbmx5IGRyYXcgYW4gaW5kaXZpZHVhbCB0ZWxlcGhvbmUgbnVtYmVyIGhpZ2hsaWdo dCBpZiB0aGVyZSBpcyBwcmVjaXNlbHkgb25lIHRlbGVwaG9uZSBudW1iZXIgc2VsZWN0ZWQuCisg ICAgaWYgKG1fY3VycmVudFNlbGVjdGlvblJhbmdlcy5pc0VtcHR5KCkgfHwgbV9jdXJyZW50U2Vs ZWN0aW9uUmFuZ2VzLnNpemUoKSA+IDEpIHsKICAgICAgICAgY2xlYXJIaWdobGlnaHRzKCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gZ3Jh cGhpY3NDb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpOworICAgIGF1dG8mIHJhbmdlID0gbV9jdXJy ZW50U2VsZWN0aW9uUmFuZ2VzWzBdOworCisgICAgLy8gRklYTUU6IFRoaXMgd2lsbCBjaG9rZSBp ZiB0aGUgcmFuZ2Ugd3JhcHMgYXJvdW5kIHRoZSBlZGdlIG9mIHRoZSB2aWV3LgorICAgIC8vIFdo YXQgc2hvdWxkIHdlIGRvIGluIHRoYXQgY2FzZT8KKyAgICBJbnRSZWN0IHJlY3QgPSB0ZXh0UXVh ZHNUb0JvdW5kaW5nUmVjdEZvclJhbmdlKCpyYW5nZSk7CisKKyAgICAvLyBDb252ZXJ0IHRvIHRo ZSBtYWluIGRvY3VtZW50J3MgY29vcmRpbmF0ZSBzcGFjZS4KKyAgICAvLyBGSVhNRTogSXQncyBh IGxpdHRsZSBjcmF6eSB0byBjYWxsIGNvbnRlbnRzVG9XaW5kb3cgYW5kIHRoZW4gd2luZG93VG9D b250ZW50cyBpbiBvcmRlciB0byBnZXQgdGhlIHJpZ2h0IGNvb3JkaW5hdGUgc3BhY2UuCisgICAg Ly8gV2Ugc2hvdWxkIGNvbnNpZGVyIGFkZGluZyBjb252ZXJzaW9uIGZ1bmN0aW9ucyB0byBTY3Jv bGxWaWV3IGZvciBjb250ZW50c1RvRG9jdW1lbnQoKS4gUmlnaHQgbm93LCBjb250ZW50c1RvUm9v dFZpZXcoKSBpcworICAgIC8vIG5vdCBlcXVpdmFsZW50IHRvIHdoYXQgd2UgbmVlZCB3aGVuIHlv dSBoYXZlIGEgdG9wQ29udGVudEluc2V0IG9yIGEgaGVhZGVyIGJhbm5lci4KKyAgICBGcmFtZVZp ZXcqIHZpZXdGb3JSYW5nZSA9IHJhbmdlLT5vd25lckRvY3VtZW50KCkudmlldygpOworICAgIGlm ICghdmlld0ZvclJhbmdlKQorICAgICAgICByZXR1cm47CisgICAgRnJhbWVWaWV3JiBtYWluRnJh bWVWaWV3ID0gKm1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkudmlldygpOworICAg IHJlY3Quc2V0TG9jYXRpb24obWFpbkZyYW1lVmlldy53aW5kb3dUb0NvbnRlbnRzKHZpZXdGb3JS YW5nZS0+Y29udGVudHNUb1dpbmRvdyhyZWN0LmxvY2F0aW9uKCkpKSk7CisKKyAgICAvLyBJZiB0 aGUgc2VsZWN0aW9uIHJlY3QgaXMgY29tcGxldGVseSBvdXRzaWRlIHRoaXMgZHJhd2luZyB0aWxl LCBkb24ndCBwcm9jZXNzIGl0IGZ1cnRoZXIKKyAgICBpZiAoIXJlY3QuaW50ZXJzZWN0cyhkaXJ0 eVJlY3QpKQorICAgICAgICByZXR1cm47CisKKyAgICBDR1JlY3QgY2dSZWN0c1tdID0geyAoQ0dS ZWN0KXJlY3QgfTsKKworICAgIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4gaGlnaGxpZ2h0ID0g YWRvcHRDRihEREhpZ2hsaWdodENyZWF0ZVdpdGhSZWN0c0luVmlzaWJsZVJlY3QobnVsbHB0ciwg Y2dSZWN0cywgMSwgdmlld0ZvclJhbmdlLT5ib3VuZHNSZWN0KCksIHRydWUpKTsKKyAgICBtX2hp Z2hsaWdodGVkVGVsZXBob25lTnVtYmVyRGF0YSA9IFRlbGVwaG9uZU51bWJlckRhdGE6OmNyZWF0 ZShyYW5nZS5nZXQoKSwgaGlnaGxpZ2h0LmdldCgpKTsKKworICAgIEJvb2xlYW4gb25CdXR0b247 CisgICAgYm9vbCBvbkhpZ2hsaWdodCA9IERESGlnaGxpZ2h0UG9pbnRJc09uSGlnaGxpZ2h0KGhp Z2hsaWdodC5nZXQoKSwgKENHUG9pbnQpbV9sYXN0TW91c2VNb3ZlUG9zaXRpb24sICZvbkJ1dHRv bik7CisKKyAgICBtX2hpZ2hsaWdodGVkVGVsZXBob25lTnVtYmVyRGF0YS0+c2V0SG92ZXJlZChv bkhpZ2hsaWdodCk7CisKKyAgICAvLyBEb24ndCBkcmF3IHRoZSBoaWdobGlnaHQgaWYgdGhlIG1v dXNlIGlzIG5vdCBob3ZlcmVkIG92ZXIgaXQuCisgICAgaWYgKCFvbkhpZ2hsaWdodCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gQ2hlY2sgYW5kIHNlZSBpZiB0aGUgbW91c2UgaXMgY3VycmVu dGx5IGRvd24gaW5zaWRlIHRoaXMgaGlnaGxpZ2h0J3MgYnV0dG9uLgorICAgIGlmIChtX21vdXNl RG93blBvc2l0aW9uICE9IEludFBvaW50KCkgJiYgb25CdXR0b24pCisgICAgICAgIG1fY3VycmVu dE1vdXNlRG93bk51bWJlciA9IG1faGlnaGxpZ2h0ZWRUZWxlcGhvbmVOdW1iZXJEYXRhOwogICAg IAotICAgIGZvciAoYXV0byYgcmFuZ2UgOiBtX2N1cnJlbnRTZWxlY3Rpb25SYW5nZXMpIHsKLSAg ICAgICAgLy8gRklYTUU6IFRoaXMgd2lsbCBjaG9rZSBpZiB0aGUgcmFuZ2Ugd3JhcHMgYXJvdW5k IHRoZSBlZGdlIG9mIHRoZSB2aWV3LgotICAgICAgICAvLyBXaGF0IHNob3VsZCB3ZSBkbyBpbiB0 aGF0IGNhc2U/Ci0gICAgICAgIEludFJlY3QgcmVjdCA9IHRleHRRdWFkc1RvQm91bmRpbmdSZWN0 Rm9yUmFuZ2UoKnJhbmdlKTsKLQotICAgICAgICAvLyBDb252ZXJ0IHRvIHRoZSBtYWluIGRvY3Vt ZW50J3MgY29vcmRpbmF0ZSBzcGFjZS4KLSAgICAgICAgLy8gRklYTUU6IEl0J3MgYSBsaXR0bGUg Y3JhenkgdG8gY2FsbCBjb250ZW50c1RvV2luZG93IGFuZCB0aGVuIHdpbmRvd1RvQ29udGVudHMg aW4gb3JkZXIgdG8gZ2V0IHRoZSByaWdodCBjb29yZGluYXRlIHNwYWNlLgotICAgICAgICAvLyBX ZSBzaG91bGQgY29uc2lkZXIgYWRkaW5nIGNvbnZlcnNpb24gZnVuY3Rpb25zIHRvIFNjcm9sbFZp ZXcgZm9yIGNvbnRlbnRzVG9Eb2N1bWVudCgpLiBSaWdodCBub3csIGNvbnRlbnRzVG9Sb290Vmll dygpIGlzCi0gICAgICAgIC8vIG5vdCBlcXVpdmFsZW50IHRvIHdoYXQgd2UgbmVlZCB3aGVuIHlv dSBoYXZlIGEgdG9wQ29udGVudEluc2V0IG9yIGEgaGVhZGVyIGJhbm5lci4KLSAgICAgICAgRnJh bWVWaWV3KiB2aWV3Rm9yUmFuZ2UgPSByYW5nZS0+b3duZXJEb2N1bWVudCgpLnZpZXcoKTsKLSAg ICAgICAgaWYgKCF2aWV3Rm9yUmFuZ2UpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIEZy YW1lVmlldyYgbWFpbkZyYW1lVmlldyA9ICptX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFt ZSgpLnZpZXcoKTsKLSAgICAgICAgcmVjdC5zZXRMb2NhdGlvbihtYWluRnJhbWVWaWV3LndpbmRv d1RvQ29udGVudHModmlld0ZvclJhbmdlLT5jb250ZW50c1RvV2luZG93KHJlY3QubG9jYXRpb24o KSkpKTsKLQotICAgICAgICAvLyBJZiB0aGUgc2VsZWN0aW9uIHJlY3QgaXMgY29tcGxldGVseSBv dXRzaWRlIHRoaXMgZHJhd2luZyB0aWxlLCBkb24ndCBwcm9jZXNzIGl0IGZ1cnRoZXIKLSAgICAg ICAgaWYgKCFyZWN0LmludGVyc2VjdHMoZGlydHlSZWN0KSkKLSAgICAgICAgICAgIGNvbnRpbnVl OwotCi0gICAgICAgIENHUmVjdCBjZ1JlY3RzW10gPSB7IChDR1JlY3QpcmVjdCB9OwotCi0gICAg ICAgIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4gaGlnaGxpZ2h0ID0gYWRvcHRDRihEREhpZ2hs aWdodENyZWF0ZVdpdGhSZWN0c0luVmlzaWJsZVJlY3QobnVsbHB0ciwgY2dSZWN0cywgMSwgdmll d0ZvclJhbmdlLT5ib3VuZHNSZWN0KCksIHRydWUpKTsKLSAgICAgICAgUmVmUHRyPFRlbGVwaG9u ZU51bWJlckRhdGE+IHRlbGVwaG9uZU51bWJlckRhdGEgPSBUZWxlcGhvbmVOdW1iZXJEYXRhOjpj cmVhdGUocmFuZ2UuZ2V0KCksIGhpZ2hsaWdodC5nZXQoKSk7Ci0gICAgICAgIG1fdGVsZXBob25l TnVtYmVyRGF0YXMuYXBwZW5kKHRlbGVwaG9uZU51bWJlckRhdGEpOwotICAgICAgICAKLSAgICAg ICAgLy8gQ2hlY2sgYW5kIHNlZSBpZiB0aGUgbW91c2UgaXMgY3VycmVudGx5IGRvd24gaW5zaWRl IHRoaXMgaGlnaGxpZ2h0J3MgYnV0dG9uLgotICAgICAgICBpZiAobV9tb3VzZURvd25Qb3NpdGlv biAhPSBJbnRQb2ludCgpKSB7Ci0gICAgICAgICAgICBCb29sZWFuIG9uQnV0dG9uOwotICAgICAg ICAgICAgaWYgKERESGlnaGxpZ2h0UG9pbnRJc09uSGlnaGxpZ2h0KGhpZ2hsaWdodC5nZXQoKSwg KENHUG9pbnQpbV9tb3VzZURvd25Qb3NpdGlvbiwgJm9uQnV0dG9uKSkgewotICAgICAgICAgICAg ICAgIGlmIChvbkJ1dHRvbikgewotICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRNb3VzZURv d25OdW1iZXIgPSB0ZWxlcGhvbmVOdW1iZXJEYXRhOwotICAgICAgICAgICAgICAgICAgICAKLSAg ICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gZG8gdGhlIGZvbGxvd2luZywg YnV0IFNPRlRfTElOSyBpc24ndCB3b3JraW5nIGZvciB0aGlzIG1ldGhvZC4KLSAgICAgICAgICAg ICAgICAgICAgLy8gRERIaWdobGlnaHRTZXRCdXR0b25QcmVzc2VkKGhpZ2hsaWdodCwgdHJ1ZSk7 Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIAot ICAgICAgICBDR0xheWVyUmVmIGhpZ2hsaWdodExheWVyID0gRERIaWdobGlnaHRHZXRMYXllcldp dGhDb250ZXh0KGhpZ2hsaWdodC5nZXQoKSwgY2dDb250ZXh0KTsKLSAgICAgICAgQ0dSZWN0IGhp Z2hsaWdodEJvdW5kaW5nUmVjdCA9IERESGlnaGxpZ2h0R2V0Qm91bmRpbmdSZWN0KGhpZ2hsaWdo dC5nZXQoKSk7Ci0gICAgICAgIAotICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0 YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAgICBDR0xheWVyUmVmIGhpZ2hsaWdodExheWVy ID0gRERIaWdobGlnaHRHZXRMYXllcldpdGhDb250ZXh0KGhpZ2hsaWdodC5nZXQoKSwgY2dDb250 ZXh0KTsKKyAgICBDR1JlY3QgaGlnaGxpZ2h0Qm91bmRpbmdSZWN0ID0gRERIaWdobGlnaHRHZXRC b3VuZGluZ1JlY3QoaGlnaGxpZ2h0LmdldCgpKTsKKyAgICAKKyAgICBHcmFwaGljc0NvbnRleHRT dGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKIAotICAgICAgICBncmFwaGlj c0NvbnRleHQudHJhbnNsYXRlKHRvRmxvYXRTaXplKGhpZ2hsaWdodEJvdW5kaW5nUmVjdC5vcmln aW4pKTsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNjYWxlKEZsb2F0U2l6ZSgxLCAtMSkpOwot ICAgICAgICBncmFwaGljc0NvbnRleHQudHJhbnNsYXRlKEZsb2F0U2l6ZSgwLCAtaGlnaGxpZ2h0 Qm91bmRpbmdSZWN0LnNpemUuaGVpZ2h0KSk7Ci0gICAgICAgIAotICAgICAgICBDR1JlY3QgaGln aGxpZ2h0RHJhd1JlY3QgPSBoaWdobGlnaHRCb3VuZGluZ1JlY3Q7Ci0gICAgICAgIGhpZ2hsaWdo dERyYXdSZWN0Lm9yaWdpbi54ID0gMDsKLSAgICAgICAgaGlnaGxpZ2h0RHJhd1JlY3Qub3JpZ2lu LnkgPSAwOwotICAgICAgICAKLSAgICAgICAgQ0dDb250ZXh0RHJhd0xheWVySW5SZWN0KGNnQ29u dGV4dCwgaGlnaGxpZ2h0RHJhd1JlY3QsIGhpZ2hsaWdodExheWVyKTsKLSAgICB9CisgICAgZ3Jh cGhpY3NDb250ZXh0LnRyYW5zbGF0ZSh0b0Zsb2F0U2l6ZShoaWdobGlnaHRCb3VuZGluZ1JlY3Qu b3JpZ2luKSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNjYWxlKEZsb2F0U2l6ZSgxLCAtMSkpOwor ICAgIGdyYXBoaWNzQ29udGV4dC50cmFuc2xhdGUoRmxvYXRTaXplKDAsIC1oaWdobGlnaHRCb3Vu ZGluZ1JlY3Quc2l6ZS5oZWlnaHQpKTsKKyAgICAKKyAgICBDR1JlY3QgaGlnaGxpZ2h0RHJhd1Jl Y3QgPSBoaWdobGlnaHRCb3VuZGluZ1JlY3Q7CisgICAgaGlnaGxpZ2h0RHJhd1JlY3Qub3JpZ2lu LnggPSAwOworICAgIGhpZ2hsaWdodERyYXdSZWN0Lm9yaWdpbi55ID0gMDsKKyAgICAKKyAgICBD R0NvbnRleHREcmF3TGF5ZXJJblJlY3QoY2dDb250ZXh0LCBoaWdobGlnaHREcmF3UmVjdCwgaGln aGxpZ2h0TGF5ZXIpOwogfQogICAgIAogdm9pZCBUZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJv bGxlcjo6aGFuZGxlVGVsZXBob25lQ2xpY2soVGVsZXBob25lTnVtYmVyRGF0YSogbnVtYmVyLCBj b25zdCBJbnRQb2ludCYgcG9pbnQpCkBAIC0xMzksNyArMTM3LDE3IEBAIHZvaWQgVGVsZXBob25l TnVtYmVyT3ZlcmxheUNvbnRyb2xsZXI6OmhhbmRsZVRlbGVwaG9uZUNsaWNrKFRlbGVwaG9uZU51 bWJlckRhdGEqCiAgICAgCiBib29sIFRlbGVwaG9uZU51bWJlck92ZXJsYXlDb250cm9sbGVyOjpt b3VzZUV2ZW50KFBhZ2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiB7Ci0g ICAgSW50UG9pbnQgbW91c2VQb3NpdGlvbiA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZy YW1lKCkudmlldygpLT5yb290Vmlld1RvQ29udGVudHMoZXZlbnQucG9zaXRpb24oKSk7CisgICAg bV9sYXN0TW91c2VNb3ZlUG9zaXRpb24gPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFt ZSgpLnZpZXcoKS0+cm9vdFZpZXdUb0NvbnRlbnRzKGV2ZW50LnBvc2l0aW9uKCkpOworCisgICAg aWYgKG1faGlnaGxpZ2h0ZWRUZWxlcGhvbmVOdW1iZXJEYXRhKSB7CisgICAgICAgIEJvb2xlYW4g b25CdXR0b247CisgICAgICAgIGJvb2wgaG92ZXJlZCA9IERESGlnaGxpZ2h0UG9pbnRJc09uSGln aGxpZ2h0KG1faGlnaGxpZ2h0ZWRUZWxlcGhvbmVOdW1iZXJEYXRhLT5oaWdobGlnaHQoKSwgKENH UG9pbnQpbV9sYXN0TW91c2VNb3ZlUG9zaXRpb24sICZvbkJ1dHRvbik7CisKKyAgICAgICAgaWYg KGhvdmVyZWQgIT0gbV9oaWdobGlnaHRlZFRlbGVwaG9uZU51bWJlckRhdGEtPmhvdmVyZWQoKSkK KyAgICAgICAgICAgIG1fdGVsZXBob25lTnVtYmVyT3ZlcmxheS0+c2V0TmVlZHNEaXNwbGF5KCk7 CisKKyAgICAgICAgbV9oaWdobGlnaHRlZFRlbGVwaG9uZU51bWJlckRhdGEtPnNldEhvdmVyZWQo aG92ZXJlZCk7CisgICAgfQogCiAgICAgLy8gSWYgdGhpcyBldmVudCBoYXMgbm90aGluZyB0byBk byB3aXRoIHRoZSBsZWZ0IGJ1dHRvbiwgaXQgY2xlYXJzIHRoZSBjdXJyZW50IG1vdXNlIGRvd24g dHJhY2tpbmcgYW5kIHdlJ3JlIGRvbmUgcHJvY2Vzc2luZyBpdC4KICAgICBpZiAoZXZlbnQuYnV0 dG9uKCkgIT0gV2ViTW91c2VFdmVudDo6TGVmdEJ1dHRvbikgewpAQCAtMTU1LDggKzE2Myw4IEBA IGJvb2wgVGVsZXBob25lTnVtYmVyT3ZlcmxheUNvbnRyb2xsZXI6Om1vdXNlRXZlbnQoUGFnZU92 ZXJsYXkqLCBjb25zdCBXZWJNb3VzZUV2CiAgICAgICAgIAogICAgICAgICAvLyBJZiB0aGUgbW91 c2UgbGlmdGVkIHdoaWxlIHN0aWxsIG92ZXIgdGhlIGhpZ2hsaWdodCBidXR0b24gdGhhdCBpdCB3 ZW50IGRvd24gb24sIHRoZW4gdGhhdCBpcyBhIGNsaWNrLgogICAgICAgICBCb29sZWFuIG9uQnV0 dG9uOwotICAgICAgICBpZiAoRERIaWdobGlnaHRQb2ludElzT25IaWdobGlnaHQoY3VycmVudE51 bWJlci0+aGlnaGxpZ2h0KCksIChDR1BvaW50KW1vdXNlUG9zaXRpb24sICZvbkJ1dHRvbikgJiYg b25CdXR0b24pIHsKLSAgICAgICAgICAgIGhhbmRsZVRlbGVwaG9uZUNsaWNrKGN1cnJlbnROdW1i ZXIuZ2V0KCksIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkudmlldygpLT5jb250 ZW50c1RvV2luZG93KG1vdXNlUG9zaXRpb24pKTsKKyAgICAgICAgaWYgKERESGlnaGxpZ2h0UG9p bnRJc09uSGlnaGxpZ2h0KGN1cnJlbnROdW1iZXItPmhpZ2hsaWdodCgpLCAoQ0dQb2ludCltX2xh c3RNb3VzZU1vdmVQb3NpdGlvbiwgJm9uQnV0dG9uKSAmJiBvbkJ1dHRvbikgeworICAgICAgICAg ICAgaGFuZGxlVGVsZXBob25lQ2xpY2soY3VycmVudE51bWJlci5nZXQoKSwgbV93ZWJQYWdlLT5j b3JlUGFnZSgpLT5tYWluRnJhbWUoKS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cobV9sYXN0TW91 c2VNb3ZlUG9zaXRpb24pKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIH0KQEAgLTE2OSw3ICsxNzcsNyBAQCBib29sIFRlbGVwaG9uZU51bWJlck92ZXJs YXlDb250cm9sbGVyOjptb3VzZUV2ZW50KFBhZ2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdgog ICAgICAgICBCb29sZWFuIG9uQnV0dG9uOwogICAgICAgICAKICAgICAgICAgLy8gTW92aW5nIHdp dGggdGhlIG1vdXNlIGJ1dHRvbiBkb3duIGlzIG9rYXkgYXMgbG9uZyBhcyB0aGUgbW91c2UgbmV2 ZXIgbGVhdmVzIHRoZSBoaWdobGlnaHQgYnV0dG9uLgotICAgICAgICBpZiAoRERIaWdobGlnaHRQ b2ludElzT25IaWdobGlnaHQoY3VycmVudE51bWJlci0+aGlnaGxpZ2h0KCksIChDR1BvaW50KW1v dXNlUG9zaXRpb24sICZvbkJ1dHRvbikgJiYgb25CdXR0b24pCisgICAgICAgIGlmIChEREhpZ2hs aWdodFBvaW50SXNPbkhpZ2hsaWdodChjdXJyZW50TnVtYmVyLT5oaWdobGlnaHQoKSwgKENHUG9p bnQpbV9sYXN0TW91c2VNb3ZlUG9zaXRpb24sICZvbkJ1dHRvbikgJiYgb25CdXR0b24pCiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgCiAgICAgICAgIGNsZWFyTW91c2VEb3duSW5m b3JtYXRpb24oKTsKQEAgLTE4MSwyMCArMTg5LDE1IEBAIGJvb2wgVGVsZXBob25lTnVtYmVyT3Zl cmxheUNvbnRyb2xsZXI6Om1vdXNlRXZlbnQoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJNb3VzZUV2 CiAgICAgaWYgKGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VEb3duKSB7CiAgICAgICAg IEFTU0VSVCghbV9jdXJyZW50TW91c2VEb3duTnVtYmVyKTsKICAgICAgICAgCi0gICAgICAgIGZv ciAoYXV0byYgdGVsZXBob25lTnVtYmVyRGF0YSA6IG1fdGVsZXBob25lTnVtYmVyRGF0YXMpIHsK LSAgICAgICAgICAgIEJvb2xlYW4gb25CdXR0b247Ci0gICAgICAgICAgICBpZiAoRERIaWdobGln aHRQb2ludElzT25IaWdobGlnaHQodGVsZXBob25lTnVtYmVyRGF0YS0+aGlnaGxpZ2h0KCksIChD R1BvaW50KW1vdXNlUG9zaXRpb24sICZvbkJ1dHRvbikgJiYgb25CdXR0b24pIHsKLSAgICAgICAg ICAgICAgICBtX21vdXNlRG93blBvc2l0aW9uID0gbW91c2VQb3NpdGlvbjsKLSAgICAgICAgICAg ICAgICBtX2N1cnJlbnRNb3VzZURvd25OdW1iZXIgPSB0ZWxlcGhvbmVOdW1iZXJEYXRhOwotICAg ICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGRvIHRo ZSBmb2xsb3dpbmcsIGJ1dCBTT0ZUX0xJTksgaXNuJ3Qgd29ya2luZyBmb3IgdGhpcyBtZXRob2Qu Ci0gICAgICAgICAgICAgICAgLy8gRERIaWdobGlnaHRTZXRCdXR0b25QcmVzc2VkKGhpZ2hsaWdo dC5nZXQoKSwgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgbV90ZWxl cGhvbmVOdW1iZXJPdmVybGF5LT5zZXROZWVkc0Rpc3BsYXkoKTsKLSAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgQm9vbGVhbiBvbkJ1dHRvbjsKKyAg ICAgICAgaWYgKERESGlnaGxpZ2h0UG9pbnRJc09uSGlnaGxpZ2h0KG1faGlnaGxpZ2h0ZWRUZWxl cGhvbmVOdW1iZXJEYXRhLT5oaWdobGlnaHQoKSwgKENHUG9pbnQpbV9sYXN0TW91c2VNb3ZlUG9z aXRpb24sICZvbkJ1dHRvbikgJiYgb25CdXR0b24pIHsKKyAgICAgICAgICAgIG1fbW91c2VEb3du UG9zaXRpb24gPSBtX2xhc3RNb3VzZU1vdmVQb3NpdGlvbjsKKyAgICAgICAgICAgIG1fY3VycmVu dE1vdXNlRG93bk51bWJlciA9IG1faGlnaGxpZ2h0ZWRUZWxlcGhvbmVOdW1iZXJEYXRhOworICAg ICAgICAgICAgCisgICAgICAgICAgICBtX3RlbGVwaG9uZU51bWJlck92ZXJsYXktPnNldE5lZWRz RGlzcGxheSgpOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KLSAgICAgICAg CisKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICAgICAgCkBAIC0yMDksNyArMjEy LDcgQEAgdm9pZCBUZWxlcGhvbmVOdW1iZXJPdmVybGF5Q29udHJvbGxlcjo6Y2xlYXJNb3VzZURv d25JbmZvcm1hdGlvbigpCiAgICAgCiB2b2lkIFRlbGVwaG9uZU51bWJlck92ZXJsYXlDb250cm9s bGVyOjpjbGVhckhpZ2hsaWdodHMoKQogewotICAgIG1fdGVsZXBob25lTnVtYmVyRGF0YXMuY2xl YXIoKTsKKyAgICBtX2hpZ2hsaWdodGVkVGVsZXBob25lTnVtYmVyRGF0YSA9IG51bGxwdHI7CiAg ICAgbV9jdXJyZW50TW91c2VEb3duTnVtYmVyID0gbnVsbHB0cjsKIH0KICAgICAK