131433 2014-04-09 00:19:05 -0700 REGRESSION(r166975): [GTK] Page overlays are not drawn anymore after r166975 2015-01-27 08:10:28 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 1 cgarcia webkit-unassigned zan oldest_to_newest 999119 0 cgarcia 2014-04-09 00:19:05 -0700 WebPage::pageOverlays() and WebPage::drawPageOverlay() have been removed in r166975. We need to use PageOverlayController now. 999123 1 cgarcia 2014-04-09 00:36:04 -0700 Committed r167006: <http://trac.webkit.org/changeset/167006> 1003211 2 cgarcia 2014-04-23 00:46:07 -0700 It seems webkit-patch land incorrectly closed this bug. This regression is still present. 1064484 3 245437 cgarcia 2015-01-27 05:17:47 -0800 Created attachment 245437 Patch This brings back the highlighted areas used by the inspector! 1064486 4 245437 zan 2015-01-27 05:34:07 -0800 Comment on attachment 245437 Patch r=me 1064516 5 cgarcia 2015-01-27 08:10:28 -0800 Committed r179182: <http://trac.webkit.org/changeset/179182> 245437 2015-01-27 05:17:47 -0800 2015-01-27 05:34:07 -0800 Patch wk2-page-overlays.diff text/plain 12481 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1YTM0OGEwLi41OWIwZDU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTUtMDEtMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04ocjE2Njk3NSk6IFtHVEtdIFBhZ2Ugb3ZlcmxheXMgYXJl IG5vdCBkcmF3biBhbnltb3JlIGFmdGVyIHIxNjY5NzUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTQzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBwYWdlIG92ZXJsYXlzIGZvciB0aGUg R1RLKyBwb3J0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0Lmg6CisgICAgICAgIE92ZXJyaWRlIHB1cmUg dmlydHVhbCBzZXRWaWV3T3ZlcmxheVJvb3RMYXllcigpLgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl YUltcGw6OmRpc3BsYXkpOiBSZW1vdmUgRklYTUUgYW5kIHVzZSBtb2Rlcm4KKyAgICAgICAgZm9y IGxvb3AuCisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6YXR0YWNoVmlld092ZXJs YXlHcmFwaGljc0xheWVyKTogUmVtb3ZlCisgICAgICAgIGlmZGVmcyBhbmQgdXNlIExheWVyVHJl ZUhvc3Q6OnNldFZpZXdPdmVybGF5Um9vdExheWVyKCkuCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL0xheWVyVHJlZUhvc3QuaDogQWRkIHB1cmUgdmlydHVhbCBzZXRWaWV3T3ZlcmxheVJv b3RMYXllcigpLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9z dEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OkxheWVyVHJlZUhv c3RHdGspOiBJbml0aWFsaXplIG1fdmlld092ZXJsYXlSb290TGF5ZXIuCisgICAgICAgIChXZWJL aXQ6OkxheWVyVHJlZUhvc3RHdGs6OmluaXRpYWxpemUpOiBSZW1vdmUgRklYTUUuCisgICAgICAg IChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OnNldE5vbkNvbXBvc2l0ZWRDb250ZW50c05lZWRE aXNwbGF5KToKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBvbGQgcGFnZSBvdmVybGF5cyBjb2RlLgor ICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0R3RrOjpzZXROb25Db21wb3NpdGVkQ29udGVu dHNOZWVkRGlzcGxheUluUmVjdCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVI b3N0R3RrOjpzaXplRGlkQ2hhbmdlKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJl ZUhvc3RHdGs6OnBhaW50Q29udGVudHMpOiBSZW1vdmUgRklYTUUuCisgICAgICAgIChXZWJLaXQ6 OkxheWVyVHJlZUhvc3RHdGs6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6IEZsdXNoCisgICAg ICAgIGNvbXBvc2l0aW5nIHN0YXRlIG9uIG1fcGFnZU92ZXJsYXlMYXllcnMgaWYgcHJlc2VudC4K KyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6c2V0Vmlld092ZXJsYXlSb290TGF5 ZXIpOiBTZXQgbV9wYWdlT3ZlcmxheUxheWVycy4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVl SG9zdEd0azo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OkxheWVyVHJlZUhvc3RHdGs6OmRlc3Ryb3lQYWdlT3ZlcmxheUxheWVyKTogRGVsZXRlZC4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaDogUmVt b3ZlIHVudXNlZCBvbGQKKyAgICAgICAgcGFnZSBvdmVybGF5cyBjb2RlLgorCiAyMDE1LTAxLTI2 ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBndGtkb2MgZG9lcyBub3QgYXBwZWFyIGluIERldkhlbHAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5h dGVkTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nv b3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmgKaW5kZXggMGNmZDAy OC4uMjQxZWJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmgKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRp bmF0ZWRMYXllclRyZWVIb3N0LmgKQEAgLTcwLDcgKzcwLDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBzY2hlZHVsZUFuaW1hdGlvbigpIG92ZXJyaWRlOwogI2VuZGlmCiAKLSAgICB2b2lk IHNldFZpZXdPdmVybGF5Um9vdExheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKTsKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0Vmlld092ZXJsYXlSb290TGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NMYXll ciopIG92ZXJyaWRlOwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViQ29yZTo6Q29vcmRpbmF0 ZWRTdXJmYWNlPiBjcmVhdGVDb29yZGluYXRlZFN1cmZhY2UoY29uc3QgV2ViQ29yZTo6SW50U2l6 ZSYsIFdlYkNvcmU6OkNvb3JkaW5hdGVkU3VyZmFjZTo6RmxhZ3MpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCmluZGV4 IDM2OTMyMDUuLjEwM2VkMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC0zOSwxMCArMzksNiBAQAogI2luY2x1 ZGUgPFdlYkNvcmUvUGFnZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KIAotI2lm IFVTRShDT09SRElOQVRFRF9HUkFQSElDU19USFJFQURFRCkKLSNpbmNsdWRlICJUaHJlYWRlZENv b3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oIgotI2VuZGlmCi0KIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTY1NCwxMiArNjUwLDkgQEAgdm9pZCBEcmF3 aW5nQXJlYUltcGw6OmRpc3BsYXkoVXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKIAogICAgIGdyYXBo aWNzQ29udGV4dC0+dHJhbnNsYXRlKC1ib3VuZHMueCgpLCAtYm91bmRzLnkoKSk7CiAKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3RzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIG1fd2Vi UGFnZS5kcmF3UmVjdCgqZ3JhcGhpY3NDb250ZXh0LCByZWN0c1tpXSk7Ci0KLSAgICAgICAgLy8g RklYTUU6IERyYXcgcGFnZSBvbHZlcmxheXMuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzE0MzMuCi0KLSAgICAgICAgdXBkYXRlSW5mby51cGRhdGVSZWN0cy5hcHBl bmQocmVjdHNbaV0pOworICAgIGZvciAoY29uc3QgYXV0byYgcmVjdCA6IHJlY3RzKSB7CisgICAg ICAgIG1fd2ViUGFnZS5kcmF3UmVjdCgqZ3JhcGhpY3NDb250ZXh0LCByZWN0KTsKKyAgICAgICAg dXBkYXRlSW5mby51cGRhdGVSZWN0cy5hcHBlbmQocmVjdCk7CiAgICAgfQogCiAgICAgLy8gTGF5 b3V0IGNhbiB0cmlnZ2VyIG1vcmUgY2FsbHMgdG8gc2V0TmVlZHNEaXNwbGF5IGFuZCB3ZSBkb24n dCB3YW50IHRvIHByb2Nlc3MgdGhlbQpAQCAtNjY5LDE5ICs2NjIsMTMgQEAgdm9pZCBEcmF3aW5n QXJlYUltcGw6OmRpc3BsYXkoVXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKIAogdm9pZCBEcmF3aW5n QXJlYUltcGw6OmF0dGFjaFZpZXdPdmVybGF5R3JhcGhpY3NMYXllcihXZWJDb3JlOjpGcmFtZSog ZnJhbWUsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIHZpZXdPdmVybGF5Um9vdExheWVyKQogewot I2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDU19USFJFQURFRCkKICAgICBpZiAoIWZyYW1lLT5p c01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIW1fbGF5ZXJUcmVlSG9z dCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhv c3QqIGNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdCA9IHN0YXRpY19jYXN0PFRocmVhZGVkQ29vcmRp bmF0ZWRMYXllclRyZWVIb3N0Kj4obV9sYXllclRyZWVIb3N0LmdldCgpKTsKLSAgICBjb29yZGlu YXRlZExheWVyVHJlZUhvc3QtPnNldFZpZXdPdmVybGF5Um9vdExheWVyKHZpZXdPdmVybGF5Um9v dExheWVyKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKGZyYW1lKTsKLSAgICBVTlVTRURfUEFS QU0odmlld092ZXJsYXlSb290TGF5ZXIpOwotI2VuZGlmCisgICAgbV9sYXllclRyZWVIb3N0LT5z ZXRWaWV3T3ZlcmxheVJvb3RMYXllcih2aWV3T3ZlcmxheVJvb3RMYXllcik7CiB9CiAKICNpZiBV U0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDgxMGIwNWEuLjY1 MDc5OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXll clRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVy VHJlZUhvc3QuaApAQCAtOTMsNiArOTMsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNj aGVkdWxlQW5pbWF0aW9uKCkgPSAwOwogI2VuZGlmCiAKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmll d092ZXJsYXlSb290TGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NMYXllciopID0gMDsKKwogcHJvdGVj dGVkOgogICAgIGV4cGxpY2l0IExheWVyVHJlZUhvc3QoV2ViUGFnZSopOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0 R3RrLmNwcAppbmRleCA2YTc4MTdiLi4zZWY3NTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAKQEAg LTc0LDYgKzc0LDcgQEAgTGF5ZXJUcmVlSG9zdEd0azo6TGF5ZXJUcmVlSG9zdEd0ayhXZWJQYWdl KiB3ZWJQYWdlKQogICAgICwgbV9ub3RpZnlBZnRlclNjaGVkdWxlZExheWVyRmx1c2goZmFsc2Up CiAgICAgLCBtX2xhc3RJbW1lZGlhdGVGbHVzaFRpbWUoMCkKICAgICAsIG1fbGF5ZXJGbHVzaFNj aGVkdWxpbmdFbmFibGVkKHRydWUpCisgICAgLCBtX3ZpZXdPdmVybGF5Um9vdExheWVyKG51bGxw dHIpCiB7CiB9CiAKQEAgLTEyNSw4ICsxMjYsNiBAQCB2b2lkIExheWVyVHJlZUhvc3RHdGs6Omlu aXRpYWxpemUoKQogICAgIHN0YXRpY19jYXN0PFRleHR1cmVNYXBwZXJHTCo+KG1fdGV4dHVyZU1h cHBlci5nZXQoKSktPnNldEVuYWJsZUVkZ2VEaXN0YW5jZUFudGlhbGlhc2luZyh0cnVlKTsKICAg ICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4oKm1fcm9vdExheWVyKS5sYXll cigpLnNldFRleHR1cmVNYXBwZXIobV90ZXh0dXJlTWFwcGVyLmdldCgpKTsKIAotICAgIC8vIEZJ WE1FOiBDcmV0YWUgcGFnZSBvbHZlcmxheSBsYXllcnMuIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzE0MzMuCi0KICAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKIH0K IApAQCAtMTc5LDIyICsxNzgsMTIgQEAgdm9pZCBMYXllclRyZWVIb3N0R3RrOjppbnZhbGlkYXRl KCkKIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERp c3BsYXkoKQogewogICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNw bGF5KCk7Ci0KLSAgICBQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VP dmVybGF5TGF5ZXJzLmVuZCgpOwotICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0 b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAg ICAgICAgaXQtPnZhbHVlLT5zZXROZWVkc0Rpc3BsYXkoKTsKLQogICAgIHNjaGVkdWxlTGF5ZXJG bHVzaCgpOwogfQogCiB2b2lkIExheWVyVHJlZUhvc3RHdGs6OnNldE5vbkNvbXBvc2l0ZWRDb250 ZW50c05lZWREaXNwbGF5SW5SZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgbV9ub25D b21wb3NpdGVkQ29udGVudExheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QocmVjdCk7Ci0KLSAg ICBQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJz LmVuZCgpOwotICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3Bh Z2VPdmVybGF5TGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAgICAgaXQtPnZh bHVlLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QocmVjdCk7Ci0KICAgICBzY2hlZHVsZUxheWVyRmx1 c2goKTsKIH0KIApAQCAtMjIzLDEwICsyMTIsNiBAQCB2b2lkIExheWVyVHJlZUhvc3RHdGs6OnNp emVEaWRDaGFuZ2UoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKICAgICAgICAgbV9ub25Db21wb3Np dGVkQ29udGVudExheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QoRmxvYXRSZWN0KDAsIG9sZFNp emUuaGVpZ2h0KCksIG5ld1NpemUud2lkdGgoKSwgbmV3U2l6ZS5oZWlnaHQoKSAtIG9sZFNpemUu aGVpZ2h0KCkpKTsKICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5lZWRzRGlz cGxheSgpOwogCi0gICAgUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgZW5kID0gbV9wYWdl T3ZlcmxheUxheWVycy5lbmQoKTsKLSAgICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJh dG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCi0g ICAgICAgIGl0LT52YWx1ZS0+c2V0U2l6ZShuZXdTaXplKTsKLQogICAgIGNvbXBvc2l0ZUxheWVy c1RvQ29udGV4dChGb3JSZXNpemUpOwogfQogCkBAIC0yNDMsMTIgKzIyOCw4IEBAIHZvaWQgTGF5 ZXJUcmVlSG9zdEd0azo6Zm9yY2VSZXBhaW50KCkKIAogdm9pZCBMYXllclRyZWVIb3N0R3RrOjpw YWludENvbnRlbnRzKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXBoaWNz Q29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgY29u c3QgRmxvYXRSZWN0JiBjbGlwUmVjdCkKIHsKLSAgICBpZiAoZ3JhcGhpY3NMYXllciA9PSBtX25v bkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuZ2V0KCkpIHsKKyAgICBpZiAoZ3JhcGhpY3NMYXllciA9 PSBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuZ2V0KCkpCiAgICAgICAgIG1fd2ViUGFnZS0+ ZHJhd1JlY3QoZ3JhcGhpY3NDb250ZXh0LCBlbmNsb3NpbmdJbnRSZWN0KGNsaXBSZWN0KSk7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICAvLyBGSVhNRTogRHJhdyBwYWdlIG92ZXJsYXlz LiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDMzLgogfQogCiBz dGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkU2tpcE5leHRGcmFtZUJlY2F1c2VPZkNvbnRpbm91c0lt bWVkaWF0ZUZsdXNoZXMoZG91YmxlIGN1cnJlbnQsIGRvdWJsZSBsYXN0SW1tZWRpYXRlRmx1c2hU aW1lKQpAQCAtMjk2LDEzICsyNzcsMTIgQEAgYm9vbCBMYXllclRyZWVIb3N0R3RrOjpmbHVzaFBl bmRpbmdMYXllckNoYW5nZXMoKQogICAgIG1fcm9vdExheWVyLT5mbHVzaENvbXBvc2l0aW5nU3Rh dGVGb3JUaGlzTGF5ZXJPbmx5KCk7CiAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5m bHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCk7CiAKLSAgICBQYWdlT3Zlcmxh eUxheWVyTWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOwotICAg IGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5 ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAgICAgaXQtPnZhbHVlLT5mbHVzaENv bXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCk7Ci0KICAgICBpZiAoIW1fd2ViUGFnZS0+ Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkudmlldygpLT5mbHVzaENvbXBvc2l0aW5nU3RhdGVJbmNs dWRpbmdTdWJmcmFtZXMoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKG1fdmll d092ZXJsYXlSb290TGF5ZXIpCisgICAgICAgIG1fdmlld092ZXJsYXlSb290TGF5ZXItPmZsdXNo Q29tcG9zaXRpbmdTdGF0ZShGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCBtX3Jvb3RMYXllci0+c2l6 ZSgpKSk7CisKICAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4oKm1fcm9v dExheWVyKS51cGRhdGVCYWNraW5nU3RvcmVJbmNsdWRpbmdTdWJMYXllcnMoKTsKICAgICByZXR1 cm4gdHJ1ZTsKIH0KQEAgLTM1OCwzMSArMzM4LDYgQEAgdm9pZCBMYXllclRyZWVIb3N0R3RrOjpm bHVzaEFuZFJlbmRlckxheWVycygpCiAgICAgfQogfQogCi12b2lkIExheWVyVHJlZUhvc3RHdGs6 OmNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoV2ViQ29yZTo6UGFnZU92ZXJsYXkqIHBhZ2VPdmVybGF5 KQotewotICAgIHN0ZDo6dW5pcXVlX3B0cjxHcmFwaGljc0xheWVyPiBsYXllciA9IEdyYXBoaWNz TGF5ZXI6OmNyZWF0ZShncmFwaGljc0xheWVyRmFjdG9yeSgpLCAqdGhpcyk7Ci0jaWZuZGVmIE5E RUJVRwotICAgIGxheWVyLT5zZXROYW1lKCJMYXllclRyZWVIb3N0IHBhZ2Ugb3ZlcmxheSBjb250 ZW50Iik7Ci0jZW5kaWYKLQotICAgIGxheWVyLT5zZXRBY2NlbGVyYXRlc0RyYXdpbmcobV93ZWJQ YWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLmFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSk7 Ci0gICAgbGF5ZXItPnNldERyYXdzQ29udGVudCh0cnVlKTsKLSAgICBsYXllci0+c2V0U2l6ZSht X3dlYlBhZ2UtPnNpemUoKSk7Ci0gICAgbGF5ZXItPnNldFNob3dEZWJ1Z0JvcmRlcihtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkuc2hvd0RlYnVnQm9yZGVycygpKTsKLSAgICBsYXll ci0+c2V0U2hvd1JlcGFpbnRDb3VudGVyKG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3Mo KS5zaG93UmVwYWludENvdW50ZXIoKSk7Ci0KLSAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobGF5 ZXIuZ2V0KCkpOwotICAgIG1fcGFnZU92ZXJsYXlMYXllcnMuYWRkKHBhZ2VPdmVybGF5LCBXVEY6 Om1vdmUobGF5ZXIpKTsKLX0KLQotdm9pZCBMYXllclRyZWVIb3N0R3RrOjpkZXN0cm95UGFnZU92 ZXJsYXlMYXllcihXZWJDb3JlOjpQYWdlT3ZlcmxheSogcGFnZU92ZXJsYXkpCi17Ci0gICAgc3Rk Ojp1bmlxdWVfcHRyPEdyYXBoaWNzTGF5ZXI+IGxheWVyID0gbV9wYWdlT3ZlcmxheUxheWVycy50 YWtlKHBhZ2VPdmVybGF5KTsKLSAgICBBU1NFUlQobGF5ZXIpOwotCi0gICAgbGF5ZXItPnJlbW92 ZUZyb21QYXJlbnQoKTsKLX0KLQogdm9pZCBMYXllclRyZWVIb3N0R3RrOjpzY2hlZHVsZUxheWVy Rmx1c2goKQogewogICAgIGlmICghbV9sYXllckZsdXNoU2NoZWR1bGluZ0VuYWJsZWQpCkBAIC00 MTgsNiArMzczLDEzIEBAIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6Y2FuY2VsUGVuZGluZ0xheWVy Rmx1c2goKQogICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2suY2FuY2VsKCk7CiB9CiAKK3Zv aWQgTGF5ZXJUcmVlSG9zdEd0azo6c2V0Vmlld092ZXJsYXlSb290TGF5ZXIoV2ViQ29yZTo6R3Jh cGhpY3NMYXllciogdmlld092ZXJsYXlSb290TGF5ZXIpCit7CisgICAgbV92aWV3T3ZlcmxheVJv b3RMYXllciA9IHZpZXdPdmVybGF5Um9vdExheWVyOworICAgIGlmIChtX3ZpZXdPdmVybGF5Um9v dExheWVyKQorICAgICAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV92aWV3T3ZlcmxheVJvb3RM YXllcik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3Rr LmgKaW5kZXggMTZmNjhhYi4uYzgwOWIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmgKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmgKQEAgLTM0LDggKzM0 LDYgQEAKICNpbmNsdWRlICJUZXh0dXJlTWFwcGVyTGF5ZXIuaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0dMQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllckNsaWVudC5oPgot I2luY2x1ZGUgPFdlYkNvcmUvUGFnZU92ZXJsYXkuaD4KLSNpbmNsdWRlIDx3dGYvSGFzaE1hcC5o PgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oPgogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKQEAgLTcxLDE1ICs2OSwxMyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBz ZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheSgpIG92ZXJyaWRlOwogICAgIHZpcnR1 YWwgdm9pZCBzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheUluUmVjdChjb25zdCBX ZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbE5vbkNv bXBvc2l0ZWRDb250ZW50cyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0KSBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld092ZXJsYXlSb290TGF5ZXIoV2ViQ29yZTo6 R3JhcGhpY3NMYXllciopIG92ZXJyaWRlOwogCiAgICAgLy8gR3JhcGhpY3NMYXllckNsaWVudAog ICAgIHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXIqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBXZWJDb3JlOjpHcmFwaGljc0xheWVyUGFp bnRpbmdQaGFzZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBjbGlwUmVjdCkgb3ZlcnJpZGU7 CiAKICAgICBib29sIGZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpOwogCi0gICAgdm9pZCBjcmVh dGVQYWdlT3ZlcmxheUxheWVyKFdlYkNvcmU6OlBhZ2VPdmVybGF5Kik7Ci0gICAgdm9pZCBkZXN0 cm95UGFnZU92ZXJsYXlMYXllcihXZWJDb3JlOjpQYWdlT3ZlcmxheSopOwotCiAgICAgZW51bSBD b21wb3NpdGVQdXJwb3NlIHsgRm9yUmVzaXplLCBOb3RGb3JSZXNpemUgfTsKICAgICB2b2lkIGNv bXBvc2l0ZUxheWVyc1RvQ29udGV4dChDb21wb3NpdGVQdXJwb3NlID0gTm90Rm9yUmVzaXplKTsK IApAQCAtOTUsMTMgKzkxLDEyIEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX25vdGlmeUFmdGVyU2No ZWR1bGVkTGF5ZXJGbHVzaDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6R3JhcGhpY3NM YXllcj4gbV9yb290TGF5ZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXI+IG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllcjsKLSAgICB0eXBlZGVmIEhhc2hNYXA8 V2ViQ29yZTo6UGFnZU92ZXJsYXkqLCBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6R3JhcGhpY3NM YXllcj4+IFBhZ2VPdmVybGF5TGF5ZXJNYXA7Ci0gICAgUGFnZU92ZXJsYXlMYXllck1hcCBtX3Bh Z2VPdmVybGF5TGF5ZXJzOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpUZXh0dXJlTWFw cGVyPiBtX3RleHR1cmVNYXBwZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OkdMQ29u dGV4dD4gbV9jb250ZXh0OwogICAgIGRvdWJsZSBtX2xhc3RJbW1lZGlhdGVGbHVzaFRpbWU7CiAg ICAgYm9vbCBtX2xheWVyRmx1c2hTY2hlZHVsaW5nRW5hYmxlZDsKICAgICBHTWFpbkxvb3BTb3Vy Y2UgbV9sYXllckZsdXNoVGltZXJDYWxsYmFjazsKKyAgICBXZWJDb3JlOjpHcmFwaGljc0xheWVy KiBtX3ZpZXdPdmVybGF5Um9vdExheWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==