53432 2011-01-31 09:54:58 -0800 Make LayerTreeHost an abstract base class and make LayerTreeHostMac inherit from it 2011-01-31 10:08:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 342628 0 andersca 2011-01-31 09:54:58 -0800 Make LayerTreeHost an abstract base class and make LayerTreeHostMac inherit from it 342630 1 80651 andersca 2011-01-31 09:58:03 -0800 Created attachment 80651 Patch 342632 2 80651 aroben 2011-01-31 10:02:44 -0800 Comment on attachment 80651 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80651&action=review Maybe WebPorcess/WebPage/ca/LayerTreeHostCA.mm would be more appropriate? > Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp:47 > + return adoptPtr(static_cast<LayerTreeHost*>(new LayerTreeHostMac(webPage, graphicsLayer))); Is the cast really needed here? 342639 3 andersca 2011-01-31 10:08:15 -0800 Committed r77139: <http://trac.webkit.org/changeset/77139> 80651 2011-01-31 09:58:03 -0800 2011-01-31 10:02:44 -0800 Patch bug-53432-20110131095802.patch text/plain 13796 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MTM2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDEtMzEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIExheWVyVHJlZUhvc3QgYW4gYWJzdHJhY3QgYmFz ZSBjbGFzcyBhbmQgbWFrZSBMYXllclRyZWVIb3N0TWFjIGluaGVyaXQgZnJvbSBpdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM0MzIKKworICAgICAg ICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRkIExheWVy VHJlZUhvc3RNYWMuaC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJl YUltcGwuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwu aDoKKyAgICAgICAgTWFrZSBtX2xheWVyVHJlZUhvc3QgYW4gT3duUHRyIGFuZCBpbml0aWFsaXpl L2Rlc3Ryb3kgaXQgYXBwcm9wcmlhdGVseS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9MYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdDo6Y3Jl YXRlKToKKyAgICAgICAgT24gTWFjLCBjcmVhdGUgYSBMYXllclRyZWVIb3N0TWFjIGluc3RhbmNl LgorCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3Q6On5MYXllclRyZWVIb3N0KToKKyAg ICAgICAgTm8gbmVlZCB0byBjYWxsIHBsYXRmb3JtSW52YWxpZGF0ZSBhbnltb3JlLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaDogQWRkZWQuCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9MYXllclRyZWVIb3N0TWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpMYXllclRyZWVIb3N0TWFjOjp+TGF5ZXJUcmVlSG9zdE1hYyk6CisgICAgICAgIEludmFs aWRhdGUgdGhlIHJ1biBsb29wIG9ic2VydmVyIGhlcmUgaW5zdGVhZCBvZiBpbiBwbGF0Zm9ybUlu dmFsaWRhdGUuCisKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6c2NoZWR1bGVM YXllckZsdXNoKToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6Zmx1c2hQZW5k aW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2spOgorICAgICAgICBUaGVzZSBh cmUgbm93IG1lbWJlcnMgb2YgTGF5ZXJUcmVlSG9zdE1hYy4KKwogMjAxMS0wMS0zMCAgR2VvZmZy ZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCShyZXZpc2lvbiA3NzEzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTQzLDYgKzE0Myw3 IEBACiAJCTFBNjQyNTY4MTJERTQyRUMwMENBQUUyQyAvKiBCYWNraW5nU3RvcmUuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjQyNTY2MTJERTQyRUMw MENBQUUyQyAvKiBCYWNraW5nU3RvcmUuaCAqLzsgfTsKIAkJMUE2NDI1NjkxMkRFNDJFQzAwQ0FB RTJDIC8qIEJhY2tpbmdTdG9yZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQTY0MjU2NzEyREU0MkVDMDBDQUFFMkMgLyogQmFja2luZ1N0b3JlLmNw cCAqLzsgfTsKIAkJMUE2NDI5MkQxMkRFNUY5ODAwQ0FBRTJDIC8qIEJhY2tpbmdTdG9yZU1hYy5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjQyOTJD MTJERTVGOTgwMENBQUUyQyAvKiBCYWNraW5nU3RvcmVNYWMubW0gKi87IH07CisJCTFBNjkwRDE3 MTJGMzlFMzMwMEVDRDI4OSAvKiBMYXllclRyZWVIb3N0TWFjLmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTY5MEQxNjEyRjM5RTMzMDBFQ0QyODkgLyog TGF5ZXJUcmVlSG9zdE1hYy5oICovOyB9OwogCQkxQTZGOUY5MDExRTEzRUZDMDBEQjEzNzEgLyog Q29tbWFuZExpbmUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBNkY5RjhFMTFFMTNFRkMwMERCMTM3MSAvKiBDb21tYW5kTGluZS5oICovOyB9OwogCQkx QTZGOUZCNzExRTE0MDg1MDBEQjEzNzEgLyogQ29tbWFuZExpbmVNYWMuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE2RjlGQjYxMUUxNDA4NTAwREIx MzcxIC8qIENvbW1hbmRMaW5lTWFjLmNwcCAqLzsgfTsKIAkJMUE2RkEwMUUxMUUxNTI2MzAwREIx MzcxIC8qIFdlYlByb2Nlc3NNYWluTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE2RkEwMUQxMUUxNTI2MzAwREIxMzcxIC8qIFdlYlByb2Nlc3NN YWluTWFjLm1tICovOyB9OwpAQCAtODg5LDYgKzg5MCw3IEBACiAJCTFBNjQyNTY2MTJERTQyRUMw MENBQUUyQyAvKiBCYWNraW5nU3RvcmUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gQmFja2luZ1N0b3JlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBNjQyNTY3 MTJERTQyRUMwMENBQUUyQyAvKiBCYWNraW5nU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gQmFja2luZ1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJMUE2NDI5MkMxMkRFNUY5ODAwQ0FBRTJDIC8qIEJhY2tpbmdTdG9yZU1hYy5tbSAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEJhY2tpbmdTdG9yZU1hYy5t bTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUE2OTBEMTYxMkYzOUUzMzAwRUNEMjg5 IC8qIExheWVyVHJlZUhvc3RNYWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g TGF5ZXJUcmVlSG9zdE1hYy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTZGOUY4 RTExRTEzRUZDMDBEQjEzNzEgLyogQ29tbWFuZExpbmUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gQ29tbWFuZExpbmUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MUE2RjlGQjYxMUUxNDA4NTAwREIxMzcxIC8qIENvbW1hbmRMaW5lTWFjLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvbW1hbmRMaW5lTWFjLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE2RkEwMUQxMUUxNTI2MzAwREIxMzcxIC8qIFdlYlByb2Nl c3NNYWluTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV2Vi UHJvY2Vzc01haW5NYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0yNTc1LDYg KzI1NzcsNyBAQAogCQkJCTI5Q0Q1NUE5MTI4RTI5NEYwMDEzM0M4NSAvKiBBY2Nlc3NpYmlsaXR5 V2ViUGFnZU9iamVjdC5tbSAqLywKIAkJCQlCQzVGN0JCODExODIzNzk5MDA1MkMwMkMgLyogQ2h1 bmtlZFVwZGF0ZURyYXdpbmdBcmVhTWFjLmNwcCAqLywKIAkJCQkwRjUyNjVCNTExREQzNzcwMDAw NkQzM0MgLyogTGF5ZXJCYWNrZWREcmF3aW5nQXJlYU1hYy5tbSAqLywKKwkJCQkxQTY5MEQxNjEy RjM5RTMzMDBFQ0QyODkgLyogTGF5ZXJUcmVlSG9zdE1hYy5oICovLAogCQkJCTFBMTg3MTg0MTJF Rjk4NzcwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0TWFjLm1tICovLAogCQkJCTFDOEUyREFEMTI3 OEM1QjIwMEJDN0JEMCAvKiBXZWJJbnNwZWN0b3JNYWMubW0gKi8sCiAJCQkJQkM5NjNENkQxMTNE RDFBNTAwNTc0QkUyIC8qIFdlYlBhZ2VNYWMubW0gKi8sCkBAIC0zMTE1LDYgKzMxMTgsNyBAQAog CQkJCUJGQTYxNzlGMTJGMEI5OUQwMDMzRTBDQSAvKiBXS1ZpZXdQcml2YXRlLmggaW4gSGVhZGVy cyAqLywKIAkJCQkxQTk2MzZCRDEyRjM0ODQ5MDA3OEEwNjIgLyogU2hhcmVhYmxlU3VyZmFjZS5o IGluIEhlYWRlcnMgKi8sCiAJCQkJMUE5NjM5RjcxMkYzOEVDRDAwNzhBMDYyIC8qIENvcmVBbmlt YXRpb25SZW5kZXJlci5oIGluIEhlYWRlcnMgKi8sCisJCQkJMUE2OTBEMTcxMkYzOUUzMzAwRUNE Mjg5IC8qIExheWVyVHJlZUhvc3RNYWMuaCBpbiBIZWFkZXJzICovLAogCQkJKTsKIAkJCXJ1bk9u bHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJ KHJldmlzaW9uIDc3MTM1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU2LDcgKzU2LDYgQEAgRHJhd2lu Z0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwoV2ViUGFnZQogICAgICwgbV9pc1dhaXRpbmdGb3JE aWRVcGRhdGUoZmFsc2UpCiAgICAgLCBtX2lzUGFpbnRpbmdTdXNwZW5kZWQoIXBhcmFtZXRlcnMu aXNWaXNpYmxlKQogICAgICwgbV9kaXNwbGF5VGltZXIoV2ViUHJvY2Vzczo6c2hhcmVkKCkucnVu TG9vcCgpLCB0aGlzLCAmRHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5KQotICAgICwgbV9sYXllclRy ZWVIb3N0KHdlYlBhZ2UpCiB7CiB9CiAKQEAgLTEyOCwxNCArMTI3LDE2IEBAIHZvaWQgRHJhd2lu Z0FyZWFJbXBsOjpkZXRhY2hDb21wb3NpdGluZ0MKIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZXRS b290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyKQogewogICAg IGlmIChncmFwaGljc0xheWVyKQotICAgICAgICBtX2xheWVyVHJlZUhvc3QuYXR0YWNoUm9vdENv bXBvc2l0aW5nTGF5ZXIoZ3JhcGhpY3NMYXllcik7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdCA9 IExheWVyVHJlZUhvc3Q6OmNyZWF0ZShtX3dlYlBhZ2UsIGdyYXBoaWNzTGF5ZXIpOwogICAgIGVs c2UKLSAgICAgICAgbV9sYXllclRyZWVIb3N0LmRldGFjaFJvb3RDb21wb3NpdGluZ0xheWVyKCk7 CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdCA9IG51bGxwdHI7CiB9CiAKIHZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjpzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkKIHsKLSAgICBtX2xheWVyVHJl ZUhvc3Quc2NoZWR1bGVMYXllckZsdXNoKCk7CisgICAgaWYgKCFtX2xheWVyVHJlZUhvc3QpCisg ICAgICAgIHJldHVybjsKKyAgICBtX2xheWVyVHJlZUhvc3QtPnNjaGVkdWxlTGF5ZXJGbHVzaCgp OwogfQogCiB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzKCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0Fy ZWFJbXBsLmgJKHJldmlzaW9uIDc3MTM1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw4ICs3OCw4IEBA IHByaXZhdGU6CiAKICAgICBSdW5Mb29wOjpUaW1lcjxEcmF3aW5nQXJlYUltcGw+IG1fZGlzcGxh eVRpbWVyOwogCi0gICAgLy8gVGhlIGxheWVyIHRyZWUgaG9zdCB3aGljaCBoYW5kbGVzIGFjY2Vs ZXJhdGVkIGNvbXBvc2l0aW5nLgotICAgIExheWVyVHJlZUhvc3QgbV9sYXllclRyZWVIb3N0Owor ICAgIC8vIFRoZSBsYXllciB0cmVlIGhvc3QgdGhhdCBoYW5kbGVzIGFjY2VsZXJhdGVkIGNvbXBv c2l0aW5nLgorICAgIE93blB0cjxMYXllclRyZWVIb3N0PiBtX2xheWVyVHJlZUhvc3Q7CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9MYXllclRyZWVIb3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5jcHAJKHJldmlzaW9uIDc3MTM1KQorKysg U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw5IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAj aW5jbHVkZSAiV2ViUGFnZS5oIgogCi0jaWYgIVBMQVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShN QUMpCisjaW5jbHVkZSAiTGF5ZXJUcmVlSG9zdE1hYy5oIgorI2Vsc2UKICNlcnJvciAiVGhpcyBj bGFzcyBpcyBub3QgcmVhZHkgZm9yIHVzZSBieSBvdGhlciBwb3J0cyB5ZXQuIgogI2VuZGlmCiAK QEAgLTM5LDI0ICs0MSwyMiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKLUxheWVyVHJlZUhvc3Q6OkxheWVyVHJlZUhvc3QoV2ViUGFnZSogd2ViUGFn ZSkKLSAgICA6IG1fd2ViUGFnZSh3ZWJQYWdlKQorUGFzc093blB0cjxMYXllclRyZWVIb3N0PiBM YXllclRyZWVIb3N0OjpjcmVhdGUoV2ViUGFnZSogd2ViUGFnZSwgR3JhcGhpY3NMYXllciogZ3Jh cGhpY3NMYXllcikKIHsKLX0KKyNpZiBQTEFURk9STShNQUMpCisgICAgcmV0dXJuIGFkb3B0UHRy KHN0YXRpY19jYXN0PExheWVyVHJlZUhvc3QqPihuZXcgTGF5ZXJUcmVlSG9zdE1hYyh3ZWJQYWdl LCBncmFwaGljc0xheWVyKSkpOworI2VuZGlmCiAKLUxheWVyVHJlZUhvc3Q6On5MYXllclRyZWVI b3N0KCkKLXsKLSAgICBwbGF0Zm9ybUludmFsaWRhdGUoKTsKKyAgICByZXR1cm4gMDsKIH0KIAot dm9pZCBMYXllclRyZWVIb3N0OjphdHRhY2hSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xh eWVyKiBncmFwaGljc0xheWVyKQorTGF5ZXJUcmVlSG9zdDo6TGF5ZXJUcmVlSG9zdChXZWJQYWdl KiB3ZWJQYWdlKQorICAgIDogbV93ZWJQYWdlKHdlYlBhZ2UpCiB7Ci0gICAgLy8gRklYTUU6IElt cGxlbWVudC4KIH0KIAotdm9pZCBMYXllclRyZWVIb3N0OjpkZXRhY2hSb290Q29tcG9zaXRpbmdM YXllcigpCitMYXllclRyZWVIb3N0Ojp+TGF5ZXJUcmVlSG9zdCgpCiB7Ci0gICAgLy8gRklYTUU6 IEltcGxlbWVudC4KIH0KIAogYm9vbCBMYXllclRyZWVIb3N0OjpmbHVzaFBlbmRpbmdMYXllckNo YW5nZXMoKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJl ZUhvc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv TGF5ZXJUcmVlSG9zdC5oCShyZXZpc2lvbiA3NzEzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3 LDcgQEAKICNkZWZpbmUgTGF5ZXJUcmVlSG9zdF9oCiAKICNpbmNsdWRlIDx3dGYvTm9uY29weWFi bGUuaD4KKyNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogCiAjaWYgUExBVEZPUk0oTUFDKQog I2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTQ0LDI2ICs0NSwxOCBAQCBjbGFzcyBMYXll clRyZWVIb3N0IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShMYXllclRyZWVIb3N0KTsKIAog cHVibGljOgotICAgIGV4cGxpY2l0IExheWVyVHJlZUhvc3QoV2ViUGFnZSopOwotICAgIH5MYXll clRyZWVIb3N0KCk7CisgICAgc3RhdGljIFBhc3NPd25QdHI8TGF5ZXJUcmVlSG9zdD4gY3JlYXRl KFdlYlBhZ2UqLCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CisgICAgdmlydHVhbCB+TGF5ZXJU cmVlSG9zdCgpOwogCi0gICAgdm9pZCBhdHRhY2hSb290Q29tcG9zaXRpbmdMYXllcihXZWJDb3Jl OjpHcmFwaGljc0xheWVyKik7Ci0gICAgdm9pZCBkZXRhY2hSb290Q29tcG9zaXRpbmdMYXllcigp OworICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUxheWVyRmx1c2goKSA9IDA7CiAKLSAgICB2b2lk IHNjaGVkdWxlTGF5ZXJGbHVzaCgpOworcHJvdGVjdGVkOgorICAgIGV4cGxpY2l0IExheWVyVHJl ZUhvc3QoV2ViUGFnZSopOworICAgIGJvb2wgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CiAK IHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUludmFsaWRhdGUoKTsKIAotICAgIGJvb2wgZmx1 c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7Ci0KLSNpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGlj IHZvaWQgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2soQ0ZS dW5Mb29wT2JzZXJ2ZXJSZWYsIENGUnVuTG9vcEFjdGl2aXR5LCB2b2lkKik7Ci0gICAgdm9pZCBm bHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2JzZXJ2ZXJDYWxsYmFjaygpOwotICAgIAot ICAgIFJldGFpblB0cjxDRlJ1bkxvb3BPYnNlcnZlclJlZj4gbV9mbHVzaFBlbmRpbmdMYXllckNo YW5nZXNSdW5Mb29wT2JzZXJ2ZXI7Ci0jZW5kaWYKLQogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsK IH07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJU cmVlSG9zdE1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9MYXllclRyZWVIb3N0TWFjLmgJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsNTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBh cmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWlu IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVN UExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIExheWVyVHJlZUhvc3RNYWNf aAorI2RlZmluZSBMYXllclRyZWVIb3N0TWFjX2gKKworI2luY2x1ZGUgIkxheWVyVHJlZUhvc3Qu aCIKKyNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitj bGFzcyBMYXllclRyZWVIb3N0TWFjIDogcHVibGljIExheWVyVHJlZUhvc3QgeworcHJpdmF0ZToK KyAgICBmcmllbmQgY2xhc3MgTGF5ZXJUcmVlSG9zdDsKKyAgICAKKyAgICBleHBsaWNpdCBMYXll clRyZWVIb3N0TWFjKFdlYlBhZ2UqLCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CisgICAgfkxh eWVyVHJlZUhvc3RNYWMoKTsKKworICAgIC8vIExheWVyVHJlZUhvc3QuCisgICAgdmlydHVhbCB2 b2lkIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOworCisgICAgc3RhdGljIHZvaWQgZmx1c2hQZW5kaW5n TGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2soQ0ZSdW5Mb29wT2JzZXJ2ZXJSZWYs IENGUnVuTG9vcEFjdGl2aXR5LCB2b2lkKik7CisgICAgdm9pZCBmbHVzaFBlbmRpbmdMYXllckNo YW5nZXNSdW5Mb29wT2JzZXJ2ZXJDYWxsYmFjaygpOworICAgIAorICAgIFJldGFpblB0cjxDRlJ1 bkxvb3BPYnNlcnZlclJlZj4gbV9mbHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2JzZXJ2 ZXI7Cit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlmIC8vIExheWVyVHJlZUhv c3RNYWNfaApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9MYXll clRyZWVIb3N0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbQkocmV2aXNpb24gNzcxMzUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTI0LDExICsyNCwyNCBAQAogICovCiAKICNpbXBvcnQgImNvbmZpZy5o IgotI2ltcG9ydCAiTGF5ZXJUcmVlSG9zdC5oIgorI2ltcG9ydCAiTGF5ZXJUcmVlSG9zdE1hYy5o IgorCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZv aWQgTGF5ZXJUcmVlSG9zdDo6c2NoZWR1bGVMYXllckZsdXNoKCkKK0xheWVyVHJlZUhvc3RNYWM6 OkxheWVyVHJlZUhvc3RNYWMoV2ViUGFnZSogd2ViUGFnZSwgR3JhcGhpY3NMYXllciogZ3JhcGhp Y3NMYXllcikKKyAgICA6IExheWVyVHJlZUhvc3Qod2ViUGFnZSkKK3sKK30KKworTGF5ZXJUcmVl SG9zdE1hYzo6fkxheWVyVHJlZUhvc3RNYWMoKQoreworICAgIGlmIChtX2ZsdXNoUGVuZGluZ0xh eWVyQ2hhbmdlc1J1bkxvb3BPYnNlcnZlcikKKyAgICAgICAgQ0ZSdW5Mb29wT2JzZXJ2ZXJJbnZh bGlkYXRlKG1fZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyLmdldCgpKTsK K30KKwordm9pZCBMYXllclRyZWVIb3N0TWFjOjpzY2hlZHVsZUxheWVyRmx1c2goKQogewogICAg IENGUnVuTG9vcFJlZiBjdXJyZW50UnVuTG9vcCA9IENGUnVuTG9vcEdldEN1cnJlbnQoKTsKICAg ICAKQEAgLTQ2LDE4ICs1OSwxMiBAQCB2b2lkIExheWVyVHJlZUhvc3Q6OnNjaGVkdWxlTGF5ZXJG bHVzaCgpCiAgICAgQ0ZSdW5Mb29wQWRkT2JzZXJ2ZXIoY3VycmVudFJ1bkxvb3AsIG1fZmx1c2hQ ZW5kaW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyLmdldCgpLCBrQ0ZSdW5Mb29wQ29tbW9u TW9kZXMpOwogfQogCi12b2lkIExheWVyVHJlZUhvc3Q6OnBsYXRmb3JtSW52YWxpZGF0ZSgpCi17 Ci0gICAgaWYgKG1fZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyKQotICAg ICAgICBDRlJ1bkxvb3BPYnNlcnZlckludmFsaWRhdGUobV9mbHVzaFBlbmRpbmdMYXllckNoYW5n ZXNSdW5Mb29wT2JzZXJ2ZXIuZ2V0KCkpOwotfQotCi12b2lkIExheWVyVHJlZUhvc3Q6OmZsdXNo UGVuZGluZ0xheWVyQ2hhbmdlc1J1bkxvb3BPYnNlcnZlckNhbGxiYWNrKENGUnVuTG9vcE9ic2Vy dmVyUmVmLCBDRlJ1bkxvb3BBY3Rpdml0eSwgdm9pZCogY29udGV4dCkKK3ZvaWQgTGF5ZXJUcmVl SG9zdE1hYzo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2so Q0ZSdW5Mb29wT2JzZXJ2ZXJSZWYsIENGUnVuTG9vcEFjdGl2aXR5LCB2b2lkKiBjb250ZXh0KQog ewotICAgIHN0YXRpY19jYXN0PExheWVyVHJlZUhvc3QqPihjb250ZXh0KS0+Zmx1c2hQZW5kaW5n TGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2soKTsKKyAgICBzdGF0aWNfY2FzdDxM YXllclRyZWVIb3N0TWFjKj4oY29udGV4dCktPmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlc1J1bkxv b3BPYnNlcnZlckNhbGxiYWNrKCk7CiB9CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdDo6Zmx1c2hQZW5k aW5nTGF5ZXJDaGFuZ2VzUnVuTG9vcE9ic2VydmVyQ2FsbGJhY2soKQordm9pZCBMYXllclRyZWVI b3N0TWFjOjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2JzZXJ2ZXJDYWxsYmFjaygp CiB7CiAgICAgaWYgKCFmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKSkKICAgICAgICAgcmV0dXJu Owo=