49117 2010-11-05 17:39:58 -0700 Allow applets to participate in accelerated compositing 2010-11-08 09:49:25 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser andersca simon.fraser oldest_to_newest 305669 0 simon.fraser 2010-11-05 17:39:58 -0700 We should allow <applet> to be composited if the plugin adopts the CA rendering model. 305670 1 simon.fraser 2010-11-05 17:40:15 -0700 <rdar://problem/8625819> 305677 2 73149 simon.fraser 2010-11-05 17:48:21 -0700 Created attachment 73149 Patch 306168 3 simon.fraser 2010-11-08 09:49:25 -0800 http://trac.webkit.org/changeset/71536 73149 2010-11-05 17:48:21 -0700 2010-11-08 02:19:38 -0800 Patch bug-49117-20101105174820.patch text/plain 14299 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODZkYTgzNzhhMmY1MGI0YmYxNjg4MDEzNjE5MmQ2MjMxYWRkOWRlNC4uMmJjZmMzMjg5ZTVhZTVj ODVkNWVkYjYzNWUxZDhjZWMwNWNiNTA0NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0xMS0wNSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBhcHBsZXRzIHRvIHBhcnRpY2lwYXRl IGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00OTExNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNTgx OT4KKyAgICAgICAgCisgICAgICAgIEFkZCBSZW5kZXJBcHBsZXQgdG8gdGhlIGxpc3Qgb2YgcmVu ZGVyZXJzIHRoYXQgY2FuIG9wdGlvbmFsbHkgZ2V0IFJlbmRlckxheWVycywKKyAgICAgICAgYW5k IGJlIGNvbXBvc2l0ZWQgZm9yIHNvbWUgcmVhc29uLgorCisgICAgICAgIE5vdCBjdXJyZW50bHkg dGVzdGFibGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQXBwbGV0Lmg6IE91dGRlbnRl ZCB0aGUgY2xhc3MgZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQXBw bGV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckFwcGxldDo6cmVxdWlyZXNMYXllcik6 IFJldHVybiB0cnVlIGlmIHRoZSB1bmRlcmx5aW5nIHdpZGdldAorICAgICAgICBoYXMgYSBwbGF0 Zm9ybSBsYXllci4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckFwcGxldDo6YWxsb3dzQWNjZWxl cmF0ZWRDb21wb3NpdGluZyk6IENoZWNrIHRoZSB3aWRnZXQgdG8gc2VlCisgICAgICAgIGlmIGl0 IGhhcyBhIHBsYXRmb3JtIGxheWVyLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1hbEZsb3dP bmx5KTogUmVmb3JtYXQsIGFuZCBhZGQgaXNBcHBsZXQoKS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjppc1NlbGZQYWludGluZ0xheWVyKTogUmVmb3JtYXQsIGFuZCBhZGQgaXNBcHBs ZXQoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZp Z3VyYXRpb24pOiBVc2UgJ3JlbmRlcmVyJyBsb2NhbCB2YXJpYWJsZQorICAgICAgICBmb3IgZWZm aWNpZW5jeS4gTm93IGNoZWNrIGZvciBlbWJlZGRlZCBvYmplY3RzIGFuZCBhcHBsZXRzLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yUGx1Z2lu KTogQ2hlY2sgZm9yIGVtYmVkZGVkIG9iamVjdHMgYW5kIGFwcGxldHMuCisKIDIwMTAtMTEtMDUg IElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJB cHBsZXQuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQXBwbGV0LmNwcAppbmRleCBmOWVi NTZlODJmOTY0ZjllMjE1NzM2ZDA0NDM1MGUyNGZhMWM5OTZiLi5lYWEzNTM1YTE5OGY5MzhjOWM5 MzNkMDkwNDA5ZmMyMDAxNGFiMTNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJBcHBsZXQuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFwcGxldC5jcHAKQEAg LTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJIVE1MQXBwbGV0RWxlbWVudC5oIgogI2luY2x1ZGUg IkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxQYXJhbUVsZW1lbnQuaCIKKyNpbmNsdWRlICJQ bHVnaW5WaWV3QmFzZS5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CkBAIC05MSw0ICs5MiwxOSBAQCB2b2lkIFJlbmRlckFwcGxldDo6bGF5b3V0KCkKICAgICBz ZXROZWVkc0xheW91dChmYWxzZSk7CiB9CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCitib29sIFJlbmRlckFwcGxldDo6cmVxdWlyZXNMYXllcigpIGNvbnN0Cit7CisgICAgaWYg KFJlbmRlcldpZGdldDo6cmVxdWlyZXNMYXllcigpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAKKyAgICByZXR1cm4gYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOworfQorCitib29s IFJlbmRlckFwcGxldDo6YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIHdpZGdldCgpICYmIHdpZGdldCgpLT5pc1BsdWdpblZpZXdCYXNlKCkgJiYgc3Rh dGljX2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPih3aWRnZXQoKSktPnBsYXRmb3JtTGF5ZXIoKTsKK30K KyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJBcHBsZXQuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFwcGxldC5o CmluZGV4IDY0MTU2OGQ4MjY0MGQzZjgzYWI2ZjE3ZTA5MGU1YjE4NWM2ODA5YzUuLjAwNzkwMmQx ZjI1MGFjOGE3MTZhMmQ0OTA3MThkYzVlNDM5NmFhZTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckFwcGxldC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFwcGxl dC5oCkBAIC0yNywzNCArMjcsNDIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xh c3MgSFRNTEFwcGxldEVsZW1lbnQ7CitjbGFzcyBIVE1MQXBwbGV0RWxlbWVudDsKIAotICAgIGNs YXNzIFJlbmRlckFwcGxldCA6IHB1YmxpYyBSZW5kZXJXaWRnZXQgewotICAgIHB1YmxpYzoKLSAg ICAgICAgUmVuZGVyQXBwbGV0KEhUTUxBcHBsZXRFbGVtZW50KiwgY29uc3QgSGFzaE1hcDxTdHJp bmcsIFN0cmluZz4mIGFyZ3MpOwotICAgICAgICB2aXJ0dWFsIH5SZW5kZXJBcHBsZXQoKTsKK2Ns YXNzIFJlbmRlckFwcGxldCA6IHB1YmxpYyBSZW5kZXJXaWRnZXQgeworcHVibGljOgorICAgIFJl bmRlckFwcGxldChIVE1MQXBwbGV0RWxlbWVudCosIGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+JiBhcmdzKTsKKyAgICB2aXJ0dWFsIH5SZW5kZXJBcHBsZXQoKTsKIAotICAgICAgICB2b2lk IGNyZWF0ZVdpZGdldElmTmVjZXNzYXJ5KCk7CisgICAgdm9pZCBjcmVhdGVXaWRnZXRJZk5lY2Vz c2FyeSgpOwogCi0gICAgcHJpdmF0ZToKLSAgICAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5k ZXJOYW1lKCkgY29uc3QgeyByZXR1cm4gIlJlbmRlckFwcGxldCI7IH0KKyNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCisgICAgdmlydHVhbCBib29sIGFsbG93c0FjY2VsZXJhdGVkQ29t cG9zaXRpbmcoKSBjb25zdDsKKyNlbmRpZgogCi0gICAgICAgIHZpcnR1YWwgYm9vbCBpc0FwcGxl dCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KK3ByaXZhdGU6CisgICAgdmlydHVhbCBjb25zdCBj aGFyKiByZW5kZXJOYW1lKCkgY29uc3QgeyByZXR1cm4gIlJlbmRlckFwcGxldCI7IH0KIAotICAg ICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7Ci0gICAgICAgIHZpcnR1YWwgSW50U2l6ZSBpbnRy aW5zaWNTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCBib29sIGlzQXBwbGV0KCkgY29uc3QgeyBy ZXR1cm4gdHJ1ZTsgfQogCi0gICAgICAgIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IG1fYXJnczsK LSAgICB9OworICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKTsKKyAgICB2aXJ0dWFsIEludFNpemUg aW50cmluc2ljU2l6ZSgpIGNvbnN0OwogCi0gICAgaW5saW5lIFJlbmRlckFwcGxldCogdG9SZW5k ZXJBcHBsZXQoUmVuZGVyT2JqZWN0KiBvYmplY3QpCi0gICAgewotICAgICAgICBBU1NFUlQoIW9i amVjdCB8fCBvYmplY3QtPmlzQXBwbGV0KCkpOwotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 UmVuZGVyQXBwbGV0Kj4ob2JqZWN0KTsKLSAgICB9CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQorICAgIHZpcnR1YWwgYm9vbCByZXF1aXJlc0xheWVyKCkgY29uc3Q7CisjZW5kaWYK IAotICAgIC8vIFRoaXMgd2lsbCBjYXRjaCBhbnlvbmUgZG9pbmcgYW4gdW5uZWNlc3NhcnkgY2Fz dC4KLSAgICB2b2lkIHRvUmVuZGVyQXBwbGV0KGNvbnN0IFJlbmRlckFwcGxldCopOworICAgIEhh c2hNYXA8U3RyaW5nLCBTdHJpbmc+IG1fYXJnczsKK307CisKK2lubGluZSBSZW5kZXJBcHBsZXQq IHRvUmVuZGVyQXBwbGV0KFJlbmRlck9iamVjdCogb2JqZWN0KQoreworICAgIEFTU0VSVCghb2Jq ZWN0IHx8IG9iamVjdC0+aXNBcHBsZXQoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRl ckFwcGxldCo+KG9iamVjdCk7Cit9CisKKy8vIFRoaXMgd2lsbCBjYXRjaCBhbnlvbmUgZG9pbmcg YW4gdW5uZWNlc3NhcnkgY2FzdC4KK3ZvaWQgdG9SZW5kZXJBcHBsZXQoY29uc3QgUmVuZGVyQXBw bGV0Kik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCmluZGV4IDRlOGNlZWM4OTk3ODU2MzkxOWYxMmE1Mzc2MjdkYTIzOWExMmVjMGYuLjJmODll YjVkZDJiYTljMzkzYjc2YWI5YThmMmQ3MzA4OWI2NTYwODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKQEAgLTM3NDUsOCArMzc0NSwxNCBAQCB2b2lkIFJlbmRlckxheWVyOjpyZXBhaW50 SW5jbHVkaW5nTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50cyhSZW5kZXJCb3hNb2RlbE9iamVjdAog CiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1hbEZsb3dPbmx5KCkgY29uc3QKIHsKLSAg ICByZXR1cm4gKHJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgpIHx8IHJlbmRlcmVyKCktPmhh c1JlZmxlY3Rpb24oKSB8fCByZW5kZXJlcigpLT5oYXNNYXNrKCkgfHwgcmVuZGVyZXIoKS0+aXNW aWRlbygpIHx8IHJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSB8fCAKLSAgICAgICAgICAg IHJlbmRlcmVyKCktPmlzUmVuZGVySUZyYW1lKCkgfHwgcmVuZGVyZXIoKS0+c3R5bGUoKS0+c3Bl Y2lmaWVzQ29sdW1ucygpKQorICAgIHJldHVybiAocmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlw KCkKKyAgICAgICAgICAgICAgICB8fCByZW5kZXJlcigpLT5oYXNSZWZsZWN0aW9uKCkKKyAgICAg ICAgICAgICAgICB8fCByZW5kZXJlcigpLT5oYXNNYXNrKCkKKyAgICAgICAgICAgICAgICB8fCBy ZW5kZXJlcigpLT5pc1ZpZGVvKCkKKyAgICAgICAgICAgICAgICB8fCByZW5kZXJlcigpLT5pc0Vt YmVkZGVkT2JqZWN0KCkKKyAgICAgICAgICAgICAgICB8fCByZW5kZXJlcigpLT5pc0FwcGxldCgp CisgICAgICAgICAgICAgICAgfHwgcmVuZGVyZXIoKS0+aXNSZW5kZXJJRnJhbWUoKQorICAgICAg ICAgICAgICAgIHx8IHJlbmRlcmVyKCktPnN0eWxlKCktPnNwZWNpZmllc0NvbHVtbnMoKSkKICAg ICAgICAgICAgICYmICFyZW5kZXJlcigpLT5pc1Bvc2l0aW9uZWQoKQogICAgICAgICAgICAgJiYg IXJlbmRlcmVyKCktPmlzUmVsUG9zaXRpb25lZCgpCiAgICAgICAgICAgICAmJiAhcmVuZGVyZXIo KS0+aGFzVHJhbnNmb3JtKCkKQEAgLTM3NTUsNyArMzc2MSwxNCBAQCBib29sIFJlbmRlckxheWVy OjpzaG91bGRCZU5vcm1hbEZsb3dPbmx5KCkgY29uc3QKIAogYm9vbCBSZW5kZXJMYXllcjo6aXNT ZWxmUGFpbnRpbmdMYXllcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICFpc05vcm1hbEZsb3dPbmx5 KCkgfHwgcmVuZGVyZXIoKS0+aGFzUmVmbGVjdGlvbigpIHx8IHJlbmRlcmVyKCktPmhhc01hc2so KSB8fCByZW5kZXJlcigpLT5pc1RhYmxlUm93KCkgfHwgcmVuZGVyZXIoKS0+aXNWaWRlbygpIHx8 IHJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSB8fCByZW5kZXJlcigpLT5pc1JlbmRlcklG cmFtZSgpOworICAgIHJldHVybiAhaXNOb3JtYWxGbG93T25seSgpCisgICAgICAgIHx8IHJlbmRl cmVyKCktPmhhc1JlZmxlY3Rpb24oKQorICAgICAgICB8fCByZW5kZXJlcigpLT5oYXNNYXNrKCkK KyAgICAgICAgfHwgcmVuZGVyZXIoKS0+aXNUYWJsZVJvdygpCisgICAgICAgIHx8IHJlbmRlcmVy KCktPmlzVmlkZW8oKQorICAgICAgICB8fCByZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkK KyAgICAgICAgfHwgcmVuZGVyZXIoKS0+aXNBcHBsZXQoKQorICAgICAgICB8fCByZW5kZXJlcigp LT5pc1JlbmRlcklGcmFtZSgpOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjpzdHlsZUNoYW5nZWQo U3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKikKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDc3N2QwN2YzYjE3ZjYyMzQ1MGYwYmM0NmNj NWFmMzE2YmM0YTU3MTAuLjRmMTY4MDA3MTVhZmZkNGM4MTEzZmU4MzRkMzg5OTFiMDlmZmE4YmQg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysr IGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNDYsNiArNDYs NyBAQAogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIktl eWZyYW1lTGlzdC5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgiCisjaW5jbHVkZSAiUmVu ZGVyQXBwbGV0LmgiCiAjaW5jbHVkZSAiUmVuZGVyQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVySUZy YW1lLmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKQEAgLTIyNCw2ICsyMjUsNyBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJMYXlvdXQoVXBkYXRlRGVwdGggdXBkYXRl RGVwdGgsIGJvb2wgaXNVcGRhdAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBo aWNzTGF5ZXJDb25maWd1cmF0aW9uKCkKIHsKICAgICBSZW5kZXJMYXllckNvbXBvc2l0b3IqIGNv bXBvc2l0b3IgPSB0aGlzLT5jb21wb3NpdG9yKCk7CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJl ciA9IHRoaXMtPnJlbmRlcmVyKCk7CiAKICAgICBib29sIGxheWVyQ29uZmlnQ2hhbmdlZCA9IGZh bHNlOwogICAgIGlmICh1cGRhdGVGb3JlZ3JvdW5kTGF5ZXIoY29tcG9zaXRvci0+bmVlZHNDb250 ZW50c0NvbXBvc2l0aW5nTGF5ZXIobV9vd25pbmdMYXllcikpKQpAQCAtMjMyLDcgKzIzNCw3IEBA IGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyQ29uZmlndXJhdGlv bigpCiAgICAgaWYgKHVwZGF0ZUNsaXBwaW5nTGF5ZXJzKGNvbXBvc2l0b3ItPmNsaXBwZWRCeUFu Y2VzdG9yKG1fb3duaW5nTGF5ZXIpLCBjb21wb3NpdG9yLT5jbGlwc0NvbXBvc2l0aW5nRGVzY2Vu ZGFudHMobV9vd25pbmdMYXllcikpKQogICAgICAgICBsYXllckNvbmZpZ0NoYW5nZWQgPSB0cnVl OwogCi0gICAgaWYgKHVwZGF0ZU1hc2tMYXllcihtX293bmluZ0xheWVyLT5yZW5kZXJlcigpLT5o YXNNYXNrKCkpKQorICAgIGlmICh1cGRhdGVNYXNrTGF5ZXIocmVuZGVyZXItPmhhc01hc2soKSkp CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TWFza0xheWVyKG1fbWFza0xheWVyLmdldCgp KTsKIAogICAgIGlmIChtX293bmluZ0xheWVyLT5oYXNSZWZsZWN0aW9uKCkpIHsKQEAgLTI0Niwy NyArMjQ4LDI4IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVy Q29uZmlndXJhdGlvbigpCiAgICAgaWYgKGlzRGlyZWN0bHlDb21wb3NpdGVkSW1hZ2UoKSkKICAg ICAgICAgdXBkYXRlSW1hZ2VDb250ZW50cygpOwogCi0gICAgaWYgKHJlbmRlcmVyKCktPmlzRW1i ZWRkZWRPYmplY3QoKSAmJiB0b1JlbmRlckVtYmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT5hbGxv d3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpIHsKLSAgICAgICAgUGx1Z2luVmlld0Jhc2UqIHBs dWdpblZpZXdCYXNlID0gc3RhdGljX2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPih0b1JlbmRlckVtYmVk ZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT53aWRnZXQoKSk7CisgICAgaWYgKChyZW5kZXJlci0+aXNF bWJlZGRlZE9iamVjdCgpICYmIHRvUmVuZGVyRW1iZWRkZWRPYmplY3QocmVuZGVyZXIpLT5hbGxv d3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpCisgICAgICAgIHx8IChyZW5kZXJlci0+aXNBcHBs ZXQoKSAmJiB0b1JlbmRlckFwcGxldChyZW5kZXJlciktPmFsbG93c0FjY2VsZXJhdGVkQ29tcG9z aXRpbmcoKSkpIHsKKyAgICAgICAgUGx1Z2luVmlld0Jhc2UqIHBsdWdpblZpZXdCYXNlID0gc3Rh dGljX2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPih0b1JlbmRlcldpZGdldChyZW5kZXJlciktPndpZGdl dCgpKTsKICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRDb250ZW50c1RvTWVkaWEocGx1Z2lu Vmlld0Jhc2UtPnBsYXRmb3JtTGF5ZXIoKSk7CiAgICAgfQogI2lmIEVOQUJMRShWSURFTykKLSAg ICBlbHNlIGlmIChyZW5kZXJlcigpLT5pc1ZpZGVvKCkpIHsKLSAgICAgICAgSFRNTE1lZGlhRWxl bWVudCogbWVkaWFFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KHJlbmRl cmVyKCktPm5vZGUoKSk7CisgICAgZWxzZSBpZiAocmVuZGVyZXItPmlzVmlkZW8oKSkgeworICAg ICAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTWVk aWFFbGVtZW50Kj4ocmVuZGVyZXItPm5vZGUoKSk7CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+ c2V0Q29udGVudHNUb01lZGlhKG1lZGlhRWxlbWVudC0+cGxhdGZvcm1MYXllcigpKTsKICAgICB9 CiAjZW5kaWYKICNpZiBFTkFCTEUoM0RfQ0FOVkFTKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRf Q0FOVkFTKQotICAgIGVsc2UgaWYgKGlzQWNjZWxlcmF0ZWRDYW52YXMocmVuZGVyZXIoKSkpIHsK LSAgICAgICAgSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcyA9IHN0YXRpY19jYXN0PEhUTUxDYW52 YXNFbGVtZW50Kj4ocmVuZGVyZXIoKS0+bm9kZSgpKTsKKyAgICBlbHNlIGlmIChpc0FjY2VsZXJh dGVkQ2FudmFzKHJlbmRlcmVyKSkgeworICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFz ID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihyZW5kZXJlci0+bm9kZSgpKTsKICAg ICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBjYW52YXMtPnJlbmRl cmluZ0NvbnRleHQoKSkKICAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNU b0NhbnZhcyhjb250ZXh0LT5wbGF0Zm9ybUxheWVyKCkpOwogICAgICAgICBsYXllckNvbmZpZ0No YW5nZWQgPSB0cnVlOwogICAgIH0KICNlbmRpZgogCi0gICAgaWYgKHJlbmRlcmVyKCktPmlzUmVu ZGVySUZyYW1lKCkpCi0gICAgICAgIGxheWVyQ29uZmlnQ2hhbmdlZCA9IFJlbmRlckxheWVyQ29t cG9zaXRvcjo6cGFyZW50SUZyYW1lQ29udGVudExheWVycyh0b1JlbmRlcklGcmFtZShyZW5kZXJl cigpKSk7CisgICAgaWYgKHJlbmRlcmVyLT5pc1JlbmRlcklGcmFtZSgpKQorICAgICAgICBsYXll ckNvbmZpZ0NoYW5nZWQgPSBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnBhcmVudElGcmFtZUNvbnRl bnRMYXllcnModG9SZW5kZXJJRnJhbWUocmVuZGVyZXIpKTsKIAogICAgIHJldHVybiBsYXllckNv bmZpZ0NoYW5nZWQ7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAppbmRleCAxNDY4YjZjYTFhZTEyMjQ4ZGZmM2RlZDBlYWEwYjVkYTUxMjQ0MWNlLi5hNTM4 ODU3YTE3MjIzZTQ4ODRmODFhMDZkMWI3Mzc3MWQ3Mzk5ZTkzIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTQyLDYgKzQyLDcgQEAKICNpbmNsdWRl ICJIaXRUZXN0UmVzdWx0LmgiCiAjaW5jbHVkZSAiTm9kZUxpc3QuaCIKICNpbmNsdWRlICJQYWdl LmgiCisjaW5jbHVkZSAiUmVuZGVyQXBwbGV0LmgiCiAjaW5jbHVkZSAiUmVuZGVyRW1iZWRkZWRP YmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJJRnJhbWUuaCIKICNpbmNsdWRlICJSZW5kZXJMYXll ckJhY2tpbmcuaCIKQEAgLTEyMjcsMjEgKzEyMjgsMjAgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JDYW52YXMoUmVuZGVyT2JqZWN0KiByZW5kZXJl cikKIAogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JQ bHVnaW4oUmVuZGVyT2JqZWN0KiByZW5kZXJlcikgY29uc3QKIHsKLSAgICBpZiAoIXJlbmRlcmVy LT5pc0VtYmVkZGVkT2JqZWN0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBS ZW5kZXJFbWJlZGRlZE9iamVjdCogZW1iZWRSZW5kZXJlciA9IHRvUmVuZGVyRW1iZWRkZWRPYmpl Y3QocmVuZGVyZXIpOwotICAgIGlmICghZW1iZWRSZW5kZXJlci0+YWxsb3dzQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpKQorICAgIGJvb2wgY29tcG9zaXRlID0gKHJlbmRlcmVyLT5pc0VtYmVkZGVk T2JqZWN0KCkgJiYgdG9SZW5kZXJFbWJlZGRlZE9iamVjdChyZW5kZXJlciktPmFsbG93c0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmcoKSkKKyAgICAgICAgICAgICAgICAgIHx8IChyZW5kZXJlci0+aXNB cHBsZXQoKSAmJiB0b1JlbmRlckFwcGxldChyZW5kZXJlciktPmFsbG93c0FjY2VsZXJhdGVkQ29t cG9zaXRpbmcoKSk7CisgICAgaWYgKCFjb21wb3NpdGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIG1fY29tcG9zaXRpbmdEZXBlbmRzT25HZW9tZXRyeSA9IHRydWU7Ci0KKyAgICAKKyAg ICBSZW5kZXJXaWRnZXQqIHBsdWdpblJlbmRlcmVyID0gdG9SZW5kZXJXaWRnZXQocmVuZGVyZXIp OwogICAgIC8vIElmIHdlIGNhbid0IHJlbGlhYmx5IGtub3cgdGhlIHNpemUgb2YgdGhlIHBsdWdp biB5ZXQsIGRvbid0IGNoYW5nZSBjb21wb3NpdGluZyBzdGF0ZS4KLSAgICBpZiAocmVuZGVyZXIt Pm5lZWRzTGF5b3V0KCkpCi0gICAgICAgIHJldHVybiBlbWJlZFJlbmRlcmVyLT5oYXNMYXllcigp ICYmIGVtYmVkUmVuZGVyZXItPmxheWVyKCktPmlzQ29tcG9zaXRlZCgpOworICAgIGlmIChwbHVn aW5SZW5kZXJlci0+bmVlZHNMYXlvdXQoKSkKKyAgICAgICAgcmV0dXJuIHBsdWdpblJlbmRlcmVy LT5oYXNMYXllcigpICYmIHBsdWdpblJlbmRlcmVyLT5sYXllcigpLT5pc0NvbXBvc2l0ZWQoKTsK IAogICAgIC8vIERvbid0IGdvIGludG8gY29tcG9zaXRpbmcgbW9kZSBpZiBoZWlnaHQgb3Igd2lk dGggYXJlIHplcm8sIG9yIHNpemUgaXMgMXgxLgotICAgIEludFJlY3QgY29udGVudEJveCA9IGVt YmVkUmVuZGVyZXItPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgSW50UmVjdCBjb250ZW50Qm94ID0g cGx1Z2luUmVuZGVyZXItPmNvbnRlbnRCb3hSZWN0KCk7CiAgICAgcmV0dXJuIGNvbnRlbnRCb3gu aGVpZ2h0KCkgKiBjb250ZW50Qm94LndpZHRoKCkgPiAxOwogfQogCmRpZmYgLS1naXQgYS9XZWJL aXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGZlZTRjOWIyNDBm ZjFiYjhhYTM3MzVmNzUyZWIxZWE0NjM4OTNhMDMuLmFkYWU5NTIwYWMxYmEwM2MzOTBlMWY2YTZl M2YzMzBhODFhOTM1YmUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTEtMDUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgYXBwbGV0cyB0byBwYXJ0aWNpcGF0ZSBpbiBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDkxMTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg2MjU4MTk+Cisg ICAgICAgIAorICAgICAgICBJZiBKYXZhIGlzIGJlaW5nIGxvYWRlZCB2aWEgdGhlIE5ldHNjYXBl IFBsdWdpbiBBUEksIGNyZWF0ZSBhCisgICAgICAgIE5ldHNjYXBlUGx1Z2luV2lkZ2V0IHNvIHRo YXQgaXQgaGFzIGFuIGltcGxlbWVudGF0aW9uIG9mIHBsYXRmb3JtTGF5ZXIoKS4KKyAgICAgICAg CisgICAgICAgIEFsc28gY2xlYW4gdXAgYnkgdXNpbmcgZWFybHkgcmV0dXJucy4KKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorCiAyMDEwLTExLTA1 ICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5tbQppbmRleCAzMDUzYjQ5ZTFjOGY0NTIzYWE1MmIwN2VjMTYyNmM1OTIw NDM2ODBlLi43Y2EyN2MwMjI0Y2JmOTE0N2E4NGUxODY4NWI3NjAyMjFiOGFkMmQxIDEwMDY0NAot LS0gYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisr KyBiL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAg LTE3NTIsNiArMTc1Miw4IEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBXZWJGcmFtZUxvYWRlckNsaWVu dDo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBzCiAgICAgICAgICAgICAg ICAgW3ZhbHVlcyBhZGRPYmplY3Q6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIlZCIsIHNp emUuaGVpZ2h0KCldXTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHZpZXcgPSBwbHVnaW5W aWV3KG1fd2ViRnJhbWUuZ2V0KCksIChXZWJQbHVnaW5QYWNrYWdlICopcGx1Z2luUGFja2FnZSwg bmFtZXMsIHZhbHVlcywgYmFzZVVSTCwga2l0KGVsZW1lbnQpLCBOTyk7CisgICAgICAgICAgICBp ZiAodmlldykKKyAgICAgICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBsdWdpbldpZGdl dCh2aWV3KSk7CiAgICAgICAgIH0gCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAg ICAgICAgIGVsc2UgaWYgKFtwbHVnaW5QYWNrYWdlIGlzS2luZE9mQ2xhc3M6W1dlYk5ldHNjYXBl UGx1Z2luUGFja2FnZSBjbGFzc11dKSB7CkBAIC0xNzY0LDYgKzE3NjYsOCBAQCBQYXNzUmVmUHRy PFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29u c3QgSW50U2l6ZSYgcwogICAgICAgICAgICAgICAgIGF0dHJpYnV0ZVZhbHVlczpraXQocGFyYW1W YWx1ZXMpCiAgICAgICAgICAgICAgICAgbG9hZE1hbnVhbGx5Ok5PCiAgICAgICAgICAgICAgICAg ZWxlbWVudDplbGVtZW50XSBhdXRvcmVsZWFzZV07CisgICAgICAgICAgICBpZiAodmlldykKKyAg ICAgICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE5ldHNjYXBlUGx1Z2luV2lkZ2V0KHZp ZXcpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogICAgICAgICB9CkBAIC0xNzgxLDE1ICsxNzg1LDkgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUm IHMKICAgICAgICAgfQogICAgIH0KIAotICAgIEFTU0VSVCh2aWV3KTsKLSAgICByZXR1cm4gYWRv cHRSZWYobmV3IFBsdWdpbldpZGdldCh2aWV3KSk7Ci0KICAgICBFTkRfQkxPQ0tfT0JKQ19FWENF UFRJT05TOwotICAgIAotICAgIHJldHVybiBhZG9wdFJlZihuZXcgUGx1Z2luV2lkZ2V0KTsKLSNl bHNlCi0gICAgcmV0dXJuIDA7CiAjZW5kaWYgLy8gRU5BQkxFKEpBVkFfQlJJREdFKQorICAgIHJl dHVybiAwOwogfQogCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCg==