87080 2012-05-21 22:36:40 -0700 Use the same animation begin time while updating compositing layers 2012-05-22 14:19:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84410 1 simon.fraser simon.fraser dino enne eric jamesr macpherson menard simon.fraser webkit.review.bot oldest_to_newest 629935 0 simon.fraser 2012-05-21 22:36:40 -0700 RenderLayerCompositor::updateCompositingLayers() ends up calling code that relies on the current state of animations, via calls to RenderLayer::currentTransform(). This is called while mapping layer bounds to absolute coordinates, for overlap testing. We should treat the entire compositing layer update as one animation batch (begin/end animation update). Without this, it's impossible to compare the results of coordinate mapping via two different code paths in ASSERTs. It seems reasonable to do anyway. 630715 1 143356 simon.fraser 2012-05-22 13:49:04 -0700 Created attachment 143356 Patch 630728 2 143356 dino 2012-05-22 13:59:24 -0700 Comment on attachment 143356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143356&action=review > Source/WebCore/ChangeLog:26 > + to cover over calls to recalcStyle which might need this (87159). over-calls? > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:1325 > + AnimationUpdateBlock animationBlock(renderer->animation()); I like animationUpdateBlock as the var names through the patch, but not a big deal. > Source/WebCore/rendering/RenderLayerCompositor.cpp:354 > + Frame* frame = m_renderView->frameView()->frame(); > + AnimationUpdateBlock animationBlock(frame->animation()); One line? no need for frame elsewhere? 630751 3 simon.fraser 2012-05-22 14:19:09 -0700 http://trac.webkit.org/changeset/118052 143356 2012-05-22 13:49:04 -0700 2012-05-22 13:59:24 -0700 Patch bug-87080-20120522134908.patch text/plain 9705 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA2YzRjM2RjMTU5OWEz NTk4YTZiOWVkZTE4OTcxOTY2ZDc0Mzk3ZC4uM2NjNDBiY2E5YTE2OWNlYjkwMTNjMDBmYjI2YzMw NWJjMTNjMDU5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSArMSw2MyBAQAorMjAxMi0wNS0yMiAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGhlIHNhbWUg YW5pbWF0aW9uIGJlZ2luIHRpbWUgd2hpbGUgdXBkYXRpbmcgY29tcG9zaXRpbmcgbGF5ZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzA4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGlk aWVkIHVwIHNvbWUgYmVnaW5BbmltYXRpb25VcGRhdGUvZW5kQW5pbWF0aW9uVXBkYXRlIGxvZ2lj LAorICAgICAgICBidXQgZnVydGhlciBjbGVhbmluZyBpcyByZXF1aXJlZC4gV2UgY3VycmVudGx5 IGJyYWNrZXQgc29tZSBjYWxscworICAgICAgICB0byByZWNhY2xjU3R5bGUoKSB3aXRoIGJlZ2lu L2VuZEFuaW1hdGlvblVwZGF0ZSwgYnV0IG5vdCBhbGwuCisgICAgICAgIFdlIGRvbid0IGJyYWNr ZXQgbGF5b3V0LCBvciBjb21wb3NpdGluZyB1cGRhdGVzLiBUaGlzIHBhdGNoCisgICAgICAgIGFk ZHMgYnJhY2tldGluZyBhcm91bmQgY29tcG9zaXRpbmcgdXBkYXRlcywgaW4gb3JkZXIgdG8gYmUK KyAgICAgICAgYWJsZSB0byBhZGQgc29tZSBhc3NlcnRpb25zIGluIGEgbGF0ZXIgcGF0Y2ggdGhh dCByZWx5IG9uCisgICAgICAgIFJlbmRlckxheWVyOjpjdXJyZW50VHJhbnNmb3JtKCkgZ2l2aW5n IGNvbnNpc3RlbnQgcmVzdWx0cywKKyAgICAgICAgc2luY2UgY3VycmVudFRyYW5zZm9ybSgpIGRl cGVuZHMgb24gdGhlIGFuaW1hdGlvbiBiZWdpbiB0aW1lLgorICAgICAgICAKKyAgICAgICAgTWFk ZSBBbmltYXRpb25Db250cm9sbGVyOjpiZWdpbkFuaW1hdGlvblVwZGF0ZSgpIGFuZAorICAgICAg ICBBbmltYXRpb25Db250cm9sbGVyOjplbmRBbmltYXRpb25VcGRhdGUoKSBuZXN0YWJsZSBieSBh ZGRpbmcKKyAgICAgICAgYSBjb3VudGVyLgorICAgICAgICAKKyAgICAgICAgQWRkZWQgYSBzdGFj ay1iYXNlZCBjbGFzcywgQW5pbWF0aW9uVXBkYXRlQmxvY2ssIHdoaWNoCisgICAgICAgIGNhbGxz IGJlZ2luL2VuZEFuaW1hdGlvblVwZGF0ZS4KKyAgICAgICAgCisgICAgICAgIFJlcGxhY2VkIGNh bGxzIHRvIGJlZ2luL2VuZEFuaW1hdGlvblVwZGF0ZSBpbiBEb2N1bWVudDo6dXBkYXRlU3R5bGVJ Zk5lZWRlZCgpCisgICAgICAgIGFuZCBEb2N1bWVudDo6c3R5bGVSZXNvbHZlckNoYW5nZWQoKSB3 aXRoIEFuaW1hdGlvblVwZGF0ZUJsb2NrLiBGaWxlZCBhIGJ1ZworICAgICAgICB0byBjb3ZlciBv dmVyIGNhbGxzIHRvIHJlY2FsY1N0eWxlIHdoaWNoIG1pZ2h0IG5lZWQgdGhpcyAoODcxNTkpLgor ICAgICAgICAKKyAgICAgICAgUmVtb3ZlZCBhIGNhbGwgdG8gYmVnaW5BbmltYXRpb25VcGRhdGUo KSBpbiBEb2N1bWVudDo6aW1wbGljaXRPcGVuKCksCisgICAgICAgIHdoaWNoIHdhcyBhZGRlZCBp biByNDI0MTUuIEkgYmVsaWV2ZSB0aGF0IHI1NzM5MCBtYWtlcyB0aGlzIHVubmVjZXNzYXJ5LAor ICAgICAgICBhbmQgd2FzIG5vdCBhYmxlIHRvIHJlcHJvZHVjZSB0aGUgb3JpZ2luYWwgYnVnIGFm dGVyIHJlbW92aW5nIGl0LiBJdAorICAgICAgICB3YXMgdGhlIG9ubHkgdW5wYWlyZWQgYmVnaW5B bmltYXRpb25VcGRhdGUgY2FsbC4KKyAgICAgICAgCisgICAgICAgIE1hZGUgQW5pbWF0aW9uQ29u dHJvbGxlclByaXZhdGU6OmdldEFuaW1hdGVkU3R5bGVGb3JSZW5kZXJlcigpIG5vdCAKKyAgICAg ICAgdXNlIGEgbmV3IGJlZ2luVGltZSBlYWNoIHRpbWUgaXQgd2FzIGNhbGxlZCwgc28gaXRzIGJl Z2luVGltZSBub3cKKyAgICAgICAgZGVwZW5kcyBvbiBzb21lIGVhcmxpZXIgYmVnaW5BbmltYXRp b25VcGRhdGUuCisgICAgICAgIAorICAgICAgICBGaXhlZCBDU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoKSB0byB1c2UKKyAgICAgICAgYW4gQW5pbWF0aW9u VXBkYXRlQmxvY2sgc28gdGhhdCBjYWxscyB0byBjb21wdXRlZCBzdHlsZSBkbworICAgICAgICB1 c2UgdGhlIGN1cnJlbnQgdGltZSB0byBjb21wdXRlIGFuIGFuaW1hdGluZyB2YWx1ZSAoYXMgYmVm b3JlKS4KKworICAgICAgICBOb3QgdGVzdGFibGUuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0 ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZSk6CisgICAgICAgICogZG9tL0RvY3Vt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjppbXBsaWNpdE9wZW4pOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnN0eWxlUmVzb2x2ZXJDaGFuZ2VkKToKKyAgICAgICAgKiBwYWdl L2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFu aW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpnZXRBbmltYXRlZFN0eWxlRm9yUmVuZGVyZXIpOgor ICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlcjo6QW5pbWF0aW9uQ29udHJvbGxl cik6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyOjpiZWdpbkFuaW1hdGlv blVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyOjplbmRBbmlt YXRpb25VcGRhdGUpOgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xs ZXIuaDoKKyAgICAgICAgKEFuaW1hdGlvbkNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChBbmltYXRpb25VcGRhdGVCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpBbmlt YXRpb25VcGRhdGVCbG9jazo6QW5pbWF0aW9uVXBkYXRlQmxvY2spOgorICAgICAgICAoV2ViQ29y ZTo6QW5pbWF0aW9uVXBkYXRlQmxvY2s6On5BbmltYXRpb25VcGRhdGVCbG9jayk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKToKKwogPT0g Um9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIwMTItMDUtMjIgPT0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggMmZiZjA3ZTUx ZDRkNmNhZGQ1ZjdhNzgwZTgzZjQwMDRmNGZkZGVhZS4uZjU1OWZkNDNhN2I0YWM2YjkzMDAwNjIw OWJmZDIyMWEzZWYwZTczOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTEzMjIsNiArMTMyMiw3IEBAIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1 ZShDU1NQcm9wZXJ0CiAKICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlOwogICAgIGlmIChy ZW5kZXJlciAmJiByZW5kZXJlci0+aXNDb21wb3NpdGVkKCkgJiYgQW5pbWF0aW9uQ29udHJvbGxl cjo6c3VwcG9ydHNBY2NlbGVyYXRlZEFuaW1hdGlvbk9mUHJvcGVydHkocHJvcGVydHlJRCkpIHsK KyAgICAgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uQmxvY2socmVuZGVyZXItPmFu aW1hdGlvbigpKTsKICAgICAgICAgc3R5bGUgPSByZW5kZXJlci0+YW5pbWF0aW9uKCktPmdldEFu aW1hdGVkU3R5bGVGb3JSZW5kZXJlcihyZW5kZXJlcik7CiAgICAgICAgIGlmIChtX3BzZXVkb0Vs ZW1lbnRTcGVjaWZpZXIpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGNhY2hlZCBwc2V1 ZG8gc3R5bGUgd2lsbCBvbmx5IGV4aXN0IGlmIHRoZSBhbmltYXRpb24gaGFzIGJlZW4gcnVuIGF0 IGxlYXN0IG9uY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5MzE0NWYxOTAwOTY1NTgz YzZhZmNhODJlYmNjMzMzYjJkN2VlNjkyLi5jMjA2NDhlNTFiYmRlYzBhMTA1ZjkyNzUwOTVkNDY1 OTE4ODBkZDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTE4MDgsMTQgKzE4MDgsOCBA QCB2b2lkIERvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKCkKICAgICBpZiAoKCFtX3BlbmRp bmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNlICYmICFjaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSkgfHwg aW5QYWdlQ2FjaGUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fZnJhbWUpCi0gICAg ICAgIG1fZnJhbWUtPmFuaW1hdGlvbigpLT5iZWdpbkFuaW1hdGlvblVwZGF0ZSgpOwotICAgICAg ICAKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25CbG9jayhtX2ZyYW1lID8gbV9m cmFtZS0+YW5pbWF0aW9uKCkgOiAwKTsKICAgICByZWNhbGNTdHlsZShOb0NoYW5nZSk7Ci0KLSAg ICAvLyBUZWxsIHRoZSBhbmltYXRpb24gY29udHJvbGxlciB0aGF0IHVwZGF0ZVN0eWxlSWZOZWVk ZWQgaXMgZmluaXNoZWQgYW5kIGl0IGNhbiBkbyBhbnkgcG9zdC1wcm9jZXNzaW5nCi0gICAgaWYg KG1fZnJhbWUpCi0gICAgICAgIG1fZnJhbWUtPmFuaW1hdGlvbigpLT5lbmRBbmltYXRpb25VcGRh dGUoKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6dXBkYXRlU3R5bGVGb3JBbGxEb2N1bWVudHMoKQpA QCAtMjI5NywxMSArMjI5MSw2IEBAIHZvaWQgRG9jdW1lbnQ6OmltcGxpY2l0T3BlbigpCiAgICAg bV9wYXJzZXIgPSBjcmVhdGVQYXJzZXIoKTsKICAgICBzZXRQYXJzaW5nKHRydWUpOwogICAgIHNl dFJlYWR5U3RhdGUoTG9hZGluZyk7Ci0KLSAgICAvLyBJZiB3ZSByZWxvYWQsIHRoZSBhbmltYXRp b24gY29udHJvbGxlciBzdGlja3MgYXJvdW5kIGFuZCBoYXMKLSAgICAvLyBhIHN0YWxlIGFuaW1h dGlvbiB0aW1lLiBXZSBuZWVkIHRvIHVwZGF0ZSBpdCBoZXJlLgotICAgIGlmIChtX2ZyYW1lICYm IG1fZnJhbWUtPmFuaW1hdGlvbigpKQotICAgICAgICBtX2ZyYW1lLT5hbmltYXRpb24oKS0+YmVn aW5BbmltYXRpb25VcGRhdGUoKTsKIH0KIAogSFRNTEVsZW1lbnQqIERvY3VtZW50Ojpib2R5KCkg Y29uc3QKQEAgLTMyODksMTEgKzMyNzgsMTAgQEAgdm9pZCBEb2N1bWVudDo6c3R5bGVSZXNvbHZl ckNoYW5nZWQoU3R5bGVSZXNvbHZlclVwZGF0ZUZsYWcgdXBkYXRlRmxhZykKIAogICAgIC8vIFRo aXMgcmVjYWxjU3R5bGUgaW5pdGlhdGVzIGEgbmV3IHJlY2FsYyBjeWNsZS4gV2UgbmVlZCB0byBi cmFja2V0IGl0IHRvCiAgICAgLy8gbWFrZSBzdXJlIGFuaW1hdGlvbnMgZ2V0IHRoZSBjb3JyZWN0 IHVwZGF0ZSB0aW1lCi0gICAgaWYgKG1fZnJhbWUpCi0gICAgICAgIG1fZnJhbWUtPmFuaW1hdGlv bigpLT5iZWdpbkFuaW1hdGlvblVwZGF0ZSgpOwotICAgIHJlY2FsY1N0eWxlKEZvcmNlKTsKLSAg ICBpZiAobV9mcmFtZSkKLSAgICAgICAgbV9mcmFtZS0+YW5pbWF0aW9uKCktPmVuZEFuaW1hdGlv blVwZGF0ZSgpOworICAgIHsKKyAgICAgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9u QmxvY2sobV9mcmFtZSA/IG1fZnJhbWUtPmFuaW1hdGlvbigpIDogMCk7CisgICAgICAgIHJlY2Fs Y1N0eWxlKEZvcmNlKTsKKyAgICB9CiAKICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVM SU5HCiAgICAgaWYgKCFvd25lckVsZW1lbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggMjMwNzY2OGRkYmI2 ZWVjOGFmNTVmNjRjNDc1NmQwZmVkYmQzMTYyNS4uYzQ5MTE5ZTZhMTNjMDE0YzhmMjU4ZTI5NDYx MzgxMWNkZmEwZDUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTM4Myw5ICszODMsNiBAQCBQYXNzUmVmUHRy PFJlbmRlclN0eWxlPiBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6Z2V0QW5pbWF0ZWRTdHls ZUZvclJlbmRlcmVyKAogICAgIGlmICghcmVuZGVyZXJBbmltYXRpb25zKQogICAgICAgICByZXR1 cm4gcmVuZGVyZXItPnN0eWxlKCk7CiAgICAgCi0gICAgLy8gTWFrZSBzdXJlIGFuaW1hdGlvblVw ZGF0ZVRpbWUgaXMgdXBkYXRlZCwgc28gdGhhdCBpdCBpcyBjdXJyZW50IGV2ZW4gaWYgbm8KLSAg ICAvLyBzdHlsZUNoYW5nZSBoYXMgaGFwcGVuZWQgKGUuZy4gYWNjZWxlcmF0ZWQgYW5pbWF0aW9u cykuCi0gICAgc2V0QmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKGNCZWdpbkFuaW1hdGlvblVwZGF0 ZVRpbWVOb3RTZXQpOwogICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gYW5pbWF0aW5nU3R5bGUgPSBy ZW5kZXJlckFuaW1hdGlvbnMtPmdldEFuaW1hdGVkU3R5bGUoKTsKICAgICBpZiAoIWFuaW1hdGlu Z1N0eWxlKQogICAgICAgICBhbmltYXRpbmdTdHlsZSA9IHJlbmRlcmVyLT5zdHlsZSgpOwpAQCAt NDk3LDYgKzQ5NCw3IEBAIFBhc3NSZWZQdHI8V2ViS2l0QW5pbWF0aW9uTGlzdD4gQW5pbWF0aW9u Q29udHJvbGxlclByaXZhdGU6OmFuaW1hdGlvbnNGb3JSZW5kZXJlCiAKIEFuaW1hdGlvbkNvbnRy b2xsZXI6OkFuaW1hdGlvbkNvbnRyb2xsZXIoRnJhbWUqIGZyYW1lKQogICAgIDogbV9kYXRhKGFk b3B0UHRyKG5ldyBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZShmcmFtZSkpKQorICAgICwgbV9i ZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50KDApCiB7CiB9CiAKQEAgLTYyMiwxMiArNjIwLDE3IEBA IHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6cmVzdW1lQW5pbWF0aW9uc0ZvckRvY3VtZW50KERv Y3VtZW50KiBkb2N1bWVudCkKIAogdm9pZCBBbmltYXRpb25Db250cm9sbGVyOjpiZWdpbkFuaW1h dGlvblVwZGF0ZSgpCiB7Ci0gICAgbV9kYXRhLT5zZXRCZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUo Y0JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZU5vdFNldCk7CisgICAgaWYgKCFtX2JlZ2luQW5pbWF0 aW9uVXBkYXRlQ291bnQpCisgICAgICAgIG1fZGF0YS0+c2V0QmVnaW5BbmltYXRpb25VcGRhdGVU aW1lKGNCZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWVOb3RTZXQpOworICAgICsrbV9iZWdpbkFuaW1h dGlvblVwZGF0ZUNvdW50OwogfQogCiB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXI6OmVuZEFuaW1h dGlvblVwZGF0ZSgpCiB7Ci0gICAgbV9kYXRhLT5lbmRBbmltYXRpb25VcGRhdGUoKTsKKyAgICBB U1NFUlQobV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50ID4gMCk7CisgICAgLS1tX2JlZ2luQW5p bWF0aW9uVXBkYXRlQ291bnQ7CisgICAgaWYgKCFtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQp CisgICAgICAgIG1fZGF0YS0+ZW5kQW5pbWF0aW9uVXBkYXRlKCk7CiB9CiAKIGJvb2wgQW5pbWF0 aW9uQ29udHJvbGxlcjo6c3VwcG9ydHNBY2NlbGVyYXRlZEFuaW1hdGlvbk9mUHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5p bWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0 aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuaAppbmRleCAxODc3MmRkNTkzOTRhYjgwNDYwZmQ5NjU0 ZGY0Zjc5ZDU2ZWJlYWVmLi5lYTNjNDFjZjdmZGZhMmUyYzk5ODhhODViNTc2OGMxZTY5NzM1Y2Ex IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250 cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29u dHJvbGxlci5oCkBAIC04Miw2ICs4MiwyNSBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgT3du UHRyPEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlPiBtX2RhdGE7CisgICAgaW50IG1fYmVnaW5B bmltYXRpb25VcGRhdGVDb3VudDsKK307CisKK2NsYXNzIEFuaW1hdGlvblVwZGF0ZUJsb2NrIHsK K3B1YmxpYzoKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayhBbmltYXRpb25Db250cm9sbGVyKiBh bmltYXRpb25Db250cm9sbGVyKQorICAgICAgICA6IG1fYW5pbWF0aW9uQ29udHJvbGxlcihhbmlt YXRpb25Db250cm9sbGVyKQorICAgIHsKKyAgICAgICAgaWYgKG1fYW5pbWF0aW9uQ29udHJvbGxl cikKKyAgICAgICAgICAgIG1fYW5pbWF0aW9uQ29udHJvbGxlci0+YmVnaW5BbmltYXRpb25VcGRh dGUoKTsKKyAgICB9CisgICAgCisgICAgfkFuaW1hdGlvblVwZGF0ZUJsb2NrKCkKKyAgICB7Cisg ICAgICAgIGlmIChtX2FuaW1hdGlvbkNvbnRyb2xsZXIpCisgICAgICAgICAgICBtX2FuaW1hdGlv bkNvbnRyb2xsZXItPmVuZEFuaW1hdGlvblVwZGF0ZSgpOworICAgIH0KKyAgICAKKyAgICBBbmlt YXRpb25Db250cm9sbGVyKiBtX2FuaW1hdGlvbkNvbnRyb2xsZXI7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCmluZGV4IDA2YzYyYzM0MjdmYmQyMmEyMGNlOGE0ZWYwODk0OWQyOTVm NDNmZmMuLjZhYzhjYTRkN2FiODUzYjU5NzExOWYwN2YwNjYzMzMxYTI3YjE4OGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBA IC0zNTAsNiArMzUwLDkgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBv c2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKICAgICBpZiAoIW1fcmVl dmFsdWF0ZUNvbXBvc2l0aW5nQWZ0ZXJMYXlvdXQgJiYgIW1fY29tcG9zaXRpbmcpCiAgICAgICAg IHJldHVybjsKIAorICAgIEZyYW1lKiBmcmFtZSA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCkt PmZyYW1lKCk7CisgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uQmxvY2soZnJhbWUt PmFuaW1hdGlvbigpKTsKKwogICAgIGJvb2wgY2hlY2tGb3JIaWVyYXJjaHlVcGRhdGUgPSBtX3Jl ZXZhbHVhdGVDb21wb3NpdGluZ0FmdGVyTGF5b3V0OwogICAgIGJvb2wgbmVlZEdlb21ldHJ5VXBk YXRlID0gZmFsc2U7CiAK