128118 2014-02-03 12:53:03 -0800 Manage CalcExpressionNode and derived classes through std::unique_ptr instead of OwnPtr 2014-02-05 03:15:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128007 1 zan zan commit-queue esprehn+autocc glenn gyuyoung.kim kondapallykalyan macpherson menard oldest_to_newest 975974 0 zan 2014-02-03 12:53:03 -0800 Manage CalcExpressionNode and derived classes through std::unique_ptr instead of OwnPtr 975975 1 223012 zan 2014-02-03 12:54:49 -0800 Created attachment 223012 Patch 976073 2 223012 darin 2014-02-03 15:54:27 -0800 Comment on attachment 223012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223012&action=review > Source/WebCore/css/CSSCalculationValue.cpp:401 > + std::unique_ptr<CalcExpressionNode> left(m_leftSide->toCalcValue(style, rootStyle, zoom)); Maybe auto here? > Source/WebCore/css/CSSCalculationValue.cpp:404 > + std::unique_ptr<CalcExpressionNode> right(m_rightSide->toCalcValue(style, rootStyle, zoom)); Maybe auto here? 976410 3 223012 zan 2014-02-04 10:08:11 -0800 Comment on attachment 223012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223012&action=review >> Source/WebCore/css/CSSCalculationValue.cpp:401 >> + std::unique_ptr<CalcExpressionNode> left(m_leftSide->toCalcValue(style, rootStyle, zoom)); > > Maybe auto here? I'd rather not -- nothing in 'm_leftSide->toCalcValue(...)' tells me that std::unique_ptr is returned. >> Source/WebCore/css/CSSCalculationValue.cpp:404 >> + std::unique_ptr<CalcExpressionNode> right(m_rightSide->toCalcValue(style, rootStyle, zoom)); > > Maybe auto here? Ditto. 976703 4 223012 zan 2014-02-05 03:15:03 -0800 Comment on attachment 223012 Patch Clearing flags on attachment: 223012 Committed r163439: <http://trac.webkit.org/changeset/163439> 976704 5 zan 2014-02-05 03:15:12 -0800 All reviewed patches have been landed. Closing bug. 223012 2014-02-03 12:54:49 -0800 2014-02-05 03:15:02 -0800 Patch bug-128118-20140203215448.patch text/plain 11287 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFlMGE1MDViY2JjOWJi ZDlhMDVhZjgwMWVhZGExZjA5ZGJkMzg0ZS4uMzU3MWQ4OWMwYjg2YWZiODAxNThiZTMyNjQxN2Y0 NmJkM2RiOTM0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAyLTAzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNYW5hZ2UgQ2FsY0V4 cHJlc3Npb25Ob2RlIGFuZCBkZXJpdmVkIGNsYXNzZXMgdGhyb3VnaCBzdGQ6OnVuaXF1ZV9wdHIg aW5zdGVhZCBvZiBPd25QdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyODExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlcGxhY2UgdXNlcyBvZiBPd25QdHIgZm9yIENhbGNFeHByZXNzaW9uTm9kZSBh bmQgZGVyaXZlZCBjbGFzc2VzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAgICogY3Nz L0NTU0NhbGN1bGF0aW9uVmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ2FsY1ByaW1p dGl2ZVZhbHVlOjp0b0NhbGNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NDYWxjQmluYXJ5 T3BlcmF0aW9uOjp0b0NhbGNWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU0NhbGN1bGF0aW9uVmFs dWUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9DYWxjdWxhdGlvblZhbHVlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNhbGN1bGF0aW9uVmFsdWU6OmNyZWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0v Q2FsY3VsYXRpb25WYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FsY3VsYXRpb25WYWx1ZTo6 Q2FsY3VsYXRpb25WYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWxjRXhwcmVzc2lvbkJpbmFy eU9wZXJhdGlvbjo6Q2FsY0V4cHJlc3Npb25CaW5hcnlPcGVyYXRpb24pOgorICAgICAgICAqIHBs YXRmb3JtL0xlbmd0aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMZW5ndGg6OmJsZW5kTWl4ZWRU eXBlcyk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkJhc2ljU2hhcGVDZW50ZXJDb29yZGluYXRlOjp1cGRhdGVDb21wdXRlZExl bmd0aCk6CisKIDIwMTQtMDItMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgog CiAgICAgICAgIENUVEU6IFJlbmRlclNWR0dyYWRpZW50U3RvcCBhbHdheXMgaGFzIGEgU1ZHU3Rv cEVsZW1lbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ2FsY3VsYXRpb25W YWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ2FsY3VsYXRpb25WYWx1ZS5jcHAKaW5k ZXggMDIzMjljZGQ0MDM0YzlkM2ViNjAxNDkwOWZhNjNlNWNkM2E4NzUwZC4uNzQ4NzBhMzgzOTNj MWI2NDMyMjk3Y2FhM2FlZWVjZGNhYTM5NWM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NhbGN1bGF0aW9uVmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND YWxjdWxhdGlvblZhbHVlLmNwcApAQCAtMzcsOCArMzcsNiBAQAogI2luY2x1ZGUgIlN0eWxlUmVz b2x2ZXIuaCIKIAogI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+Ci0jaW5jbHVkZSA8d3RmL093 blB0ci5oPgotI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgogCiBzdGF0aWMgY29uc3QgaW50IG1heEV4cHJlc3Npb25EZXB0aCA9 IDEwMDsKQEAgLTIwNywxOSArMjA1LDE4IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fdmFs dWUtPmNzc1RleHQoKTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q2FsY0V4cHJl c3Npb25Ob2RlPiB0b0NhbGNWYWx1ZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IFJl bmRlclN0eWxlKiByb290U3R5bGUsIGRvdWJsZSB6b29tKSBjb25zdAorICAgIHZpcnR1YWwgc3Rk Ojp1bmlxdWVfcHRyPENhbGNFeHByZXNzaW9uTm9kZT4gdG9DYWxjVmFsdWUoY29uc3QgUmVuZGVy U3R5bGUqIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgem9vbSkg Y29uc3QKICAgICB7CiAgICAgICAgIHN3aXRjaCAobV9jYXRlZ29yeSkgewogICAgICAgICBjYXNl IENhbGNOdW1iZXI6Ci0gICAgICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IENhbGNFeHByZXNz aW9uTnVtYmVyKG1fdmFsdWUtPmdldEZsb2F0VmFsdWUoKSkpOworICAgICAgICAgICAgcmV0dXJu IHN0ZDo6bWFrZV91bmlxdWU8Q2FsY0V4cHJlc3Npb25OdW1iZXI+KG1fdmFsdWUtPmdldEZsb2F0 VmFsdWUoKSk7CiAgICAgICAgIGNhc2UgQ2FsY0xlbmd0aDoKLSAgICAgICAgICAgIHJldHVybiBh ZG9wdFB0cihuZXcgQ2FsY0V4cHJlc3Npb25OdW1iZXIobV92YWx1ZS0+Y29tcHV0ZUxlbmd0aDxm bG9hdD4oc3R5bGUsIHJvb3RTdHlsZSwgem9vbSkpKTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6 Om1ha2VfdW5pcXVlPENhbGNFeHByZXNzaW9uTnVtYmVyPihtX3ZhbHVlLT5jb21wdXRlTGVuZ3Ro PGZsb2F0PihzdHlsZSwgcm9vdFN0eWxlLCB6b29tKSk7CiAgICAgICAgIGNhc2UgQ2FsY1BlcmNl bnQ6CiAgICAgICAgIGNhc2UgQ2FsY1BlcmNlbnRMZW5ndGg6IHsKICAgICAgICAgICAgIENTU1By aW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IG1fdmFsdWUuZ2V0KCk7Ci0gICAgICAgICAg ICByZXR1cm4gYWRvcHRQdHIobmV3IENhbGNFeHByZXNzaW9uTGVuZ3RoKHByaW1pdGl2ZVZhbHVl Ci0gICAgICAgICAgICAgICAgPyBwcmltaXRpdmVWYWx1ZS0+Y29udmVydFRvTGVuZ3RoPEZpeGVk RmxvYXRDb252ZXJzaW9uIHwgUGVyY2VudENvbnZlcnNpb24gfCBGcmFjdGlvbkNvbnZlcnNpb24+ KHN0eWxlLCByb290U3R5bGUsIHpvb20pCi0gICAgICAgICAgICAgICAgOiBMZW5ndGgoVW5kZWZp bmVkKSkpOworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8Q2FsY0V4cHJlc3Np b25MZW5ndGg+KHByaW1pdGl2ZVZhbHVlCisgICAgICAgICAgICAgICAgPyBwcmltaXRpdmVWYWx1 ZS0+Y29udmVydFRvTGVuZ3RoPEZpeGVkRmxvYXRDb252ZXJzaW9uIHwgUGVyY2VudENvbnZlcnNp b24gfCBGcmFjdGlvbkNvbnZlcnNpb24+KHN0eWxlLCByb290U3R5bGUsIHpvb20pIDogTGVuZ3Ro KFVuZGVmaW5lZCkpOwogICAgICAgICB9CiAgICAgICAgIC8vIE9ubHkgdHlwZXMgdGhhdCBjb3Vs ZCBiZSBwYXJ0IG9mIGEgTGVuZ3RoIGV4cHJlc3Npb24gY2FuIGJlIGNvbnZlcnRlZAogICAgICAg ICAvLyB0byBhIENhbGNFeHByZXNzaW9uTm9kZS4gQ2FsY1BlcmNlbnROdW1iZXIgbWFrZXMgbm8g c2Vuc2UgYXMgYSBMZW5ndGguCkBAIC0zOTksMTUgKzM5NiwxNSBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiAhZG91YmxlVmFsdWUoKTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8 Q2FsY0V4cHJlc3Npb25Ob2RlPiB0b0NhbGNWYWx1ZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUs IGNvbnN0IFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRvdWJsZSB6b29tKSBjb25zdAorICAgIHZp cnR1YWwgc3RkOjp1bmlxdWVfcHRyPENhbGNFeHByZXNzaW9uTm9kZT4gdG9DYWxjVmFsdWUoY29u c3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3Vi bGUgem9vbSkgY29uc3QKICAgICB7Ci0gICAgICAgIE93blB0cjxDYWxjRXhwcmVzc2lvbk5vZGU+ IGxlZnQobV9sZWZ0U2lkZS0+dG9DYWxjVmFsdWUoc3R5bGUsIHJvb3RTdHlsZSwgem9vbSkpOwor ICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q2FsY0V4cHJlc3Npb25Ob2RlPiBsZWZ0KG1fbGVmdFNp ZGUtPnRvQ2FsY1ZhbHVlKHN0eWxlLCByb290U3R5bGUsIHpvb20pKTsKICAgICAgICAgaWYgKCFs ZWZ0KQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgIE93blB0cjxDYWxjRXhw cmVzc2lvbk5vZGU+IHJpZ2h0KG1fcmlnaHRTaWRlLT50b0NhbGNWYWx1ZShzdHlsZSwgcm9vdFN0 eWxlLCB6b29tKSk7CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxDYWxjRXhwcmVzc2lvbk5vZGU+ IHJpZ2h0KG1fcmlnaHRTaWRlLT50b0NhbGNWYWx1ZShzdHlsZSwgcm9vdFN0eWxlLCB6b29tKSk7 CiAgICAgICAgIGlmICghcmlnaHQpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAg ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBDYWxjRXhwcmVzc2lvbkJpbmFyeU9wZXJhdGlvbihsZWZ0 LnJlbGVhc2UoKSwgcmlnaHQucmVsZWFzZSgpLCBtX29wZXJhdG9yKSk7CisgICAgICAgIHJldHVy biBzdGQ6Om1ha2VfdW5pcXVlPENhbGNFeHByZXNzaW9uQmluYXJ5T3BlcmF0aW9uPihzdGQ6Om1v dmUobGVmdCksIHN0ZDo6bW92ZShyaWdodCksIG1fb3BlcmF0b3IpOwogICAgIH0KIAogICAgIHZp cnR1YWwgZG91YmxlIGRvdWJsZVZhbHVlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NDYWxjdWxhdGlvblZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ2Fs Y3VsYXRpb25WYWx1ZS5oCmluZGV4IGU2OGE2ZTU4OWNkMDc0YTU3MzYyYjljNWIwMDRjZjZlN2Vh Mjk3NGYuLjA0MWM3YjM3MDc4M2UyYzJlNjk3MzhjMjE5ODQ4NGE0NDcwZTAxMjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDYWxjdWxhdGlvblZhbHVlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NhbGN1bGF0aW9uVmFsdWUuaApAQCAtMzUsNyArMzUsNyBAQAogI2lu Y2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTVmFsdWUuaCIKICNpbmNs dWRlICJDYWxjdWxhdGlvblZhbHVlLmgiCi0jaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNp bmNsdWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3 dGYvUmVmUHRyLmg+CiAKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+ Q1NTQ2FsY0V4cHJlc3Npb25Ob2RlKCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBpc1plcm8oKSBj b25zdCA9IDA7Ci0gICAgdmlydHVhbCBQYXNzT3duUHRyPENhbGNFeHByZXNzaW9uTm9kZT4gdG9D YWxjVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqLCBjb25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxl LCBkb3VibGUgem9vbSA9IDEuMCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVf cHRyPENhbGNFeHByZXNzaW9uTm9kZT4gdG9DYWxjVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqLCBj b25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgem9vbSA9IDEuMCkgY29uc3QgPSAw OwogICAgIHZpcnR1YWwgZG91YmxlIGRvdWJsZVZhbHVlKCkgY29uc3QgPSAwOwogICAgIHZpcnR1 YWwgZG91YmxlIGNvbXB1dGVMZW5ndGhQeChjb25zdCBSZW5kZXJTdHlsZSogY3VycmVudFN0eWxl LCBjb25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciA9IDEuMCwg Ym9vbCBjb21wdXRpbmdGb250U2l6ZSA9IGZhbHNlKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBT dHJpbmcgY3VzdG9tQ1NTVGV4dCgpIGNvbnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NhbGN1bGF0aW9uVmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vQ2FsY3VsYXRpb25WYWx1ZS5jcHAKaW5kZXggZmU3NTcxZDIyODEwODAwZmI4ZDk2OGI0ZWRm ZjhhNmNjMjVhNmQxYi4uZDgwYWFiY2ZjZDMzNDIyNjA3NzVkODhlM2I1NDgxYjg0ZDEzMGEwMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ2FsY3VsYXRpb25WYWx1ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ2FsY3VsYXRpb25WYWx1ZS5jcHAKQEAgLTU1 LDkgKzU1LDkgQEAgZmxvYXQgQ2FsY0V4cHJlc3Npb25CaW5hcnlPcGVyYXRpb246OmV2YWx1YXRl KGZsb2F0IG1heFZhbHVlKSBjb25zdAogICAgIHJldHVybiBzdGQ6Om51bWVyaWNfbGltaXRzPGZs b2F0Pjo6cXVpZXRfTmFOKCk7CiB9CiAKLVBhc3NSZWZQdHI8Q2FsY3VsYXRpb25WYWx1ZT4gQ2Fs Y3VsYXRpb25WYWx1ZTo6Y3JlYXRlKFBhc3NPd25QdHI8Q2FsY0V4cHJlc3Npb25Ob2RlPiB2YWx1 ZSwgQ2FsY3VsYXRpb25QZXJtaXR0ZWRWYWx1ZVJhbmdlIHJhbmdlKQorUGFzc1JlZlB0cjxDYWxj dWxhdGlvblZhbHVlPiBDYWxjdWxhdGlvblZhbHVlOjpjcmVhdGUoc3RkOjp1bmlxdWVfcHRyPENh bGNFeHByZXNzaW9uTm9kZT4gdmFsdWUsIENhbGN1bGF0aW9uUGVybWl0dGVkVmFsdWVSYW5nZSBy YW5nZSkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IENhbGN1bGF0aW9uVmFsdWUodmFsdWUs IHJhbmdlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDYWxjdWxhdGlvblZhbHVlKHN0ZDo6 bW92ZSh2YWx1ZSksIHJhbmdlKSk7CiB9CiAKIGZsb2F0IENhbGN1bGF0aW9uVmFsdWU6OmV2YWx1 YXRlKGZsb2F0IG1heFZhbHVlKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vQ2FsY3VsYXRpb25WYWx1ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ2FsY3Vs YXRpb25WYWx1ZS5oCmluZGV4IDM2ZmJjNGUyMjNjOGM3YWNkZWUyNjk5MjVjODczOWQ3NTQ1YjM0 ZmIuLmY2YWU2NzZlYWEwOWU2YzNiYTZhZDAwYmY5MTJkZjY3ODRhYzdhMmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NhbGN1bGF0aW9uVmFsdWUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9DYWxjdWxhdGlvblZhbHVlLmgKQEAgLTMzLDggKzMzLDcgQEAKIAog I2luY2x1ZGUgIkxlbmd0aC5oIgogI2luY2x1ZGUgIkxlbmd0aEZ1bmN0aW9ucy5oIgotI2luY2x1 ZGUgPHd0Zi9Pd25QdHIuaD4KLSNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgorI2luY2x1ZGUg PG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KIApAQCAtODMsNyArODIsNyBAQCBwcm90ZWN0ZWQ6CiAKIGNsYXNzIENhbGN1bGF0aW9u VmFsdWUgOiBwdWJsaWMgUmVmQ291bnRlZDxDYWxjdWxhdGlvblZhbHVlPiB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFBhc3NSZWZQdHI8Q2FsY3VsYXRpb25WYWx1ZT4gY3JlYXRlKFBhc3NPd25QdHI8 Q2FsY0V4cHJlc3Npb25Ob2RlPiB2YWx1ZSwgQ2FsY3VsYXRpb25QZXJtaXR0ZWRWYWx1ZVJhbmdl KTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxDYWxjdWxhdGlvblZhbHVlPiBjcmVhdGUoc3RkOjp1 bmlxdWVfcHRyPENhbGNFeHByZXNzaW9uTm9kZT4gdmFsdWUsIENhbGN1bGF0aW9uUGVybWl0dGVk VmFsdWVSYW5nZSk7CiAgICAgZmxvYXQgZXZhbHVhdGUoZmxvYXQgbWF4VmFsdWUpIGNvbnN0Owog CiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IENhbGN1bGF0aW9uVmFsdWUmIG8pIGNvbnN0CkBA IC05NSwxMyArOTQsMTMgQEAgcHVibGljOgogICAgIGNvbnN0IENhbGNFeHByZXNzaW9uTm9kZSog ZXhwcmVzc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUuZ2V0KCk7IH0KIAogcHJpdmF0ZToK LSAgICBDYWxjdWxhdGlvblZhbHVlKFBhc3NPd25QdHI8Q2FsY0V4cHJlc3Npb25Ob2RlPiB2YWx1 ZSwgQ2FsY3VsYXRpb25QZXJtaXR0ZWRWYWx1ZVJhbmdlIHJhbmdlKQotICAgICAgICA6IG1fdmFs dWUodmFsdWUpCisgICAgQ2FsY3VsYXRpb25WYWx1ZShzdGQ6OnVuaXF1ZV9wdHI8Q2FsY0V4cHJl c3Npb25Ob2RlPiB2YWx1ZSwgQ2FsY3VsYXRpb25QZXJtaXR0ZWRWYWx1ZVJhbmdlIHJhbmdlKQor ICAgICAgICA6IG1fdmFsdWUoc3RkOjptb3ZlKHZhbHVlKSkKICAgICAgICAgLCBtX2lzTm9uTmVn YXRpdmUocmFuZ2UgPT0gQ2FsY3VsYXRpb25SYW5nZU5vbk5lZ2F0aXZlKQogICAgIHsKICAgICB9 CiAKLSAgICBPd25QdHI8Q2FsY0V4cHJlc3Npb25Ob2RlPiBtX3ZhbHVlOworICAgIHN0ZDo6dW5p cXVlX3B0cjxDYWxjRXhwcmVzc2lvbk5vZGU+IG1fdmFsdWU7CiAgICAgYm9vbCBtX2lzTm9uTmVn YXRpdmU7CiB9OwogCkBAIC0xNzcsOSArMTc2LDkgQEAgaW5saW5lIGNvbnN0IENhbGNFeHByZXNz aW9uTGVuZ3RoKiB0b0NhbGNFeHByZXNzaW9uTGVuZ3RoKGNvbnN0IENhbGNFeHByZXNzaW9uTm8K IAogY2xhc3MgQ2FsY0V4cHJlc3Npb25CaW5hcnlPcGVyYXRpb24gOiBwdWJsaWMgQ2FsY0V4cHJl c3Npb25Ob2RlIHsKIHB1YmxpYzoKLSAgICBDYWxjRXhwcmVzc2lvbkJpbmFyeU9wZXJhdGlvbihQ YXNzT3duUHRyPENhbGNFeHByZXNzaW9uTm9kZT4gbGVmdFNpZGUsIFBhc3NPd25QdHI8Q2FsY0V4 cHJlc3Npb25Ob2RlPiByaWdodFNpZGUsIENhbGNPcGVyYXRvciBvcCkKLSAgICAgICAgOiBtX2xl ZnRTaWRlKGxlZnRTaWRlKQotICAgICAgICAsIG1fcmlnaHRTaWRlKHJpZ2h0U2lkZSkKKyAgICBD YWxjRXhwcmVzc2lvbkJpbmFyeU9wZXJhdGlvbihzdGQ6OnVuaXF1ZV9wdHI8Q2FsY0V4cHJlc3Np b25Ob2RlPiBsZWZ0U2lkZSwgc3RkOjp1bmlxdWVfcHRyPENhbGNFeHByZXNzaW9uTm9kZT4gcmln aHRTaWRlLCBDYWxjT3BlcmF0b3Igb3ApCisgICAgICAgIDogbV9sZWZ0U2lkZShzdGQ6Om1vdmUo bGVmdFNpZGUpKQorICAgICAgICAsIG1fcmlnaHRTaWRlKHN0ZDo6bW92ZShyaWdodFNpZGUpKQog ICAgICAgICAsIG1fb3BlcmF0b3Iob3ApCiAgICAgewogICAgICAgICBtX3R5cGUgPSBDYWxjRXhw cmVzc2lvbk5vZGVCaW5hcnlPcGVyYXRpb247CkBAIC0yMDIsOCArMjAxLDggQEAgcHVibGljOgog ICAgIENhbGNPcGVyYXRvciBnZXRPcGVyYXRvcigpIGNvbnN0IHsgcmV0dXJuIG1fb3BlcmF0b3I7 IH0KIAogcHJpdmF0ZToKLSAgICBPd25QdHI8Q2FsY0V4cHJlc3Npb25Ob2RlPiBtX2xlZnRTaWRl OwotICAgIE93blB0cjxDYWxjRXhwcmVzc2lvbk5vZGU+IG1fcmlnaHRTaWRlOworICAgIHN0ZDo6 dW5pcXVlX3B0cjxDYWxjRXhwcmVzc2lvbk5vZGU+IG1fbGVmdFNpZGU7CisgICAgc3RkOjp1bmlx dWVfcHRyPENhbGNFeHByZXNzaW9uTm9kZT4gbV9yaWdodFNpZGU7CiAgICAgQ2FsY09wZXJhdG9y IG1fb3BlcmF0b3I7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9M ZW5ndGguY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmNwcAppbmRleCA0ZTE2 ZDE1NTA0NmIxZWUzMTVmYjYxZmZkNzk5YTliMTUxNzE3ZmMwLi41NTI0YmZjM2I2Y2IwYmE4MDQ0 MWI0M2UzZDBkNDljMTc2OThlMTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9MZW5ndGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aC5jcHAKQEAg LTIyMyw4ICsyMjMsOCBAQCBMZW5ndGggTGVuZ3RoOjpibGVuZE1peGVkVHlwZXMoY29uc3QgTGVu Z3RoJiBmcm9tLCBkb3VibGUgcHJvZ3Jlc3MpIGNvbnN0CiAgICAgaWYgKHByb2dyZXNzID49IDEu MCkKICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgICAgICAKLSAgICBPd25QdHI8Q2FsY0V4cHJl c3Npb25Ob2RlPiBibGVuZCA9IGFkb3B0UHRyKG5ldyBDYWxjRXhwcmVzc2lvbkJsZW5kTGVuZ3Ro KGZyb20sICp0aGlzLCBwcm9ncmVzcykpOwotICAgIHJldHVybiBMZW5ndGgoQ2FsY3VsYXRpb25W YWx1ZTo6Y3JlYXRlKGJsZW5kLnJlbGVhc2UoKSwgQ2FsY3VsYXRpb25SYW5nZUFsbCkpOworICAg IGF1dG8gYmxlbmQgPSBzdGQ6Om1ha2VfdW5pcXVlPENhbGNFeHByZXNzaW9uQmxlbmRMZW5ndGg+ KGZyb20sICp0aGlzLCBwcm9ncmVzcyk7CisgICAgcmV0dXJuIExlbmd0aChDYWxjdWxhdGlvblZh bHVlOjpjcmVhdGUoc3RkOjptb3ZlKGJsZW5kKSwgQ2FsY3VsYXRpb25SYW5nZUFsbCkpOwogfQog ICAgICAgICAgIAogUGFzc1JlZlB0cjxDYWxjdWxhdGlvblZhbHVlPiBMZW5ndGg6OmNhbGN1bGF0 aW9uVmFsdWUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL0Jhc2ljU2hhcGVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNp Y1NoYXBlcy5jcHAKaW5kZXggYTVmYWExYjJjYTQxOGZiZmVlODAyYWRiMzk5NzEyNTMwMmI4MzM4 Mi4uZDRlMGQ0NzQyYzJjZTI4OTUxOWVkNWYwYTczZTU5YzRmNDlmZDkzZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwCkBAIC01MSwxMCArNTEs MTAgQEAgdm9pZCBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZTo6dXBkYXRlQ29tcHV0ZWRMZW5n dGgoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgT3duUHRyPENhbGNFeHByZXNzaW9u TGVuZ3RoPiBsaHMgPSBhZG9wdFB0cihuZXcgQ2FsY0V4cHJlc3Npb25MZW5ndGgoTGVuZ3RoKDEw MCwgUGVyY2VudCkpKTsKLSAgICBPd25QdHI8Q2FsY0V4cHJlc3Npb25MZW5ndGg+IHJocyA9IGFk b3B0UHRyKG5ldyBDYWxjRXhwcmVzc2lvbkxlbmd0aChtX2xlbmd0aCkpOwotICAgIE93blB0cjxD YWxjRXhwcmVzc2lvbkJpbmFyeU9wZXJhdGlvbj4gb3AgPSBhZG9wdFB0cihuZXcgQ2FsY0V4cHJl c3Npb25CaW5hcnlPcGVyYXRpb24obGhzLnJlbGVhc2UoKSwgcmhzLnJlbGVhc2UoKSwgQ2FsY1N1 YnRyYWN0KSk7Ci0gICAgbV9jb21wdXRlZExlbmd0aCA9IExlbmd0aChDYWxjdWxhdGlvblZhbHVl OjpjcmVhdGUob3AucmVsZWFzZSgpLCBDYWxjdWxhdGlvblJhbmdlQWxsKSk7CisgICAgYXV0byBs aHMgPSBzdGQ6Om1ha2VfdW5pcXVlPENhbGNFeHByZXNzaW9uTGVuZ3RoPihMZW5ndGgoMTAwLCBQ ZXJjZW50KSk7CisgICAgYXV0byByaHMgPSBzdGQ6Om1ha2VfdW5pcXVlPENhbGNFeHByZXNzaW9u TGVuZ3RoPihtX2xlbmd0aCk7CisgICAgYXV0byBvcCA9IHN0ZDo6bWFrZV91bmlxdWU8Q2FsY0V4 cHJlc3Npb25CaW5hcnlPcGVyYXRpb24+KHN0ZDo6bW92ZShsaHMpLCBzdGQ6Om1vdmUocmhzKSwg Q2FsY1N1YnRyYWN0KTsKKyAgICBtX2NvbXB1dGVkTGVuZ3RoID0gTGVuZ3RoKENhbGN1bGF0aW9u VmFsdWU6OmNyZWF0ZShzdGQ6Om1vdmUob3ApLCBDYWxjdWxhdGlvblJhbmdlQWxsKSk7CiB9CiAK IGJvb2wgQmFzaWNTaGFwZTo6Y2FuQmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIpIGNvbnN0 Cg==