53523 2011-02-01 13:27:56 -0800 [chromium] Remove unnecessary WebCore:: prefixing in a few places and fix-up some indentation. 2011-02-01 15:04:56 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 343471 0 fishd 2011-02-01 13:27:56 -0800 [chromium] Remove unnecessary WebCore:: prefixing in a few places and fix-up some indentation. 343475 1 80815 fishd 2011-02-01 13:29:17 -0800 Created attachment 80815 v1 patch 343557 2 80815 levin 2011-02-01 14:43:11 -0800 Comment on attachment 80815 v1 patch Didn't set cq+ since the cr ews bots didn't pass yet. Feel free to do so whenever you like. 343574 3 fishd 2011-02-01 15:04:56 -0800 Landed as http://trac.webkit.org/changeset/77320 80815 2011-02-01 13:29:17 -0800 2011-02-01 15:04:40 -0800 v1 patch cleanup_1.txt text/plain 11528 fishd SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3NzI3OSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTEtMDItMDEgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIFJl bW92ZSB1bm5lY2Vzc2FyeSBXZWJDb3JlOjogcHJlZml4aW5nIGluIGEgZmV3IHBsYWNlcyBhbmQg Zml4LXVwIHNvbWUgaW5kZW50YXRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MzUyMworCisgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OmF0dGFjaCk6 CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjppbnNwZWN0Tm9kZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjppbnNwZWN0b3JDb250cm9sbGVy KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6Om1haW5GcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjppZGVudGlmaWVyRm9ySW5pdGlh bFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0FnZW50SW1wbDo6c2VuZE1l c3NhZ2VUb0Zyb250ZW5kKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6 OnVwZGF0ZUluc3BlY3RvclN0YXRlQ29va2llKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9v bHNBZ2VudDo6aW50ZXJydXB0QW5kRGlzcGF0Y2gpOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZU b29sc0FnZW50Ojpwcm9jZXNzUGVuZGluZ01lc3NhZ2VzKToKKyAgICAgICAgKiBzcmMvV2ViUG9w dXBNZW51SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudUltcGw6OnJlc2l6 ZSk6CisgICAgICAgICogc3JjL1dlYlNjcm9sbGJhckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJTY3JvbGxiYXJJbXBsOjpzZXRMb2NhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlNj cm9sbGJhckltcGw6OnNldFZhbHVlKToKKyAgICAgICAgKFdlYktpdDo6V2ViU2Nyb2xsYmFySW1w bDo6b25Nb3VzZVdoZWVsKToKKyAgICAgICAgKFdlYktpdDo6V2ViU2Nyb2xsYmFySW1wbDo6b25L ZXlEb3duKToKKyAgICAgICAgKFdlYktpdDo6V2ViU2Nyb2xsYmFySW1wbDo6c2Nyb2xsUG9zaXRp b24pOgorICAgICAgICAoV2ViS2l0OjpXZWJTY3JvbGxiYXJJbXBsOjpzZXRTY3JvbGxPZmZzZXQp OgorICAgICAgICAoV2ViS2l0OjpXZWJTY3JvbGxiYXJJbXBsOjppbnZhbGlkYXRlU2Nyb2xsYmFy UmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNjcm9sbGJhckltcGw6OmdldFRpY2ttYXJrcyk6 CisKIDIwMTEtMDItMDEgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCByb2xsIG9mIENocm9taXVtIGRlcHMgdG8gcjczMzA2LiBUaGlz IHBpY2tzIHVwIGEgZml4IHRvIGdldApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAkocmV2aXNpb24gNzcyNzkpCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY0LDIzICs2NCw3IEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+ CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgogCi11c2luZyBXZWJDb3JlOjpEb2N1bWVudExvYWRl cjsKLXVzaW5nIFdlYkNvcmU6OkZyYW1lTG9hZGVyOwotdXNpbmcgV2ViQ29yZTo6SW5qZWN0ZWRT Y3JpcHRIb3N0OwotdXNpbmcgV2ViQ29yZTo6SW5zcGVjdG9yQXJyYXk7Ci11c2luZyBXZWJDb3Jl OjpJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjsKLXVzaW5nIFdlYkNvcmU6Okluc3BlY3RvckNv bnRyb2xsZXI7Ci11c2luZyBXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb247Ci11c2lu ZyBXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWU7Ci11c2luZyBXZWJDb3Jl OjpOb2RlOwotdXNpbmcgV2ViQ29yZTo6UGFnZTsKLXVzaW5nIFdlYkNvcmU6OlJlc291cmNlRXJy b3I7Ci11c2luZyBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q7Ci11c2luZyBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlOwotdXNpbmcgV1RGOjpTdHJpbmc7Ci11c2luZyBXZWJDb3JlOjpWOERPTVdy YXBwZXI7Ci11c2luZyBXZWJDb3JlOjpWOE5vZGU7Ci11c2luZyBXZWJDb3JlOjpWOFByb3h5Owor dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC04OSwx NCArNzMsMTQgQEAgbmFtZXNwYWNlIHsKIHN0YXRpYyBjb25zdCBjaGFyIGtGcm9udGVuZENvbm5l Y3RlZEZlYXR1cmVOYW1lW10gPSAiZnJvbnRlbmQtY29ubmVjdGVkIjsKIHN0YXRpYyBjb25zdCBj aGFyIGtJbnNwZWN0b3JTdGF0ZUZlYXR1cmVOYW1lW10gPSAiaW5zcGVjdG9yLXN0YXRlIjsKIAot Y2xhc3MgQ2xpZW50TWVzc2FnZUxvb3BBZGFwdGVyIDogcHVibGljIFdlYkNvcmU6OlNjcmlwdERl YnVnU2VydmVyOjpDbGllbnRNZXNzYWdlTG9vcCB7CitjbGFzcyBDbGllbnRNZXNzYWdlTG9vcEFk YXB0ZXIgOiBwdWJsaWMgU2NyaXB0RGVidWdTZXJ2ZXI6OkNsaWVudE1lc3NhZ2VMb29wIHsKIHB1 YmxpYzoKICAgICBzdGF0aWMgdm9pZCBlbnN1cmVDbGllbnRNZXNzYWdlTG9vcENyZWF0ZWQoV2Vi RGV2VG9vbHNBZ2VudENsaWVudCogY2xpZW50KQogICAgIHsKICAgICAgICAgaWYgKHNfaW5zdGFu Y2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHNfaW5zdGFuY2UgPSBuZXcgQ2xpZW50 TWVzc2FnZUxvb3BBZGFwdGVyKGNsaWVudC0+Y3JlYXRlQ2xpZW50TWVzc2FnZUxvb3AoKSk7Ci0g ICAgICAgIFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5zZXRDbGllbnRNZXNz YWdlTG9vcChzX2luc3RhbmNlKTsKKyAgICAgICAgU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgp LnNldENsaWVudE1lc3NhZ2VMb29wKHNfaW5zdGFuY2UpOwogICAgIH0KIAogICAgIHN0YXRpYyB2 b2lkIGluc3BlY3RlZFZpZXdDbG9zZWQoV2ViVmlld0ltcGwqIHZpZXcpCkBAIC0xMDksNyArOTMs NyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICAvLyBSZWxlYXNlIHJlbmRlciB0aHJlYWQgaWYg bmVjZXNzYXJ5LgogICAgICAgICBpZiAoc19pbnN0YW5jZSAmJiBzX2luc3RhbmNlLT5tX3J1bm5p bmcpCi0gICAgICAgICAgICBXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuY29u dGludWVQcm9ncmFtKCk7CisgICAgICAgICAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCku Y29udGludWVQcm9ncmFtKCk7CiAgICAgfQogCiBwcml2YXRlOgpAQCAtMjA0LDggKzE4OCw4IEBA IHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmF0dGFjaCgpCiAgICAgbV9kZWJ1Z2dlckFnZW50 SW1wbC5zZXQoCiAgICAgICAgIG5ldyBEZWJ1Z2dlckFnZW50SW1wbChtX3dlYlZpZXdJbXBsLCB0 aGlzLCBtX2NsaWVudCkpOwogICAgIFdlYkNTdHJpbmcgZGVidWdnZXJTY3JpcHRKcyA9IG1fY2xp ZW50LT5kZWJ1Z2dlclNjcmlwdFNvdXJjZSgpOwotICAgIFdlYkNvcmU6OlNjcmlwdERlYnVnU2Vy dmVyOjpzaGFyZWQoKS5zZXREZWJ1Z2dlclNjcmlwdFNvdXJjZSgKLSAgICAgICAgV1RGOjpTdHJp bmcoZGVidWdnZXJTY3JpcHRKcy5kYXRhKCksIGRlYnVnZ2VyU2NyaXB0SnMubGVuZ3RoKCkpKTsK KyAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuc2V0RGVidWdnZXJTY3JpcHRTb3VyY2Uo CisgICAgICAgIFN0cmluZyhkZWJ1Z2dlclNjcmlwdEpzLmRhdGEoKSwgZGVidWdnZXJTY3JpcHRK cy5sZW5ndGgoKSkpOwogICAgIG1fYXR0YWNoZWQgPSB0cnVlOwogfQogCkBAIC0yNDksNyArMjMz LDcgQEAgdm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6aW5zcGVjdEVsZW1lbgogdm9pZCBXZWJE ZXZUb29sc0FnZW50SW1wbDo6aW5zcGVjdE5vZGUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5vZGUp CiB7CiAgICAgaWYgKCFWOE5vZGU6Okhhc0luc3RhbmNlKG5vZGUpKQotICAgICAgICBWOFByb3h5 OjpzZXRET01FeGNlcHRpb24oV2ViQ29yZTo6VFlQRV9NSVNNQVRDSF9FUlIpOworICAgICAgICBW OFByb3h5OjpzZXRET01FeGNlcHRpb24oVFlQRV9NSVNNQVRDSF9FUlIpOwogICAgIGVsc2UKICAg ICAgICAgaW5zcGVjdG9yQ29udHJvbGxlcigpLT5pbnNwZWN0KFY4Tm9kZTo6dG9OYXRpdmUodjg6 OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChub2RlKSkpOwogfQpAQCAtMjYyLDE0ICsyNDYsMTQg QEAgdm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6c2V0UnVudGltZVBybwogICAgIH0KIH0KIAot V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlciogV2ViRGV2VG9vbHNBZ2VudEltcGw6Omluc3Bl Y3RvckNvbnRyb2xsZXIoKQorSW5zcGVjdG9yQ29udHJvbGxlciogV2ViRGV2VG9vbHNBZ2VudElt cGw6Omluc3BlY3RvckNvbnRyb2xsZXIoKQogewogICAgIGlmIChQYWdlKiBwYWdlID0gbV93ZWJW aWV3SW1wbC0+cGFnZSgpKQogICAgICAgICByZXR1cm4gcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxl cigpOwogICAgIHJldHVybiAwOwogfQogCi1XZWJDb3JlOjpGcmFtZSogV2ViRGV2VG9vbHNBZ2Vu dEltcGw6Om1haW5GcmFtZSgpCitGcmFtZSogV2ViRGV2VG9vbHNBZ2VudEltcGw6Om1haW5GcmFt ZSgpCiB7CiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX3dlYlZpZXdJbXBsLT5wYWdlKCkpCiAgICAg ICAgIHJldHVybiBwYWdlLT5tYWluRnJhbWUoKTsKQEAgLTI4NCw3ICsyNjgsNyBAQCB2b2lkIFdl YkRldlRvb2xzQWdlbnRJbXBsOjppZGVudGlmaWVyRm9yCiAgICAgY29uc3QgV2ViVVJMUmVxdWVz dCYgcmVxdWVzdCkKIHsKICAgICBXZWJGcmFtZUltcGwqIHdlYkZyYW1lSW1wbCA9IHN0YXRpY19j YXN0PFdlYkZyYW1lSW1wbCo+KHdlYkZyYW1lKTsKLSAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWUg PSB3ZWJGcmFtZUltcGwtPmZyYW1lKCk7CisgICAgRnJhbWUqIGZyYW1lID0gd2ViRnJhbWVJbXBs LT5mcmFtZSgpOwogICAgIERvY3VtZW50TG9hZGVyKiBsb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCkt PmFjdGl2ZURvY3VtZW50TG9hZGVyKCk7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpp ZGVudGlmaWVyRm9ySW5pdGlhbFJlcXVlc3QoZnJhbWUsIHJlc291cmNlSWQsIGxvYWRlciwgcmVx dWVzdC50b1Jlc291cmNlUmVxdWVzdCgpKTsKIH0KQEAgLTM2MCw3ICszNDQsNyBAQCB2b2lkIFdl YkRldlRvb2xzQWdlbnRJbXBsOjpzdG9yZVNldHRpbmcoCiAgICAgbV93ZWJWaWV3SW1wbC0+c2V0 SW5zcGVjdG9yU2V0dGluZyhrZXksIHZhbHVlKTsKIH0KIAotYm9vbCBXZWJEZXZUb29sc0FnZW50 SW1wbDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFdURjo6U3RyaW5nJiBtZXNzYWdlKQor Ym9vbCBXZWJEZXZUb29sc0FnZW50SW1wbDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0 cmluZyYgbWVzc2FnZSkKIHsKICAgICBXZWJEZXZUb29sc0FnZW50SW1wbCogZGV2VG9vbHNBZ2Vu dCA9IHN0YXRpY19jYXN0PFdlYkRldlRvb2xzQWdlbnRJbXBsKj4obV93ZWJWaWV3SW1wbC0+ZGV2 VG9vbHNBZ2VudCgpKTsKICAgICBpZiAoIWRldlRvb2xzQWdlbnQpCkBAIC0zNzAsNyArMzU0LDcg QEAgYm9vbCBXZWJEZXZUb29sc0FnZW50SW1wbDo6c2VuZE1lc3NhZ2VUbwogICAgIHJldHVybiB0 cnVlOwogfQogCi12b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjp1cGRhdGVJbnNwZWN0b3JTdGF0 ZUNvb2tpZShjb25zdCBXVEY6OlN0cmluZyYgc3RhdGUpCit2b2lkIFdlYkRldlRvb2xzQWdlbnRJ bXBsOjp1cGRhdGVJbnNwZWN0b3JTdGF0ZUNvb2tpZShjb25zdCBTdHJpbmcmIHN0YXRlKQogewog ICAgIG1fY2xpZW50LT5ydW50aW1lUHJvcGVydHlDaGFuZ2VkKGtJbnNwZWN0b3JTdGF0ZUZlYXR1 cmVOYW1lLCBzdGF0ZSk7CiB9CkBAIC00MDIsNyArMzg2LDcgQEAgdm9pZCBXZWJEZXZUb29sc0Fn ZW50OjpkZWJ1Z2dlclBhdXNlU2NyaQogCiB2b2lkIFdlYkRldlRvb2xzQWdlbnQ6OmludGVycnVw dEFuZERpc3BhdGNoKE1lc3NhZ2VEZXNjcmlwdG9yKiBkKQogewotICAgIGNsYXNzIERlYnVnZ2Vy VGFzayA6IHB1YmxpYyBXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6VGFzayB7CisgICAgY2xh c3MgRGVidWdnZXJUYXNrIDogcHVibGljIFNjcmlwdERlYnVnU2VydmVyOjpUYXNrIHsKICAgICBw dWJsaWM6CiAgICAgICAgIERlYnVnZ2VyVGFzayhXZWJEZXZUb29sc0FnZW50OjpNZXNzYWdlRGVz Y3JpcHRvciogZGVzY3JpcHRvcikgOiBtX2Rlc2NyaXB0b3IoZGVzY3JpcHRvcikgeyB9CiAgICAg ICAgIHZpcnR1YWwgfkRlYnVnZ2VyVGFzaygpIHsgfQpAQCAtNDE0LDcgKzM5OCw3IEBAIHZvaWQg V2ViRGV2VG9vbHNBZ2VudDo6aW50ZXJydXB0QW5kRGlzcGEKICAgICBwcml2YXRlOgogICAgICAg ICBPd25QdHI8V2ViRGV2VG9vbHNBZ2VudDo6TWVzc2FnZURlc2NyaXB0b3I+IG1fZGVzY3JpcHRv cjsKICAgICB9OwotICAgIFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjppbnRlcnJ1cHRBbmRS dW4obmV3IERlYnVnZ2VyVGFzayhkKSk7CisgICAgU2NyaXB0RGVidWdTZXJ2ZXI6OmludGVycnVw dEFuZFJ1bihuZXcgRGVidWdnZXJUYXNrKGQpKTsKIH0KIAogYm9vbCBXZWJEZXZUb29sc0FnZW50 OjpzaG91bGRJbnRlcnJ1cHRGb3JNZXNzYWdlKGNvbnN0IFdlYlN0cmluZyYgbWVzc2FnZSkKQEAg LTQzNCw3ICs0MTgsNyBAQCBib29sIFdlYkRldlRvb2xzQWdlbnQ6OnNob3VsZEludGVycnVwdEZv CiAKIHZvaWQgV2ViRGV2VG9vbHNBZ2VudDo6cHJvY2Vzc1BlbmRpbmdNZXNzYWdlcygpCiB7Ci0g ICAgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnJ1blBlbmRpbmdUYXNrcygp OworICAgIFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5ydW5QZW5kaW5nVGFza3MoKTsKIH0K IAogdm9pZCBXZWJEZXZUb29sc0FnZW50OjpzZXRNZXNzYWdlTG9vcERpc3BhdGNoSGFuZGxlcihN ZXNzYWdlTG9vcERpc3BhdGNoSGFuZGxlciBoYW5kbGVyKQpJbmRleDogU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAJKHJldmlzaW9uIDc3Mjc5KQor KysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE0MSwxMyArMTQxLDEzIEBAIHZvaWQgV2ViUG9wdXBNZW51SW1wbDo6cmVz aXplKGNvbnN0IFdlYlMKICAgICBtX3NpemUgPSBuZXdTaXplOwogCiAgICAgaWYgKG1fd2lkZ2V0 KSB7Ci0gICAgICBJbnRSZWN0IG5ld0dlb21ldHJ5KDAsIDAsIG1fc2l6ZS53aWR0aCwgbV9zaXpl LmhlaWdodCk7Ci0gICAgICBtX3dpZGdldC0+c2V0RnJhbWVSZWN0KG5ld0dlb21ldHJ5KTsKKyAg ICAgICAgSW50UmVjdCBuZXdHZW9tZXRyeSgwLCAwLCBtX3NpemUud2lkdGgsIG1fc2l6ZS5oZWln aHQpOworICAgICAgICBtX3dpZGdldC0+c2V0RnJhbWVSZWN0KG5ld0dlb21ldHJ5KTsKICAgICB9 CiAKICAgICBpZiAobV9jbGllbnQpIHsKLSAgICAgIFdlYlJlY3QgZGFtYWdlZFJlY3QoMCwgMCwg bV9zaXplLndpZHRoLCBtX3NpemUuaGVpZ2h0KTsKLSAgICAgIG1fY2xpZW50LT5kaWRJbnZhbGlk YXRlUmVjdChkYW1hZ2VkUmVjdCk7CisgICAgICAgIFdlYlJlY3QgZGFtYWdlZFJlY3QoMCwgMCwg bV9zaXplLndpZHRoLCBtX3NpemUuaGVpZ2h0KTsKKyAgICAgICAgbV9jbGllbnQtPmRpZEludmFs aWRhdGVSZWN0KGRhbWFnZWRSZWN0KTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNjcm9sbGJhckltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNjcm9sbGJhckltcGwuY3BwCShyZXZpc2lvbiA3NzI3OSkK KysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNjcm9sbGJhckltcGwuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIFdlYlNjcm9sbGJhckltcGw6On5XZWJTY3JvbGxi YXJJbXBsKCkKIAogdm9pZCBXZWJTY3JvbGxiYXJJbXBsOjpzZXRMb2NhdGlvbihjb25zdCBXZWJS ZWN0JiByZWN0KQogewotICAgIFdlYkNvcmU6OkludFJlY3Qgb2xkUmVjdCA9IG1fc2Nyb2xsYmFy LT5mcmFtZVJlY3QoKTsKKyAgICBJbnRSZWN0IG9sZFJlY3QgPSBtX3Njcm9sbGJhci0+ZnJhbWVS ZWN0KCk7CiAgICAgbV9zY3JvbGxiYXItPnNldEZyYW1lUmVjdChyZWN0KTsKICAgICBpZiAoV2Vi UmVjdChvbGRSZWN0KSAhPSByZWN0KQogICAgICAgbV9zY3JvbGxiYXItPmludmFsaWRhdGUoKTsK QEAgLTk1LDcgKzk1LDcgQEAgaW50IFdlYlNjcm9sbGJhckltcGw6OnZhbHVlKCkgY29uc3QKIAog dm9pZCBXZWJTY3JvbGxiYXJJbXBsOjpzZXRWYWx1ZShpbnQgcG9zaXRpb24pCiB7Ci0gICAgV2Vi Q29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihtX3Nj cm9sbGJhci0+b3JpZW50YXRpb24oKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBvc2l0aW9uKSk7Cisg ICAgU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihtX3Njcm9s bGJhci0+b3JpZW50YXRpb24oKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBvc2l0aW9uKSk7CiB9CiAK IHZvaWQgV2ViU2Nyb2xsYmFySW1wbDo6c2V0RG9jdW1lbnRTaXplKGludCBzaXplKQpAQCAtMjIw LDcgKzIyMCw3IEBAIGJvb2wgV2ViU2Nyb2xsYmFySW1wbDo6b25Nb3VzZVdoZWVsKGNvbnMKICAg ICAgICAgICAgIGlmIChuZWdhdGl2ZSkKICAgICAgICAgICAgICAgICBkZWx0YSAqPSAtMTsKICAg ICAgICAgfQotICAgICAgICBXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsKChtX3Njcm9s bGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKSA/IFdlYkNvcmU6OlNj cm9sbExlZnQgOiBXZWJDb3JlOjpTY3JvbGxVcCwgV2ViQ29yZTo6U2Nyb2xsQnlQaXhlbCwgZGVs dGEpOworICAgICAgICBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsKChtX3Njcm9sbGJhci0+b3JpZW50 YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKSA/IFdlYkNvcmU6OlNjcm9sbExlZnQgOiBX ZWJDb3JlOjpTY3JvbGxVcCwgV2ViQ29yZTo6U2Nyb2xsQnlQaXhlbCwgZGVsdGEpOwogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTI1OSw3ICsyNTksNyBAQCBib29sIFdlYlNjcm9s bGJhckltcGw6Om9uS2V5RG93bihjb25zdCBXCiAgICAgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJp dHkgc2Nyb2xsR3JhbnVsYXJpdHk7CiAgICAgaWYgKFdlYlZpZXdJbXBsOjptYXBLZXlDb2RlRm9y U2Nyb2xsKGtleUNvZGUsICZzY3JvbGxEaXJlY3Rpb24sICZzY3JvbGxHcmFudWxhcml0eSkpIHsK ICAgICAgICAgLy8gV2lsbCByZXR1cm4gZmFsc2UgaWYgc2Nyb2xsIGRpcmVjdGlvbiB3YXNuJ3Qg Y29tcGF0aWJsZSB3aXRoIHRoaXMgc2Nyb2xsYmFyLgotICAgICAgICByZXR1cm4gV2ViQ29yZTo6 U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbChzY3JvbGxEaXJlY3Rpb24sIHNjcm9sbEdyYW51bGFyaXR5 KTsKKyAgICAgICAgcmV0dXJuIFNjcm9sbGFibGVBcmVhOjpzY3JvbGwoc2Nyb2xsRGlyZWN0aW9u LCBzY3JvbGxHcmFudWxhcml0eSk7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTI2 OSwxMiArMjY5LDEyIEBAIGludCBXZWJTY3JvbGxiYXJJbXBsOjpzY3JvbGxTaXplKFdlYkNvcmUK ICAgICByZXR1cm4gKG9yaWVudGF0aW9uID09IG1fc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpKSA/ IChtX3Njcm9sbGJhci0+dG90YWxTaXplKCkgLSBtX3Njcm9sbGJhci0+dmlzaWJsZVNpemUoKSkg OiAwOwogfQogCi1pbnQgV2ViU2Nyb2xsYmFySW1wbDo6c2Nyb2xsUG9zaXRpb24oV2ViQ29yZTo6 U2Nyb2xsYmFyKikgY29uc3QKK2ludCBXZWJTY3JvbGxiYXJJbXBsOjpzY3JvbGxQb3NpdGlvbihT Y3JvbGxiYXIqKSBjb25zdAogewogICAgIHJldHVybiBtX3Njcm9sbE9mZnNldDsKIH0KIAotdm9p ZCBXZWJTY3JvbGxiYXJJbXBsOjpzZXRTY3JvbGxPZmZzZXQoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIG9mZnNldCkKK3ZvaWQgV2ViU2Nyb2xsYmFySW1wbDo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0 IEludFBvaW50JiBvZmZzZXQpCiB7CiAgICAgaWYgKG1fc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigp ID09IEhvcml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIG1fc2Nyb2xsT2Zmc2V0ID0gb2Zmc2V0 LngoKTsKQEAgLTI4NCw3ICsyODQsNyBAQCB2b2lkIFdlYlNjcm9sbGJhckltcGw6OnNldFNjcm9s bE9mZnNldChjCiAgICAgbV9jbGllbnQtPnZhbHVlQ2hhbmdlZCh0aGlzKTsKIH0KIAotdm9pZCBX ZWJTY3JvbGxiYXJJbXBsOjppbnZhbGlkYXRlU2Nyb2xsYmFyUmVjdChXZWJDb3JlOjpTY3JvbGxi YXIqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQordm9pZCBXZWJTY3JvbGxiYXJJbXBs OjppbnZhbGlkYXRlU2Nyb2xsYmFyUmVjdChTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0JiByZWN0 KQogewogICAgIFdlYlJlY3Qgd2VicmVjdChyZWN0KTsKICAgICB3ZWJyZWN0LnggKz0gbV9zY3Jv bGxiYXItPngoKTsKQEAgLTMwMiw3ICszMDIsNyBAQCBib29sIFdlYlNjcm9sbGJhckltcGw6OnNj cm9sbGJhckNvcm5lclByCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFdlYlNjcm9sbGJh ckltcGw6OmdldFRpY2ttYXJrcyhWZWN0b3I8V2ViQ29yZTo6SW50UmVjdD4mIHRpY2ttYXJrcykg Y29uc3QKK3ZvaWQgV2ViU2Nyb2xsYmFySW1wbDo6Z2V0VGlja21hcmtzKFZlY3RvcjxJbnRSZWN0 PiYgdGlja21hcmtzKSBjb25zdAogewogICAgIFdlYlZlY3RvcjxXZWJSZWN0PiB0aWNrczsKICAg ICBtX2NsaWVudC0+Z2V0VGlja21hcmtzKGNvbnN0X2Nhc3Q8V2ViU2Nyb2xsYmFySW1wbCo+KHRo aXMpLCAmdGlja3MpOwo=