121388 2013-09-15 06:36:17 -0700 CTTE: RenderMedia and RenderVideo are never anonymous. 2013-09-15 07:13:03 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue eric.carlson esprehn+autocc glenn jer.noble kling kondapallykalyan oldest_to_newest 929429 0 kling 2013-09-15 06:36:17 -0700 CTTE: RenderMedia and RenderVideo are never anonymous. 929430 1 211704 kling 2013-09-15 06:36:56 -0700 Created attachment 211704 Patch 929433 2 kling 2013-09-15 07:05:58 -0700 Committed r155809: <http://trac.webkit.org/changeset/155809> 929434 3 kling 2013-09-15 07:11:16 -0700 Reverted r155809 for reason: Accidentally removed files, let's redo this. Committed r155810: <http://trac.webkit.org/changeset/155810> 929435 4 211704 kling 2013-09-15 07:12:57 -0700 Comment on attachment 211704 Patch Clearing flags on attachment: 211704 Committed r155811: <http://trac.webkit.org/changeset/155811> 929436 5 kling 2013-09-15 07:13:03 -0700 All reviewed patches have been landed. Closing bug. 211704 2013-09-15 06:36:56 -0700 2013-09-15 07:12:57 -0700 Patch bug-121388.diff text/plain 15187 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxMzY5YWY3Li5lNTVjNjU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTMtMDktMTUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENUVEU6IFJlbmRlck1lZGlhIGFuZCBSZW5kZXJWaWRlbyBhcmUgbmV2ZXIgYW5vbnltb3Vz LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTIxMzg4PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvZGlmeSB0aGUgZm9sbG93aW5nOgor CisgICAgICAgIC0gUmVuZGVyTWVkaWEgYWx3YXlzIGhhcyBhbiBIVE1MTWVkaWFFbGVtZW50Lgor ICAgICAgICAtIFJlbmRlclZpZGVvIGFsd2F5cyBoYXMgYW4gSFRNTFZpZGVvRWxlbWVudC4KKwor ICAgICAgICBOb25lIG9mIHRoZXNlIHJlbmRlcmVycyBhcmUgZXZlciBhbm9ueW1vdXMsIHNvIGRl bGV0ZSBlbGVtZW50KCkgYW5kIHByb3ZpZGUKKyAgICAgICAgc3Ryb25nbHkgdHlwZWQgcmVmZXJl bmNlIGdldHRlcnMgaW5zdGVhZC4KKworMjAxMy0wOS0xNSAgQW5kcmVhcyBLbGluZyAgPGFrbGlu Z0BhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIFJlbmRlck9iamVjdDo6Y2xlYXJOb2RlKCku CiAgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjEzODY+CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTE1lZGlhRWxlbWVudEN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxNZWRpYUVsZW1lbnRDdXN0b20uY3BwCmlu ZGV4IGJjZTA3OTQuLmM0MjY1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTSFRNTE1lZGlhRWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNIVE1MTWVkaWFFbGVtZW50Q3VzdG9tLmNwcApAQCAtMzYsMTIgKzM2LDExIEBA IHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIHZvaWQgSlNIVE1MTWVkaWFFbGVtZW50OjpzZXRDb250 cm9sbGVyKEV4ZWNTdGF0ZSosIEpTVmFsdWUgdmFsdWUpCiB7Ci0gICAgSFRNTE1lZGlhRWxlbWVu dCogaW1wID0gdG9IVE1MTWVkaWFFbGVtZW50KGltcGwoKSk7CiAgICAgLy8gNC44LjEwLjExLjIg TWVkaWEgY29udHJvbGxlcnM6IGNvbnRyb2xsZXIgYXR0cmlidXRlLgogICAgIC8vIE9uIHNldHRp bmcsIGl0IG11c3QgZmlyc3QgcmVtb3ZlIHRoZSBlbGVtZW50J3MgbWVkaWFncm91cCBhdHRyaWJ1 dGUsIGlmIGFueSwgCi0gICAgaW1wLT5zZXRNZWRpYUdyb3VwKFN0cmluZygpKTsKKyAgICBpbXBs KCktPnNldE1lZGlhR3JvdXAoU3RyaW5nKCkpOwogICAgIC8vIGFuZCB0aGVuIHNldCB0aGUgY3Vy cmVudCBtZWRpYSBjb250cm9sbGVyIHRvIHRoZSBnaXZlbiB2YWx1ZS4KLSAgICBpbXAtPnNldENv bnRyb2xsZXIodG9NZWRpYUNvbnRyb2xsZXIodmFsdWUpKTsKKyAgICBpbXBsKCktPnNldENvbnRy b2xsZXIodG9NZWRpYUNvbnRyb2xsZXIodmFsdWUpKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggZWM4YTE1OC4uZWVjN2JiZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01NjAsNyArNTYwLDcgQEAgUmVu ZGVyT2JqZWN0KiBIVE1MTWVkaWFFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSog YXJlbmEsIFJlbmRlclN0eWxlKikKIHsKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURF TykKICAgICAvLyBTZXR1cCB0aGUgcmVuZGVyZXIgaWYgd2UgYWxyZWFkeSBoYXZlIGEgcHJveHkg d2lkZ2V0LgotICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0KiBtZWRpYVJlbmRlcmVyID0gbmV3IChh cmVuYSkgUmVuZGVyRW1iZWRkZWRPYmplY3QodGhpcyk7CisgICAgUmVuZGVyRW1iZWRkZWRPYmpl Y3QqIG1lZGlhUmVuZGVyZXIgPSBuZXcgKGFyZW5hKSBSZW5kZXJFbWJlZGRlZE9iamVjdCgqdGhp cyk7CiAgICAgaWYgKG1fcHJveHlXaWRnZXQpIHsKICAgICAgICAgbWVkaWFSZW5kZXJlci0+c2V0 V2lkZ2V0KG1fcHJveHlXaWRnZXQpOwogCkBAIC01NjksNyArNTY5LDcgQEAgUmVuZGVyT2JqZWN0 KiBIVE1MTWVkaWFFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSogYXJlbmEsIFJl bmRlclN0eWxlKikKICAgICB9CiAgICAgcmV0dXJuIG1lZGlhUmVuZGVyZXI7CiAjZWxzZQotICAg IHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJNZWRpYSh0aGlzKTsKKyAgICByZXR1cm4gbmV3IChh cmVuYSkgUmVuZGVyTWVkaWEoKnRoaXMpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmgKaW5kZXggNmYxMzVmNS4uMWM4OTUzYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKQEAgLTgwMiwxMiArODAyLDIxIEBAIGlubGluZSBib29s IGlzTWVkaWFFbGVtZW50KE5vZGUqIG5vZGUpCiAgICAgcmV0dXJuIG5vZGUgJiYgbm9kZS0+aXNF bGVtZW50Tm9kZSgpICYmIHRvRWxlbWVudChub2RlKS0+aXNNZWRpYUVsZW1lbnQoKTsKIH0KIAor aW5saW5lIEhUTUxNZWRpYUVsZW1lbnQmIHRvSFRNTE1lZGlhRWxlbWVudChOb2RlJiBub2RlKQor eworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGlzTWVkaWFFbGVtZW50KCZu b2RlKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxNZWRpYUVsZW1lbnQmPihub2RlKTsK K30KKwogaW5saW5lIEhUTUxNZWRpYUVsZW1lbnQqIHRvSFRNTE1lZGlhRWxlbWVudChOb2RlKiBu b2RlKQogewogICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFub2RlIHx8IGlz TWVkaWFFbGVtZW50KG5vZGUpKTsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxl bWVudCo+KG5vZGUpOwogfQogCit2b2lkIHRvSFRNTE1lZGlhRWxlbWVudChjb25zdCBIVE1MTWVk aWFFbGVtZW50Jik7Cit2b2lkIHRvSFRNTE1lZGlhRWxlbWVudChjb25zdCBIVE1MTWVkaWFFbGVt ZW50Kik7CisKIH0gLy9uYW1lc3BhY2UKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VmlkZW9FbGVtZW50LmNwcAppbmRleCAyYWM2ODllLi4yN2Q3YTIwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgYm9vbCBIVE1MVmlk ZW9FbGVtZW50OjpyZW5kZXJlcklzTmVlZGVkKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKICNp ZiAhRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCiBSZW5kZXJPYmplY3QqIEhUTUxWaWRl b0VsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hKiBhcmVuYSwgUmVuZGVyU3R5bGUq KQogewotICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJWaWRlbyh0aGlzKTsKKyAgICByZXR1 cm4gbmV3IChhcmVuYSkgUmVuZGVyVmlkZW8oKnRoaXMpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCmluZGV4IGFjZDFhZGYuLmY0OWJhYTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcApAQCAtMjgsMjEgKzI4LDIw IEBACiAjaWYgRU5BQkxFKFZJREVPKQogI2luY2x1ZGUgIlJlbmRlck1lZGlhLmgiCiAKLSNpbmNs dWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyRmxvd1RocmVhZC5oIgog I2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlIDx3dGYvU3RhY2tTdGF0cy5oPgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlck1lZGlhOjpSZW5kZXJNZWRpYShIVE1MTWVkaWFF bGVtZW50KiB2aWRlbykKLSAgICA6IFJlbmRlckltYWdlKHZpZGVvKQorUmVuZGVyTWVkaWE6OlJl bmRlck1lZGlhKEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpCisgICAgOiBSZW5kZXJJbWFnZSgm ZWxlbWVudCkKIHsKICAgICBzZXRJbWFnZVJlc291cmNlKFJlbmRlckltYWdlUmVzb3VyY2U6OmNy ZWF0ZSgpKTsKIH0KIAotUmVuZGVyTWVkaWE6OlJlbmRlck1lZGlhKEhUTUxNZWRpYUVsZW1lbnQq IHZpZGVvLCBjb25zdCBJbnRTaXplJiBpbnRyaW5zaWNTaXplKQotICAgIDogUmVuZGVySW1hZ2Uo dmlkZW8pCitSZW5kZXJNZWRpYTo6UmVuZGVyTWVkaWEoSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVu dCwgY29uc3QgSW50U2l6ZSYgaW50cmluc2ljU2l6ZSkKKyAgICA6IFJlbmRlckltYWdlKCZlbGVt ZW50KQogewogICAgIHNldEltYWdlUmVzb3VyY2UoUmVuZGVySW1hZ2VSZXNvdXJjZTo6Y3JlYXRl KCkpOwogICAgIHNldEludHJpbnNpY1NpemUoaW50cmluc2ljU2l6ZSk7CkBAIC01MiwxMSArNTEs NiBAQCBSZW5kZXJNZWRpYTo6flJlbmRlck1lZGlhKCkKIHsKIH0KIAotSFRNTE1lZGlhRWxlbWVu dCogUmVuZGVyTWVkaWE6Om1lZGlhRWxlbWVudCgpIGNvbnN0Ci17IAotICAgIHJldHVybiB0b0hU TUxNZWRpYUVsZW1lbnQoZWxlbWVudCgpKTsgCi19Ci0KIHZvaWQgUmVuZGVyTWVkaWE6OmxheW91 dCgpCiB7CiAgICAgU3RhY2tTdGF0czo6TGF5b3V0Q2hlY2tQb2ludCBsYXlvdXRDaGVja1BvaW50 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuaAppbmRleCBiNmIyNDg3Li4yYWVi M2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuaApAQCAtMjgsMzAgKzI4 LDMxIEBACiAKICNpZiBFTkFCTEUoVklERU8pCiAKKyNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50 LmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1j bGFzcyBIVE1MTWVkaWFFbGVtZW50OwotCiBjbGFzcyBSZW5kZXJNZWRpYSA6IHB1YmxpYyBSZW5k ZXJJbWFnZSB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgUmVuZGVyTWVkaWEoSFRNTE1lZGlhRWxl bWVudCopOwotICAgIFJlbmRlck1lZGlhKEhUTUxNZWRpYUVsZW1lbnQqLCBjb25zdCBJbnRTaXpl JiBpbnRyaW5zaWNTaXplKTsKKyAgICBleHBsaWNpdCBSZW5kZXJNZWRpYShIVE1MTWVkaWFFbGVt ZW50Jik7CisgICAgUmVuZGVyTWVkaWEoSFRNTE1lZGlhRWxlbWVudCYsIGNvbnN0IEludFNpemUm IGludHJpbnNpY1NpemUpOwogICAgIHZpcnR1YWwgflJlbmRlck1lZGlhKCk7CiAKKyAgICBIVE1M TWVkaWFFbGVtZW50JiBtZWRpYUVsZW1lbnQoKSBjb25zdCB7IHJldHVybiAqdG9IVE1MTWVkaWFF bGVtZW50KFJlbmRlckltYWdlOjplbGVtZW50KCkpOyB9CisKICAgICBSZW5kZXJPYmplY3QqIGZp cnN0Q2hpbGQoKSBjb25zdCB7IHJldHVybiBtX2NoaWxkcmVuLmZpcnN0Q2hpbGQoKTsgfQogICAg IFJlbmRlck9iamVjdCogbGFzdENoaWxkKCkgY29uc3QgeyByZXR1cm4gbV9jaGlsZHJlbi5sYXN0 Q2hpbGQoKTsgfQogCiAgICAgdmlydHVhbCBjb25zdCBSZW5kZXJPYmplY3RDaGlsZExpc3QqIGNo aWxkcmVuKCkgY29uc3QgT1ZFUlJJREUgRklOQUwgeyByZXR1cm4gJm1fY2hpbGRyZW47IH0KICAg ICB2aXJ0dWFsIFJlbmRlck9iamVjdENoaWxkTGlzdCogY2hpbGRyZW4oKSBPVkVSUklERSBGSU5B TCB7IHJldHVybiAmbV9jaGlsZHJlbjsgfQogCi0gICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFF bGVtZW50KCkgY29uc3Q7Ci0KIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7 CiAKIHByaXZhdGU6CisgICAgdm9pZCBlbGVtZW50KCkgY29uc3QgV1RGX0RFTEVURURfRlVOQ1RJ T047CisKICAgICB2aXJ0dWFsIGJvb2wgY2FuSGF2ZUNoaWxkcmVuKCkgY29uc3QgT1ZFUlJJREUg RklOQUwgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5kZXJO YW1lKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gIlJlbmRlck1lZGlhIjsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXggOThmNGEyOS4uZTUzNWMyZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwCkBAIC00OCwxNyArNDgsMTcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCi1S ZW5kZXJWaWRlbzo6UmVuZGVyVmlkZW8oSFRNTFZpZGVvRWxlbWVudCogdmlkZW8pCi0gICAgOiBS ZW5kZXJNZWRpYSh2aWRlbykKK1JlbmRlclZpZGVvOjpSZW5kZXJWaWRlbyhIVE1MVmlkZW9FbGVt ZW50JiBlbGVtZW50KQorICAgIDogUmVuZGVyTWVkaWEoZWxlbWVudCkKIHsKICAgICBzZXRJbnRy aW5zaWNTaXplKGNhbGN1bGF0ZUludHJpbnNpY1NpemUoKSk7CiB9CiAKIFJlbmRlclZpZGVvOjp+ UmVuZGVyVmlkZW8oKQogewotICAgIGlmIChNZWRpYVBsYXllciogcCA9IG1lZGlhRWxlbWVudCgp LT5wbGF5ZXIoKSkgewotICAgICAgICBwLT5zZXRWaXNpYmxlKGZhbHNlKTsKLSAgICAgICAgcC0+ c2V0RnJhbWVWaWV3KDApOworICAgIGlmIChNZWRpYVBsYXllciogcGxheWVyID0gdmlkZW9FbGVt ZW50KCkucGxheWVyKCkpIHsKKyAgICAgICAgcGxheWVyLT5zZXRWaXNpYmxlKGZhbHNlKTsKKyAg ICAgICAgcGxheWVyLT5zZXRGcmFtZVZpZXcoMCk7CiAgICAgfQogfQogCkBAIC03Myw3ICs3Myw3 IEBAIEludFNpemUgUmVuZGVyVmlkZW86OmRlZmF1bHRTaXplKCkKIAogdm9pZCBSZW5kZXJWaWRl bzo6aW50cmluc2ljU2l6ZUNoYW5nZWQoKQogewotICAgIGlmICh2aWRlb0VsZW1lbnQoKS0+c2hv dWxkRGlzcGxheVBvc3RlckltYWdlKCkpCisgICAgaWYgKHZpZGVvRWxlbWVudCgpLnNob3VsZERp c3BsYXlQb3N0ZXJJbWFnZSgpKQogICAgICAgICBSZW5kZXJNZWRpYTo6aW50cmluc2ljU2l6ZUNo YW5nZWQoKTsKICAgICB1cGRhdGVJbnRyaW5zaWNTaXplKCk7IAogfQpAQCAtODQsNyArODQsNyBA QCB2b2lkIFJlbmRlclZpZGVvOjp1cGRhdGVJbnRyaW5zaWNTaXplKCkKICAgICBzaXplLnNjYWxl KHN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSk7CiAKICAgICAvLyBOZXZlciBzZXQgdGhlIGVsZW1l bnQgc2l6ZSB0byB6ZXJvIHdoZW4gaW4gYSBtZWRpYSBkb2N1bWVudC4KLSAgICBpZiAoc2l6ZS5p c0VtcHR5KCkgJiYgZWxlbWVudCgpLT5kb2N1bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKQorICAg IGlmIChzaXplLmlzRW1wdHkoKSAmJiBkb2N1bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKQogICAg ICAgICByZXR1cm47CiAKICAgICBpZiAoc2l6ZSA9PSBpbnRyaW5zaWNTaXplKCkpCkBAIC05Nyw4 ICs5Nyw2IEBAIHZvaWQgUmVuZGVyVmlkZW86OnVwZGF0ZUludHJpbnNpY1NpemUoKQogICAgIAog TGF5b3V0U2l6ZSBSZW5kZXJWaWRlbzo6Y2FsY3VsYXRlSW50cmluc2ljU2l6ZSgpCiB7Ci0gICAg SFRNTFZpZGVvRWxlbWVudCogdmlkZW8gPSB2aWRlb0VsZW1lbnQoKTsKLSAgICAKICAgICAvLyBT cGVjIHRleHQgZnJvbSA0LjguNgogICAgIC8vCiAgICAgLy8gVGhlIGludHJpbnNpYyB3aWR0aCBv ZiBhIHZpZGVvIGVsZW1lbnQncyBwbGF5YmFjayBhcmVhIGlzIHRoZSBpbnRyaW5zaWMgd2lkdGgg CkBAIC0xMDgsMjcgKzEwNiwyNyBAQCBMYXlvdXRTaXplIFJlbmRlclZpZGVvOjpjYWxjdWxhdGVJ bnRyaW5zaWNTaXplKCkKICAgICAvLyBUaGUgaW50cmluc2ljIGhlaWdodCBvZiBhIHZpZGVvIGVs ZW1lbnQncyBwbGF5YmFjayBhcmVhIGlzIHRoZSBpbnRyaW5zaWMgaGVpZ2h0IAogICAgIC8vIG9m IHRoZSB2aWRlbyByZXNvdXJjZSwgaWYgdGhhdCBpcyBhdmFpbGFibGU7IG90aGVyd2lzZSBpdCBp cyB0aGUgaW50cmluc2ljIAogICAgIC8vIGhlaWdodCBvZiB0aGUgcG9zdGVyIGZyYW1lLCBpZiB0 aGF0IGlzIGF2YWlsYWJsZTsgb3RoZXJ3aXNlIGl0IGlzIDE1MCBDU1MgcGl4ZWxzLgotICAgIE1l ZGlhUGxheWVyKiBwbGF5ZXIgPSBtZWRpYUVsZW1lbnQoKS0+cGxheWVyKCk7Ci0gICAgaWYgKHBs YXllciAmJiB2aWRlby0+cmVhZHlTdGF0ZSgpID49IEhUTUxWaWRlb0VsZW1lbnQ6OkhBVkVfTUVU QURBVEEpIHsKKyAgICBNZWRpYVBsYXllciogcGxheWVyID0gdmlkZW9FbGVtZW50KCkucGxheWVy KCk7CisgICAgaWYgKHBsYXllciAmJiB2aWRlb0VsZW1lbnQoKS5yZWFkeVN0YXRlKCkgPj0gSFRN TFZpZGVvRWxlbWVudDo6SEFWRV9NRVRBREFUQSkgewogICAgICAgICBMYXlvdXRTaXplIHNpemUg PSBwbGF5ZXItPm5hdHVyYWxTaXplKCk7CiAgICAgICAgIGlmICghc2l6ZS5pc0VtcHR5KCkpCiAg ICAgICAgICAgICByZXR1cm4gc2l6ZTsKICAgICB9CiAKLSAgICBpZiAodmlkZW8tPnNob3VsZERp c3BsYXlQb3N0ZXJJbWFnZSgpICYmICFtX2NhY2hlZEltYWdlU2l6ZS5pc0VtcHR5KCkgJiYgIWlt YWdlUmVzb3VyY2UoKS0+ZXJyb3JPY2N1cnJlZCgpKQorICAgIGlmICh2aWRlb0VsZW1lbnQoKS5z aG91bGREaXNwbGF5UG9zdGVySW1hZ2UoKSAmJiAhbV9jYWNoZWRJbWFnZVNpemUuaXNFbXB0eSgp ICYmICFpbWFnZVJlc291cmNlKCktPmVycm9yT2NjdXJyZWQoKSkKICAgICAgICAgcmV0dXJuIG1f Y2FjaGVkSW1hZ2VTaXplOwogCiAgICAgLy8gV2hlbiB0aGUgbmF0dXJhbCBzaXplIG9mIHRoZSB2 aWRlbyBpcyB1bmF2YWlsYWJsZSwgd2UgdXNlIHRoZSBwcm92aWRlZAogICAgIC8vIHdpZHRoIGFu ZCBoZWlnaHQgYXR0cmlidXRlcyBvZiB0aGUgdmlkZW8gZWxlbWVudCBhcyB0aGUgaW50cmluc2lj IHNpemUgdW50aWwKLSAgICAvLyBiZXR0ZXIgdmFsdWVzIGJlY29tZSBhdmFpbGFibGUuIAotICAg IGlmICh2aWRlby0+aGFzQXR0cmlidXRlKHdpZHRoQXR0cikgJiYgdmlkZW8tPmhhc0F0dHJpYnV0 ZShoZWlnaHRBdHRyKSkKLSAgICAgICAgcmV0dXJuIExheW91dFNpemUodmlkZW8tPndpZHRoKCks IHZpZGVvLT5oZWlnaHQoKSk7CisgICAgLy8gYmV0dGVyIHZhbHVlcyBiZWNvbWUgYXZhaWxhYmxl LgorICAgIGlmICh2aWRlb0VsZW1lbnQoKS5oYXNBdHRyaWJ1dGUod2lkdGhBdHRyKSAmJiB2aWRl b0VsZW1lbnQoKS5oYXNBdHRyaWJ1dGUoaGVpZ2h0QXR0cikpCisgICAgICAgIHJldHVybiBMYXlv dXRTaXplKHZpZGVvRWxlbWVudCgpLndpZHRoKCksIHZpZGVvRWxlbWVudCgpLmhlaWdodCgpKTsK IAogICAgIC8vIDx2aWRlbz4gaW4gc3RhbmRhbG9uZSBtZWRpYSBkb2N1bWVudHMgc2hvdWxkIG5v dCB1c2UgdGhlIGRlZmF1bHQgMzAweDE1MAogICAgIC8vIHNpemUgc2luY2UgdGhleSBhbHNvIGhh dmUgYXVkaW8tb25seSBmaWxlcy4gQnkgc2V0dGluZyB0aGUgaW50cmluc2ljCiAgICAgLy8gc2l6 ZSB0byAzMDB4MSB0aGUgdmlkZW8gd2lsbCByZXNpemUgaXRzZWxmIGluIHRoZXNlIGNhc2VzLCBh bmQgYXVkaW8gd2lsbAogICAgIC8vIGhhdmUgdGhlIGNvcnJlY3QgaGVpZ2h0IChpdCBuZWVkcyB0 byBiZSA+IDAgZm9yIGNvbnRyb2xzIHRvIHJlbmRlciBwcm9wZXJseSkuCi0gICAgaWYgKHZpZGVv LT5kb2N1bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKQorICAgIGlmICh2aWRlb0VsZW1lbnQoKS5k b2N1bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKQogICAgICAgICByZXR1cm4gTGF5b3V0U2l6ZShk ZWZhdWx0U2l6ZSgpLndpZHRoKCksIDEpOwogCiAgICAgcmV0dXJuIGRlZmF1bHRTaXplKCk7CkBA IC0xNDEsNyArMTM5LDcgQEAgdm9pZCBSZW5kZXJWaWRlbzo6aW1hZ2VDaGFuZ2VkKFdyYXBwZWRJ bWFnZVB0ciBuZXdJbWFnZSwgY29uc3QgSW50UmVjdCogcmVjdCkKICAgICAvLyBDYWNoZSB0aGUg aW1hZ2UgaW50cmluc2ljIHNpemUgc28gd2UgY2FuIGNvbnRpbnVlIHRvIHVzZSBpdCB0byBkcmF3 IHRoZSBpbWFnZSBjb3JyZWN0bHkKICAgICAvLyBldmVuIGlmIHdlIGtub3cgdGhlIHZpZGVvIGlu dHJpbnNpYyBzaXplIGJ1dCBhcmVuJ3QgYWJsZSB0byBkcmF3IHZpZGVvIGZyYW1lcyB5ZXQKICAg ICAvLyAod2UgZG9uJ3Qgd2FudCB0byBzY2FsZSB0aGUgcG9zdGVyIHRvIHRoZSB2aWRlbyBzaXpl IHdpdGhvdXQga2VlcGluZyBhc3BlY3QgcmF0aW8pLgotICAgIGlmICh2aWRlb0VsZW1lbnQoKS0+ c2hvdWxkRGlzcGxheVBvc3RlckltYWdlKCkpCisgICAgaWYgKHZpZGVvRWxlbWVudCgpLnNob3Vs ZERpc3BsYXlQb3N0ZXJJbWFnZSgpKQogICAgICAgICBtX2NhY2hlZEltYWdlU2l6ZSA9IGludHJp bnNpY1NpemUoKTsKIAogICAgIC8vIFRoZSBpbnRyaW5zaWMgc2l6ZSBpcyBub3cgdGhhdCBvZiB0 aGUgaW1hZ2UsIGJ1dCBpbiBjYXNlIHdlIGFscmVhZHkgaGFkIHRoZQpAQCAtMTUzLDcgKzE1MSw3 IEBAIEludFJlY3QgUmVuZGVyVmlkZW86OnZpZGVvQm94KCkgY29uc3QKIHsKICAgICBMYXlvdXRT aXplIGludHJpbnNpY1NpemUgPSB0aGlzLT5pbnRyaW5zaWNTaXplKCk7CiAKLSAgICBpZiAodmlk ZW9FbGVtZW50KCktPnNob3VsZERpc3BsYXlQb3N0ZXJJbWFnZSgpKQorICAgIGlmICh2aWRlb0Vs ZW1lbnQoKS5zaG91bGREaXNwbGF5UG9zdGVySW1hZ2UoKSkKICAgICAgICAgaW50cmluc2ljU2l6 ZSA9IG1fY2FjaGVkSW1hZ2VTaXplOwogCiAgICAgcmV0dXJuIHBpeGVsU25hcHBlZEludFJlY3Qo cmVwbGFjZWRDb250ZW50UmVjdChpbnRyaW5zaWNTaXplKSk7CkBAIC0xNjEsMTMgKzE1OSwxMyBA QCBJbnRSZWN0IFJlbmRlclZpZGVvOjp2aWRlb0JveCgpIGNvbnN0CiAKIGJvb2wgUmVuZGVyVmlk ZW86OnNob3VsZERpc3BsYXlWaWRlbygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICF2aWRlb0VsZW1l bnQoKS0+c2hvdWxkRGlzcGxheVBvc3RlckltYWdlKCk7CisgICAgcmV0dXJuICF2aWRlb0VsZW1l bnQoKS5zaG91bGREaXNwbGF5UG9zdGVySW1hZ2UoKTsKIH0KIAogdm9pZCBSZW5kZXJWaWRlbzo6 cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBh aW50T2Zmc2V0KQogewotICAgIE1lZGlhUGxheWVyKiBtZWRpYVBsYXllciA9IG1lZGlhRWxlbWVu dCgpLT5wbGF5ZXIoKTsKLSAgICBib29sIGRpc3BsYXlpbmdQb3N0ZXIgPSB2aWRlb0VsZW1lbnQo KS0+c2hvdWxkRGlzcGxheVBvc3RlckltYWdlKCk7CisgICAgTWVkaWFQbGF5ZXIqIG1lZGlhUGxh eWVyID0gdmlkZW9FbGVtZW50KCkucGxheWVyKCk7CisgICAgYm9vbCBkaXNwbGF5aW5nUG9zdGVy ID0gdmlkZW9FbGVtZW50KCkuc2hvdWxkRGlzcGxheVBvc3RlckltYWdlKCk7CiAKICAgICBQYWdl KiBwYWdlID0gZnJhbWUoKS5wYWdlKCk7CiAKQEAgLTIxMSw5ICsyMDksOSBAQCB2b2lkIFJlbmRl clZpZGVvOjpsYXlvdXQoKQogICAgIHVwZGF0ZVBsYXllcigpOwogfQogICAgIAotSFRNTFZpZGVv RWxlbWVudCogUmVuZGVyVmlkZW86OnZpZGVvRWxlbWVudCgpIGNvbnN0CitIVE1MVmlkZW9FbGVt ZW50JiBSZW5kZXJWaWRlbzo6dmlkZW9FbGVtZW50KCkgY29uc3QKIHsKLSAgICByZXR1cm4gdG9I VE1MVmlkZW9FbGVtZW50KGVsZW1lbnQoKSk7IAorICAgIHJldHVybiB0b0hUTUxWaWRlb0VsZW1l bnQoUmVuZGVyTWVkaWE6Om1lZGlhRWxlbWVudCgpKTsKIH0KIAogdm9pZCBSZW5kZXJWaWRlbzo6 dXBkYXRlRnJvbUVsZW1lbnQoKQpAQCAtMjI5LDExICsyMjcsMTEgQEAgdm9pZCBSZW5kZXJWaWRl bzo6dXBkYXRlUGxheWVyKCkKIAogICAgIHVwZGF0ZUludHJpbnNpY1NpemUoKTsKIAotICAgIE1l ZGlhUGxheWVyKiBtZWRpYVBsYXllciA9IG1lZGlhRWxlbWVudCgpLT5wbGF5ZXIoKTsKKyAgICBN ZWRpYVBsYXllciogbWVkaWFQbGF5ZXIgPSB2aWRlb0VsZW1lbnQoKS5wbGF5ZXIoKTsKICAgICBp ZiAoIW1lZGlhUGxheWVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIXZpZGVvRWxlbWVu dCgpLT5pbkFjdGl2ZURvY3VtZW50KCkpIHsKKyAgICBpZiAoIXZpZGVvRWxlbWVudCgpLmluQWN0 aXZlRG9jdW1lbnQoKSkgewogICAgICAgICBtZWRpYVBsYXllci0+c2V0VmlzaWJsZShmYWxzZSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yNjcsMjQgKzI2NSwyMSBAQCBMYXlvdXRVbml0 IFJlbmRlclZpZGVvOjptaW5pbXVtUmVwbGFjZWRIZWlnaHQoKSBjb25zdAogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKIGJvb2wgUmVuZGVyVmlkZW86OnN1cHBvcnRzQWNjZWxlcmF0 ZWRSZW5kZXJpbmcoKSBjb25zdAogewotICAgIE1lZGlhUGxheWVyKiBwID0gbWVkaWFFbGVtZW50 KCktPnBsYXllcigpOwotICAgIGlmIChwKQotICAgICAgICByZXR1cm4gcC0+c3VwcG9ydHNBY2Nl bGVyYXRlZFJlbmRlcmluZygpOwotCisgICAgaWYgKE1lZGlhUGxheWVyKiBwbGF5ZXIgPSB2aWRl b0VsZW1lbnQoKS5wbGF5ZXIoKSkKKyAgICAgICAgcmV0dXJuIHBsYXllci0+c3VwcG9ydHNBY2Nl bGVyYXRlZFJlbmRlcmluZygpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBSZW5kZXJW aWRlbzo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKQogewotICAgIE1lZGlhUGxh eWVyKiBwID0gbWVkaWFFbGVtZW50KCktPnBsYXllcigpOwotICAgIGlmIChwKQotICAgICAgICBw LT5hY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpOworICAgIGlmIChNZWRpYVBsYXll ciogcGxheWVyID0gdmlkZW9FbGVtZW50KCkucGxheWVyKCkpCisgICAgICAgIHBsYXllci0+YWNj ZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKTsKIH0KICNlbmRpZiAgLy8gVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogCiBib29sIFJlbmRlclZpZGVvOjpyZXF1aXJlc0ltbWVkaWF0 ZUNvbXBvc2l0aW5nKCkgY29uc3QKIHsKLSAgICBNZWRpYVBsYXllciogcGxheWVyID0gbWVkaWFF bGVtZW50KCktPnBsYXllcigpOworICAgIE1lZGlhUGxheWVyKiBwbGF5ZXIgPSB2aWRlb0VsZW1l bnQoKS5wbGF5ZXIoKTsKICAgICByZXR1cm4gcGxheWVyICYmIHBsYXllci0+cmVxdWlyZXNJbW1l ZGlhdGVDb21wb3NpdGluZygpOwogfQogCkBAIC0zMzMsMTMgKzMyOCwxMyBAQCBMYXlvdXRVbml0 IFJlbmRlclZpZGVvOjpvZmZzZXRIZWlnaHQoKSBjb25zdAogCiBib29sIFJlbmRlclZpZGVvOjpm b3JlZ3JvdW5kSXNLbm93blRvQmVPcGFxdWVJblJlY3QoY29uc3QgTGF5b3V0UmVjdCYgbG9jYWxS ZWN0LCB1bnNpZ25lZCBtYXhEZXB0aFRvVGVzdCkgY29uc3QKIHsKLSAgICBpZiAodmlkZW9FbGVt ZW50KCktPnNob3VsZERpc3BsYXlQb3N0ZXJJbWFnZSgpKQorICAgIGlmICh2aWRlb0VsZW1lbnQo KS5zaG91bGREaXNwbGF5UG9zdGVySW1hZ2UoKSkKICAgICAgICAgcmV0dXJuIFJlbmRlckltYWdl Ojpmb3JlZ3JvdW5kSXNLbm93blRvQmVPcGFxdWVJblJlY3QobG9jYWxSZWN0LCBtYXhEZXB0aFRv VGVzdCk7CiAKICAgICBpZiAoIXZpZGVvQm94KCkuY29udGFpbnMoZW5jbG9zaW5nSW50UmVjdChs b2NhbFJlY3QpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKE1lZGlhUGxheWVy KiBwbGF5ZXIgPSBtZWRpYUVsZW1lbnQoKS0+cGxheWVyKCkpCisgICAgaWYgKE1lZGlhUGxheWVy KiBwbGF5ZXIgPSB2aWRlb0VsZW1lbnQoKS5wbGF5ZXIoKSkKICAgICAgICAgcmV0dXJuIHBsYXll ci0+aGFzQXZhaWxhYmxlVmlkZW9GcmFtZSgpOwogCiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uaAppbmRleCAxYTkxMjhiLi42MDc1MmMwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uaApAQCAtMzEsMTUgKzMxLDE2IEBACiAj aW5jbHVkZSAiUmVuZGVyTWVkaWEuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewotICAgIAotY2xh c3MgSFRNTE1lZGlhRWxlbWVudDsKKwogY2xhc3MgSFRNTFZpZGVvRWxlbWVudDsKIAogY2xhc3Mg UmVuZGVyVmlkZW8gRklOQUwgOiBwdWJsaWMgUmVuZGVyTWVkaWEgewogcHVibGljOgotICAgIFJl bmRlclZpZGVvKEhUTUxWaWRlb0VsZW1lbnQqKTsKKyAgICBleHBsaWNpdCBSZW5kZXJWaWRlbyhI VE1MVmlkZW9FbGVtZW50Jik7CiAgICAgdmlydHVhbCB+UmVuZGVyVmlkZW8oKTsKIAorICAgIEhU TUxWaWRlb0VsZW1lbnQmIHZpZGVvRWxlbWVudCgpIGNvbnN0OworCiAgICAgSW50UmVjdCB2aWRl b0JveCgpIGNvbnN0OwogCiAgICAgc3RhdGljIEludFNpemUgZGVmYXVsdFNpemUoKTsKQEAgLTU0 LDggKzU1LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGREaXNwbGF5VmlkZW8o KSBjb25zdDsKIAogcHJpdmF0ZToKKyAgICB2b2lkIG1lZGlhRWxlbWVudCgpIGNvbnN0IFdURl9E RUxFVEVEX0ZVTkNUSU9OOworCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7 Ci0gICAgaW5saW5lIEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvRWxlbWVudCgpIGNvbnN0OwogCiAg ICAgdmlydHVhbCB2b2lkIGludHJpbnNpY1NpemVDaGFuZ2VkKCk7CiAgICAgTGF5b3V0U2l6ZSBj YWxjdWxhdGVJbnRyaW5zaWNTaXplKCk7Cg==