127046 2014-01-15 06:00:46 -0800 Rename functions in SVGDocumentExtension 2014-01-16 01:05:01 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 krit webkit-unassigned commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr schenney zimmermann oldest_to_newest 968294 0 krit 2014-01-15 06:00:46 -0800 Rename functions in SVGDocumentExtension 968296 1 221263 krit 2014-01-15 06:04:02 -0800 Created attachment 221263 Patch 968641 2 221263 commit-queue 2014-01-16 01:04:56 -0800 Comment on attachment 221263 Patch Clearing flags on attachment: 221263 Committed r162119: <http://trac.webkit.org/changeset/162119> 968642 3 commit-queue 2014-01-16 01:05:01 -0800 All reviewed patches have been landed. Closing bug. 221263 2014-01-15 06:04:02 -0800 2014-01-16 01:04:56 -0800 Patch refactor.patch text/plain 14767 krit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MWQ2ZTkxLi41YWY3MzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzgg QEAKKzIwMTQtMDEtMTUgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZW5hbWUgZnVuY3Rpb25zIGluIFNWR0RvY3VtZW50RXh0ZW5zaW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcwNDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2Ugc29tZSBmdW5jdGlvbiBu YW1lcyBpbiBTVkdEb2N1bWVudEV4dGVuc2lvbgorICAgICAgICB0byBtYWtlIHRoZW0gbW9yZSBk ZXNjcmlwdGl2ZS4KKworICAgICAgICBTaW1wbGUgcmVmYWN0b3JpbmcuIE5vIG5ldyB0ZXN0cy4K KworICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI6OnJlZ2lzdGVy UmVzb3VyY2UpOgorICAgICAgICAqIHN2Zy9TVkdEb2N1bWVudEV4dGVuc2lvbnMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjphZGRQZW5kaW5nUmVzb3VyY2Up OgorICAgICAgICAoV2ViQ29yZTo6U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjppc0lkT2ZQZW5kaW5n UmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjppc0Vs ZW1lbnRXaXRoUGVuZGluZ1Jlc291cmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpTVkdEb2N1bWVu dEV4dGVuc2lvbnM6OmlzUGVuZGluZ1Jlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0Rv Y3VtZW50RXh0ZW5zaW9uczo6Y2xlYXJIYXNQZW5kaW5nUmVzb3VyY2VzSWZQb3NzaWJsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdEb2N1bWVudEV4dGVuc2lvbnM6OnJlbW92ZUVsZW1lbnRGcm9t UGVuZGluZ1Jlc291cmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpTVkdEb2N1bWVudEV4dGVuc2lv bnM6OnJlbW92ZVBlbmRpbmdSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdEb2N1bWVu dEV4dGVuc2lvbnM6OnJlbW92ZVBlbmRpbmdSZXNvdXJjZUZvclJlbW92YWwpOgorICAgICAgICAo V2ViQ29yZTo6U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjptYXJrUGVuZGluZ1Jlc291cmNlc0ZvclJl bW92YWwpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpyZW1vdmVF bGVtZW50RnJvbVBlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsTWFwKTogVGhlIG5hbWUgaXMgbm90 IGdyZWF0IGJ1dCBhIGJpdCBtb3JlIGRlc2NyaXB0aXZlLgorICAgICAgICAqIHN2Zy9TVkdEb2N1 bWVudEV4dGVuc2lvbnMuaDoKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTVkdFbGVtZW50OjpidWlsZFBlbmRpbmdSZXNvdXJjZXNJZk5lZWRlZCk6Cisg ICAgICAgICogc3ZnL1NWR01QYXRoRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdN UGF0aEVsZW1lbnQ6OmJ1aWxkUGVuZGluZ1Jlc291cmNlKToKKyAgICAgICAgKiBzdmcvU1ZHVGV4 dFBhdGhFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RleHRQYXRoRWxlbWVudDo6 YnVpbGRQZW5kaW5nUmVzb3VyY2UpOgorICAgICAgICAqIHN2Zy9hbmltYXRpb24vU1ZHU01JTEVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHU01JTEVsZW1lbnQ6OmJ1aWxkUGVuZGlu Z1Jlc291cmNlKToKKwogMjAxNC0wMS0xNSAgQW5kcmVpIEJ1Y3VyICA8YWJ1Y3VyQGFkb2JlLmNv bT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIEhpdC10ZXN0aW5nIGdvZXMgdGhyb3VnaCBjbGlw cGVkIGxheWVyIGluIGZhc3QvcmVnaW9ucy9vdmVyZmxvdy1maXJzdC1hbmQtbGFzdC1yZWdpb25z LWluLWNvbnRhaW5lci1oaWRkZW4uaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcAppbmRleCA1YTIx MzMzLi4yZDhhNzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcApAQCAtMTY5LDE5ICsxNjksMTkg QEAgdm9pZCBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcjo6cmVtb3ZlQ2xpZW50UmVuZGVyTGF5 ZXIoUmVuZGVyTGF5ZXIqIGNsaWVudCkKIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI6 OnJlZ2lzdGVyUmVzb3VyY2UoKQogewogICAgIFNWR0RvY3VtZW50RXh0ZW5zaW9ucyYgZXh0ZW5z aW9ucyA9IHN2Z0V4dGVuc2lvbnNGcm9tRWxlbWVudChlbGVtZW50KCkpOwotICAgIGlmICghZXh0 ZW5zaW9ucy5oYXNQZW5kaW5nUmVzb3VyY2UobV9pZCkpIHsKKyAgICBpZiAoIWV4dGVuc2lvbnMu aXNJZE9mUGVuZGluZ1Jlc291cmNlKG1faWQpKSB7CiAgICAgICAgIGV4dGVuc2lvbnMuYWRkUmVz b3VyY2UobV9pZCwgdGhpcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBzdGQ6OnVu aXF1ZV9wdHI8U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpTVkdQZW5kaW5nRWxlbWVudHM+IGNsaWVu dHMgPSBleHRlbnNpb25zLnJlbW92ZVBlbmRpbmdSZXNvdXJjZShtX2lkKTsKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpQZW5kaW5nRWxlbWVudHM+IGNsaWVudHMg PSBleHRlbnNpb25zLnJlbW92ZVBlbmRpbmdSZXNvdXJjZShtX2lkKTsKIAogICAgIC8vIENhY2hl IHVzIHdpdGggdGhlIG5ldyBpZC4KICAgICBleHRlbnNpb25zLmFkZFJlc291cmNlKG1faWQsIHRo aXMpOwogCiAgICAgLy8gVXBkYXRlIGNhY2hlZCByZXNvdXJjZXMgb2YgcGVuZGluZyBjbGllbnRz LgotICAgIGNvbnN0IFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6U1ZHUGVuZGluZ0VsZW1lbnRzOjpj b25zdF9pdGVyYXRvciBlbmQgPSBjbGllbnRzLT5lbmQoKTsKLSAgICBmb3IgKFNWR0RvY3VtZW50 RXh0ZW5zaW9uczo6U1ZHUGVuZGluZ0VsZW1lbnRzOjpjb25zdF9pdGVyYXRvciBpdCA9IGNsaWVu dHMtPmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgIGF1dG8gZW5kID0gY2xpZW50cy0+ ZW5kKCk7CisgICAgZm9yIChhdXRvIGl0ID0gY2xpZW50cy0+YmVnaW4oKTsgaXQgIT0gZW5kOyAr K2l0KSB7CiAgICAgICAgIEFTU0VSVCgoKml0KS0+aGFzUGVuZGluZ1Jlc291cmNlcygpKTsKICAg ICAgICAgZXh0ZW5zaW9ucy5jbGVhckhhc1BlbmRpbmdSZXNvdXJjZXNJZlBvc3NpYmxlKCppdCk7 CiAgICAgICAgIGF1dG8gcmVuZGVyZXIgPSAoKml0KS0+cmVuZGVyZXIoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdEb2N1bWVudEV4dGVuc2lvbnMuY3BwIGIvU291cmNlL1dl YkNvcmUvc3ZnL1NWR0RvY3VtZW50RXh0ZW5zaW9ucy5jcHAKaW5kZXggOWNhMjQwOS4uNjU1YjJh MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0RvY3VtZW50RXh0ZW5zaW9ucy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0RvY3VtZW50RXh0ZW5zaW9ucy5jcHAKQEAg LTE1NSwxMyArMTU1LDEzIEBAIHZvaWQgU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjphZGRQZW5kaW5n UmVzb3VyY2UoY29uc3QgQXRvbWljU3RyaW5nJiBpZCwgRWxlbWVudCoKIAogICAgIGF1dG8gcmVz dWx0ID0gbV9wZW5kaW5nUmVzb3VyY2VzLmFkZChpZCwgbnVsbHB0cik7CiAgICAgaWYgKHJlc3Vs dC5pc05ld0VudHJ5KQotICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gc3RkOjptYWtl X3VuaXF1ZTxTVkdQZW5kaW5nRWxlbWVudHM+KCk7CisgICAgICAgIHJlc3VsdC5pdGVyYXRvci0+ dmFsdWUgPSBzdGQ6Om1ha2VfdW5pcXVlPFBlbmRpbmdFbGVtZW50cz4oKTsKICAgICByZXN1bHQu aXRlcmF0b3ItPnZhbHVlLT5hZGQoZWxlbWVudCk7CiAKICAgICBlbGVtZW50LT5zZXRIYXNQZW5k aW5nUmVzb3VyY2VzKCk7CiB9CiAKLWJvb2wgU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpoYXNQZW5k aW5nUmVzb3VyY2UoY29uc3QgQXRvbWljU3RyaW5nJiBpZCkgY29uc3QKK2Jvb2wgU1ZHRG9jdW1l bnRFeHRlbnNpb25zOjppc0lkT2ZQZW5kaW5nUmVzb3VyY2UoY29uc3QgQXRvbWljU3RyaW5nJiBp ZCkgY29uc3QKIHsKICAgICBpZiAoaWQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CkBAIC0xNjksMTYgKzE2OSwxNCBAQCBib29sIFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6aGFzUGVu ZGluZ1Jlc291cmNlKGNvbnN0IEF0b21pY1N0cmluZyYgaWQpIGNvbnN0CiAgICAgcmV0dXJuIG1f cGVuZGluZ1Jlc291cmNlcy5jb250YWlucyhpZCk7CiB9CiAKLWJvb2wgU1ZHRG9jdW1lbnRFeHRl bnNpb25zOjppc0VsZW1lbnRQZW5kaW5nUmVzb3VyY2VzKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0 Citib29sIFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6aXNFbGVtZW50V2l0aFBlbmRpbmdSZXNvdXJj ZXMoRWxlbWVudCogZWxlbWVudCkgY29uc3QKIHsKICAgICAvLyBUaGlzIGFsZ29yaXRobSB0YWtl cyB0aW1lIHByb3BvcnRpb25hbCB0byB0aGUgbnVtYmVyIG9mIHBlbmRpbmcgcmVzb3VyY2VzIGFu ZCBuZWVkIG5vdC4KICAgICAvLyBJZiBwZXJmb3JtYW5jZSBiZWNvbWVzIGFuIGlzc3VlIHdlIGNh biBrZWVwIGEgY291bnRlZCBzZXQgb2YgZWxlbWVudHMgYW5kIGFuc3dlciB0aGUgcXVlc3Rpb24g ZWZmaWNpZW50bHkuCi0KICAgICBBU1NFUlQoZWxlbWVudCk7Ci0KICAgICBhdXRvIGVuZCA9IG1f cGVuZGluZ1Jlc291cmNlcy5lbmQoKTsKICAgICBmb3IgKGF1dG8gaXQgPSBtX3BlbmRpbmdSZXNv dXJjZXMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFNWR1BlbmRpbmdFbGVt ZW50cyogZWxlbWVudHMgPSBpdC0+dmFsdWUuZ2V0KCk7CisgICAgICAgIFBlbmRpbmdFbGVtZW50 cyogZWxlbWVudHMgPSBpdC0+dmFsdWUuZ2V0KCk7CiAgICAgICAgIEFTU0VSVChlbGVtZW50cyk7 CiAKICAgICAgICAgaWYgKGVsZW1lbnRzLT5jb250YWlucyhlbGVtZW50KSkKQEAgLTE4NywxMSAr MTg1LDExIEBAIGJvb2wgU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjppc0VsZW1lbnRQZW5kaW5nUmVz b3VyY2VzKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1i b29sIFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6aXNFbGVtZW50UGVuZGluZ1Jlc291cmNlKEVsZW1l bnQqIGVsZW1lbnQsIGNvbnN0IEF0b21pY1N0cmluZyYgaWQpIGNvbnN0Citib29sIFNWR0RvY3Vt ZW50RXh0ZW5zaW9uczo6aXNQZW5kaW5nUmVzb3VyY2UoRWxlbWVudCogZWxlbWVudCwgY29uc3Qg QXRvbWljU3RyaW5nJiBpZCkgY29uc3QKIHsKICAgICBBU1NFUlQoZWxlbWVudCk7CiAKLSAgICBp ZiAoIWhhc1BlbmRpbmdSZXNvdXJjZShpZCkpCisgICAgaWYgKCFpc0lkT2ZQZW5kaW5nUmVzb3Vy Y2UoaWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gbV9wZW5kaW5nUmVz b3VyY2VzLmdldChpZCktPmNvbnRhaW5zKGVsZW1lbnQpOwpAQCAtMTk5LDcgKzE5Nyw3IEBAIGJv b2wgU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjppc0VsZW1lbnRQZW5kaW5nUmVzb3VyY2UoRWxlbWVu dCogZWxlbWVudCwgY29uc3QgQXRvCiAKIHZvaWQgU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpjbGVh ckhhc1BlbmRpbmdSZXNvdXJjZXNJZlBvc3NpYmxlKEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAg aWYgKCFpc0VsZW1lbnRQZW5kaW5nUmVzb3VyY2VzKGVsZW1lbnQpKQorICAgIGlmICghaXNFbGVt ZW50V2l0aFBlbmRpbmdSZXNvdXJjZXMoZWxlbWVudCkpCiAgICAgICAgIGVsZW1lbnQtPmNsZWFy SGFzUGVuZGluZ1Jlc291cmNlcygpOwogfQogCkBAIC0yMTIsNyArMjEwLDcgQEAgdm9pZCBTVkdE b2N1bWVudEV4dGVuc2lvbnM6OnJlbW92ZUVsZW1lbnRGcm9tUGVuZGluZ1Jlc291cmNlcyhFbGVt ZW50KiBlbGVtZW50KQogICAgICAgICBWZWN0b3I8QXRvbWljU3RyaW5nPiB0b0JlUmVtb3ZlZDsK ICAgICAgICAgYXV0byBlbmQgPSBtX3BlbmRpbmdSZXNvdXJjZXMuZW5kKCk7CiAgICAgICAgIGZv ciAoYXV0byBpdCA9IG1fcGVuZGluZ1Jlc291cmNlcy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQp IHsKLSAgICAgICAgICAgIFNWR1BlbmRpbmdFbGVtZW50cyogZWxlbWVudHMgPSBpdC0+dmFsdWUu Z2V0KCk7CisgICAgICAgICAgICBQZW5kaW5nRWxlbWVudHMqIGVsZW1lbnRzID0gaXQtPnZhbHVl LmdldCgpOwogICAgICAgICAgICAgQVNTRVJUKGVsZW1lbnRzKTsKICAgICAgICAgICAgIEFTU0VS VCghZWxlbWVudHMtPmlzRW1wdHkoKSk7CiAKQEAgLTIzNCw3ICsyMzIsNyBAQCB2b2lkIFNWR0Rv Y3VtZW50RXh0ZW5zaW9uczo6cmVtb3ZlRWxlbWVudEZyb21QZW5kaW5nUmVzb3VyY2VzKEVsZW1l bnQqIGVsZW1lbnQpCiAgICAgICAgIFZlY3RvcjxBdG9taWNTdHJpbmc+IHRvQmVSZW1vdmVkOwog ICAgICAgICBhdXRvIGVuZCA9IG1fcGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWwuZW5kKCk7CiAg ICAgICAgIGZvciAoYXV0byBpdCA9IG1fcGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWwuYmVnaW4o KTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgICAgICBTVkdQZW5kaW5nRWxlbWVudHMqIGVs ZW1lbnRzID0gaXQtPnZhbHVlLmdldCgpOworICAgICAgICAgICAgUGVuZGluZ0VsZW1lbnRzKiBl bGVtZW50cyA9IGl0LT52YWx1ZS5nZXQoKTsKICAgICAgICAgICAgIEFTU0VSVChlbGVtZW50cyk7 CiAgICAgICAgICAgICBBU1NFUlQoIWVsZW1lbnRzLT5pc0VtcHR5KCkpOwogCkBAIC0yNTAsMTMg KzI0OCwxMyBAQCB2b2lkIFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6cmVtb3ZlRWxlbWVudEZyb21Q ZW5kaW5nUmVzb3VyY2VzKEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgfQogfQogCi1zdGQ6OnVuaXF1 ZV9wdHI8U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpTVkdQZW5kaW5nRWxlbWVudHM+IFNWR0RvY3Vt ZW50RXh0ZW5zaW9uczo6cmVtb3ZlUGVuZGluZ1Jlc291cmNlKGNvbnN0IEF0b21pY1N0cmluZyYg aWQpCitzdGQ6OnVuaXF1ZV9wdHI8U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpQZW5kaW5nRWxlbWVu dHM+IFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6cmVtb3ZlUGVuZGluZ1Jlc291cmNlKGNvbnN0IEF0 b21pY1N0cmluZyYgaWQpCiB7CiAgICAgQVNTRVJUKG1fcGVuZGluZ1Jlc291cmNlcy5jb250YWlu cyhpZCkpOwogICAgIHJldHVybiBtX3BlbmRpbmdSZXNvdXJjZXMudGFrZShpZCk7CiB9CiAKLXN0 ZDo6dW5pcXVlX3B0cjxTVkdEb2N1bWVudEV4dGVuc2lvbnM6OlNWR1BlbmRpbmdFbGVtZW50cz4g U1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpyZW1vdmVQZW5kaW5nUmVzb3VyY2VGb3JSZW1vdmFsKGNv bnN0IEF0b21pY1N0cmluZyYgaWQpCitzdGQ6OnVuaXF1ZV9wdHI8U1ZHRG9jdW1lbnRFeHRlbnNp b25zOjpQZW5kaW5nRWxlbWVudHM+IFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6cmVtb3ZlUGVuZGlu Z1Jlc291cmNlRm9yUmVtb3ZhbChjb25zdCBBdG9taWNTdHJpbmcmIGlkKQogewogICAgIEFTU0VS VChtX3BlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsLmNvbnRhaW5zKGlkKSk7CiAgICAgcmV0dXJu IG1fcGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWwudGFrZShpZCk7CkBAIC0yNjksMTcgKzI2Nywx NyBAQCB2b2lkIFNWR0RvY3VtZW50RXh0ZW5zaW9uczo6bWFya1BlbmRpbmdSZXNvdXJjZXNGb3JS ZW1vdmFsKGNvbnN0IEF0b21pY1N0cmluZyYgaQogCiAgICAgQVNTRVJUKCFtX3BlbmRpbmdSZXNv dXJjZXNGb3JSZW1vdmFsLmNvbnRhaW5zKGlkKSk7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8U1ZH UGVuZGluZ0VsZW1lbnRzPiBleGlzdGluZyA9IG1fcGVuZGluZ1Jlc291cmNlcy50YWtlKGlkKTsK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8UGVuZGluZ0VsZW1lbnRzPiBleGlzdGluZyA9IG1fcGVuZGlu Z1Jlc291cmNlcy50YWtlKGlkKTsKICAgICBpZiAoZXhpc3RpbmcgJiYgIWV4aXN0aW5nLT5pc0Vt cHR5KCkpCiAgICAgICAgIG1fcGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWwuYWRkKGlkLCBzdGQ6 Om1vdmUoZXhpc3RpbmcpKTsKIH0KIAotRWxlbWVudCogU1ZHRG9jdW1lbnRFeHRlbnNpb25zOjpy ZW1vdmVFbGVtZW50RnJvbVBlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsKGNvbnN0IEF0b21pY1N0 cmluZyYgaWQpCitFbGVtZW50KiBTVkdEb2N1bWVudEV4dGVuc2lvbnM6OnJlbW92ZUVsZW1lbnRG cm9tUGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWxNYXAoY29uc3QgQXRvbWljU3RyaW5nJiBpZCkK IHsKICAgICBpZiAoaWQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIFNWR1Bl bmRpbmdFbGVtZW50cyogcmVzb3VyY2VTZXQgPSBtX3BlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFs LmdldChpZCk7CisgICAgUGVuZGluZ0VsZW1lbnRzKiByZXNvdXJjZVNldCA9IG1fcGVuZGluZ1Jl c291cmNlc0ZvclJlbW92YWwuZ2V0KGlkKTsKICAgICBpZiAoIXJlc291cmNlU2V0IHx8IHJlc291 cmNlU2V0LT5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHRG9jdW1lbnRFeHRlbnNpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHRG9jdW1lbnRFeHRlbnNpb25zLmgKaW5kZXggYjNjZDRiMS4uNDYwYjE0NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0RvY3VtZW50RXh0ZW5zaW9ucy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdEb2N1bWVudEV4dGVuc2lvbnMuaApAQCAtNDMsNyArNDMsNyBA QCBjbGFzcyBFbGVtZW50OwogY2xhc3MgU1ZHRG9jdW1lbnRFeHRlbnNpb25zIHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShTVkdEb2N1bWVudEV4dGVuc2lvbnMpOyBXVEZfTUFLRV9GQVNUX0FM TE9DQVRFRDsKIHB1YmxpYzoKLSAgICB0eXBlZGVmIEhhc2hTZXQ8RWxlbWVudCo+IFNWR1BlbmRp bmdFbGVtZW50czsKKyAgICB0eXBlZGVmIEhhc2hTZXQ8RWxlbWVudCo+IFBlbmRpbmdFbGVtZW50 czsKICAgICBTVkdEb2N1bWVudEV4dGVuc2lvbnMoRG9jdW1lbnQqKTsKICAgICB+U1ZHRG9jdW1l bnRFeHRlbnNpb25zKCk7CiAgICAgCkBAIC04Myw4ICs4Myw4IEBAIHByaXZhdGU6CiAgICAgSGFz aFNldDxTVkdGb250RmFjZUVsZW1lbnQqPiBtX3N2Z0ZvbnRGYWNlRWxlbWVudHM7CiAjZW5kaWYK ICAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIqPiBt X3Jlc291cmNlczsKLSAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgc3RkOjp1bmlxdWVfcHRyPFNW R1BlbmRpbmdFbGVtZW50cz4+IG1fcGVuZGluZ1Jlc291cmNlczsgLy8gUmVzb3VyY2VzIHRoYXQg YXJlIHBlbmRpbmcuCi0gICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIHN0ZDo6dW5pcXVlX3B0cjxT VkdQZW5kaW5nRWxlbWVudHM+PiBtX3BlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsOyAvLyBSZXNv dXJjZXMgdGhhdCBhcmUgcGVuZGluZyBhbmQgc2NoZWR1bGVkIGZvciByZW1vdmFsLgorICAgIEhh c2hNYXA8QXRvbWljU3RyaW5nLCBzdGQ6OnVuaXF1ZV9wdHI8UGVuZGluZ0VsZW1lbnRzPj4gbV9w ZW5kaW5nUmVzb3VyY2VzOyAvLyBSZXNvdXJjZXMgdGhhdCBhcmUgcGVuZGluZy4KKyAgICBIYXNo TWFwPEF0b21pY1N0cmluZywgc3RkOjp1bmlxdWVfcHRyPFBlbmRpbmdFbGVtZW50cz4+IG1fcGVu ZGluZ1Jlc291cmNlc0ZvclJlbW92YWw7IC8vIFJlc291cmNlcyB0aGF0IGFyZSBwZW5kaW5nIGFu ZCBzY2hlZHVsZWQgZm9yIHJlbW92YWwuCiAgICAgSGFzaE1hcDxTVkdFbGVtZW50Kiwgc3RkOjp1 bmlxdWVfcHRyPEhhc2hTZXQ8U1ZHRWxlbWVudCo+Pj4gbV9lbGVtZW50RGVwZW5kZW5jaWVzOwog ICAgIHN0ZDo6dW5pcXVlX3B0cjxTVkdSZXNvdXJjZXNDYWNoZT4gbV9yZXNvdXJjZXNDYWNoZTsK IApAQCAtOTMsMTkgKzkzLDE5IEBAIHB1YmxpYzoKICAgICAvLyB3aGljaCBhcmUgcmVmZXJlbmNl ZCBieSBhbnkgb2JqZWN0IGluIHRoZSBTVkcgZG9jdW1lbnQsIGJ1dCBkbyBOT1QgZXhpc3QgeWV0 LgogICAgIC8vIEZvciBpbnN0YW5jZSwgZHluYW1pY2FsbHkgYnVpbGQgZ3JhZGllbnRzIC8gcGF0 dGVybnMgLyBjbGlwcGVycy4uLgogICAgIHZvaWQgYWRkUGVuZGluZ1Jlc291cmNlKGNvbnN0IEF0 b21pY1N0cmluZyYgaWQsIEVsZW1lbnQqKTsKLSAgICBib29sIGhhc1BlbmRpbmdSZXNvdXJjZShj b25zdCBBdG9taWNTdHJpbmcmIGlkKSBjb25zdDsKLSAgICBib29sIGlzRWxlbWVudFBlbmRpbmdS ZXNvdXJjZXMoRWxlbWVudCopIGNvbnN0OwotICAgIGJvb2wgaXNFbGVtZW50UGVuZGluZ1Jlc291 cmNlKEVsZW1lbnQqLCBjb25zdCBBdG9taWNTdHJpbmcmIGlkKSBjb25zdDsKKyAgICBib29sIGlz SWRPZlBlbmRpbmdSZXNvdXJjZShjb25zdCBBdG9taWNTdHJpbmcmIGlkKSBjb25zdDsKKyAgICBi b29sIGlzUGVuZGluZ1Jlc291cmNlKEVsZW1lbnQqLCBjb25zdCBBdG9taWNTdHJpbmcmIGlkKSBj b25zdDsKICAgICB2b2lkIGNsZWFySGFzUGVuZGluZ1Jlc291cmNlc0lmUG9zc2libGUoRWxlbWVu dCopOwogICAgIHZvaWQgcmVtb3ZlRWxlbWVudEZyb21QZW5kaW5nUmVzb3VyY2VzKEVsZW1lbnQq KTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8U1ZHUGVuZGluZ0VsZW1lbnRzPiByZW1vdmVQZW5kaW5n UmVzb3VyY2UoY29uc3QgQXRvbWljU3RyaW5nJiBpZCk7CisgICAgc3RkOjp1bmlxdWVfcHRyPFBl bmRpbmdFbGVtZW50cz4gcmVtb3ZlUGVuZGluZ1Jlc291cmNlKGNvbnN0IEF0b21pY1N0cmluZyYg aWQpOwogCiAgICAgLy8gVGhlIGZvbGxvd2luZyB0d28gZnVuY3Rpb25zIGFyZSB1c2VkIGZvciBz Y2hlZHVsaW5nIGEgcGVuZGluZyByZXNvdXJjZSB0byBiZSByZW1vdmVkLgogICAgIHZvaWQgbWFy a1BlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsKGNvbnN0IEF0b21pY1N0cmluZyYpOwotICAgIEVs ZW1lbnQqIHJlbW92ZUVsZW1lbnRGcm9tUGVuZGluZ1Jlc291cmNlc0ZvclJlbW92YWwoY29uc3Qg QXRvbWljU3RyaW5nJik7CisgICAgRWxlbWVudCogcmVtb3ZlRWxlbWVudEZyb21QZW5kaW5nUmVz b3VyY2VzRm9yUmVtb3ZhbE1hcChjb25zdCBBdG9taWNTdHJpbmcmKTsKIAogcHJpdmF0ZToKLSAg ICBzdGQ6OnVuaXF1ZV9wdHI8U1ZHUGVuZGluZ0VsZW1lbnRzPiByZW1vdmVQZW5kaW5nUmVzb3Vy Y2VGb3JSZW1vdmFsKGNvbnN0IEF0b21pY1N0cmluZyYpOworICAgIGJvb2wgaXNFbGVtZW50V2l0 aFBlbmRpbmdSZXNvdXJjZXMoRWxlbWVudCopIGNvbnN0OworICAgIHN0ZDo6dW5pcXVlX3B0cjxQ ZW5kaW5nRWxlbWVudHM+IHJlbW92ZVBlbmRpbmdSZXNvdXJjZUZvclJlbW92YWwoY29uc3QgQXRv bWljU3RyaW5nJik7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZH RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggMTEz NmY0ZS4uMTdmMTdlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtMTAzNiwxNCAr MTAzNiwxNCBAQCB2b2lkIFNWR0VsZW1lbnQ6OmJ1aWxkUGVuZGluZ1Jlc291cmNlc0lmTmVlZGVk KCkKIAogICAgIFNWR0RvY3VtZW50RXh0ZW5zaW9ucyogZXh0ZW5zaW9ucyA9IGRvY3VtZW50KCku YWNjZXNzU1ZHRXh0ZW5zaW9ucygpOwogICAgIFN0cmluZyByZXNvdXJjZUlkID0gZ2V0SWRBdHRy aWJ1dGUoKTsKLSAgICBpZiAoIWV4dGVuc2lvbnMtPmhhc1BlbmRpbmdSZXNvdXJjZShyZXNvdXJj ZUlkKSkKKyAgICBpZiAoIWV4dGVuc2lvbnMtPmlzSWRPZlBlbmRpbmdSZXNvdXJjZShyZXNvdXJj ZUlkKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gTWFyayBwZW5kaW5nIHJlc291cmNlcyBh cyBwZW5kaW5nIGZvciByZW1vdmFsLgogICAgIGV4dGVuc2lvbnMtPm1hcmtQZW5kaW5nUmVzb3Vy Y2VzRm9yUmVtb3ZhbChyZXNvdXJjZUlkKTsKIAogICAgIC8vIFJlYnVpbGQgcGVuZGluZyByZXNv dXJjZXMgZm9yIGVhY2ggY2xpZW50IG9mIGEgcGVuZGluZyByZXNvdXJjZSB0aGF0IGlzIGJlaW5n IHJlbW92ZWQuCi0gICAgd2hpbGUgKEVsZW1lbnQqIGNsaWVudEVsZW1lbnQgPSBleHRlbnNpb25z LT5yZW1vdmVFbGVtZW50RnJvbVBlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsKHJlc291cmNlSWQp KSB7CisgICAgd2hpbGUgKEVsZW1lbnQqIGNsaWVudEVsZW1lbnQgPSBleHRlbnNpb25zLT5yZW1v dmVFbGVtZW50RnJvbVBlbmRpbmdSZXNvdXJjZXNGb3JSZW1vdmFsTWFwKHJlc291cmNlSWQpKSB7 CiAgICAgICAgIEFTU0VSVChjbGllbnRFbGVtZW50LT5oYXNQZW5kaW5nUmVzb3VyY2VzKCkpOwog ICAgICAgICBpZiAoY2xpZW50RWxlbWVudC0+aGFzUGVuZGluZ1Jlc291cmNlcygpKSB7CiAgICAg ICAgICAgICBjbGllbnRFbGVtZW50LT5idWlsZFBlbmRpbmdSZXNvdXJjZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR01QYXRoRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHTVBhdGhFbGVtZW50LmNwcAppbmRleCA0NTUyYTAzLi5lNWQxYzIyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHTVBhdGhFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHTVBhdGhFbGVtZW50LmNwcApAQCAtNjcsNyArNjcsNyBAQCB2b2lkIFNW R01QYXRoRWxlbWVudDo6YnVpbGRQZW5kaW5nUmVzb3VyY2UoKQogICAgIEVsZW1lbnQqIHRhcmdl dCA9IFNWR1VSSVJlZmVyZW5jZTo6dGFyZ2V0RWxlbWVudEZyb21JUklTdHJpbmcoaHJlZigpLCBk b2N1bWVudCgpLCAmaWQpOwogICAgIGlmICghdGFyZ2V0KSB7CiAgICAgICAgIC8vIERvIG5vdCBy ZWdpc3RlciBhcyBwZW5kaW5nIGlmIHdlIGFyZSBhbHJlYWR5IHBlbmRpbmcgdGhpcyByZXNvdXJj ZS4KLSAgICAgICAgaWYgKGRvY3VtZW50KCkuYWNjZXNzU1ZHRXh0ZW5zaW9ucygpLT5pc0VsZW1l bnRQZW5kaW5nUmVzb3VyY2UodGhpcywgaWQpKQorICAgICAgICBpZiAoZG9jdW1lbnQoKS5hY2Nl c3NTVkdFeHRlbnNpb25zKCktPmlzUGVuZGluZ1Jlc291cmNlKHRoaXMsIGlkKSkKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBpZiAoIWlkLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1RleHRQYXRoRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHVGV4dFBhdGhFbGVtZW50LmNwcAppbmRleCA4YjMwYzY2Li40MTM4MzY2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGV4dFBhdGhFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGV4dFBhdGhFbGVtZW50LmNwcApAQCAtMTYzLDcgKzE2Myw3 IEBAIHZvaWQgU1ZHVGV4dFBhdGhFbGVtZW50OjpidWlsZFBlbmRpbmdSZXNvdXJjZSgpCiAgICAg RWxlbWVudCogdGFyZ2V0ID0gU1ZHVVJJUmVmZXJlbmNlOjp0YXJnZXRFbGVtZW50RnJvbUlSSVN0 cmluZyhocmVmKCksIGRvY3VtZW50KCksICZpZCk7CiAgICAgaWYgKCF0YXJnZXQpIHsKICAgICAg ICAgLy8gRG8gbm90IHJlZ2lzdGVyIGFzIHBlbmRpbmcgaWYgd2UgYXJlIGFscmVhZHkgcGVuZGlu ZyB0aGlzIHJlc291cmNlLgotICAgICAgICBpZiAoZG9jdW1lbnQoKS5hY2Nlc3NTVkdFeHRlbnNp b25zKCktPmlzRWxlbWVudFBlbmRpbmdSZXNvdXJjZSh0aGlzLCBpZCkpCisgICAgICAgIGlmIChk b2N1bWVudCgpLmFjY2Vzc1NWR0V4dGVuc2lvbnMoKS0+aXNQZW5kaW5nUmVzb3VyY2UodGhpcywg aWQpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmICghaWQuaXNFbXB0eSgpKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvYW5pbWF0aW9uL1NWR1NNSUxFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9hbmltYXRpb24vU1ZHU01JTEVsZW1lbnQuY3BwCmlu ZGV4IDdkNjRkNzIuLjAxMzc3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9hbmlt YXRpb24vU1ZHU01JTEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9hbmltYXRp b24vU1ZHU01JTEVsZW1lbnQuY3BwCkBAIC0xNzUsNyArMTc1LDcgQEAgdm9pZCBTVkdTTUlMRWxl bWVudDo6YnVpbGRQZW5kaW5nUmVzb3VyY2UoKQogCiAgICAgaWYgKCFzdmdUYXJnZXQpIHsKICAg ICAgICAgLy8gRG8gbm90IHJlZ2lzdGVyIGFzIHBlbmRpbmcgaWYgd2UgYXJlIGFscmVhZHkgcGVu ZGluZyB0aGlzIHJlc291cmNlLgotICAgICAgICBpZiAoZG9jdW1lbnQoKS5hY2Nlc3NTVkdFeHRl bnNpb25zKCktPmlzRWxlbWVudFBlbmRpbmdSZXNvdXJjZSh0aGlzLCBpZCkpCisgICAgICAgIGlm IChkb2N1bWVudCgpLmFjY2Vzc1NWR0V4dGVuc2lvbnMoKS0+aXNQZW5kaW5nUmVzb3VyY2UodGhp cywgaWQpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmICghaWQuaXNFbXB0eSgp KSB7Cg==