117058 2013-05-30 16:30:55 -0700 [wk2] All intrinsic content size changes should go through the 0-delay timer 2013-05-31 17:02:05 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 895727 0 thorton 2013-05-30 16:30:55 -0700 In https://bugs.webkit.org/show_bug.cgi?id=113258, I added a 0-delay timer so that we'd coalesce intrinsic content size changes. However, didUpdateGeometry still immediately updates intrinsic content size without coalescing. <rdar://problem/13935042> 895739 1 203398 thorton 2013-05-30 16:59:31 -0700 Created attachment 203398 patch 895740 2 203399 thorton 2013-05-30 17:00:30 -0700 Created attachment 203399 patch 896028 3 thorton 2013-05-31 17:02:05 -0700 http://trac.webkit.org/changeset/151057 203398 2013-05-30 16:59:31 -0700 2013-05-30 17:00:30 -0700 patch didupdate.diff text/plain 5696 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOGViNGEyLi5jNDFmMzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDUtMzAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gQWxsIGludHJpbnNpYyBjb250ZW50IHNpemUgY2hhbmdlcyBzaG91bGQg Z28gdGhyb3VnaCB0aGUgMC1kZWxheSB0aW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MDU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzkz NTA0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biByMTQ2OTEzLCBJIGFkZGVkIGEgMC1kZWxheSB0aW1lciBzbyB0aGF0IHdlJ2QgY29hbGVzY2Ug aW50cmluc2ljCisgICAgICAgIGNvbnRlbnQgc2l6ZSBjaGFuZ2VzLiBIb3dldmVyLCBkaWRVcGRh dGVHZW9tZXRyeSB3YXMgc3RpbGwgaW1tZWRpYXRlbHkKKyAgICAgICAgaW52YWxpZGF0aW5nIHRo ZSBpbnRyaW5zaWMgY29udGVudCBzaXplIHdpdGhvdXQgY29hbGVzY2luZy4KKworICAgICAgICBN b3ZlIHRoYXQgdXBkYXRlIHRvIHRoZSBXZWJQcm9jZXNzIHRvIHNoYXJlIHRoZSB0aW1lci4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKiBVSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW06CisgICAgICAgIChX ZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21l dHJ5KToKKyAgICAgICAgUmVtb3ZlIHRoZSBuZXdJbnRyaW5zaWNDb250ZW50U2l6ZSBhcmd1bWVu dCwgYW5kIGRvbid0IGludmFsaWRhdGUgaW50cmluc2ljCisgICAgICAgIGNvbnRlbnQgc2l6ZSBp bnNpZGUgZGlkVXBkYXRlR2VvbWV0cnkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICBT dGFydCB0aGUgaW50cmluc2ljIGNvbnRlbnQgc2l6ZSB1cGRhdGUgdGltZXIgd2hlbiB3ZSBmaW5p c2ggdXBkYXRlR2VvbWV0cnkuCisKIDIwMTMtMDUtMjkgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFw cGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBFbmFibGUgY2FjaGUgcGFydGl0aW9uaW5nIGFuZCB0 aGUgcHVibGljIHN1ZmZpeCBsaXN0IG9uIDEwLjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv RHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IGZlZTIzMTcuLjlmMzViM2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaApAQCAtMTEyLDcgKzExMiw3IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2Rl KHVpbnQ2NF90IC8qIGJhY2tpbmdTdG9yZVN0YXRlSUQgKi8sIGNvbnN0IExheWVyVHJlZUNvbnRl eHQmKSB7IH0KICNlbmRpZgogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2aXJ0dWFsIHZvaWQgZGlk VXBkYXRlR2VvbWV0cnkoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbmV3SW50cmluc2ljQ29udGVu dFNpemUpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRVcGRhdGVHZW9tZXRyeSgpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBpbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBuZXdJbnRyaW5zaWNDb250ZW50U2l6ZSkgeyB9CiAjZW5kaWYKIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2Vz LmluCmluZGV4IGIzZjAyYWYuLmEyNzJjYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0zMSw3ICszMSw3IEBA IG1lc3NhZ2VzIC0+IERyYXdpbmdBcmVhUHJveHkgewogCiAjaWYgUExBVEZPUk0oTUFDKQogICAg IC8vIFVzZWQgYnkgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS4KLSAgICBEaWRV cGRhdGVHZW9tZXRyeShXZWJDb3JlOjpJbnRTaXplIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQor ICAgIERpZFVwZGF0ZUdlb21ldHJ5KCkKICAgICBJbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5n ZShXZWJDb3JlOjpJbnRTaXplIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQogI2VuZGlmCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDZlNzRiNjQuLjUwMThiYmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCkBAIC01NSw3ICs1NSw3IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVp bnQ2NF90IGJhY2tpbmdTdG9yZVN0YXRlSUQsIGNvbnN0IExheWVyVHJlZUNvbnRleHQmKSBPVkVS UklERTsKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCi0gICAgdmlydHVhbCB2b2lkIGRpZFVw ZGF0ZUdlb21ldHJ5KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIG5ld0ludHJpbnNpY0NvbnRlbnRT aXplKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkVXBkYXRlR2VvbWV0cnkoKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW50cmluc2ljQ29udGVudFNpemVEaWRDaGFuZ2UoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgbmV3SW50cmluc2ljQ29udGVudFNpemUpIE9WRVJSSURFOwog CiAgICAgdm9pZCBzZW5kVXBkYXRlR2VvbWV0cnkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbSBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWFQcm94eS5tbQppbmRleCAwZDE1NGU0Li5lM2I1N2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5Lm1tCkBAIC0xMzEsNyArMTMxLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5Ojp1cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50 NjQKICAgICBtX3dlYlBhZ2VQcm94eS0+dXBkYXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUo bGF5ZXJUcmVlQ29udGV4dCk7CiB9CiAKLXZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoY29uc3QgSW50U2l6ZSYgbmV3SW50cmluc2ljQ29u dGVudFNpemUpCit2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpZFVw ZGF0ZUdlb21ldHJ5KCkKIHsKICAgICBBU1NFUlQobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9t ZXRyeSk7CiAKQEAgLTE0Myw5ICsxNDMsNiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIG5ld0ludAogICAg IC8vIHdlIG5lZWQgdG8gcmVzZW5kIHRoZSBuZXcgc2l6ZSBoZXJlLgogICAgIGlmIChtX2xhc3RT ZW50U2l6ZSAhPSBtX3NpemUgfHwgbV9sYXN0U2VudExheWVyUG9zaXRpb24gIT0gbV9sYXllclBv c2l0aW9uIHx8IG1fbGFzdFNlbnRNaW5pbXVtTGF5b3V0V2lkdGggIT0gbWluaW11bUxheW91dFdp ZHRoKQogICAgICAgICBzZW5kVXBkYXRlR2VvbWV0cnkoKTsKLQotICAgIGlmIChtaW5pbXVtTGF5 b3V0V2lkdGggPiAwKQotICAgICAgICBtX3dlYlBhZ2VQcm94eS0+aW50cmluc2ljQ29udGVudFNp emVEaWRDaGFuZ2UobmV3SW50cmluc2ljQ29udGVudFNpemUpOwogfQogCiB2b2lkIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmludHJpbnNpY0NvbnRlbnRTaXplRGlkQ2hhbmdl KGNvbnN0IEludFNpemUmIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggNzc1YzVkNy4uMWFlZjRmNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC00NTUsOCArNDU1LDEw IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNv bnN0IEludFNpemUmIHZpZXdTaXplLCBjb25zCiAgICAgW0NBVHJhbnNhY3Rpb24gZmx1c2hdOwog ICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIAotICAgIG1fbGFzdFNlbnRJbnRyaW5z aWNDb250ZW50U2l6ZSA9IGNvbnRlbnRTaXplOwotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdl czo6RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlR2VvbWV0cnkoY29udGVudFNpemUpKTsKKyAg ICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFVwZGF0ZUdl b21ldHJ5KCkpOworCisgICAgaWYgKCFtX3VwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGltZXIu aXNBY3RpdmUoKSkKKyAgICAgICAgbV91cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyLnN0 YXJ0T25lU2hvdCgwKTsKIAogICAgIG1faW5VcGRhdGVHZW9tZXRyeSA9IGZhbHNlOwogfQo= 203399 2013-05-30 17:00:30 -0700 2013-05-31 16:58:02 -0700 patch didupdate.diff text/plain 5731 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOGViNGEyLi5jNDFmMzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDUtMzAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gQWxsIGludHJpbnNpYyBjb250ZW50IHNpemUgY2hhbmdlcyBzaG91bGQg Z28gdGhyb3VnaCB0aGUgMC1kZWxheSB0aW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MDU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzkz NTA0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biByMTQ2OTEzLCBJIGFkZGVkIGEgMC1kZWxheSB0aW1lciBzbyB0aGF0IHdlJ2QgY29hbGVzY2Ug aW50cmluc2ljCisgICAgICAgIGNvbnRlbnQgc2l6ZSBjaGFuZ2VzLiBIb3dldmVyLCBkaWRVcGRh dGVHZW9tZXRyeSB3YXMgc3RpbGwgaW1tZWRpYXRlbHkKKyAgICAgICAgaW52YWxpZGF0aW5nIHRo ZSBpbnRyaW5zaWMgY29udGVudCBzaXplIHdpdGhvdXQgY29hbGVzY2luZy4KKworICAgICAgICBN b3ZlIHRoYXQgdXBkYXRlIHRvIHRoZSBXZWJQcm9jZXNzIHRvIHNoYXJlIHRoZSB0aW1lci4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKiBVSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW06CisgICAgICAgIChX ZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21l dHJ5KToKKyAgICAgICAgUmVtb3ZlIHRoZSBuZXdJbnRyaW5zaWNDb250ZW50U2l6ZSBhcmd1bWVu dCwgYW5kIGRvbid0IGludmFsaWRhdGUgaW50cmluc2ljCisgICAgICAgIGNvbnRlbnQgc2l6ZSBp bnNpZGUgZGlkVXBkYXRlR2VvbWV0cnkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICBT dGFydCB0aGUgaW50cmluc2ljIGNvbnRlbnQgc2l6ZSB1cGRhdGUgdGltZXIgd2hlbiB3ZSBmaW5p c2ggdXBkYXRlR2VvbWV0cnkuCisKIDIwMTMtMDUtMjkgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFw cGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBFbmFibGUgY2FjaGUgcGFydGl0aW9uaW5nIGFuZCB0 aGUgcHVibGljIHN1ZmZpeCBsaXN0IG9uIDEwLjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv RHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IGZlZTIzMTcuLjlmMzViM2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaApAQCAtMTEyLDcgKzExMiw3IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2Rl KHVpbnQ2NF90IC8qIGJhY2tpbmdTdG9yZVN0YXRlSUQgKi8sIGNvbnN0IExheWVyVHJlZUNvbnRl eHQmKSB7IH0KICNlbmRpZgogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2aXJ0dWFsIHZvaWQgZGlk VXBkYXRlR2VvbWV0cnkoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbmV3SW50cmluc2ljQ29udGVu dFNpemUpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRVcGRhdGVHZW9tZXRyeSgpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBpbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBuZXdJbnRyaW5zaWNDb250ZW50U2l6ZSkgeyB9CiAjZW5kaWYKIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2Vz LmluCmluZGV4IGIzZjAyYWYuLmEyNzJjYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0zMSw3ICszMSw3IEBA IG1lc3NhZ2VzIC0+IERyYXdpbmdBcmVhUHJveHkgewogCiAjaWYgUExBVEZPUk0oTUFDKQogICAg IC8vIFVzZWQgYnkgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS4KLSAgICBEaWRV cGRhdGVHZW9tZXRyeShXZWJDb3JlOjpJbnRTaXplIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQor ICAgIERpZFVwZGF0ZUdlb21ldHJ5KCkKICAgICBJbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5n ZShXZWJDb3JlOjpJbnRTaXplIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQogI2VuZGlmCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDZlNzRiNjQuLjUwMThiYmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCkBAIC01NSw3ICs1NSw3IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVp bnQ2NF90IGJhY2tpbmdTdG9yZVN0YXRlSUQsIGNvbnN0IExheWVyVHJlZUNvbnRleHQmKSBPVkVS UklERTsKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCi0gICAgdmlydHVhbCB2b2lkIGRpZFVw ZGF0ZUdlb21ldHJ5KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIG5ld0ludHJpbnNpY0NvbnRlbnRT aXplKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkVXBkYXRlR2VvbWV0cnkoKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW50cmluc2ljQ29udGVudFNpemVEaWRDaGFuZ2UoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgbmV3SW50cmluc2ljQ29udGVudFNpemUpIE9WRVJSSURFOwog CiAgICAgdm9pZCBzZW5kVXBkYXRlR2VvbWV0cnkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbSBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWFQcm94eS5tbQppbmRleCAwZDE1NGU0Li5lM2I1N2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5Lm1tCkBAIC0xMzEsNyArMTMxLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5Ojp1cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50 NjQKICAgICBtX3dlYlBhZ2VQcm94eS0+dXBkYXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUo bGF5ZXJUcmVlQ29udGV4dCk7CiB9CiAKLXZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoY29uc3QgSW50U2l6ZSYgbmV3SW50cmluc2ljQ29u dGVudFNpemUpCit2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpZFVw ZGF0ZUdlb21ldHJ5KCkKIHsKICAgICBBU1NFUlQobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9t ZXRyeSk7CiAKQEAgLTE0Myw5ICsxNDMsNiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIG5ld0ludAogICAg IC8vIHdlIG5lZWQgdG8gcmVzZW5kIHRoZSBuZXcgc2l6ZSBoZXJlLgogICAgIGlmIChtX2xhc3RT ZW50U2l6ZSAhPSBtX3NpemUgfHwgbV9sYXN0U2VudExheWVyUG9zaXRpb24gIT0gbV9sYXllclBv c2l0aW9uIHx8IG1fbGFzdFNlbnRNaW5pbXVtTGF5b3V0V2lkdGggIT0gbWluaW11bUxheW91dFdp ZHRoKQogICAgICAgICBzZW5kVXBkYXRlR2VvbWV0cnkoKTsKLQotICAgIGlmIChtaW5pbXVtTGF5 b3V0V2lkdGggPiAwKQotICAgICAgICBtX3dlYlBhZ2VQcm94eS0+aW50cmluc2ljQ29udGVudFNp emVEaWRDaGFuZ2UobmV3SW50cmluc2ljQ29udGVudFNpemUpOwogfQogCiB2b2lkIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmludHJpbnNpY0NvbnRlbnRTaXplRGlkQ2hhbmdl KGNvbnN0IEludFNpemUmIG5ld0ludHJpbnNpY0NvbnRlbnRTaXplKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggNzc1YzVkNy4uNWFmOWM5YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC00NTUsOCArNDU1LDEw IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNv bnN0IEludFNpemUmIHZpZXdTaXplLCBjb25zCiAgICAgW0NBVHJhbnNhY3Rpb24gZmx1c2hdOwog ICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIAotICAgIG1fbGFzdFNlbnRJbnRyaW5z aWNDb250ZW50U2l6ZSA9IGNvbnRlbnRTaXplOwotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdl czo6RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlR2VvbWV0cnkoY29udGVudFNpemUpKTsKKyAg ICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFVwZGF0ZUdl b21ldHJ5KCkpOworCisgICAgaWYgKG1fd2ViUGFnZS0+bWluaW11bUxheW91dFdpZHRoKCkgJiYg IW1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lci5pc0FjdGl2ZSgpKQorICAgICAgICBt X3VwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGltZXIuc3RhcnRPbmVTaG90KDApOwogCiAgICAg bV9pblVwZGF0ZUdlb21ldHJ5ID0gZmFsc2U7CiB9Cg==