43272 2010-07-30 14:49:33 -0700 [CHROMIUM] PlatformContextSkia and NativeImageSkia should live in the WebCore namespace 2010-08-03 13:23:35 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P3 Normal --- 1 senorblanco senorblanco fishd jamesr oldest_to_newest 258402 0 senorblanco 2010-07-30 14:49:33 -0700 There's no real reason why these classes live outside namespace WebCore. They should be moved in. 258888 1 63222 senorblanco 2010-08-02 08:44:06 -0700 Created attachment 63222 Patch 259660 2 senorblanco 2010-08-03 13:23:35 -0700 Committed r64584: <http://trac.webkit.org/changeset/64584> 63222 2010-08-02 08:44:06 -0700 2010-08-03 11:49:54 -0700 Patch bug-43272-20100802114404.patch text/plain 23478 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDQ2MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTMgQEAKKzIwMTAtMDctMzAgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTW92ZSBQbGF0Zm9ybUNvbnRleHRTa2lhIGFuZCBOYXRpdmVJbWFnZVNraWEgaW50byB0 aGUgV2ViQ29yZSBuYW1lc3BhY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00MzI3MgorCisgICAgICAgIE9uZSB3cmlua2xlIGlzIHRoYXQgUGxhdGZv cm1Db250ZXh0IGFuZCBOYXRpdmVJbWFnZVB0ciBhcmUgCisgICAgICAgIHR5cGVkZWYnZWQgb3V0 c2lkZSBvdXRzaWRlIHRoZSBXZWJDb3JlIG5hbWVzcGFjZSBibG9jaywgc28gdGhlCisgICAgICAg IFBsYXRmb3JtQ29udGV4dFNraWEgYW5kIE5hdGl2ZUltYWdlU2tpYSBoYXZlIHRvIGJlIGZvcndh cmQtZGVjbGFyZWQgCisgICAgICAgIGV4cGxpY2l0bHkgd2l0aGluIHRoYXQgbmFtZXNwYWNlLiAg QW5vdGhlciBzb2x1dGlvbiBtaWdodCBiZSB0byBtb3ZlCisgICAgICAgIHRob3NlIGRlY2xhcmF0 aW9ucyBpbnRvIHRoZSBXZWJDb3JlIG5hbWVzcGFjZSBibG9jayBiZWxvdywgYnV0IHRoYXQKKyAg ICAgICAgd291bGQgYWZmZWN0IHBsYXRmb3JtcyBvdGhlciB0aGFuIFNraWEsIHNvIEkgbGVhdmUg aXQgdG8gdGhlIHJldmlld2VyCisgICAgICAgIHRvIGRlY2lkZS4KKworICAgICAgICBUZXN0OiAg aWYgaXQgY29tcGlsZXMsIHlvdSdyZSBoYXBweS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdl Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpOYXRpdmVJbWFnZVNraWE6Omhhc1Jlc2l6ZWRCaXRtYXApOgorICAgICAgICAoV2Vi Q29yZTo6TmF0aXZlSW1hZ2VTa2lhOjpzaG91bGRDYWNoZVJlc2FtcGxpbmcpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjpTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpiZWdpbkxheWVyQ2xpcHBlZFRvSW1hZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6ZHJhd1JlY3QpOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0dXBQYWludEZvclN0cm9raW5nKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OmdldFN0cm9rZVN0eWxlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnNldFN0cm9rZVN0eWxlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnNldFRleHREcmF3aW5nTW9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjppbnRlcnBvbGF0aW9uUXVh bGl0eSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXRJbnRlcnBv bGF0aW9uUXVhbGl0eSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpn ZXRJbWFnZVJlc2FtcGxpbmdIaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4 dFNraWE6OnNldEltYWdlUmVzYW1wbGluZ0hpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZv cm1Db250ZXh0U2tpYTo6Y2xlYXJJbWFnZVJlc2FtcGxpbmdIaW50KToKKyAgICAgICAgKFdlYkNv cmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OmFwcGx5Q2xpcEZyb21JbWFnZSk6CisgICAgICAgIChX ZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXRHTEVTMkNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6cHJlcGFyZUZvclNvZnR3YXJlRHJhdyk6Cisg ICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpwcmVwYXJlRm9ySGFyZHdhcmVE cmF3KToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnN5bmNTb2Z0d2Fy ZUNhbnZhcyk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjp1cGxvYWRT b2Z0d2FyZVRvSGFyZHdhcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxh dGZvcm1Db250ZXh0U2tpYS5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tp YTo6Z3B1Q2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFGb250 V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndpbmRvd3NDYW5IYW5kbGVEcmF3VGV4dFNoYWRv dyk6CisgICAgICAgIChXZWJDb3JlOjpwYWludFNraWFUZXh0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9za2lhL1NraWFGb250V2luLmg6CisKIDIwMTAtMDgtMDIgIEJhbGF6cyBLZWxl bWVuICA8a2JAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCShyZXZpc2lvbiA2NDQ2MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDcgKzY5LDEwIEBAIGNsYXNzIHd4V2lu ZG93REM7CiAgICAgdHlwZWRlZiB3eFdpbmRvd0RDIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0Owog I2VuZGlmCiAjZWxpZiBQTEFURk9STShTS0lBKQotdHlwZWRlZiBjbGFzcyBQbGF0Zm9ybUNvbnRl eHRTa2lhIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0OworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xh c3MgUGxhdGZvcm1Db250ZXh0U2tpYTsKK30KK3R5cGVkZWYgV2ViQ29yZTo6UGxhdGZvcm1Db250 ZXh0U2tpYSBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDsKICNlbGlmIFBMQVRGT1JNKEhBSUtVKQog Y2xhc3MgQlZpZXc7CiB0eXBlZGVmIEJWaWV3IFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0OwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaAkocmV2aXNpb24gNjQ0NjApCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDEwICs1NSw2 IEBAIHR5cGVkZWYgU0laRSogTFBTSVpFOwogdHlwZWRlZiBzdHJ1Y3QgSEJJVE1BUF9fICpIQklU TUFQOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShTS0lBKQotY2xhc3MgTmF0aXZlSW1hZ2VTa2lh OwotI2VuZGlmCi0KICNpZiBQTEFURk9STShRVCkKICNpbmNsdWRlIDxRUGl4bWFwPgogI2VuZGlm CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5oCShyZXZpc2lvbiA2 NDQ2MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDYsNyArNDYsOSBAQCBRVF9FTkRfTkFNRVNQQUNFCiBzdHJ1Y3QgX2NhaXJv X3N1cmZhY2U7CiB0eXBlZGVmIHN0cnVjdCBfY2Fpcm9fc3VyZmFjZSBjYWlyb19zdXJmYWNlX3Q7 CiAjZWxpZiBQTEFURk9STShTS0lBKQorbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgTmF0aXZl SW1hZ2VTa2lhOworfQogI2VsaWYgUExBVEZPUk0oSEFJS1UpCiBjbGFzcyBCQml0bWFwOwogI2Vs aWYgT1MoV0lOQ0UpCkBAIC04NCw3ICs4Niw3IEBAIHR5cGVkZWYgd3hCaXRtYXAqIE5hdGl2ZUlt YWdlUHRyOwogI2VsaWYgUExBVEZPUk0oQ0FJUk8pCiB0eXBlZGVmIGNhaXJvX3N1cmZhY2VfdCog TmF0aXZlSW1hZ2VQdHI7CiAjZWxpZiBQTEFURk9STShTS0lBKQotdHlwZWRlZiBOYXRpdmVJbWFn ZVNraWEqIE5hdGl2ZUltYWdlUHRyOwordHlwZWRlZiBXZWJDb3JlOjpOYXRpdmVJbWFnZVNraWEq IE5hdGl2ZUltYWdlUHRyOwogI2VsaWYgUExBVEZPUk0oSEFJS1UpCiB0eXBlZGVmIEJCaXRtYXAq IE5hdGl2ZUltYWdlUHRyOwogI2VsaWYgT1MoV0lOQ0UpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNwcAkocmV2aXNpb24gNjQ0 NjApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIk5hdGl2ZUltYWdl U2tpYS5oIgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgogCituYW1lc3BhY2UgV2ViQ29yZSB7CisK IE5hdGl2ZUltYWdlU2tpYTo6TmF0aXZlSW1hZ2VTa2lhKCkKICAgICA6IG1faXNEYXRhQ29tcGxl dGUoZmFsc2UpLAogICAgICAgbV9sYXN0UmVxdWVzdFNpemUoMCwgMCksCkBAIC01Miw3ICs1NCw3 IEBAIGJvb2wgTmF0aXZlSW1hZ2VTa2lhOjpoYXNSZXNpemVkQml0bWFwKGkKICAgICBpZiAobV9s YXN0UmVxdWVzdFNpemUud2lkdGgoKSA9PSB3ICYmIG1fbGFzdFJlcXVlc3RTaXplLmhlaWdodCgp ID09IGgpCiAgICAgICAgIG1fcmVzaXplUmVxdWVzdHMrKzsKICAgICBlbHNlIHsKLSAgICAgICAg bV9sYXN0UmVxdWVzdFNpemUgPSBXZWJDb3JlOjpJbnRTaXplKHcsIGgpOworICAgICAgICBtX2xh c3RSZXF1ZXN0U2l6ZSA9IEludFNpemUodywgaCk7CiAgICAgICAgIG1fcmVzaXplUmVxdWVzdHMg PSAwOwogICAgIH0KIApAQCAtOTcsNyArOTksNyBAQCBib29sIE5hdGl2ZUltYWdlU2tpYTo6c2hv dWxkQ2FjaGVSZXNhbXBsCiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gV2hlbiBhIGRpZmZlcmVu dCBzaXplIGlzIGJlaW5nIHJlcXVlc3RlZCwgY291bnQgdGhpcyBhcyBhIHF1ZXJ5CiAgICAgICAg IC8vIChoYXNSZXNpemVkQml0bWFwKSBhbmQgcmVzZXQgdGhlIGNvdW50ZXIuCi0gICAgICAgIG1f bGFzdFJlcXVlc3RTaXplID0gV2ViQ29yZTo6SW50U2l6ZShkZXN0V2lkdGgsIGRlc3RIZWlnaHQp OworICAgICAgICBtX2xhc3RSZXF1ZXN0U2l6ZSA9IEludFNpemUoZGVzdFdpZHRoLCBkZXN0SGVp Z2h0KTsKICAgICAgICAgbV9yZXNpemVSZXF1ZXN0cyA9IDA7CiAgICAgfQogCkBAIC0xMDcsMyAr MTA5LDUgQEAgYm9vbCBOYXRpdmVJbWFnZVNraWE6OnNob3VsZENhY2hlUmVzYW1wbAogICAgIGlu dCBkZXN0U3Vic2V0U2l6ZSA9IGRlc3RTdWJzZXRXaWR0aCAqIGRlc3RTdWJzZXRIZWlnaHQ7CiAg ICAgcmV0dXJuIGRlc3RTaXplIC8gNCA8IGRlc3RTdWJzZXRTaXplOwogfQorCit9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZl SW1hZ2VTa2lhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L05hdGl2ZUltYWdlU2tpYS5oCShyZXZpc2lvbiA2NDQ2MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsNiAr MzQsOCBAQAogI2luY2x1ZGUgIlNrQml0bWFwLmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogCitu YW1lc3BhY2UgV2ViQ29yZSB7CisKIC8vIFRoaXMgb2JqZWN0IGlzIHVzZWQgYXMgdGhlICJuYXRp dmUgaW1hZ2UiIGluIG91ciBwb3J0LiBXaGVuIFdlYktpdCB1c2VzCiAvLyAiTmF0aXZlSW1hZ2VQ dHIiLCBpdCBpcyBhIHBvaW50ZXIgdG8gdGhpcyB0eXBlLiBJdCBpcyBhbiBTa0JpdG1hcCwgYnV0 IGFsc28KIC8vIHN0b3JlcyBhIGNhY2hlZCByZXNpemVkIGltYWdlLgpAQCAtOTYsOSArOTgsMTAg QEAgcHJpdmF0ZToKICAgICAvLyBUaGlzIGFsbG93cyB1cyB0byBzZWUgaWYgbWFueSByZXF1ZXN0 cyBoYXZlIGJlZW4gbWFkZSBmb3IgdGhlIHNhbWUKICAgICAvLyByZXNpemVkIGltYWdlLCB3ZSBr bm93IHRoYXQgd2Ugc2hvdWxkIHByb2JhYmx5IGNhY2hlIGl0LCBldmVuIGlmIGFsbCBvZgogICAg IC8vIHRob3NlIHJlcXVlc3RzIGluZGl2aWR1YWxseSBhcmUgc21hbGwgYW5kIHdvdWxkIG5vdCBv dGhlcndpc2UgYmUgY2FjaGVkLgotICAgIG11dGFibGUgV2ViQ29yZTo6SW50U2l6ZSBtX2xhc3RS ZXF1ZXN0U2l6ZTsKKyAgICBtdXRhYmxlIEludFNpemUgbV9sYXN0UmVxdWVzdFNpemU7CiAgICAg bXV0YWJsZSBpbnQgbV9yZXNpemVSZXF1ZXN0czsKIH07CiAKK30KICNlbmRpZiAgLy8gTmF0aXZl SW1hZ2VTa2lhX2gKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRm b3JtQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gNjQ0NjApCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU1LDEwICs1NSw5IEBACiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+ CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCi1uYW1lc3BhY2UgV2ViQ29yZSAKLXsKK25hbWVz cGFjZSBXZWJDb3JlIHsKKwogZXh0ZXJuIGJvb2wgaXNQYXRoU2tpYVNhZmUoY29uc3QgU2tNYXRy aXgmIHRyYW5zZm9ybSwgY29uc3QgU2tQYXRoJiBwYXRoKTsKLX0KIAogLy8gU3RhdGUgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIApAQCAtODAsNyArNzksNyBAQCBzdHJ1Y3QgUGxhdGZvcm1Db250ZXh0U2tpYTo6 U3RhdGUgewogICAgIFNrU2hhZGVyKiBtX2ZpbGxTaGFkZXI7CiAKICAgICAvLyBTdHJva2UuCi0g ICAgV2ViQ29yZTo6U3Ryb2tlU3R5bGUgbV9zdHJva2VTdHlsZTsKKyAgICBTdHJva2VTdHlsZSBt X3N0cm9rZVN0eWxlOwogICAgIFNrQ29sb3IgbV9zdHJva2VDb2xvcjsKICAgICBTa1NoYWRlciog bV9zdHJva2VTaGFkZXI7CiAgICAgZmxvYXQgbV9zdHJva2VUaGlja25lc3M7CkBAIC0xMDEsMTMg KzEwMCwxMyBAQCBzdHJ1Y3QgUGxhdGZvcm1Db250ZXh0U2tpYTo6U3RhdGUgewogICAgIC8vIElm IG5vbi1lbXB0eSwgdGhlIGN1cnJlbnQgU3RhdGUgaXMgY2xpcHBlZCB0byB0aGlzIGltYWdlLgog ICAgIFNrQml0bWFwIG1faW1hZ2VCdWZmZXJDbGlwOwogICAgIC8vIElmIG1faW1hZ2VCdWZmZXJD bGlwIGlzIG5vbi1lbXB0eSwgdGhpcyBpcyB0aGUgcmVnaW9uIHRoZSBpbWFnZSBpcyBjbGlwcGVk IHRvLgotICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX2NsaXA7CisgICAgRmxvYXRSZWN0IG1fY2xp cDsKICNlbmRpZgogCiAgICAgLy8gVGhpcyBpcyBhIGxpc3Qgb2YgY2xpcHBpbmcgcGF0aHMgd2hp Y2ggYXJlIGN1cnJlbnRseSBhY3RpdmUsIGluIHRoZQogICAgIC8vIG9yZGVyIGluIHdoaWNoIHRo ZXkgd2VyZSBwdXNoZWQuCiAgICAgV1RGOjpWZWN0b3I8U2tQYXRoPiBtX2FudGlBbGlhc0NsaXBQ YXRoczsKLSAgICBXZWJDb3JlOjpJbnRlcnBvbGF0aW9uUXVhbGl0eSBtX2ludGVycG9sYXRpb25R dWFsaXR5OworICAgIEludGVycG9sYXRpb25RdWFsaXR5IG1faW50ZXJwb2xhdGlvblF1YWxpdHk7 CiAKICAgICBQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0ZSBjbG9uZUluaGVyaXRlZFByb3BlcnRp ZXMoKTsKIHByaXZhdGU6CkBAIC0xMjMsOCArMTIyLDggQEAgUGxhdGZvcm1Db250ZXh0U2tpYTo6 U3RhdGU6OlN0YXRlKCkKICAgICAsIG1fbG9vcGVyKDApCiAgICAgLCBtX2ZpbGxDb2xvcigweEZG MDAwMDAwKQogICAgICwgbV9maWxsU2hhZGVyKDApCi0gICAgLCBtX3N0cm9rZVN0eWxlKFdlYkNv cmU6OlNvbGlkU3Ryb2tlKQotICAgICwgbV9zdHJva2VDb2xvcihXZWJDb3JlOjpDb2xvcjo6Ymxh Y2spCisgICAgLCBtX3N0cm9rZVN0eWxlKFNvbGlkU3Ryb2tlKQorICAgICwgbV9zdHJva2VDb2xv cihDb2xvcjo6YmxhY2spCiAgICAgLCBtX3N0cm9rZVNoYWRlcigwKQogICAgICwgbV9zdHJva2VU aGlja25lc3MoMCkKICAgICAsIG1fZGFzaFJhdGlvKDMpCkBAIC0xMzIsOCArMTMxLDggQEAgUGxh dGZvcm1Db250ZXh0U2tpYTo6U3RhdGU6OlN0YXRlKCkKICAgICAsIG1fbGluZUNhcChTa1BhaW50 OjprRGVmYXVsdF9DYXApCiAgICAgLCBtX2xpbmVKb2luKFNrUGFpbnQ6OmtEZWZhdWx0X0pvaW4p CiAgICAgLCBtX2Rhc2goMCkKLSAgICAsIG1fdGV4dERyYXdpbmdNb2RlKFdlYkNvcmU6OmNUZXh0 RmlsbCkKLSAgICAsIG1faW50ZXJwb2xhdGlvblF1YWxpdHkoV2ViQ29yZTo6SW50ZXJwb2xhdGlv bkhpZ2gpCisgICAgLCBtX3RleHREcmF3aW5nTW9kZShjVGV4dEZpbGwpCisgICAgLCBtX2ludGVy cG9sYXRpb25RdWFsaXR5KEludGVycG9sYXRpb25IaWdoKQogewogfQogCkBAIC0yNTYsOCArMjU1 LDggQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzYXZlKCkKIH0KIAogI2lmIE9TKExJTlVY KSB8fCBPUyhXSU5ET1dTKQotdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpiZWdpbkxheWVyQ2xp cHBlZFRvSW1hZ2UoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiByZWN0LAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViQ29yZTo6SW1h Z2VCdWZmZXIqIGltYWdlQnVmZmVyKQordm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpiZWdpbkxh eWVyQ2xpcHBlZFRvSW1hZ2UoY29uc3QgRmxvYXRSZWN0JiByZWN0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW1hZ2VCdWZmZXIqIGlt YWdlQnVmZmVyKQogewogICAgIC8vIFNraWEgZG9lc24ndCBzdXBwb3J0IGNsaXBwaW5nIHRvIGFu IGltYWdlLCBzbyB3ZSBjcmVhdGUgYSBsYXllci4gVGhlIG5leHQKICAgICAvLyB0aW1lIHJlc3Rv cmUgaXMgaW52b2tlZCB0aGUgbGF5ZXIgYW5kIHxpbWFnZUJ1ZmZlcnwgYXJlIGNvbWJpbmVkIHRv CkBAIC0zMjksOCArMzI4LDggQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpkcmF3UmVjdChT a1JlYwogICAgICAgICBjYW52YXMoKS0+ZHJhd1JlY3QocmVjdCwgcGFpbnQpOwogICAgIH0KIAot ICAgIGlmIChtX3N0YXRlLT5tX3N0cm9rZVN0eWxlICE9IFdlYkNvcmU6Ok5vU3Ryb2tlICYmCi0g ICAgICAgIChtX3N0YXRlLT5tX3N0cm9rZUNvbG9yICYgMHhGRjAwMDAwMCkpIHsKKyAgICBpZiAo bV9zdGF0ZS0+bV9zdHJva2VTdHlsZSAhPSBOb1N0cm9rZQorICAgICAgICAmJiAobV9zdGF0ZS0+ bV9zdHJva2VDb2xvciAmIDB4RkYwMDAwMDApKSB7CiAgICAgICAgIC8vIFdlIGRvIGEgZmlsbCBv ZiBmb3VyIHJlY3RzIHRvIHNpbXVsYXRlIHRoZSBzdHJva2Ugb2YgYSBib3JkZXIuCiAgICAgICAg IFNrQ29sb3Igb2xkRmlsbENvbG9yID0gbV9zdGF0ZS0+bV9maWxsQ29sb3I7CiAKQEAgLTM5Miwx MyArMzkxLDEzIEBAIGZsb2F0IFBsYXRmb3JtQ29udGV4dFNraWE6OnNldHVwUGFpbnRGb3IKICAg ICAgICAgcGFpbnQtPnNldFBhdGhFZmZlY3QobV9zdGF0ZS0+bV9kYXNoKTsKICAgICBlbHNlIHsK ICAgICAgICAgc3dpdGNoIChtX3N0YXRlLT5tX3N0cm9rZVN0eWxlKSB7Ci0gICAgICAgIGNhc2Ug V2ViQ29yZTo6Tm9TdHJva2U6Ci0gICAgICAgIGNhc2UgV2ViQ29yZTo6U29saWRTdHJva2U6Cisg ICAgICAgIGNhc2UgTm9TdHJva2U6CisgICAgICAgIGNhc2UgU29saWRTdHJva2U6CiAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBXZWJDb3JlOjpEYXNoZWRTdHJva2U6CisgICAgICAg IGNhc2UgRGFzaGVkU3Ryb2tlOgogICAgICAgICAgICAgd2lkdGggPSBtX3N0YXRlLT5tX2Rhc2hS YXRpbyAqIHdpZHRoOwogICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgotICAgICAgICBjYXNl IFdlYkNvcmU6OkRvdHRlZFN0cm9rZToKKyAgICAgICAgY2FzZSBEb3R0ZWRTdHJva2U6CiAgICAg ICAgICAgICAvLyBUcnVuY2F0ZSB0aGUgd2lkdGgsIHNpbmNlIHdlIGRvbid0IHdhbnQgZnV6enkg ZG90cyBvciBkYXNoZXMuCiAgICAgICAgICAgICBpbnQgZGFzaExlbmd0aCA9IHN0YXRpY19jYXN0 PGludD4od2lkdGgpOwogICAgICAgICAgICAgLy8gU3VidHJhY3Qgb2ZmIHRoZSBlbmRjYXBzLCBz aW5jZSB0aGV5J3JlIHJlbmRlcmVkIHNlcGFyYXRlbHkuCkBAIC00NjcsMTIgKzQ2NiwxMiBAQCBT a0RyYXdMb29wZXIqIFBsYXRmb3JtQ29udGV4dFNraWE6OmdldERyCiAgICAgcmV0dXJuIG1fc3Rh dGUtPm1fbG9vcGVyOwogfQogCi1XZWJDb3JlOjpTdHJva2VTdHlsZSBQbGF0Zm9ybUNvbnRleHRT a2lhOjpnZXRTdHJva2VTdHlsZSgpIGNvbnN0CitTdHJva2VTdHlsZSBQbGF0Zm9ybUNvbnRleHRT a2lhOjpnZXRTdHJva2VTdHlsZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fc3RhdGUtPm1fc3Ry b2tlU3R5bGU7CiB9CiAKLXZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0U3Ryb2tlU3R5bGUo V2ViQ29yZTo6U3Ryb2tlU3R5bGUgc3Ryb2tlU3R5bGUpCit2b2lkIFBsYXRmb3JtQ29udGV4dFNr aWE6OnNldFN0cm9rZVN0eWxlKFN0cm9rZVN0eWxlIHN0cm9rZVN0eWxlKQogewogICAgIG1fc3Rh dGUtPm1fc3Ryb2tlU3R5bGUgPSBzdHJva2VTdHlsZTsKIH0KQEAgLTUxNCwxMCArNTEzLDEwIEBA IGZsb2F0IFBsYXRmb3JtQ29udGV4dFNraWE6OmdldEFscGhhKCkgY28KIAogdm9pZCBQbGF0Zm9y bUNvbnRleHRTa2lhOjpzZXRUZXh0RHJhd2luZ01vZGUoaW50IG1vZGUpCiB7Ci0gIC8vIGNUZXh0 Q2xpcCBpcyBuZXZlciB1c2VkLCBzbyB3ZSBhc3NlcnQgdGhhdCBpdCBpc24ndCBzZXQ6Ci0gIC8v IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg5OAotICBBU1NFUlQo KG1vZGUgJiBXZWJDb3JlOjpjVGV4dENsaXApID09IDApOwotICBtX3N0YXRlLT5tX3RleHREcmF3 aW5nTW9kZSA9IG1vZGU7CisgICAgLy8gY1RleHRDbGlwIGlzIG5ldmVyIHVzZWQsIHNvIHdlIGFz c2VydCB0aGF0IGl0IGlzbid0IHNldDoKKyAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE4OTgKKyAgICBBU1NFUlQoIShtb2RlICYgY1RleHRDbGlwKSk7Cisg ICAgbV9zdGF0ZS0+bV90ZXh0RHJhd2luZ01vZGUgPSBtb2RlOwogfQogCiB2b2lkIFBsYXRmb3Jt Q29udGV4dFNraWE6OnNldFVzZUFudGlhbGlhc2luZyhib29sIGVuYWJsZSkKQEAgLTU3MCwxMiAr NTY5LDEyIEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0RmlsbFNoYWRlcigKICAgICB9 CiB9CiAKLVdlYkNvcmU6OkludGVycG9sYXRpb25RdWFsaXR5IFBsYXRmb3JtQ29udGV4dFNraWE6 OmludGVycG9sYXRpb25RdWFsaXR5KCkgY29uc3QKK0ludGVycG9sYXRpb25RdWFsaXR5IFBsYXRm b3JtQ29udGV4dFNraWE6OmludGVycG9sYXRpb25RdWFsaXR5KCkgY29uc3QKIHsKICAgICByZXR1 cm4gbV9zdGF0ZS0+bV9pbnRlcnBvbGF0aW9uUXVhbGl0eTsKIH0KIAotdm9pZCBQbGF0Zm9ybUNv bnRleHRTa2lhOjpzZXRJbnRlcnBvbGF0aW9uUXVhbGl0eShXZWJDb3JlOjpJbnRlcnBvbGF0aW9u UXVhbGl0eSBpbnRlcnBvbGF0aW9uUXVhbGl0eSkKK3ZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6 c2V0SW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvblF1YWxpdHkgaW50ZXJwb2xhdGlv blF1YWxpdHkpCiB7CiAgICAgbV9zdGF0ZS0+bV9pbnRlcnBvbGF0aW9uUXVhbGl0eSA9IGludGVy cG9sYXRpb25RdWFsaXR5OwogfQpAQCAtNjA0LDEzICs2MDMsMTMgQEAgYm9vbCBQbGF0Zm9ybUNv bnRleHRTa2lhOjppc1ByaW50aW5nKCkKICAgICByZXR1cm4gbV9jYW52YXMtPmdldFRvcFBsYXRm b3JtRGV2aWNlKCkuSXNWZWN0b3JpYWwoKTsKIH0KIAotdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lh OjpnZXRJbWFnZVJlc2FtcGxpbmdIaW50KFdlYkNvcmU6OkludFNpemUqIHNyY1NpemUsIFdlYkNv cmU6OkZsb2F0U2l6ZSogZHN0U2l6ZSkgY29uc3QKK3ZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6 Z2V0SW1hZ2VSZXNhbXBsaW5nSGludChJbnRTaXplKiBzcmNTaXplLCBGbG9hdFNpemUqIGRzdFNp emUpIGNvbnN0CiB7CiAgICAgKnNyY1NpemUgPSBtX2ltYWdlUmVzYW1wbGluZ0hpbnRTcmNTaXpl OwogICAgICpkc3RTaXplID0gbV9pbWFnZVJlc2FtcGxpbmdIaW50RHN0U2l6ZTsKIH0KIAotdm9p ZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXRJbWFnZVJlc2FtcGxpbmdIaW50KGNvbnN0IFdlYkNv cmU6OkludFNpemUmIHNyY1NpemUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgZHN0U2l6ZSkK K3ZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0SW1hZ2VSZXNhbXBsaW5nSGludChjb25zdCBJ bnRTaXplJiBzcmNTaXplLCBjb25zdCBGbG9hdFNpemUmIGRzdFNpemUpCiB7CiAgICAgbV9pbWFn ZVJlc2FtcGxpbmdIaW50U3JjU2l6ZSA9IHNyY1NpemU7CiAgICAgbV9pbWFnZVJlc2FtcGxpbmdI aW50RHN0U2l6ZSA9IGRzdFNpemU7CkBAIC02MTgsOCArNjE3LDggQEAgdm9pZCBQbGF0Zm9ybUNv bnRleHRTa2lhOjpzZXRJbWFnZVJlc2FtcAogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OmNs ZWFySW1hZ2VSZXNhbXBsaW5nSGludCgpCiB7Ci0gICAgbV9pbWFnZVJlc2FtcGxpbmdIaW50U3Jj U2l6ZSA9IFdlYkNvcmU6OkludFNpemUoKTsKLSAgICBtX2ltYWdlUmVzYW1wbGluZ0hpbnREc3RT aXplID0gV2ViQ29yZTo6RmxvYXRTaXplKCk7CisgICAgbV9pbWFnZVJlc2FtcGxpbmdIaW50U3Jj U2l6ZSA9IEludFNpemUoKTsKKyAgICBtX2ltYWdlUmVzYW1wbGluZ0hpbnREc3RTaXplID0gRmxv YXRTaXplKCk7CiB9CiAKIGJvb2wgUGxhdGZvcm1Db250ZXh0U2tpYTo6aGFzSW1hZ2VSZXNhbXBs aW5nSGludCgpIGNvbnN0CkBAIC02MjgsNyArNjI3LDcgQEAgYm9vbCBQbGF0Zm9ybUNvbnRleHRT a2lhOjpoYXNJbWFnZVJlc2FtcAogfQogCiAjaWYgT1MoTElOVVgpIHx8IE9TKFdJTkRPV1MpCi12 b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OmFwcGx5Q2xpcEZyb21JbWFnZShjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IFNrQml0bWFwJiBpbWFnZUJ1ZmZlcikKK3ZvaWQgUGxh dGZvcm1Db250ZXh0U2tpYTo6YXBwbHlDbGlwRnJvbUltYWdlKGNvbnN0IEZsb2F0UmVjdCYgcmVj dCwgY29uc3QgU2tCaXRtYXAmIGltYWdlQnVmZmVyKQogewogICAgIC8vIE5PVEU6IHRoaXMgYXNz dW1lcyB0aGUgaW1hZ2UgbWFzayBjb250YWlucyBvcGFxdWUgYmxhY2sgZm9yIHRoZSBwb3J0aW9u cyB0aGF0IGFyZSB0byBiZSBzaG93biwgYXMgc3VjaCB3ZQogICAgIC8vIG9ubHkgbG9vayBhdCB0 aGUgYWxwaGEgd2hlbiBjb21wb3NpdGluZy4gSSdtIG5vdCAxMDAlIHN1cmUgdGhpcyBpcyB3aGF0 IFdlYktpdCBleHBlY3RzIGZvciBpbWFnZSBjbGlwcGluZy4KQEAgLTY3NiwxMCArNjc1LDEwIEBA IHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6YXBwbHlBbnRpQWxpYXMKIH0KIAogI2lmIFVTRShH TEVTMl9SRU5ERVJJTkcpCi12b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldEdMRVMyQ29udGV4 dChXZWJDb3JlOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFdlYkNvcmU6OkludFNpemUm IHNpemUpCit2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldEdMRVMyQ29udGV4dChHTEVTMkNv bnRleHQqIGNvbnRleHQsIGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgbV91c2VHUFUgPSB0 cnVlOwotICAgIG1fZ3B1Q2FudmFzID0gbmV3IFdlYkNvcmU6OkdMRVMyQ2FudmFzKGNvbnRleHQs IHNpemUpOworICAgIG1fZ3B1Q2FudmFzID0gbmV3IEdMRVMyQ2FudmFzKGNvbnRleHQsIHNpemUp OwogfQogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnByZXBhcmVGb3JTb2Z0d2FyZURyYXco KSBjb25zdApAQCAtNzE2LDcgKzcxNSw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6cHJl cGFyZUZvclNvZnQKICAgICB9IGVsc2UgaWYgKG1fYmFja2luZ1N0b3JlU3RhdGUgPT0gTWl4ZWQp IHsKICAgICAgICAgaWYgKG1fc3RhdGUtPm1feGZlck1vZGUgIT0gU2tYZmVybW9kZTo6a1NyY092 ZXJfTW9kZSkgewogICAgICAgICAgICAgLy8gSGF2ZSB0byBjb21wb3NpdGUgb3VyIGN1cnJlbnRs eSBzb2Z0d2FyZSBkcmF3biBkYXRhLi4uCi0gICAgICAgICAgICB1cGxvYWRTb2Z0d2FyZVRvSGFy ZHdhcmUoV2ViQ29yZTo6Q29tcG9zaXRlU291cmNlT3Zlcik7CisgICAgICAgICAgICB1cGxvYWRT b2Z0d2FyZVRvSGFyZHdhcmUoQ29tcG9zaXRlU291cmNlT3Zlcik7CiAgICAgICAgICAgICAvLyB0 aGVuIGRvIGEgcmVhZGJhY2sgc28gd2UgY2FuIGhhcmR3YXJlIGRyYXcgc3R1ZmYuCiAgICAgICAg ICAgICByZWFkYmFja0hhcmR3YXJlVG9Tb2Z0d2FyZSgpOwogICAgICAgICAgICAgbV9iYWNraW5n U3RvcmVTdGF0ZSA9IFNvZnR3YXJlOwpAQCAtNzMxLDExICs3MzAsMTEgQEAgdm9pZCBQbGF0Zm9y bUNvbnRleHRTa2lhOjpwcmVwYXJlRm9ySGFyZAogCiAgICAgaWYgKG1fYmFja2luZ1N0b3JlU3Rh dGUgPT0gU29mdHdhcmUpIHsKICAgICAgICAgLy8gTGFzdCBkcmF3biBpbiBzb2Z0d2FyZTsgdXBs b2FkIGV2ZXJ5dGhpbmcgd2UndmUgZHJhd24uCi0gICAgICAgIHVwbG9hZFNvZnR3YXJlVG9IYXJk d2FyZShXZWJDb3JlOjpDb21wb3NpdGVDb3B5KTsKKyAgICAgICAgdXBsb2FkU29mdHdhcmVUb0hh cmR3YXJlKENvbXBvc2l0ZUNvcHkpOwogICAgIH0gZWxzZSBpZiAobV9iYWNraW5nU3RvcmVTdGF0 ZSA9PSBNaXhlZCkgewogICAgICAgICAvLyBTdHVmZiBpbiBzb2Z0d2FyZS9oYXJkd2FyZSwgY29t cG9zaXRlIHRoZSBzb2Z0d2FyZSBzdHVmZiBvbiB0b3Agb2YKICAgICAgICAgLy8gdGhlIGhhcmR3 YXJlIHN0dWZmLgotICAgICAgICB1cGxvYWRTb2Z0d2FyZVRvSGFyZHdhcmUoV2ViQ29yZTo6Q29t cG9zaXRlU291cmNlT3Zlcik7CisgICAgICAgIHVwbG9hZFNvZnR3YXJlVG9IYXJkd2FyZShDb21w b3NpdGVTb3VyY2VPdmVyKTsKICAgICB9CiAgICAgbV9iYWNraW5nU3RvcmVTdGF0ZSA9IEhhcmR3 YXJlOwogfQpAQCAtNzQ5LDcgKzc0OCw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c3lu Y1NvZnR3YXJlQ2EKICAgICAgICAgcmVhZGJhY2tIYXJkd2FyZVRvU29mdHdhcmUoKTsKICAgICBl bHNlIGlmIChtX2JhY2tpbmdTdG9yZVN0YXRlID09IE1peGVkKSB7CiAgICAgICAgIC8vIEhhdmUg dG8gY29tcG9zaXRlIG91ciBjdXJyZW50bHkgc29mdHdhcmUgZHJhd24gZGF0YS4uCi0gICAgICAg IHVwbG9hZFNvZnR3YXJlVG9IYXJkd2FyZShXZWJDb3JlOjpDb21wb3NpdGVTb3VyY2VPdmVyKTsK KyAgICAgICAgdXBsb2FkU29mdHdhcmVUb0hhcmR3YXJlKENvbXBvc2l0ZVNvdXJjZU92ZXIpOwog ICAgICAgICAvLyB0aGVuIGRvIGEgcmVhZGJhY2suCiAgICAgICAgIHJlYWRiYWNrSGFyZHdhcmVU b1NvZnR3YXJlKCk7CiAgICAgICAgIG1fYmFja2luZ1N0b3JlU3RhdGUgPSBTb2Z0d2FyZTsKQEAg LTc1NywxNiArNzU2LDE2IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c3luY1NvZnR3YXJl Q2EKICAgICBtX2JhY2tpbmdTdG9yZVN0YXRlID0gU29mdHdhcmU7CiB9CiAKLXZvaWQgUGxhdGZv cm1Db250ZXh0U2tpYTo6dXBsb2FkU29mdHdhcmVUb0hhcmR3YXJlKFdlYkNvcmU6OkNvbXBvc2l0 ZU9wZXJhdG9yIG9wKSBjb25zdAordm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjp1cGxvYWRTb2Z0 d2FyZVRvSGFyZHdhcmUoQ29tcG9zaXRlT3BlcmF0b3Igb3ApIGNvbnN0CiB7CiAgICAgY29uc3Qg U2tCaXRtYXAmIGJpdG1hcCA9IG1fY2FudmFzLT5nZXREZXZpY2UoKS0+YWNjZXNzQml0bWFwKGZh bHNlKTsKICAgICBTa0F1dG9Mb2NrUGl4ZWxzIGxvY2soYml0bWFwKTsKICAgICBtX2dwdUNhbnZh cy0+Z2xlczJDb250ZXh0KCktPm1ha2VDdXJyZW50KCk7CiAgICAgLy8gRklYTUU6IEtlZXAgYSB0 ZXh0dXJlIGFyb3VuZCBmb3IgdGhpcyByYXRoZXIgdGhhbiBjb25zdGFudGx5IGNyZWF0aW5nL2Rl c3Ryb3lpbmcgb25lLgotICAgIFJlZlB0cjxXZWJDb3JlOjpHTEVTMlRleHR1cmU+IHRleHR1cmUg PSBXZWJDb3JlOjpHTEVTMlRleHR1cmU6OmNyZWF0ZShXZWJDb3JlOjpHTEVTMlRleHR1cmU6OkJH UkE4LCBiaXRtYXAud2lkdGgoKSwgYml0bWFwLmhlaWdodCgpKTsKKyAgICBSZWZQdHI8R0xFUzJU ZXh0dXJlPiB0ZXh0dXJlID0gR0xFUzJUZXh0dXJlOjpjcmVhdGUoR0xFUzJUZXh0dXJlOjpCR1JB OCwgYml0bWFwLndpZHRoKCksIGJpdG1hcC5oZWlnaHQoKSk7CiAgICAgdGV4dHVyZS0+bG9hZChi aXRtYXAuZ2V0UGl4ZWxzKCkpOwotICAgIFdlYkNvcmU6OkludFJlY3QgcmVjdCgwLCAwLCBiaXRt YXAud2lkdGgoKSwgYml0bWFwLmhlaWdodCgpKTsKLSAgICBncHVDYW52YXMoKS0+ZHJhd1RleHR1 cmVkUmVjdCh0ZXh0dXJlLmdldCgpLCByZWN0LCByZWN0LCBXZWJDb3JlOjpEZXZpY2VDb2xvclNw YWNlLCBvcCk7CisgICAgSW50UmVjdCByZWN0KDAsIDAsIGJpdG1hcC53aWR0aCgpLCBiaXRtYXAu aGVpZ2h0KCkpOworICAgIGdwdUNhbnZhcygpLT5kcmF3VGV4dHVyZWRSZWN0KHRleHR1cmUuZ2V0 KCksIHJlY3QsIHJlY3QsIERldmljZUNvbG9yU3BhY2UsIG9wKTsKIH0KIAogdm9pZCBQbGF0Zm9y bUNvbnRleHRTa2lhOjpyZWFkYmFja0hhcmR3YXJlVG9Tb2Z0d2FyZSgpIGNvbnN0CkBAIC03ODcs NCArNzg2LDYgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpyZWFkYmFja0hhcmR3YQogICAg ICAgICB9CiAgICAgfQogfQorCiAjZW5kaWYKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4 dFNraWEuaAkocmV2aXNpb24gNjQ0NjApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSwxNiArNDEsMTYg QEAKICNpbmNsdWRlICJTa1BhaW50LmgiCiAjaW5jbHVkZSAiU2tQYXRoLmgiCiAKLSNpZiBVU0Uo R0xFUzJfUkVOREVSSU5HKQorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KKwogbmFtZXNwYWNlIFdl YkNvcmUgeworCisjaWYgVVNFKEdMRVMyX1JFTkRFUklORykKIGVudW0gQ29tcG9zaXRlT3BlcmF0 b3I7CiBjbGFzcyBHTEVTMkNhbnZhczsKIGNsYXNzIEdMRVMyQ29udGV4dDsKLX0KICNlbmRpZgog Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgotCiAvLyBUaGlzIGNsYXNzIGhvbGRzIHRoZSBwbGF0 Zm9ybS1zcGVjaWZpYyBzdGF0ZSBmb3IgR3JhcGhpY3NDb250ZXh0LiBXZSBwdXQKIC8vIG1vc3Qg b2Ygb3VyIFNraWEgd3JhcHBlcnMgb24gdGhpcyBjbGFzcy4gSW4gdGhlb3J5LCBhIGxvdCBvZiB0 aGlzIHN0dWZmIGNvdWxkCiAvLyBiZSBtb3ZlZCB0byBHcmFwaGljc0NvbnRleHQgZGlyZWN0bHks IGV4Y2VwdCB0aGF0IHNvbWUgY29kZSBleHRlcm5hbCB0byB0aGlzCkBAIC05Nyw4ICs5Nyw3IEBA IHB1YmxpYzoKICAgICAvLyBpbnZva2VkLgogICAgIC8vIE5PVEU6IHxpbWFnZUJ1ZmZlcnwgbWF5 IGJlIGRlbGV0ZWQgYmVmb3JlIHRoZSB8cmVzdG9yZXwgaXMgaW52b2tlZC4KICNpZiBPUyhMSU5V WCkgfHwgT1MoV0lORE9XUykKLSAgICB2b2lkIGJlZ2luTGF5ZXJDbGlwcGVkVG9JbWFnZShjb25z dCBXZWJDb3JlOjpGbG9hdFJlY3QmLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFdlYkNvcmU6OkltYWdlQnVmZmVyKik7CisgICAgdm9pZCBiZWdpbkxheWVyQ2xpcHBl ZFRvSW1hZ2UoY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgSW1hZ2VCdWZmZXIqKTsKICNlbmRpZgog ICAgIHZvaWQgY2xpcFBhdGhBbnRpQWxpYXNlZChjb25zdCBTa1BhdGgmKTsKIApAQCAtMTI3LDcg KzEyNiw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFhmZXJtb2RlTW9kZShTa1hmZXJtb2RlOjpN b2RlKTsKICAgICB2b2lkIHNldEZpbGxDb2xvcihTa0NvbG9yKTsKICAgICB2b2lkIHNldEZpbGxT aGFkZXIoU2tTaGFkZXIqKTsKLSAgICB2b2lkIHNldFN0cm9rZVN0eWxlKFdlYkNvcmU6OlN0cm9r ZVN0eWxlKTsKKyAgICB2b2lkIHNldFN0cm9rZVN0eWxlKFN0cm9rZVN0eWxlKTsKICAgICB2b2lk IHNldFN0cm9rZUNvbG9yKFNrQ29sb3IpOwogICAgIHZvaWQgc2V0U3Ryb2tlVGhpY2tuZXNzKGZs b2F0IHRoaWNrbmVzcyk7CiAgICAgdm9pZCBzZXRTdHJva2VTaGFkZXIoU2tTaGFkZXIqKTsKQEAg LTEzNiw3ICsxMzUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXREYXNoUGF0aEVmZmVjdChTa0Rh c2hQYXRoRWZmZWN0Kik7CiAKICAgICBTa0RyYXdMb29wZXIqIGdldERyYXdMb29wZXIoKSBjb25z dDsKLSAgICBXZWJDb3JlOjpTdHJva2VTdHlsZSBnZXRTdHJva2VTdHlsZSgpIGNvbnN0OworICAg IFN0cm9rZVN0eWxlIGdldFN0cm9rZVN0eWxlKCkgY29uc3Q7CiAgICAgZmxvYXQgZ2V0U3Ryb2tl VGhpY2tuZXNzKCkgY29uc3Q7CiAgICAgaW50IGdldFRleHREcmF3aW5nTW9kZSgpIGNvbnN0Owog ICAgIGZsb2F0IGdldEFscGhhKCkgY29uc3Q7CkBAIC0xNTUsOCArMTU0LDggQEAgcHVibGljOgog CiAgICAgc2tpYTo6UGxhdGZvcm1DYW52YXMqIGNhbnZhcygpIHsgcmV0dXJuIG1fY2FudmFzOyB9 CiAKLSAgICBXZWJDb3JlOjpJbnRlcnBvbGF0aW9uUXVhbGl0eSBpbnRlcnBvbGF0aW9uUXVhbGl0 eSgpIGNvbnN0OwotICAgIHZvaWQgc2V0SW50ZXJwb2xhdGlvblF1YWxpdHkoV2ViQ29yZTo6SW50 ZXJwb2xhdGlvblF1YWxpdHkgaW50ZXJwb2xhdGlvblF1YWxpdHkpOworICAgIEludGVycG9sYXRp b25RdWFsaXR5IGludGVycG9sYXRpb25RdWFsaXR5KCkgY29uc3Q7CisgICAgdm9pZCBzZXRJbnRl cnBvbGF0aW9uUXVhbGl0eShJbnRlcnBvbGF0aW9uUXVhbGl0eSBpbnRlcnBvbGF0aW9uUXVhbGl0 eSk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgcHVzaGVkIGRvd24gdG8gR3JhcGhp Y3NDb250ZXh0LgogICAgIHZvaWQgZHJhd1JlY3QoU2tSZWN0IHJlY3QpOwpAQCAtMTc4LDE0ICsx NzcsMTQgQEAgcHVibGljOgogICAgIC8vIHBvc3NpYmxlIHF1YWxpdHkuCiAgICAgYm9vbCBpc1By aW50aW5nKCk7CiAKLSAgICB2b2lkIGdldEltYWdlUmVzYW1wbGluZ0hpbnQoV2ViQ29yZTo6SW50 U2l6ZSogc3JjU2l6ZSwgV2ViQ29yZTo6RmxvYXRTaXplKiBkc3RTaXplKSBjb25zdDsKLSAgICB2 b2lkIHNldEltYWdlUmVzYW1wbGluZ0hpbnQoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc3JjU2l6 ZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBkc3RTaXplKTsKKyAgICB2b2lkIGdldEltYWdl UmVzYW1wbGluZ0hpbnQoSW50U2l6ZSogc3JjU2l6ZSwgRmxvYXRTaXplKiBkc3RTaXplKSBjb25z dDsKKyAgICB2b2lkIHNldEltYWdlUmVzYW1wbGluZ0hpbnQoY29uc3QgSW50U2l6ZSYgc3JjU2l6 ZSwgY29uc3QgRmxvYXRTaXplJiBkc3RTaXplKTsKICAgICB2b2lkIGNsZWFySW1hZ2VSZXNhbXBs aW5nSGludCgpOwogICAgIGJvb2wgaGFzSW1hZ2VSZXNhbXBsaW5nSGludCgpIGNvbnN0OwogI2lm IFVTRShHTEVTMl9SRU5ERVJJTkcpCiAgICAgYm9vbCB1c2VHUFUoKSB7IHJldHVybiBtX3VzZUdQ VTsgfQotICAgIHZvaWQgc2V0R0xFUzJDb250ZXh0KFdlYkNvcmU6OkdMRVMyQ29udGV4dCosIGNv bnN0IFdlYkNvcmU6OkludFNpemUmKTsKLSAgICBXZWJDb3JlOjpHTEVTMkNhbnZhcyogZ3B1Q2Fu dmFzKCkgY29uc3QgeyByZXR1cm4gbV9ncHVDYW52YXMuZ2V0KCk7IH0KKyAgICB2b2lkIHNldEdM RVMyQ29udGV4dChHTEVTMkNvbnRleHQqLCBjb25zdCBJbnRTaXplJik7CisgICAgR0xFUzJDYW52 YXMqIGdwdUNhbnZhcygpIGNvbnN0IHsgcmV0dXJuIG1fZ3B1Q2FudmFzLmdldCgpOyB9CiAjZW5k aWYKIAogI2lmIFVTRShHTEVTMl9SRU5ERVJJTkcpCkBAIC0yMDUsMTIgKzIwNCwxMiBAQCBwcml2 YXRlOgogI2lmIE9TKExJTlVYKSB8fCBPUyhXSU5ET1dTKQogICAgIC8vIFVzZWQgd2hlbiByZXN0 b3JpbmcgYW5kIHRoZSBzdGF0ZSBoYXMgYW4gaW1hZ2UgY2xpcC4gT25seSBzaG93cyB0aGUgcGl4 ZWxzIGluCiAgICAgLy8gbV9jYW52YXMgdGhhdCBhcmUgYWxzbyBpbiBpbWFnZUJ1ZmZlci4KLSAg ICB2b2lkIGFwcGx5Q2xpcEZyb21JbWFnZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmLCBjb25z dCBTa0JpdG1hcCYpOworICAgIHZvaWQgYXBwbHlDbGlwRnJvbUltYWdlKGNvbnN0IEZsb2F0UmVj dCYsIGNvbnN0IFNrQml0bWFwJik7CiAjZW5kaWYKICAgICB2b2lkIGFwcGx5QW50aUFsaWFzZWRD bGlwUGF0aHMoV1RGOjpWZWN0b3I8U2tQYXRoPiYgcGF0aHMpOwogCiAjaWYgVVNFKEdMRVMyX1JF TkRFUklORykKLSAgICB2b2lkIHVwbG9hZFNvZnR3YXJlVG9IYXJkd2FyZShXZWJDb3JlOjpDb21w b3NpdGVPcGVyYXRvcikgY29uc3Q7CisgICAgdm9pZCB1cGxvYWRTb2Z0d2FyZVRvSGFyZHdhcmUo Q29tcG9zaXRlT3BlcmF0b3IpIGNvbnN0OwogICAgIHZvaWQgcmVhZGJhY2tIYXJkd2FyZVRvU29m dHdhcmUoKSBjb25zdDsKICNlbmRpZgogCkBAIC0yMzIsMTYgKzIzMSwxNyBAQCBwcml2YXRlOgog CiAgICAgLy8gU3RvcmVzIGltYWdlIHNpemVzIGZvciBhIGhpbnQgdG8gY29tcHV0ZSBpbWFnZSBy ZXNhbXBsaW5nIG1vZGVzLiAKICAgICAvLyBWYWx1ZXMgYXJlIHVzZWQgaW4gSW1hZ2VTa2lhLmNw cAotICAgIFdlYkNvcmU6OkludFNpemUgbV9pbWFnZVJlc2FtcGxpbmdIaW50U3JjU2l6ZTsKLSAg ICBXZWJDb3JlOjpGbG9hdFNpemUgbV9pbWFnZVJlc2FtcGxpbmdIaW50RHN0U2l6ZTsKKyAgICBJ bnRTaXplIG1faW1hZ2VSZXNhbXBsaW5nSGludFNyY1NpemU7CisgICAgRmxvYXRTaXplIG1faW1h Z2VSZXNhbXBsaW5nSGludERzdFNpemU7CiAjaWYgT1MoV0lORE9XUykKICAgICBib29sIG1fZHJh d2luZ1RvSW1hZ2VCdWZmZXI7CiAjZW5kaWYKICNpZiBVU0UoR0xFUzJfUkVOREVSSU5HKQogICAg IGJvb2wgbV91c2VHUFU7Ci0gICAgT3duUHRyPFdlYkNvcmU6OkdMRVMyQ2FudmFzPiBtX2dwdUNh bnZhczsKKyAgICBPd25QdHI8R0xFUzJDYW52YXM+IG1fZ3B1Q2FudmFzOwogICAgIG11dGFibGUg ZW51bSB7IE5vbmUsIFNvZnR3YXJlLCBNaXhlZCwgSGFyZHdhcmUgfSBtX2JhY2tpbmdTdG9yZVN0 YXRlOwogI2VuZGlmCiB9OwogCit9CiAjZW5kaWYgLy8gUGxhdGZvcm1Db250ZXh0U2tpYV9oCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYUZvbnRXaW4uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhRm9udFdpbi5jcHAJ KHJldmlzaW9uIDY0NDYwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFG b250V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIwLDcgKzIyMCw3IEBAIHZvaWQgU2tpYVdp bk91dGxpbmVDYWNoZTo6cmVtb3ZlUGF0aHNGb3IKICAgICAgICAgZGVsZXRlT3V0bGluZShvdXRs aW5lQ2FjaGUuZmluZCgqaSkpOwogfQogCi1ib29sIHdpbmRvd3NDYW5IYW5kbGVEcmF3VGV4dFNo YWRvdyhXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQgKmNvbnRleHQpCitib29sIHdpbmRvd3NDYW5I YW5kbGVEcmF3VGV4dFNoYWRvdyhHcmFwaGljc0NvbnRleHQgKmNvbnRleHQpCiB7CiAgICAgRmxv YXRTaXplIHNoYWRvd1NpemU7CiAgICAgZmxvYXQgc2hhZG93Qmx1cjsKQEAgLTMyMyw3ICszMjMs NyBAQCBib29sIHBhaW50U2tpYVRleHQoR3JhcGhpY3NDb250ZXh0KiBjb250CiAgICAgfQogCiAg ICAgLy8gU3Ryb2tpbmcgb24gdG9wIChpZiBuZWNlc3NhcnkpLgotICAgIGlmICgodGV4dE1vZGUg JiBXZWJDb3JlOjpjVGV4dFN0cm9rZSkKKyAgICBpZiAoKHRleHRNb2RlICYgY1RleHRTdHJva2Up CiAgICAgICAgICYmIHBsYXRmb3JtQ29udGV4dC0+Z2V0U3Ryb2tlU3R5bGUoKSAhPSBOb1N0cm9r ZQogICAgICAgICAmJiBwbGF0Zm9ybUNvbnRleHQtPmdldFN0cm9rZVRoaWNrbmVzcygpID4gMCkg ewogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYUZvbnRXaW4uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYUZvbnRXaW4u aAkocmV2aXNpb24gNjQ0NjApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tp YUZvbnRXaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzQsMTMgKzM0LDE0IEBACiAjaW5jbHVkZSA8 d2luZG93cy5oPgogI2luY2x1ZGUgPHVzcDEwLmg+CiAKLWNsYXNzIEdyYXBoaWNzQ29udGV4dDsK IGNsYXNzIFNrUGF0aDsKIGNsYXNzIFNrUG9pbnQ7Ci1jbGFzcyBQbGF0Zm9ybUNvbnRleHRTa2lh OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEdyYXBoaWNzQ29udGV4dDsKK2NsYXNz IFBsYXRmb3JtQ29udGV4dFNraWE7CisKIC8vIEZJWE1FOiBSZW5hbWUgZmlsZSB0byBTa2lhV2lu T3V0bGluZUNhY2hlCiBjbGFzcyBTa2lhV2luT3V0bGluZUNhY2hlIHsKIHB1YmxpYzoK