114549 2013-04-12 17:39:01 -0700 Add private interface to WKView to asynchronously update the drawing area size 2013-04-12 18:36:46 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough simon.fraser oldest_to_newest 875075 0 barraclough 2013-04-12 17:39:01 -0700 This will allow a client using the WKView to resize the contents without blocking waiting for the web process to repaint. 875076 1 197915 barraclough 2013-04-12 17:44:35 -0700 Created attachment 197915 Patch 875078 2 197915 simon.fraser 2013-04-12 18:07:36 -0700 Comment on attachment 197915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197915&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:3445 > +// The updated is performed asynchronously; we don't wait for the geometry update before returning. The update > Source/WebKit2/UIProcess/API/mac/WKView.mm:3464 > + // If a geometry update is still pending then the action of recieving the receiving > Source/WebKit2/UIProcess/API/mac/WKView.mm:3468 > + drawingArea->waitForPossibleGeometryUpdate(); > + drawingArea->waitForPossibleGeometryUpdate(); Do we really want to wait for a whole second? 875082 3 barraclough 2013-04-12 18:36:46 -0700 Fixed in: Committed revision 148331. 197915 2013-04-12 17:44:35 -0700 2013-04-12 18:07:36 -0700 Patch 114549.patch text/plain 9092 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODMyNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA0LTEyICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgcHJpdmF0 ZSBpbnRlcmZhY2UgdG8gV0tWaWV3IHRvIGFzeW5jaHJvbm91c2x5IHVwZGF0ZSB0aGUgZHJhd2lu ZyBhcmVhIHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDU0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgd2lsbCBhbGxvdyBhIGNsaWVudCB1c2luZyB0aGUgV0tWaWV3IHRvIHJlc2l6ZSB0 aGUgY29udGVudHMgd2l0aG91dCBibG9ja2luZyB3YWl0aW5nIGZvciB0aGUgd2ViIHByb2Nlc3Mg dG8gcmVwYWludC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAg ICAgICAgKC1bV0tWaWV3IF9zZXREcmF3aW5nQXJlYVNpemU6XSk6CisgICAgICAgICAgICAtIGlm IHRoZSBuZXcgc2l6ZSBvZiB0ZWggZHJhd2luZyBhcmVhIGRvZXMgbm90IG1hdGNoIHRoZSBmcmFt ZSBzaXplLCBwb3NpdGlvbiBpdCBhY2NvcmRpbmcgdG8gdGhlIGNvbnRlbnRBbmNob3IuCisgICAg ICAgICgtW1dLVmlldyB1cGRhdGVMYXllcl0pOgorICAgICAgICAgICAgLSBEb24ndCBsZXQgYSBz dWJzZXF1ZW50IGZyYW1lIHNpemUgY2hhbmdlIGJsb2NrIG9uIGEgcHJpb3IgYXN5bmMgcmVzaXpl LgorICAgICAgICAoLVtXS1ZpZXcgZm9yY2VBc3luY0RyYXdpbmdBcmVhU2l6ZVVwZGF0ZTpdKToK KyAgICAgICAgICAgIC0gcmVzaXplIHRoZSBkcmF3aW5nIGFyZWEgYXN5bmNocm9ub3VzbHksIGV2 ZW4gaWYgZnJhbWUgc2l6ZSB1ZHBhdGVzIGFyZSBkaXNhYmxlZC4KKyAgICAgICAgKC1bV0tWaWV3 IHdhaXRGb3JBc3luY0RyYXdpbmdBcmVhU2l6ZVVwZGF0ZV0pOgorICAgICAgICAgICAgLSB3YWl0 IGZvciBhc3luY2hyb25vdXMgdXBkYXRlcyB0byBjb21wbGV0ZS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlld1ByaXZhdGUuaDoKKyAgICAgICAgICAgIC0gZGVjbGFyZSBuZXcg bWV0aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdCk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaDoK KyAgICAgICAgKERyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl YVByb3h5Ojp3YWl0Rm9yUG9zc2libGVHZW9tZXRyeVVwZGF0ZSk6CisgICAgICAgICogVUlQcm9j ZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgIChU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW06CisgICAgICAgIChXZWJL aXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OndhaXRGb3JQb3NzaWJsZUdl b21ldHJ5VXBkYXRlKToKKyAgICAgICAgICAgIC0gcGFzcyB0aW1lb3V0IGZvciB3YWl0Rm9yUG9z c2libGVHZW9tZXRyeVVwZGF0ZSBhcyBhIHBhcmFtZXRlci4KKwogMjAxMy0wNC0xMiAgR2F2aW4g QmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4 IC0gdG9vIHNvb24hCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHkuY3BwCShyZXZpc2lvbiAxNDgzMTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDggQEAg dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjb25zdCBk b3VibGUgRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGVUaW1lb3V0 ID0gMC41OworCiBEcmF3aW5nQXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVh VHlwZSB0eXBlLCBXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSkKICAgICA6IG1fdHlwZSh0eXBl KQogICAgICwgbV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCShyZXZpc2lvbiAxNDgzMTEpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCSh3b3JraW5nIGNvcHkp CkBAIC02NCw4ICs2NCwxMSBAQCBwdWJsaWM6CiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYg c2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQogICAgIHZvaWQgc2V0U2l6ZShjb25zdCBX ZWJDb3JlOjpJbnRTaXplJiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYsIGNvbnN0IFdlYkNvcmU6 OkludFNpemUmIHNjcm9sbE9mZnNldCk7CiAKKyAgICAvLyBUaGUgdGltZW91dCwgaW4gc2Vjb25k cywgd2UgdXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRVcGRhdGVHZW9tZXRyeSBtZXNzYWdlLgor ICAgIHN0YXRpYyBjb25zdCBkb3VibGUgZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGVUaW1lb3V0 OworCiAgICAgdmlydHVhbCB2b2lkIHBhZ2VDdXN0b21SZXByZXNlbnRhdGlvbkNoYW5nZWQoKSB7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgd2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRhdGUoKSB7IH0K KyAgICB2aXJ0dWFsIHZvaWQgd2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRhdGUoZG91YmxlIHRp bWVvdXQgPSBkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZVRpbWVvdXQpIHsgfQogCiAgICAgdmly dHVhbCB2b2lkIGNvbG9yU3BhY2VEaWRDaGFuZ2UoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbWlu aW11bUxheW91dFdpZHRoRGlkQ2hhbmdlKCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiAxNDgzMjIpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTIyOTAs NyArMjI5MCwxMyBAQCAtICh2b2lkKV9zZXREcmF3aW5nQXJlYVNpemU6KE5TU2l6ZSlzaXplCiAg ICAgaWYgKCFfZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCkpCiAgICAgICAgIHJldHVybjsKICAg ICAKLSAgICBfZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFNpemUoSW50U2l6ZShzaXpl KSwgSW50U2l6ZShfZGF0YS0+X2ZyYW1lT3JpZ2luLngsIF9kYXRhLT5fZnJhbWVPcmlnaW4ueSks IEludFNpemUoX2RhdGEtPl9yZXNpemVTY3JvbGxPZmZzZXQpKTsKKyAgICBOU1NpemUgbGF5ZXJP ZmZzZXQgPSBOU01ha2VTaXplKF9kYXRhLT5fZnJhbWVPcmlnaW4ueCwgX2RhdGEtPl9mcmFtZU9y aWdpbi55KTsKKyAgICBpZiAoaXNXS0NvbnRlbnRBbmNob3JSaWdodChfZGF0YS0+X2NvbnRlbnRB bmNob3IpKQorICAgICAgICBsYXllck9mZnNldC53aWR0aCArPSBbc2VsZiBmcmFtZV0uc2l6ZS53 aWR0aCAtIHNpemUud2lkdGg7CisgICAgaWYgKGlzV0tDb250ZW50QW5jaG9yQm90dG9tKF9kYXRh LT5fY29udGVudEFuY2hvcikpCisgICAgICAgIGxheWVyT2Zmc2V0LmhlaWdodCArPSBbc2VsZiBm cmFtZV0uc2l6ZS5oZWlnaHQgLSBzaXplLmhlaWdodDsKKworICAgIF9kYXRhLT5fcGFnZS0+ZHJh d2luZ0FyZWEoKS0+c2V0U2l6ZShJbnRTaXplKHNpemUpLCBJbnRTaXplKGxheWVyT2Zmc2V0KSwg SW50U2l6ZShfZGF0YS0+X3Jlc2l6ZVNjcm9sbE9mZnNldCkpOwogICAgIF9kYXRhLT5fcmVzaXpl U2Nyb2xsT2Zmc2V0ID0gTlNaZXJvU2l6ZTsKIH0KIApAQCAtMzIzMSw2ICszMjM3LDEyIEBAIC0g KHZvaWQpdXBkYXRlTGF5ZXIKICAgICBlbHNlCiAgICAgICAgIHNlbGYubGF5ZXIuYmFja2dyb3Vu ZENvbG9yID0gQ0dDb2xvckdldENvbnN0YW50Q29sb3Ioa0NHQ29sb3JDbGVhcik7CiAKKyAgICAv LyBJZiBhc3luY2hyb25vdXMgZ2VvbWV0cnkgdXBkYXRlcyBoYXZlIGJlZW4gc2VudCBieSBmb3Jj ZUFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlLAorICAgIC8vIHRoZW4gc3Vic2VxdWVudCBjYWxs cyB0byBzZXRGcmFtZVNpemUgc2hvdWxkIG5vdCByZXN1bHQgaW4gdXMgd2FpdGluZyBmb3IgdGhl IGRpZAorICAgIC8vIHVkcGF0ZSByZXNwb25zZSBpZiBzZXRGcmFtZVNpemUgaXMgY2FsbGVkLgor ICAgIGlmIChbc2VsZiBmcmFtZVNpemVVcGRhdGVzRGlzYWJsZWRdKQorICAgICAgICByZXR1cm47 CisKICAgICBpZiAoRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEgPSBfZGF0YS0+X3BhZ2Ut PmRyYXdpbmdBcmVhKCkpCiAgICAgICAgIGRyYXdpbmdBcmVhLT53YWl0Rm9yUG9zc2libGVHZW9t ZXRyeVVwZGF0ZSgpOwogfQpAQCAtMzQyOSw2ICszNDQxLDM0IEBAIC0gKFdLQ29udGVudEFuY2hv ciljb250ZW50QW5jaG9yCiAgICAgcmV0dXJuIF9kYXRhLT5fY29udGVudEFuY2hvcjsKIH0KIAor Ly8gVGhpcyBtZXRob2QgZm9yY2VzIGEgZHJhd2luZyBhcmVhIGdlb21ldHJ5IHVwZGF0ZSwgZXZl biBpZiBmcmFtZSBzaXplIHVwZGF0ZXMgYXJlIGRpc2FibGVkLgorLy8gVGhlIHVwZGF0ZWQgaXMg cGVyZm9ybWVkIGFzeW5jaHJvbm91c2x5OyB3ZSBkb24ndCB3YWl0IGZvciB0aGUgZ2VvbWV0cnkg dXBkYXRlIGJlZm9yZSByZXR1cm5pbmcuCisvLyBUaGUgYXJlYSBkcmF3biBuZWVkIG5vdCBtYXRj aCB0aGUgY3VycmVudCBmcmFtZSBzaXplIC0gaWYgaXQgZGlmZmVycyBpdCB3aWxsIGJlIGFuY2hv cmVkIHRvIHRoZQorLy8gZnJhbWUgYWNjb3JkaW5nIHRvIHRoZSBjdXJyZW50IGNvbnRlbnRBbmNo b3IuCistICh2b2lkKWZvcmNlQXN5bmNEcmF3aW5nQXJlYVNpemVVcGRhdGU6KE5TU2l6ZSlzaXpl Cit7CisgICAgaWYgKF9kYXRhLT5fZXhwYW5kc1RvRml0Q29udGVudFZpYUF1dG9MYXlvdXQpCisg ICAgICAgIF9kYXRhLT5fcGFnZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChbc2VsZiB2aXNpYmxl UmVjdF0pOworICAgIFtzZWxmIF9zZXREcmF3aW5nQXJlYVNpemU6c2l6ZV07CisKKyAgICAvLyBJ ZiBhIGdlb21ldHJ5IHVwZGF0ZSBpcyBwZW5kaW5nIHRoZSBuZXcgdXBkYXRlIHdvbid0IGJlIHNl bnQuIFBvbGwgd2l0aG91dCB3YWl0aW5nIGZvciBhbnkKKyAgICAvLyBwZW5kaW5nIGRpZC11cGRh dGUgbWVzc2FnZSBub3csIHN1Y2ggdGhhdCB0aGUgbmV3IHVwZGF0ZSBjYW4gYmUgc2VudC4gV2Ug ZG8gc28gYWZ0ZXIgc2V0dGluZworICAgIC8vIHRoZSBkcmF3aW5nIGFyZWEgc2l6ZSBzdWNoIHRo YXQgdGhlIGxhdGVzdCB1cGRhdGUgaXMgc2VudC4KKyAgICBpZiAoRHJhd2luZ0FyZWFQcm94eSog ZHJhd2luZ0FyZWEgPSBfZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCkpCisgICAgICAgIGRyYXdp bmdBcmVhLT53YWl0Rm9yUG9zc2libGVHZW9tZXRyeVVwZGF0ZSgwKTsKK30KKworLSAodm9pZCl3 YWl0Rm9yQXN5bmNEcmF3aW5nQXJlYVNpemVVcGRhdGUKK3sKKyAgICBpZiAoRHJhd2luZ0FyZWFQ cm94eSogZHJhd2luZ0FyZWEgPSBfZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCkpIHsKKyAgICAg ICAgLy8gSWYgYSBnZW9tZXRyeSB1cGRhdGUgaXMgc3RpbGwgcGVuZGluZyB0aGVuIHRoZSBhY3Rp b24gb2YgcmVjaWV2aW5nIHRoZQorICAgICAgICAvLyBmaXJzdCBnZW9tZXRyeSB1cGRhdGUgbWF5 IHJlc3VsdCBpbiBhbm90aGVyIHVwZGF0ZSBiZWluZyBzY2hlZHVsZWQgLQorICAgICAgICAvLyB3 ZSBzaG91bGQgd2FpdCBmb3IgdGhpcyB0byBjb21wbGV0ZSB0b28uCisgICAgICAgIGRyYXdpbmdB cmVhLT53YWl0Rm9yUG9zc2libGVHZW9tZXRyeVVwZGF0ZSgpOworICAgICAgICBkcmF3aW5nQXJl YS0+d2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRhdGUoKTsKKyAgICB9Cit9CisKIEBlbmQKIAog QGltcGxlbWVudGF0aW9uIFdLUmVzcG9uZGVyQ2hhaW5TaW5rCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3UHJpdmF0ZS5oCShyZXZpc2lvbiAxNDgz MjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdQcml2YXRlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTcyLDQgKzcyLDcgQEAgQGludGVyZmFjZSBXS1ZpZXcgKFByaXZh dGUpCiAtIChCT09MKXdpbmRvd09jY2x1c2lvbkRldGVjdGlvbkVuYWJsZWQ7CiAtICh2b2lkKXNl dFdpbmRvd09jY2x1c2lvbkRldGVjdGlvbkVuYWJsZWQ6KEJPT0wpZmxhZzsKIAorLSAodm9pZClm b3JjZUFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlOihOU1NpemUpc2l6ZTsKKy0gKHZvaWQpd2Fp dEZvckFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlOworCiBAZW5kCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhUHJveHkuaAkocmV2aXNpb24gMTQ4MzExKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg bGF5ZXJIb3N0aW5nTW9kZURpZENoYW5nZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB2 aXNpYmlsaXR5RGlkQ2hhbmdlKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNpemVEaWRD aGFuZ2UoKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgd2FpdEZvclBvc3NpYmxlR2VvbWV0 cnlVcGRhdGUoKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgd2FpdEZvclBvc3NpYmxlR2Vv bWV0cnlVcGRhdGUoZG91YmxlIHRpbWVvdXQgPSBkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZVRp bWVvdXQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjb2xvclNwYWNlRGlkQ2hhbmdlKCkg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIG1pbmltdW1MYXlvdXRXaWR0aERpZENoYW5nZSgp IE9WRVJSSURFOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCShy ZXZpc2lvbiAxNDgzMTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0JKHdvcmtpbmcgY29weSkKQEAgLTg2LDcgKzg2 LDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OgogICAgIHNlbmRV cGRhdGVHZW9tZXRyeSgpOwogfQogCi12b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHk6OndhaXRGb3JQb3NzaWJsZUdlb21ldHJ5VXBkYXRlKCkKK3ZvaWQgVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6d2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRhdGUoZG91 YmxlIHRpbWVvdXQpCiB7CiAgICAgaWYgKCFtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUdlb21ldHJ5 KQogICAgICAgICByZXR1cm47CkBAIC05NCw5ICs5NCw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWFQcm94eToKICAgICBpZiAobV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+ aXNMYXVuY2hpbmcoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gVGhlIHRpbWVvdXQsIGlu IHNlY29uZHMsIHdlIHVzZSB3aGVuIHdhaXRpbmcgZm9yIGEgRGlkVXBkYXRlR2VvbWV0cnkgbWVz c2FnZS4KLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIGRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRl VGltZW91dCA9IDAuNTsKLSAgICBtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5jb25uZWN0aW9u KCktPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVBy b3h5OjpEaWRVcGRhdGVHZW9tZXRyeT4obV93ZWJQYWdlUHJveHktPnBhZ2VJRCgpLCBkaWRVcGRh dGVCYWNraW5nU3RvcmVTdGF0ZVRpbWVvdXQpOworICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNz KCktPmNvbm5lY3Rpb24oKS0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6 OkRyYXdpbmdBcmVhUHJveHk6OkRpZFVwZGF0ZUdlb21ldHJ5PihtX3dlYlBhZ2VQcm94eS0+cGFn ZUlEKCksIHRpbWVvdXQpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHk6OmNvbG9yU3BhY2VEaWRDaGFuZ2UoKQo=