46860 2010-09-29 17:36:47 -0700 Plumb accelerated compositing prefs through WebKit2 2010-10-14 17:37:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 287255 0 simon.fraser 2010-09-29 17:36:47 -0700 Need to have the accelerated compositing prefs work in WebKit2 287256 1 simon.fraser 2010-09-29 17:37:05 -0700 <rdar://problem/8495312> 294492 2 70809 simon.fraser 2010-10-14 17:34:38 -0700 Created attachment 70809 Patch 294493 3 70809 simon.fraser 2010-10-14 17:35:03 -0700 Comment on attachment 70809 Patch sam reviewed this in person. 294496 4 simon.fraser 2010-10-14 17:37:25 -0700 http://trac.webkit.org/changeset/69826 70809 2010-10-14 17:34:38 -0700 2010-10-14 17:35:02 -0700 Patch bug-46860-20101014173437.patch text/plain 14780 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZDQ4OGFmZWU5YzRkMjhhOTk5OTU1YzFlOTZhNGExYzM3NDZiOWZhNi4uYWZmZGEzMjdlZDZiODdm ZmNmNjQ4NWIyMzE5MTE0OWRjYTUzOTI1NSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MSBAQAorMjAxMC0xMC0xNCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBTYW0gV2VpbmlnLgorCisgICAgICAgIFBsdW1iIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIHBy ZWZzIHRocm91Z2ggV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDY4NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0OTUzMTI+CisgICAg ICAgIAorICAgICAgICBXaXJlIHVwIHRoZSBwcmVmcyB0byBlbmFibGUgYWNjZWxlcmF0ZWQgY29t cG9zaXRpbmcsIGFuZAorICAgICAgICBzaG93IGRlYnVnIGJvcmRlcnMgYW5kIHJlcGFpbnQgY291 bnRlcnMuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OldlYlByZWZlcmVuY2VzU3RvcmUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjplbmNvZGUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9X ZWJQcmVmZXJlbmNlc1N0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXNQcml2YXRlLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0QWNjZWxlcmF0ZWRD b21wb3NpdGluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldENvbXBvc2l0aW5n Qm9yZGVyc1Zpc2libGUpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldENvbXBvc2l0aW5nQm9y ZGVyc1Zpc2libGUpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldENvbXBvc2l0aW5nUmVwYWlu dENvdW50ZXJzVmlzaWJsZSk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0Q29tcG9zaXRpbmdS ZXBhaW50Q291bnRlcnNWaXNpYmxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6c2V0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ0VuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6YWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6 c2V0Q29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZl cmVuY2VzOjpjb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJlZmVyZW5jZXM6OnNldENvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpjb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zp c2libGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6V2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnByZWZlcmVuY2VzRGlkQ2hh bmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisKIDIwMTAtMTAtMTQgIEFkYSBD aGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5p Zy4KZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwIGIv V2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAKaW5kZXggN2Y4MTRmNTk4NDlh OWMxN2U4MWZhZDY4ZTFmZDU1ZjQ5OTc1ODc2MC4uZTI5OWEyZTQwZmFiMWY4MDg0NDI4Y2IyOTJj ZDJjZWRjYzI2YWIyMiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNT dG9yZS5jcHAKKysrIGIvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAKQEAg LTQwLDYgKzQwLDkgQEAgV2ViUHJlZmVyZW5jZXNTdG9yZTo6V2ViUHJlZmVyZW5jZXNTdG9yZSgp CiAgICAgLCBsb2NhbFN0b3JhZ2VFbmFibGVkKHRydWUpCiAgICAgLCB4c3NBdWRpdG9yRW5hYmxl ZCh0cnVlKQogICAgICwgZnJhbWVGbGF0dGVuaW5nRW5hYmxlZChmYWxzZSkKKyAgICAsIGFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKHRydWUpCisgICAgLCBjb21wb3NpdGluZ0JvcmRlcnNW aXNpYmxlKGZhbHNlKQorICAgICwgY29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlKGZh bHNlKQogICAgICwgZm9udFNtb290aGluZ0xldmVsKEZvbnRTbW9vdGhpbmdMZXZlbE1lZGl1bSkK ICAgICAsIG1pbmltdW1Gb250U2l6ZSgxKQogICAgICwgbWluaW11bUxvZ2ljYWxGb250U2l6ZSg5 KQpAQCAtODMsNiArODYsOSBAQCB2b2lkIFdlYlByZWZlcmVuY2VzU3RvcmU6OmVuY29kZShDb3Jl SVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci0+ZW5jb2Rl KGZpeGVkRm9udEZhbWlseSk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHNhbnNTZXJpZkZvbnRGYW1p bHkpOwogICAgIGVuY29kZXItPmVuY29kZShzZXJpZkZvbnRGYW1pbHkpOworICAgIGVuY29kZXIt PmVuY29kZShhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7CisgICAgZW5jb2Rlci0+ZW5j b2RlKGNvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGUpOworICAgIGVuY29kZXItPmVuY29kZShjb21w b3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUpOwogfQogCiBib29sIFdlYlByZWZlcmVuY2Vz U3RvcmU6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdlYlByZWZl cmVuY2VzU3RvcmUmIHMpCkBAIC0xMjMsNiArMTI5LDEyIEBAIGJvb2wgV2ViUHJlZmVyZW5jZXNT dG9yZTo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViUHJlZmVy ZW5jCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShzLnNl cmlmRm9udEZhbWlseSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShzLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKSkKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHMuY29tcG9zaXRpbmdCb3JkZXJzVmlz aWJsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShz LmNvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZSkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIGlmIChoYXNYU1NBdWRpdG9yRW5hYmxlZFRlc3RSdW5uZXJPdmVycmlkZSkKICAg ICAgICAgcy54c3NBdWRpdG9yRW5hYmxlZCA9IHhzc0F1ZGl0b3JFbmFibGVkVGVzdFJ1bm5lck92 ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5o IGIvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCmluZGV4IDZiMGNhZjRkNzk0 ZTM2ZGJmYzhhZTUyODNkZGNhYjk1NWY0YWU4OGMuLjQ3OTMzZGQzMGY0ZDc0ZTEyZTE2MGJkMmJi NDFkYTlmNWI5MTBiNmQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2Vz U3RvcmUuaAorKysgYi9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKQEAgLTUw LDYgKzUwLDEwIEBAIHN0cnVjdCBXZWJQcmVmZXJlbmNlc1N0b3JlIHsKICAgICBib29sIHhzc0F1 ZGl0b3JFbmFibGVkOwogICAgIGJvb2wgZnJhbWVGbGF0dGVuaW5nRW5hYmxlZDsKIAorICAgIGJv b2wgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ7CisgICAgYm9vbCBjb21wb3NpdGluZ0Jv cmRlcnNWaXNpYmxlOworICAgIGJvb2wgY29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxl OworCiAgICAgdWludDMyX3QgZm9udFNtb290aGluZ0xldmVsOwogCiAgICAgdWludDMyX3QgbWlu aW11bUZvbnRTaXplOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlc1ByaXZhdGUuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuY3BwCmluZGV4IDBiZmQwOWMyMzYxYTQxOGY4MGY2MjY3OWEzZGQzNjI2ZTc3YThk MDUuLjc2ZmNjOTU5MjNmZmQyYTEzODE1NDVjYzlhMGFjOWJlYzE4ZTQxYmMgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmNwcAorKysgYi9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5jcHAKQEAgLTgzLDMg KzgzLDMyIEBAIFdLRm9udFNtb290aGluZ0xldmVsIFdLUHJlZmVyZW5jZXNHZXRGb250U21vb3Ro aW5nTGV2ZWwoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlCiAgICAgcmV0dXJuIGtXS0ZvbnRTbW9v dGhpbmdMZXZlbE1lZGl1bTsKIH0KIAordm9pZCBXS1ByZWZlcmVuY2VzU2V0QWNjZWxlcmF0ZWRD b21wb3NpdGluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBm bGFnKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdFbmFibGVkKGZsYWcpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQorewor ICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5hY2NlbGVyYXRlZENvbXBvc2l0aW5n RW5hYmxlZCgpOworfQorCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRDb21wb3NpdGluZ0JvcmRlcnNW aXNpYmxlKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKK3sKKyAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlKGZs YWcpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxl KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChw cmVmZXJlbmNlc1JlZiktPmNvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGUoKTsKK30KKwordm9pZCBX S1ByZWZlcmVuY2VzU2V0Q29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlKFdLUHJlZmVy ZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKK3sKKyAgICB0b0ltcGwocHJlZmVy ZW5jZXNSZWYpLT5zZXRDb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoZmxhZyk7Cit9 CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldENvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJs ZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b0ltcGwo cHJlZmVyZW5jZXNSZWYpLT5jb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoKTsKK30K ZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4 IDA2Nzc4M2JhZTRjNDQ5ZGViMTQzY2Y0ZWFmNjZkNTJkNmYwNTdkMzUuLjdhZjgxNDBlYTUxNTcx MWNjMTk1YWVhODgzMDEwYWIyODkwYWU3NWMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaApAQCAtNDcsNiArNDcsMTggQEAgdHlwZWRlZiBlbnVt IFdLRm9udFNtb290aGluZ0xldmVsIFdLRm9udFNtb290aGluZ0xldmVsOwogV0tfRVhQT1JUIHZv aWQgV0tQcmVmZXJlbmNlc1NldEZvbnRTbW9vdGhpbmdMZXZlbChXS1ByZWZlcmVuY2VzUmVmLCBX S0ZvbnRTbW9vdGhpbmdMZXZlbCk7CiBXS19FWFBPUlQgV0tGb250U21vb3RoaW5nTGV2ZWwgV0tQ cmVmZXJlbmNlc0dldEZvbnRTbW9vdGhpbmdMZXZlbChXS1ByZWZlcmVuY2VzUmVmKTsKIAorLy8g RGVmYXVsdHMgdG8gdHJ1ZS4KK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKK1dLX0VYUE9S VCBib29sIFdLUHJlZmVyZW5jZXNHZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmKTsKKworLy8gRGVmYXVsdHMgdG8gZmFsc2UuCitXS19FWFBPUlQgdm9pZCBX S1ByZWZlcmVuY2VzU2V0Q29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZShXS1ByZWZlcmVuY2VzUmVm LCBib29sKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRDb21wb3NpdGluZ0JvcmRl cnNWaXNpYmxlKFdLUHJlZmVyZW5jZXNSZWYpOworCisvLyBEZWZhdWx0cyB0byBmYWxzZS4KK1dL X0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRDb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zp c2libGUoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVu Y2VzR2V0Q29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlKFdLUHJlZmVyZW5jZXNSZWYp OworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVy ZW5jZXMuY3BwCmluZGV4IGFlZTg0OGM5ODVlN2M1MTdiNzAwMzEyMzRhODhhZGYzZTNiNzBlMjYu LjdjOWI5ZTc4YjlkMjg0YjYxZDkyYjcxNDE1YzI4ZTZiMThkOThlOGQgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcmVmZXJlbmNlcy5jcHAKQEAgLTIxOCw1ICsyMTgsMzggQEAgY29uc3QgU3RyaW5nJiBX ZWJQcmVmZXJlbmNlczo6ZmFudGFzeUZvbnRGYW1pbHkoKSBjb25zdAogICAgIHJldHVybiBtX3N0 b3JlLmZhbnRhc3lGb250RmFtaWx5OwogfQogCit2b2lkIFdlYlByZWZlcmVuY2VzOjpzZXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChib29sIGZsYWcpCit7CisgICAgbV9zdG9yZS5hY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCA9IGZsYWc7CisgICAgdXBkYXRlKCk7Cit9CisKK2Jv b2wgV2ViUHJlZmVyZW5jZXM6OmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9zdG9yZS5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZDsKK30K Kwordm9pZCBXZWJQcmVmZXJlbmNlczo6c2V0Q29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZShib29s IGZsYWcpCit7CisgICAgbV9zdG9yZS5jb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlID0gZmxhZzsK KyAgICB1cGRhdGUoKTsKK30KKworYm9vbCBXZWJQcmVmZXJlbmNlczo6Y29tcG9zaXRpbmdCb3Jk ZXJzVmlzaWJsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc3RvcmUuY29tcG9zaXRpbmdCb3Jk ZXJzVmlzaWJsZTsKK30KKwordm9pZCBXZWJQcmVmZXJlbmNlczo6c2V0Q29tcG9zaXRpbmdSZXBh aW50Q291bnRlcnNWaXNpYmxlKGJvb2wgZmxhZykKK3sKKyAgICBtX3N0b3JlLmNvbXBvc2l0aW5n UmVwYWludENvdW50ZXJzVmlzaWJsZSA9IGZsYWc7CisgICAgdXBkYXRlKCk7Cit9CisKK2Jvb2wg V2ViUHJlZmVyZW5jZXM6OmNvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fc3RvcmUuY29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxl OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJlZmVyZW5jZXMuaCBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2Vz LmgKaW5kZXggYzE4ZDU4Njg1MjEzMjA3OTE5NTg1YmE0NTM4NzExMjQyZDdjNTVhNy4uYjYwNTMx NmJkNzM1ZWEzMTE1ZjMzYTJjMDdjMzI5NDdmMTA4YWFiOSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVm ZXJlbmNlcy5oCkBAIC0xMDAsNiArMTAwLDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEZhbnRh c3lGb250RmFtaWx5KGNvbnN0IFN0cmluZyYpOwogICAgIGNvbnN0IFN0cmluZyYgZmFudGFzeUZv bnRGYW1pbHkoKSBjb25zdDsKIAorICAgIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWQoYm9vbCk7CisgICAgYm9vbCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpIGNv bnN0OworCisgICAgdm9pZCBzZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlKGJvb2wpOworICAg IGJvb2wgY29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSgpIGNvbnN0OworCisgICAgdm9pZCBzZXRD b21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoYm9vbCk7CisgICAgYm9vbCBjb21wb3Np dGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoKSBjb25zdDsKKyAgICAKIHByaXZhdGU6CiAgICAg V2ViUHJlZmVyZW5jZXMoKTsKICAgICBXZWJQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyopOwpk aWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBmYjc0MDRlOWJlZjYwYTJj Y2IyZjJmOGI2Nzk3NjY5NjA5NTAwYTFkLi42MGEyMThjNjJmYWNjZmMwYWU3ZjViOWE2NTUyNzg0 MjU5ZTIwMzYxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTE5 LDI0ICsxMTksNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICBwYWdlQ2xpZW50cy5iYWNr Rm9yd2FyZENvbnRyb2xsZXJDbGllbnQgPSBuZXcgV2ViQmFja0ZvcndhcmRDb250cm9sbGVyQ2xp ZW50KHRoaXMpOwogICAgIG1fcGFnZSA9IGFkb3B0UHRyKG5ldyBQYWdlKHBhZ2VDbGllbnRzKSk7 CiAKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldEphdmFTY3JpcHRFbmFibGVkKHBhcmFtZXRl cnMuc3RvcmUuamF2YVNjcmlwdEVuYWJsZWQpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0 TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHBhcmFtZXRlcnMuc3RvcmUubG9hZHNJbWFnZXNBdXRv bWF0aWNhbGx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFBsdWdpbnNFbmFibGVkKHBh cmFtZXRlcnMuc3RvcmUucGx1Z2luc0VuYWJsZWQpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+ c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKHBhcmFtZXRlcnMuc3RvcmUub2Zm bGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCkt PnNldExvY2FsU3RvcmFnZUVuYWJsZWQocGFyYW1ldGVycy5zdG9yZS5sb2NhbFN0b3JhZ2VFbmFi bGVkKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFhTU0F1ZGl0b3JFbmFibGVkKHBhcmFt ZXRlcnMuc3RvcmUueHNzQXVkaXRvckVuYWJsZWQpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+ c2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZChwYXJhbWV0ZXJzLnN0b3JlLmZyYW1lRmxhdHRlbmlu Z0VuYWJsZWQpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0TWluaW11bUZvbnRTaXplKHBh cmFtZXRlcnMuc3RvcmUubWluaW11bUZvbnRTaXplKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCkt PnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUocGFyYW1ldGVycy5zdG9yZS5taW5pbXVtTG9naWNh bEZvbnRTaXplKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldERlZmF1bHRGb250U2l6ZShw YXJhbWV0ZXJzLnN0b3JlLmRlZmF1bHRGb250U2l6ZSk7Ci0gICAgbV9wYWdlLT5zZXR0aW5ncygp LT5zZXREZWZhdWx0Rml4ZWRGb250U2l6ZShwYXJhbWV0ZXJzLnN0b3JlLmRlZmF1bHRGaXhlZEZv bnRTaXplKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFN0YW5kYXJkRm9udEZhbWlseShw YXJhbWV0ZXJzLnN0b3JlLnN0YW5kYXJkRm9udEZhbWlseSk7Ci0gICAgbV9wYWdlLT5zZXR0aW5n cygpLT5zZXRDdXJzaXZlRm9udEZhbWlseShwYXJhbWV0ZXJzLnN0b3JlLmN1cnNpdmVGb250RmFt aWx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldEZhbnRhc3lGb250RmFtaWx5KHBhcmFt ZXRlcnMuc3RvcmUuZmFudGFzeUZvbnRGYW1pbHkpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+ c2V0Rml4ZWRGb250RmFtaWx5KHBhcmFtZXRlcnMuc3RvcmUuZml4ZWRGb250RmFtaWx5KTsKLSAg ICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFNhbnNTZXJpZkZvbnRGYW1pbHkocGFyYW1ldGVycy5z dG9yZS5zYW5zU2VyaWZGb250RmFtaWx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFNl cmlmRm9udEZhbWlseShwYXJhbWV0ZXJzLnN0b3JlLnNlcmlmRm9udEZhbWlseSk7Ci0gICAgbV9w YWdlLT5zZXR0aW5ncygpLT5zZXRKYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5 KHRydWUpOworICAgIHVwZGF0ZVByZWZlcmVuY2VzKHBhcmFtZXRlcnMuc3RvcmUpOwogCiAgICAg bV9wYWdlLT5zZXRHcm91cE5hbWUoIldlYktpdDJHcm91cCIpOwogICAgIApAQCAtNjkwLDIxICs2 NzMsMzYgQEAgdm9pZCBXZWJQYWdlOjpnZXRTb3VyY2VGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBjYWxsYmFja0lEKQogdm9pZCBXZWJQYWdlOjpwcmVmZXJlbmNlc0RpZENoYW5n ZShjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKIHsKICAgICBXZWJQcmVmZXJlbmNl c1N0b3JlOjpyZW1vdmVUZXN0UnVubmVyT3ZlcnJpZGVzKCk7CisgICAgdXBkYXRlUHJlZmVyZW5j ZXMoc3RvcmUpOworfQogCi0gICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRKYXZhU2NyaXB0RW5h YmxlZChzdG9yZS5qYXZhU2NyaXB0RW5hYmxlZCk7Ci0gICAgbV9wYWdlLT5zZXR0aW5ncygpLT5z ZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoc3RvcmUubG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5 KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFBsdWdpbnNFbmFibGVkKHN0b3JlLnBsdWdp bnNFbmFibGVkKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldE9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlRW5hYmxlZChzdG9yZS5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQp OwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChzdG9yZS5s b2NhbFN0b3JhZ2VFbmFibGVkKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFhTU0F1ZGl0 b3JFbmFibGVkKHN0b3JlLnhzc0F1ZGl0b3JFbmFibGVkKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdz KCktPnNldEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoc3RvcmUuZnJhbWVGbGF0dGVuaW5nRW5hYmxl ZCk7Ci0gICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoc3RvcmUu c3RhbmRhcmRGb250RmFtaWx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldEN1cnNpdmVG b250RmFtaWx5KHN0b3JlLmN1cnNpdmVGb250RmFtaWx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdz KCktPnNldEZhbnRhc3lGb250RmFtaWx5KHN0b3JlLmZhbnRhc3lGb250RmFtaWx5KTsKLSAgICBt X3BhZ2UtPnNldHRpbmdzKCktPnNldEZpeGVkRm9udEZhbWlseShzdG9yZS5maXhlZEZvbnRGYW1p bHkpOwotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0U2Fuc1NlcmlmRm9udEZhbWlseShzdG9y ZS5zYW5zU2VyaWZGb250RmFtaWx5KTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFNlcmlm Rm9udEZhbWlseShzdG9yZS5zZXJpZkZvbnRGYW1pbHkpOwotCit2b2lkIFdlYlBhZ2U6OnVwZGF0 ZVByZWZlcmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQoreworICAgIFNl dHRpbmdzKiBzZXR0aW5ncyA9IG1fcGFnZS0+c2V0dGluZ3MoKTsKKyAgICAKKyAgICBzZXR0aW5n cy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoc3RvcmUuamF2YVNjcmlwdEVuYWJsZWQpOworICAgIHNl dHRpbmdzLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoc3RvcmUubG9hZHNJbWFnZXNBdXRv bWF0aWNhbGx5KTsKKyAgICBzZXR0aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQoc3RvcmUucGx1Z2lu c0VuYWJsZWQpOworICAgIHNldHRpbmdzLT5zZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVu YWJsZWQoc3RvcmUub2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsKKyAgICBzZXR0 aW5ncy0+c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChzdG9yZS5sb2NhbFN0b3JhZ2VFbmFibGVkKTsK KyAgICBzZXR0aW5ncy0+c2V0WFNTQXVkaXRvckVuYWJsZWQoc3RvcmUueHNzQXVkaXRvckVuYWJs ZWQpOworICAgIHNldHRpbmdzLT5zZXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVkKHN0b3JlLmZyYW1l RmxhdHRlbmluZ0VuYWJsZWQpOworICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtRm9udFNpemUoc3Rv cmUubWluaW11bUZvbnRTaXplKTsKKyAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250 U2l6ZShzdG9yZS5taW5pbXVtTG9naWNhbEZvbnRTaXplKTsKKyAgICBzZXR0aW5ncy0+c2V0RGVm YXVsdEZvbnRTaXplKHN0b3JlLmRlZmF1bHRGb250U2l6ZSk7CisgICAgc2V0dGluZ3MtPnNldERl ZmF1bHRGaXhlZEZvbnRTaXplKHN0b3JlLmRlZmF1bHRGaXhlZEZvbnRTaXplKTsKKyAgICBzZXR0 aW5ncy0+c2V0U3RhbmRhcmRGb250RmFtaWx5KHN0b3JlLnN0YW5kYXJkRm9udEZhbWlseSk7Cisg ICAgc2V0dGluZ3MtPnNldEN1cnNpdmVGb250RmFtaWx5KHN0b3JlLmN1cnNpdmVGb250RmFtaWx5 KTsKKyAgICBzZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkoc3RvcmUuZmFudGFzeUZvbnRG YW1pbHkpOworICAgIHNldHRpbmdzLT5zZXRGaXhlZEZvbnRGYW1pbHkoc3RvcmUuZml4ZWRGb250 RmFtaWx5KTsKKyAgICBzZXR0aW5ncy0+c2V0U2Fuc1NlcmlmRm9udEZhbWlseShzdG9yZS5zYW5z U2VyaWZGb250RmFtaWx5KTsKKyAgICBzZXR0aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KHN0b3Jl LnNlcmlmRm9udEZhbWlseSk7CisgICAgc2V0dGluZ3MtPnNldEphdmFTY3JpcHRDYW5PcGVuV2lu ZG93c0F1dG9tYXRpY2FsbHkodHJ1ZSk7CisKKyAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWRD b21wb3NpdGluZ0VuYWJsZWQoc3RvcmUuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpOwor ICAgIHNldHRpbmdzLT5zZXRTaG93RGVidWdCb3JkZXJzKHN0b3JlLmNvbXBvc2l0aW5nQm9yZGVy c1Zpc2libGUpOworICAgIHNldHRpbmdzLT5zZXRTaG93UmVwYWludENvdW50ZXIoc3RvcmUuY29t cG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlKTsKKyAgICAKICAgICBwbGF0Zm9ybVByZWZl cmVuY2VzRGlkQ2hhbmdlKHN0b3JlKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCmluZGV4IDU5MmQ2ZWU3NWM1OGYxNjIyNTZiY2VhNWZiMjYyY2MyYTQ4MDQ4YTcuLjVjMmJm MTljM2RmZmFlZGI2NjBhMDkxMjk5ZmY0YTBhZTJiOTQwY2IgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgKQEAgLTIwNCw4ICsyMDQsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJ1 bkphdmFTY3JpcHRJbk1haW5GcmFtZShjb25zdCBTdHJpbmcmLCB1aW50NjRfdCBjYWxsYmFja0lE KTsKICAgICB2b2lkIGdldFJlbmRlclRyZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uKHVpbnQ2NF90 IGNhbGxiYWNrSUQpOwogICAgIHZvaWQgZ2V0U291cmNlRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgY2FsbGJhY2tJRCk7CisKICAgICB2b2lkIHByZWZlcmVuY2VzRGlkQ2hhbmdl KGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmKTsKICAgICB2b2lkIHBsYXRmb3JtUHJlZmVyZW5j ZXNEaWRDaGFuZ2UoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYpOworICAgIHZvaWQgdXBkYXRl UHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYpOworCiAgICAgdm9pZCBkaWRS ZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbGlzdGVuZXJJ RCwgdWludDMyX3QgcG9saWN5QWN0aW9uKTsKICAgICB2b2lkIHNldEN1c3RvbVVzZXJBZ2VudChj b25zdCBTdHJpbmcmKTsKIAo=