46468 2010-09-24 08:42:50 -0700 DrawingAreaInfo should be used in more places 2010-09-24 10:25:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 46469 1 aroben aroben andersca sam oldest_to_newest 284401 0 aroben 2010-09-24 08:42:50 -0700 DrawingAreaInfo should be used in more places 284402 1 68686 aroben 2010-09-24 08:43:45 -0700 Created attachment 68686 Patch 284496 2 aroben 2010-09-24 10:25:43 -0700 Committed r68269: <http://trac.webkit.org/changeset/68269> 68686 2010-09-24 08:43:45 -0700 2010-09-24 09:00:53 -0700 Patch bug-46468-20100924114344.patch text/plain 10506 aroben ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MDliOGY4YjIyMGM1MDg5ZTAwNDJjYWQwNzVhYmE1MDhjMGJkNjlmZS4uNDBkNmUyMjdhZmFkZDYz ZTIyMGZmMTdkNWU1ZjJhNWViMDZlZmNhMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMC0wOS0yNCAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIGEgd2hvbGUgRHJh d2luZ0FyZWFJbmZvIGluc3RlYWQgb2YgaXRzIGNvbnN0aXR1ZW50IHBhcnRzIGZyb20KKyAgICAg ICAgRHJhd2luZ0FyZWFCYXNlCisKKyAgICAgICAgVGhpcyBpcyBqdXN0IGEgc3RlcCB0b3dhcmQg Y2xlYW5pbmcgdXAgaG93IGRyYXdpbmcgYXJlYXMgYXJlCisgICAgICAgIGVuY29kZWQvZWNvZGVk LgorCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0Lm9yZy9iLzQ2NDY4PiBEcmF3aW5nQXJl YUluZm8gc2hvdWxkIGJlIHVzZWQgaW4KKyAgICAgICAgbW9yZSBwbGFjZXMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9EcmF3aW5nQXJl YUJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUJhc2U6OmVuY29kZSk6IENo YW5nZWQgdG8gdXNlIGluZm8oKS4KKworICAgICAgICAqIFNoYXJlZC9EcmF3aW5nQXJlYUJhc2Uu aDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFCYXNlOjppbmZvKTogQWRkZWQuIFJlcGxh Y2VzIHR5cGUoKSBhbmQgaWQoKS4KKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFCYXNlOjpE cmF3aW5nQXJlYUJhc2UpOiBDaGFuZ2VkIHRvIHN0b3JlIGEKKyAgICAgICAgRHJhd2luZ0FyZWFJ bmZvIGluc3RlYWQgb2Ygc3RvcmluZyBpdHMgY29uc3RpdHVlbnQgcGFydHMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICogVUlQcm9jZXNzL0NodW5r ZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvTGF5ZXJC YWNrZWREcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhLmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYS5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICBVcGRhdGVkIHRvIHVzZSBpbmZvKCkuCisKIDIwMTAt MDktMjMgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0 aGUgRHJhd2luZ0FyZWFQcm94eSBwYXJhbWV0ZXIgdG8KZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hh cmVkL0RyYXdpbmdBcmVhQmFzZS5jcHAgYi9XZWJLaXQyL1NoYXJlZC9EcmF3aW5nQXJlYUJhc2Uu Y3BwCmluZGV4IGRmYjAyYzI1OTFkNDQzYTU5OTZiYTA0OTcwYjRmOWU5NWQzYjQzZjQuLmUwYzNj Y2MwODkwYjlkMWE3YTJiOGQyNGQzYjZlYWY1ZGU0YThjMTAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv U2hhcmVkL0RyYXdpbmdBcmVhQmFzZS5jcHAKKysrIGIvV2ViS2l0Mi9TaGFyZWQvRHJhd2luZ0Fy ZWFCYXNlLmNwcApAQCAtMjksOCArMjksNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogdm9pZCBE cmF3aW5nQXJlYUJhc2U6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIp IGNvbnN0CiB7Ci0gICAgRHJhd2luZ0FyZWFJbmZvIGluZm8odHlwZSgpLCBpZCgpKTsKLSAgICBl bmNvZGVyLT5lbmNvZGUoaW5mbyk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKGluZm8oKSk7CiB9CiAK IGJvb2wgRHJhd2luZ0FyZWFCYXNlOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBk ZWNvZGVyLCBEcmF3aW5nQXJlYUluZm8mIGluZm8pCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJl ZC9EcmF3aW5nQXJlYUJhc2UuaCBiL1dlYktpdDIvU2hhcmVkL0RyYXdpbmdBcmVhQmFzZS5oCmlu ZGV4IDkxZWQ3ZGE1YTJmNjk3MjE5ZDQwMjhkNmY5NjRlZDk0MTQwNzI1MjcuLjBhMjM1MDJjNGUx Y2ZhNmNlYzU2ODk2MjcwYWE1OWQxYjc2NDc1ZTEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvU2hhcmVk L0RyYXdpbmdBcmVhQmFzZS5oCisrKyBiL1dlYktpdDIvU2hhcmVkL0RyYXdpbmdBcmVhQmFzZS5o CkBAIC00OCwxMSArNDgsNiBAQCBwdWJsaWM6CiAgICAgCiAgICAgdHlwZWRlZiB1aW50NjRfdCBE cmF3aW5nQXJlYUlEOwogICAgIAotICAgIHZpcnR1YWwgfkRyYXdpbmdBcmVhQmFzZSgpIHsgfQot ICAgIAotICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQotICAgIERyYXdp bmdBcmVhSUQgaWQoKSBjb25zdCB7IHJldHVybiBtX2lkOyB9Ci0KICAgICBzdHJ1Y3QgRHJhd2lu Z0FyZWFJbmZvIHsKICAgICAgICAgVHlwZSB0eXBlOwogICAgICAgICBEcmF3aW5nQXJlYUlEIGlk OwpAQCAtNjQsMTkgKzU5LDIxIEBAIHB1YmxpYzoKICAgICAgICAgfQogICAgIH07CiAgICAgCisg ICAgdmlydHVhbCB+RHJhd2luZ0FyZWFCYXNlKCkgeyB9CisgICAgCisgICAgY29uc3QgRHJhd2lu Z0FyZWFJbmZvJiBpbmZvKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvOyB9CisgICAgCiAgICAgLy8g VGhlIERyYXdpbmdBcmVhUHJveHkgc2hvdWxkIG5ldmVyIGJlIGRlY29kZWQgaXRzZWxmLiBJbnN0 ZWFkLCB0aGUgRHJhd2luZ0FyZWEgc2hvdWxkIGJlIGRlY29kZWQuCiAgICAgdm9pZCBlbmNvZGUo Q29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyKSBjb25zdDsKICAgICBzdGF0aWMgYm9v bCBkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiwgRHJhd2luZ0FyZWFJbmZvJik7CiAK IHByb3RlY3RlZDoKICAgICBEcmF3aW5nQXJlYUJhc2UoVHlwZSB0eXBlLCBEcmF3aW5nQXJlYUlE IGlkZW50aWZpZXIpCi0gICAgICAgIDogbV90eXBlKHR5cGUpCi0gICAgICAgICwgbV9pZChpZGVu dGlmaWVyKQorICAgICAgICA6IG1faW5mbyh0eXBlLCBpZGVudGlmaWVyKQogICAgIHsKICAgICB9 CiAKLSAgICBUeXBlIG1fdHlwZTsKLSAgICBEcmF3aW5nQXJlYUlEIG1faWQ7CisgICAgRHJhd2lu Z0FyZWFJbmZvIG1faW5mbzsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCA4YjYyZThmMTAwOGYyNWRkN2IzYjc2MTZkZWE3ZWVj MWMxNmM2YjAzLi5jMjc1Njk2MzUzNjZjODMxMzdmNGEyY2U1ZDY4MGMyZDlmOTRhOTc1IDEwMDY0 NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtNTkyLDcgKzU5Miw3IEBAIHN0YXRpYyBi b29sIGlzVmlld1Zpc2libGUoTlNWaWV3ICp2aWV3KQogCiAtICh2b2lkKV9zd2l0Y2hUb0RyYXdp bmdBcmVhVHlwZUlmTmVjZXNzYXJ5OihEcmF3aW5nQXJlYVByb3h5OjpUeXBlKXR5cGUKIHsKLSAg ICBEcmF3aW5nQXJlYVByb3h5OjpUeXBlIGV4aXN0aW5nRHJhd2luZ0FyZWFUeXBlID0gX2RhdGEt Pl9wYWdlLT5kcmF3aW5nQXJlYSgpID8gX2RhdGEtPl9wYWdlLT5kcmF3aW5nQXJlYSgpLT50eXBl KCkgOiBEcmF3aW5nQXJlYVByb3h5OjpOb25lOworICAgIERyYXdpbmdBcmVhUHJveHk6OlR5cGUg ZXhpc3RpbmdEcmF3aW5nQXJlYVR5cGUgPSBfZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCkgPyBf ZGF0YS0+X3BhZ2UtPmRyYXdpbmdBcmVhKCktPmluZm8oKS50eXBlIDogRHJhd2luZ0FyZWFQcm94 eTo6Tm9uZTsKICAgICBpZiAoZXhpc3RpbmdEcmF3aW5nQXJlYVR5cGUgPT0gdHlwZSkKICAgICAg ICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9DaHVua2VkVXBkYXRl RHJhd2luZ0FyZWFQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9DaHVua2VkVXBkYXRlRHJh d2luZ0FyZWFQcm94eS5jcHAKaW5kZXggZWFkOWJkMWRmMDdjZjZlMzBjNDkwMjMyMmZmNTlhNmIz NDFiYTA5My4uZDU2YzljYjE1NjI1YzhkNzZmZmU2ODE5YThjYWQ3ODg5YTg5ZTg5MCAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuY3Bw CisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmNw cApAQCAtOTAsNyArOTAsNyBAQCB2b2lkIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5Ojpz ZXRTaXplKGNvbnN0IEludFNpemUmIHZpZXdTaXplKQogICAgIG1faXNXYWl0aW5nRm9yRGlkU2V0 RnJhbWVOb3RpZmljYXRpb24gPSB0cnVlOwogCiAgICAgcGFnZS0+cHJvY2VzcygpLT5yZXNwb25z aXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7Ci0gICAgcGFnZS0+cHJvY2VzcygpLT5zZW5kKERyYXdp bmdBcmVhTWVzc2FnZTo6U2V0U2l6ZSwgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGlkKCks IHZpZXdTaXplKSk7CisgICAgcGFnZS0+cHJvY2VzcygpLT5zZW5kKERyYXdpbmdBcmVhTWVzc2Fn ZTo6U2V0U2l6ZSwgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGluZm8oKS5pZCwgdmlld1Np emUpKTsKIH0KIAogdm9pZCBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFnZUlz VmlzaWJsZShib29sIGlzVmlzaWJsZSkKQEAgLTEwNiwxMiArMTA2LDEyIEBAIHZvaWQgQ2h1bmtl ZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OnNldFBhZ2VJc1Zpc2libGUoYm9vbCBpc1Zpc2libGUp CiAKICAgICBpZiAoIW1faXNWaXNpYmxlKSB7CiAgICAgICAgIC8vIFRlbGwgdGhlIHdlYiBwcm9j ZXNzIHRoYXQgaXQgZG9lc24ndCBuZWVkIHRvIHBhaW50IGFueXRoaW5nIGZvciBub3cuCi0gICAg ICAgIHBhZ2UtPnByb2Nlc3MoKS0+c2VuZChEcmF3aW5nQXJlYU1lc3NhZ2U6OlN1c3BlbmRQYWlu dGluZywgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGlkKCkpKTsKKyAgICAgICAgcGFnZS0+ cHJvY2VzcygpLT5zZW5kKERyYXdpbmdBcmVhTWVzc2FnZTo6U3VzcGVuZFBhaW50aW5nLCBwYWdl LT5wYWdlSUQoKSwgQ29yZUlQQzo6SW4oaW5mbygpLmlkKSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgCiAgICAgLy8gVGhlIHBhZ2UgaXMgbm93IHZpc2libGUsIHJlc3VtZSBwYWludGlu Zy4KLSAgICBwYWdlLT5wcm9jZXNzKCktPnNlbmQoRHJhd2luZ0FyZWFNZXNzYWdlOjpSZXN1bWVQ YWludGluZywgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGlkKCksIG1fZm9yY2VSZXBhaW50 V2hlblJlc3VtaW5nUGFpbnRpbmcpKTsKKyAgICBwYWdlLT5wcm9jZXNzKCktPnNlbmQoRHJhd2lu Z0FyZWFNZXNzYWdlOjpSZXN1bWVQYWludGluZywgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6Oklu KGluZm8oKS5pZCwgbV9mb3JjZVJlcGFpbnRXaGVuUmVzdW1pbmdQYWludGluZykpOwogICAgIG1f Zm9yY2VSZXBhaW50V2hlblJlc3VtaW5nUGFpbnRpbmcgPSBmYWxzZTsKIH0KICAgICAKQEAgLTE0 Niw3ICsxNDYsNyBAQCB2b2lkIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5Ojp1cGRhdGUo VXBkYXRlQ2h1bmsqIHVwZGF0ZUNodW5rKQogICAgIH0KIAogICAgIFdlYlBhZ2VQcm94eSogcGFn ZSA9IHRoaXMtPnBhZ2UoKTsKLSAgICBwYWdlLT5wcm9jZXNzKCktPnNlbmQoRHJhd2luZ0FyZWFN ZXNzYWdlOjpEaWRVcGRhdGUsIHBhZ2UtPnBhZ2VJRCgpLCBDb3JlSVBDOjpJbihpZCgpKSk7Cisg ICAgcGFnZS0+cHJvY2VzcygpLT5zZW5kKERyYXdpbmdBcmVhTWVzc2FnZTo6RGlkVXBkYXRlLCBw YWdlLT5wYWdlSUQoKSwgQ29yZUlQQzo6SW4oaW5mbygpLmlkKSk7CiB9CiAKIHZvaWQgQ2h1bmtl ZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5l Y3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERl Y29kZXIqIGFyZ3VtZW50cykKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyQmFj a2VkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllckJhY2tlZERy YXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IDA1YzgwNmM5NGNmM2U0YzM2MWNkNjZjYzQ4NmFjNzdi MjM1ZWUyYzAuLjRlMTYyYjNmMGUxYWY4OWM2OWVkNTM0MmFjZWViNWYxMDRlNDU4NjQgMTAwNjQ0 Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eS5jcHAK KysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5LmNwcApA QCAtNzcsNyArNzcsNyBAQCB2b2lkIExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eTo6c2V0U2l6 ZShjb25zdCBJbnRTaXplJiB2aWV3U2l6ZSkKICAgICBtX2lzV2FpdGluZ0ZvckRpZFNldEZyYW1l Tm90aWZpY2F0aW9uID0gdHJ1ZTsKIAogICAgIHBhZ2UtPnByb2Nlc3MoKS0+cmVzcG9uc2l2ZW5l c3NUaW1lcigpLT5zdGFydCgpOwotICAgIHBhZ2UtPnByb2Nlc3MoKS0+Y29ubmVjdGlvbigpLT5z ZW5kKERyYXdpbmdBcmVhTWVzc2FnZTo6U2V0U2l6ZSwgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6 OkluKGlkKCksIHZpZXdTaXplKSk7CisgICAgcGFnZS0+cHJvY2VzcygpLT5jb25uZWN0aW9uKCkt PnNlbmQoRHJhd2luZ0FyZWFNZXNzYWdlOjpTZXRTaXplLCBwYWdlLT5wYWdlSUQoKSwgQ29yZUlQ Qzo6SW4oaW5mbygpLmlkLCB2aWV3U2l6ZSkpOwogfQogCiAjaWYgIVBMQVRGT1JNKE1BQykKQEAg LTk5LDEyICs5OSwxMiBAQCB2b2lkIExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFn ZUlzVmlzaWJsZShib29sIGlzVmlzaWJsZSkKIAogICAgIGlmICghbV9pc1Zpc2libGUpIHsKICAg ICAgICAgLy8gVGVsbCB0aGUgd2ViIHByb2Nlc3MgdGhhdCBpdCBkb2Vzbid0IG5lZWQgdG8gcGFp bnQgYW55dGhpbmcgZm9yIG5vdy4KLSAgICAgICAgcGFnZS0+cHJvY2VzcygpLT5jb25uZWN0aW9u KCktPnNlbmQoRHJhd2luZ0FyZWFNZXNzYWdlOjpTdXNwZW5kUGFpbnRpbmcsIHBhZ2UtPnBhZ2VJ RCgpLCBDb3JlSVBDOjpJbihpZCgpKSk7CisgICAgICAgIHBhZ2UtPnByb2Nlc3MoKS0+Y29ubmVj dGlvbigpLT5zZW5kKERyYXdpbmdBcmVhTWVzc2FnZTo6U3VzcGVuZFBhaW50aW5nLCBwYWdlLT5w YWdlSUQoKSwgQ29yZUlQQzo6SW4oaW5mbygpLmlkKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAgICAgCiAgICAgLy8gVGhlIHBhZ2UgaXMgbm93IHZpc2libGUuCi0gICAgcGFnZS0+cHJvY2Vz cygpLT5jb25uZWN0aW9uKCktPnNlbmQoRHJhd2luZ0FyZWFNZXNzYWdlOjpSZXN1bWVQYWludGlu ZywgcGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGlkKCkpKTsKKyAgICBwYWdlLT5wcm9jZXNz KCktPmNvbm5lY3Rpb24oKS0+c2VuZChEcmF3aW5nQXJlYU1lc3NhZ2U6OlJlc3VtZVBhaW50aW5n LCBwYWdlLT5wYWdlSUQoKSwgQ29yZUlQQzo6SW4oaW5mbygpLmlkKSk7CiAgICAgCiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCByZXF1ZXN0IGEgZnVsbCByZXBhaW50IGhlcmUgaWYgbmVlZGVkLgog fQpAQCAtMTIwLDcgKzEyMCw3IEBAIHZvaWQgTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5Ojpk aWRTZXRTaXplKCkKIHZvaWQgTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5Ojp1cGRhdGUoKQog ewogICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHRoaXMtPnBhZ2UoKTsKLSAgICBwYWdlLT5wcm9j ZXNzKCktPmNvbm5lY3Rpb24oKS0+c2VuZChEcmF3aW5nQXJlYU1lc3NhZ2U6OkRpZFVwZGF0ZSwg cGFnZS0+cGFnZUlEKCksIENvcmVJUEM6OkluKGlkKCkpKTsKKyAgICBwYWdlLT5wcm9jZXNzKCkt PmNvbm5lY3Rpb24oKS0+c2VuZChEcmF3aW5nQXJlYU1lc3NhZ2U6OkRpZFVwZGF0ZSwgcGFnZS0+ cGFnZUlEKCksIENvcmVJUEM6OkluKGluZm8oKS5pZCkpOwogfQogCiB2b2lkIExheWVyQmFja2Vk RHJhd2luZ0FyZWFQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbios IENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rlciog YXJndW1lbnRzKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ2h1bmtl ZFVwZGF0ZURyYXdpbmdBcmVhLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0NodW5r ZWRVcGRhdGVEcmF3aW5nQXJlYS5jcHAKaW5kZXggMWExNjA5NjRhNmNmMjMyMzRhMGY3YTNiZTc5 NmJjNmIzNGZjY2YxNy4uN2U0ZGNkZmY4MTNhN2U2NGE5Nzc2ZTRhYWRiMjY5NDRhYWIyMDYzNyAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ2h1bmtlZFVwZGF0ZURyYXdp bmdBcmVhLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9DaHVua2VkVXBkYXRl RHJhd2luZ0FyZWEuY3BwCkBAIC0xODcsNyArMTg3LDcgQEAgdm9pZCBDaHVua2VkVXBkYXRlRHJh d2luZ0FyZWE6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBD OjoKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2UgY2FuIHN3aXRjaCBkcmF3aW5nIGFyZWFz IG9uIHRoZSBmbHksIHNvIGlmIHRoaXMgbWVzc2FnZSB3YXMgdGFyZ2V0dGVkIGF0IGFuIG9ic29s ZXRlIGRyYXdpbmcgYXJlYSwgaWdub3JlIGl0LgotICAgIGlmICh0YXJnZXREcmF3aW5nQXJlYUlE ICE9IGlkKCkpCisgICAgaWYgKHRhcmdldERyYXdpbmdBcmVhSUQgIT0gaW5mbygpLmlkKQogICAg ICAgICByZXR1cm47CiAKICAgICBzd2l0Y2ggKG1lc3NhZ2VJRC5nZXQ8RHJhd2luZ0FyZWFNZXNz YWdlOjpLaW5kPigpKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9M YXllckJhY2tlZERyYXdpbmdBcmVhLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xh eWVyQmFja2VkRHJhd2luZ0FyZWEuY3BwCmluZGV4IDkzM2IyY2FlZTRkM2Q3Mzk1ZWNkZjJmYzQ5 Y2M5ZDIwN2UwNGQ3M2IuLjk2YTE2MTVhZThkMjU2NjU4ZDZlOTE0M2Q2NTlkZmI4NmIxZWE5YzUg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2VkRHJhd2lu Z0FyZWEuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2VkRHJh d2luZ0FyZWEuY3BwCkBAIC0xNTAsNyArMTUwLDcgQEAgdm9pZCBMYXllckJhY2tlZERyYXdpbmdB cmVhOjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWUK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2UgY2FuIHN3aXRjaCBkcmF3aW5nIGFyZWFzIG9u IHRoZSBmbHksIHNvIGlmIHRoaXMgbWVzc2FnZSB3YXMgdGFyZ2V0dGVkIGF0IGFuIG9ic29sZXRl IGRyYXdpbmcgYXJlYSwgaWdub3JlIGl0LgotICAgIGlmICh0YXJnZXREcmF3aW5nQXJlYUlEICE9 IGlkKCkpCisgICAgaWYgKHRhcmdldERyYXdpbmdBcmVhSUQgIT0gaW5mbygpLmlkKQogICAgICAg ICByZXR1cm47CiAKICAgICBzd2l0Y2ggKG1lc3NhZ2VJRC5nZXQ8RHJhd2luZ0FyZWFNZXNzYWdl OjpLaW5kPigpKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDk4 OGZiMzE1MmFmYTMyNDJiZWE1ZmQwM2ZkNzkzNWZmMzY3MzBjMmUuLmMxZjY0ZDFhOTdkYWIwZGMw NWJlMDQ1NzFmNDdhNGUzOTNkNzU4MjMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCkBAIC0yNDAsNyArMjQwLDcgQEAgdm9pZCBXZWJQYWdlOjpjaGFuZ2VBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZShXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBsYXllcikKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvcmVJUEM6Ok91dChuZXdE cmF3aW5nQXJlYUluZm8pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgQ29yZUlQQzo6Q29ubmVjdGlvbjo6Tm9UaW1lb3V0KTsKICAgICAKLSAgICBpZiAo bmV3RHJhd2luZ0FyZWFJbmZvLnR5cGUgIT0gZHJhd2luZ0FyZWEoKS0+dHlwZSgpKSB7CisgICAg aWYgKG5ld0RyYXdpbmdBcmVhSW5mby50eXBlICE9IGRyYXdpbmdBcmVhKCktPmluZm8oKS50eXBl KSB7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBEcmF3aW5nQXJlYTo6Y3JlYXRlKG5ld0RyYXdp bmdBcmVhSW5mby50eXBlLCBuZXdEcmF3aW5nQXJlYUluZm8uaWQsIHRoaXMpOwogICAgICAgICBt X2RyYXdpbmdBcmVhLT5zZXROZWVkc0Rpc3BsYXkoSW50UmVjdChJbnRQb2ludCgwLCAwKSwgbV92 aWV3U2l6ZSkpOwogICAgIH0K