102420 2012-11-15 12:56:38 -0800 [TexMap][Cairo][Qt] Refactor BitmapTextureGL::updateContents() . 2012-11-15 20:32:11 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P3 Normal --- 1 ostap73 webkit-unassigned igor.oliveira laszlo.gombos noam webkit.review.bot oldest_to_newest 768405 0 ostap73 2012-11-15 12:56:38 -0800 Simplify a BitmapTextureGL::updateContents(). 768425 1 174505 ostap73 2012-11-15 13:16:30 -0800 Created attachment 174505 patch 768814 2 174505 gyuyoung.kim 2012-11-15 18:37:37 -0800 Comment on attachment 174505 patch View in context: https://bugs.webkit.org/attachment.cgi?id=174505&action=review Looks make sense. > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:694 > + Unneeded line. 768857 3 174595 ostap73 2012-11-15 19:46:58 -0800 Created attachment 174595 Patch for landing with extra line removed. 768887 4 174595 webkit.review.bot 2012-11-15 20:32:07 -0800 Comment on attachment 174595 Patch for landing with extra line removed. Clearing flags on attachment: 174595 Committed r134887: <http://trac.webkit.org/changeset/134887> 768888 5 webkit.review.bot 2012-11-15 20:32:11 -0800 All reviewed patches have been landed. Closing bug. 174505 2012-11-15 13:16:30 -0800 2012-11-15 19:46:58 -0800 patch updateContents_refactor_01.diff text/plain 8604 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNGQ0OTA4Li5mMzJiZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMTEtMTUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtUZXhNYXBdW0NhaXJvXVtRdF0gUmVmYWN0b3IgQml0bWFwVGV4 dHVyZUdMOjp1cGRhdGVDb250ZW50cygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTW92ZWQgb3V0IHRleHR1cmUgdXBsb2FkIHdpdGhvdXQgc3dpenps ZSB0byB0aGUgc2VwYXJhdGUgbWV0aG9kIGFuZCBjaGFuZ2VkCisgICAgICAgIGRyYXdSZXBhaW50 Q291bnRlciB0byB1c2Ugbm8tc3dpenpsZSBtZXRob2QuIFRoaXMgYWxzbyBmaXhlcyBibHVlIGJh Y2tncm91bmQKKyAgICAgICAgb2YgcmVwYWludCBjb3VudGVycyBpbiBRdCBNaW5pYnJvd3Nlci4K KyAgICAgICAgQWRkZWQgY29uZGl0aW9uIGZvciBzdWItaW1hZ2UgYnVmZmVyIGNyZWF0aW9uIHRv IG5vdCBjcmVhdGUgaXQgaWYgZnVsbCBpbWFnZSBpcworICAgICAgICB1cGxvYWRlZC4gVGhpcyBz aG91bGQgZ2l2ZSBub3RpY2VhYmxlIGltcHJvdmVtZW50IGZvciBwbGF0Zm9ybXMgdGhhdCBkbyBu b3QgCisgICAgICAgIHN1cHBvcnQgc3ViLWltYWdlIHVwbG9hZCB0byB0ZXh0dXJlLgorCisgICAg ICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1 cmVNYXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1h cFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHNOb1N3aXp6bGUpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmg6CisgICAg ICAgIChCaXRtYXBUZXh0dXJlR0wpOgorCiAyMDEyLTExLTE0ICBUb255IENoYW5nICA8dG9ueUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ3Jhc2ggaW4gZmxleGJveCB3aGVuIHJlbW92aW5nIGFi c29sdXRlbHkgcG9zaXRpb25lZCBjaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCA0 M2IwZmJlNy4uZTk2YjI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTM0OSw3ICszNDks NyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKGludCB2YWx1ZSwg aW50IHBvaW50U2l6ZSwgY29uc3QgRmxvYXRQbwogCiAgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+ IHRleHR1cmUgPSBhY3F1aXJlVGV4dHVyZUZyb21Qb29sKHNpemUpOwogICAgIGNvbnN0IHVjaGFy KiBiaXRzID0gaW1hZ2UuYml0cygpOwotICAgIHRleHR1cmUtPnVwZGF0ZUNvbnRlbnRzKGJpdHMs IHNvdXJjZVJlY3QsIEludFBvaW50Ojp6ZXJvKCksIGltYWdlLmJ5dGVzUGVyTGluZSgpLCBCaXRt YXBUZXh0dXJlOjpVcGRhdGVDYW5Nb2RpZnlPcmlnaW5hbEltYWdlRGF0YSk7CisgICAgc3RhdGlj X2Nhc3Q8Qml0bWFwVGV4dHVyZUdMKj4odGV4dHVyZS5nZXQoKSktPnVwZGF0ZUNvbnRlbnRzTm9T d2l6emxlKGJpdHMsIHNvdXJjZVJlY3QsIEludFBvaW50Ojp6ZXJvKCksIGltYWdlLmJ5dGVzUGVy TGluZSgpKTsKICAgICBkcmF3VGV4dHVyZSgqdGV4dHVyZSwgdGFyZ2V0UmVjdCwgbW9kZWxWaWV3 TWF0cml4LCAxLjBmLCAwLCBBbGxFZGdlcyk7CiAKICNlbGlmIFVTRShDQUlSTykKQEAgLTM2Miw3 ICszNjIsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKGludCB2 YWx1ZSwgaW50IHBvaW50U2l6ZSwgY29uc3QgRmxvYXRQbwogICAgIGNhaXJvX3QqIGNyID0gY2Fp cm9fY3JlYXRlKHN1cmZhY2UpOwogICAgIGNhaXJvX3N1cmZhY2VfZGVzdHJveShzdXJmYWNlKTsK IAotICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiKGNyLCAxLCAwLCAwKTsKKyAgICBjYWlyb19zZXRf c291cmNlX3JnYihjciwgMCwgMCwgMSk7IC8vIFNpbmNlIHdlIHdvbid0IHN3YXAgUitCIGZvciBz cGVlZCwgdGhpcyB3aWxsIHBhaW50IHJlZC4KICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAsIDAs IHdpZHRoLCBoZWlnaHQpOwogICAgIGNhaXJvX2ZpbGwoY3IpOwogCkBAIC0zNzksNyArMzc5LDcg QEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdSZXBhaW50Q291bnRlcihpbnQgdmFsdWUsIGlu dCBwb2ludFNpemUsIGNvbnN0IEZsb2F0UG8KICAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gdGV4 dHVyZSA9IGFjcXVpcmVUZXh0dXJlRnJvbVBvb2woc2l6ZSk7CiAgICAgY29uc3QgdW5zaWduZWQg Y2hhciogYml0cyA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEoc3VyZmFjZSk7CiAgICAg aW50IHN0cmlkZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3N0cmlkZShzdXJmYWNlKTsKLSAg ICB0ZXh0dXJlLT51cGRhdGVDb250ZW50cyhiaXRzLCBzb3VyY2VSZWN0LCBJbnRQb2ludDo6emVy bygpLCBzdHJpZGUsIEJpdG1hcFRleHR1cmU6OlVwZGF0ZUNhbk1vZGlmeU9yaWdpbmFsSW1hZ2VE YXRhKTsKKyAgICBzdGF0aWNfY2FzdDxCaXRtYXBUZXh0dXJlR0wqPih0ZXh0dXJlLmdldCgpKS0+ dXBkYXRlQ29udGVudHNOb1N3aXp6bGUoYml0cywgc291cmNlUmVjdCwgSW50UG9pbnQ6Onplcm8o KSwgc3RyaWRlKTsKICAgICBkcmF3VGV4dHVyZSgqdGV4dHVyZSwgdGFyZ2V0UmVjdCwgbW9kZWxW aWV3TWF0cml4LCAxLjBmLCAwLCBBbGxFZGdlcyk7CiAKICAgICBjYWlyb19kZXN0cm95KGNyKTsK QEAgLTY4OSw2ICs2ODksMjcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkKICAg ICBtX2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV8yRCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwg bV90ZXh0dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxf VFJBTlNGRVJfVFlQRSwgMCk7CiB9CiAKK3ZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250 ZW50c05vU3dpenpsZShjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRS ZWN0LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0LCBpbnQgYnl0ZXNQZXJMaW5lLCB1bnNp Z25lZCBieXRlc1BlclBpeGVsLCBQbGF0Zm9ybTNET2JqZWN0IGdsRm9ybWF0KQoreworCisgICAg aWYgKCFkcml2ZXJTdXBwb3J0c1N1YkltYWdlKCkgLy8gRm9yIEVTIGRyaXZlcnMgdGhhdCBkb24n dCBzdXBwb3J0IHN1Yi1pbWFnZXMuCisgICAgICAgIHx8IChieXRlc1BlckxpbmUgPT0gc3RhdGlj X2Nhc3Q8aW50Pih0YXJnZXRSZWN0LndpZHRoKCkgKiBieXRlc1BlclBpeGVsKSAmJiBzb3VyY2VP ZmZzZXQgPT0gSW50UG9pbnQ6Onplcm8oKSkpIHsKKyAgICAgICAgbV9jb250ZXh0M0QtPnRleFN1 YkltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIHRhcmdldFJlY3QueCgp LCB0YXJnZXRSZWN0LnkoKSwgdGFyZ2V0UmVjdC53aWR0aCgpLCB0YXJnZXRSZWN0LmhlaWdodCgp LCBnbEZvcm1hdCwgREVGQVVMVF9URVhUVVJFX1BJWEVMX1RSQU5TRkVSX1RZUEUsIHNyY0RhdGEp OworICAgICAgICByZXR1cm47CisgICAgfQorCisjaWYgIWRlZmluZWQoVEVYTUFQX09QRU5HTF9F U18yKQorICAgIC8vIFVzZSB0aGUgT3BlbkdMIHN1Yi1pbWFnZSBleHRlbnNpb24sIG5vdyB0aGF0 IHdlIGtub3cgaXQncyBhdmFpbGFibGUuCisgICAgbV9jb250ZXh0M0QtPnBpeGVsU3RvcmVpKEdM X1VOUEFDS19ST1dfTEVOR1RILCBieXRlc1BlckxpbmUgLyBieXRlc1BlclBpeGVsKTsKKyAgICBt X2NvbnRleHQzRC0+cGl4ZWxTdG9yZWkoR0xfVU5QQUNLX1NLSVBfUk9XUywgc291cmNlT2Zmc2V0 LnkoKSk7CisgICAgbV9jb250ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFDS19TS0lQX1BJWEVM Uywgc291cmNlT2Zmc2V0LngoKSk7CisgICAgbV9jb250ZXh0M0QtPnRleFN1YkltYWdlMkQoR3Jh cGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIHRhcmdldFJlY3QueCgpLCB0YXJnZXRSZWN0 LnkoKSwgdGFyZ2V0UmVjdC53aWR0aCgpLCB0YXJnZXRSZWN0LmhlaWdodCgpLCBnbEZvcm1hdCwg REVGQVVMVF9URVhUVVJFX1BJWEVMX1RSQU5TRkVSX1RZUEUsIHNyY0RhdGEpOworICAgIG1fY29u dGV4dDNELT5waXhlbFN0b3JlaShHTF9VTlBBQ0tfUk9XX0xFTkdUSCwgMCk7CisgICAgbV9jb250 ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFDS19TS0lQX1JPV1MsIDApOworICAgIG1fY29udGV4 dDNELT5waXhlbFN0b3JlaShHTF9VTlBBQ0tfU0tJUF9QSVhFTFMsIDApOworI2VuZGlmCit9CisK IHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50cyhjb25zdCB2b2lkKiBzcmNEYXRh LCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0 LCBpbnQgYnl0ZXNQZXJMaW5lLCBVcGRhdGVDb250ZW50c0ZsYWcgdXBkYXRlQ29udGVudHNGbGFn KQogewogICAgIFBsYXRmb3JtM0RPYmplY3QgZ2xGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6 UkdCQTsKQEAgLTY5OSw5ICs3MjAsMTIgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNv bnRlbnRzKGNvbnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICBW ZWN0b3I8Y2hhcj4gdGVtcG9yYXJ5RGF0YTsKICAgICBJbnRQb2ludCBhZGp1c3RlZFNvdXJjZU9m ZnNldCA9IHNvdXJjZU9mZnNldDsKIAorICAgIC8vIFRleHR1cmUgdXBsb2FkIHJlcXVpcmVzIHN1 YmltYWdlIGJ1ZmZlciBpZiBkcml2ZXIgZG9lc24ndCBzdXBwb3J0IHN1YmltYWdlIGFuZCB3ZSBk b24ndCBoYXZlIGZ1bGwgaW1hZ2UgdXBsb2FkLgorICAgIGJvb2wgcmVxdWlyZVN1YkltYWdlQnVm ZmVyID0gIWRyaXZlclN1cHBvcnRzU3ViSW1hZ2UoKQorICAgICAgICAmJiAhKGJ5dGVzUGVyTGlu ZSA9PSBzdGF0aWNfY2FzdDxpbnQ+KHRhcmdldFJlY3Qud2lkdGgoKSAqIGJ5dGVzUGVyUGl4ZWwp ICYmIGFkanVzdGVkU291cmNlT2Zmc2V0ID09IEludFBvaW50Ojp6ZXJvKCkpOworCiAgICAgLy8g cHJlcGFyZSB0ZW1wb3JhcnlEYXRhIGlmIG5lY2Vzc2FyeQotICAgIGlmICgoIWRyaXZlclN1cHBv cnRzQkdSQVN3aXp6bGluZygpICYmIHVwZGF0ZUNvbnRlbnRzRmxhZyA9PSBVcGRhdGVDYW5ub3RN b2RpZnlPcmlnaW5hbEltYWdlRGF0YSkKLSAgICAgICAgfHwgIWRyaXZlclN1cHBvcnRzU3ViSW1h Z2UoKSkgeworICAgIGlmICgoIWRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGluZygpICYmIHVwZGF0 ZUNvbnRlbnRzRmxhZyA9PSBVcGRhdGVDYW5ub3RNb2RpZnlPcmlnaW5hbEltYWdlRGF0YSkgfHwg cmVxdWlyZVN1YkltYWdlQnVmZmVyKSB7CiAgICAgICAgIHRlbXBvcmFyeURhdGEucmVzaXplKHRh cmdldFJlY3Qud2lkdGgoKSAqIHRhcmdldFJlY3QuaGVpZ2h0KCkgKiBieXRlc1BlclBpeGVsKTsK ICAgICAgICAgZGF0YSA9IHRlbXBvcmFyeURhdGEuZGF0YSgpOwogICAgICAgICBjb25zdCBjaGFy KiBiaXRzID0gc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KHNyY0RhdGEpOwpAQCAtNzIzLDI3ICs3 NDcsNyBAQCB2b2lkIEJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCog c3JjRGF0YSwgY29uc3QgSW50UmVjdCYgdGFyZ2V0UgogICAgIGVsc2UKICAgICAgICAgc3dpenps ZUJHUkFUb1JHQkEocmVpbnRlcnByZXRfY2FzdDx1aW50MzJfdCo+KGRhdGEpLCBJbnRSZWN0KGFk anVzdGVkU291cmNlT2Zmc2V0LCB0YXJnZXRSZWN0LnNpemUoKSksIGJ5dGVzUGVyTGluZSAvIGJ5 dGVzUGVyUGl4ZWwpOwogCi0gICAgaWYgKGJ5dGVzUGVyTGluZSA9PSBzdGF0aWNfY2FzdDxpbnQ+ KHRhcmdldFJlY3Qud2lkdGgoKSAqIGJ5dGVzUGVyUGl4ZWwpICYmIGFkanVzdGVkU291cmNlT2Zm c2V0ID09IEludFBvaW50Ojp6ZXJvKCkpIHsKLSAgICAgICAgbV9jb250ZXh0M0QtPnRleFN1Yklt YWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIHRhcmdldFJlY3QueCgpLCB0 YXJnZXRSZWN0LnkoKSwgdGFyZ2V0UmVjdC53aWR0aCgpLCB0YXJnZXRSZWN0LmhlaWdodCgpLCBn bEZvcm1hdCwgREVGQVVMVF9URVhUVVJFX1BJWEVMX1RSQU5TRkVSX1RZUEUsIGRhdGEpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgLy8gRm9yIEVTIGRyaXZlcnMgdGhhdCBkb24ndCBz dXBwb3J0IHN1Yi1pbWFnZXMuCi0gICAgaWYgKCFkcml2ZXJTdXBwb3J0c1N1YkltYWdlKCkpIHsK LSAgICAgICAgbV9jb250ZXh0M0QtPnRleFN1YkltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRF WFRVUkVfMkQsIDAsIHRhcmdldFJlY3QueCgpLCB0YXJnZXRSZWN0LnkoKSwgdGFyZ2V0UmVjdC53 aWR0aCgpLCB0YXJnZXRSZWN0LmhlaWdodCgpLCBnbEZvcm1hdCwgREVGQVVMVF9URVhUVVJFX1BJ WEVMX1RSQU5TRkVSX1RZUEUsIGRhdGEpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0jaWYg IWRlZmluZWQoVEVYTUFQX09QRU5HTF9FU18yKQotICAgIC8vIFVzZSB0aGUgT3BlbkdMIHN1Yi1p bWFnZSBleHRlbnNpb24sIG5vdyB0aGF0IHdlIGtub3cgaXQncyBhdmFpbGFibGUuCi0gICAgbV9j b250ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFDS19ST1dfTEVOR1RILCBieXRlc1BlckxpbmUg LyBieXRlc1BlclBpeGVsKTsKLSAgICBtX2NvbnRleHQzRC0+cGl4ZWxTdG9yZWkoR0xfVU5QQUNL X1NLSVBfUk9XUywgYWRqdXN0ZWRTb3VyY2VPZmZzZXQueSgpKTsKLSAgICBtX2NvbnRleHQzRC0+ cGl4ZWxTdG9yZWkoR0xfVU5QQUNLX1NLSVBfUElYRUxTLCBhZGp1c3RlZFNvdXJjZU9mZnNldC54 KCkpOwotICAgIG1fY29udGV4dDNELT50ZXhTdWJJbWFnZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpU RVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0UmVjdC55KCksIHRhcmdldFJlY3Qu d2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9Q SVhFTF9UUkFOU0ZFUl9UWVBFLCBkYXRhKTsKLSAgICBtX2NvbnRleHQzRC0+cGl4ZWxTdG9yZWko R0xfVU5QQUNLX1JPV19MRU5HVEgsIDApOwotICAgIG1fY29udGV4dDNELT5waXhlbFN0b3JlaShH TF9VTlBBQ0tfU0tJUF9ST1dTLCAwKTsKLSAgICBtX2NvbnRleHQzRC0+cGl4ZWxTdG9yZWkoR0xf VU5QQUNLX1NLSVBfUElYRUxTLCAwKTsKLSNlbmRpZgorICAgIHVwZGF0ZUNvbnRlbnRzTm9Td2l6 emxlKGRhdGEsIHRhcmdldFJlY3QsIGFkanVzdGVkU291cmNlT2Zmc2V0LCBieXRlc1BlckxpbmUs IGJ5dGVzUGVyUGl4ZWwsIGdsRm9ybWF0KTsKIH0KIAogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVw ZGF0ZUNvbnRlbnRzKEltYWdlKiBpbWFnZSwgY29uc3QgSW50UmVjdCYgdGFyZ2V0UmVjdCwgY29u c3QgSW50UG9pbnQmIG9mZnNldCwgVXBkYXRlQ29udGVudHNGbGFnIHVwZGF0ZUNvbnRlbnRzRmxh ZykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyR0wuaAppbmRleCBjYzUwNTkzLi44ODEwZjY4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJHTC5oCkBAIC0xNTMsNiArMTUzLDggQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6Cisg ICAgdm9pZCB1cGRhdGVDb250ZW50c05vU3dpenpsZShjb25zdCB2b2lkKiwgY29uc3QgSW50UmVj dCYgdGFyZ2V0LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0LCBpbnQgYnl0ZXNQZXJMaW5l LCB1bnNpZ25lZCBieXRlc1BlclBpeGVsID0gNCwgUGxhdGZvcm0zRE9iamVjdCBnbEZvcm1hdCA9 IEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBKTsKKwogICAgIFBsYXRmb3JtM0RPYmplY3QgbV9pZDsK ICAgICBJbnRTaXplIG1fdGV4dHVyZVNpemU7CiAgICAgSW50UmVjdCBtX2RpcnR5UmVjdDsK 174595 2012-11-15 19:46:58 -0800 2012-11-15 20:32:07 -0800 Patch for landing with extra line removed. updateContents_refactor_02.diff text/plain 8599 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNGQ0OTA4Li4zYzNkMTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMTEtMTUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtUZXhNYXBdW0NhaXJvXVtRdF0gUmVmYWN0b3IgQml0bWFwVGV4 dHVyZUdMOjp1cGRhdGVDb250ZW50cygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR3l1eW91bmcg S2ltLgorCisgICAgICAgIE1vdmVkIG91dCB0ZXh0dXJlIHVwbG9hZCB3aXRob3V0IHN3aXp6bGUg dG8gdGhlIHNlcGFyYXRlIG1ldGhvZCBhbmQgY2hhbmdlZAorICAgICAgICBkcmF3UmVwYWludENv dW50ZXIgdG8gdXNlIG5vLXN3aXp6bGUgbWV0aG9kLiBUaGlzIGFsc28gZml4ZXMgYmx1ZSBiYWNr Z3JvdW5kCisgICAgICAgIG9mIHJlcGFpbnQgY291bnRlcnMgaW4gUXQgTWluaWJyb3dzZXIuCisg ICAgICAgIEFkZGVkIGNvbmRpdGlvbiBmb3Igc3ViLWltYWdlIGJ1ZmZlciBjcmVhdGlvbiB0byBu b3QgY3JlYXRlIGl0IGlmIGZ1bGwgaW1hZ2UgaXMKKyAgICAgICAgdXBsb2FkZWQuIFRoaXMgc2hv dWxkIGdpdmUgbm90aWNlYWJsZSBpbXByb3ZlbWVudCBmb3IgcGxhdGZvcm1zIHRoYXQgZG8gbm90 CisgICAgICAgIHN1cHBvcnQgc3ViLWltYWdlIHVwbG9hZCB0byB0ZXh0dXJlLgorCisgICAgICAg IENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVN YXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRl eHR1cmVHTDo6dXBkYXRlQ29udGVudHNOb1N3aXp6bGUpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgIChXZWJDb3JlOjpCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmg6CisgICAgICAg IChCaXRtYXBUZXh0dXJlR0wpOgorCiAyMDEyLTExLTE0ICBUb255IENoYW5nICA8dG9ueUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgQ3Jhc2ggaW4gZmxleGJveCB3aGVuIHJlbW92aW5nIGFic29s dXRlbHkgcG9zaXRpb25lZCBjaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCA0M2Iw ZmJlNy4uNDg0OGY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTM0OSw3ICszNDksNyBA QCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKGludCB2YWx1ZSwgaW50 IHBvaW50U2l6ZSwgY29uc3QgRmxvYXRQbwogCiAgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IHRl eHR1cmUgPSBhY3F1aXJlVGV4dHVyZUZyb21Qb29sKHNpemUpOwogICAgIGNvbnN0IHVjaGFyKiBi aXRzID0gaW1hZ2UuYml0cygpOwotICAgIHRleHR1cmUtPnVwZGF0ZUNvbnRlbnRzKGJpdHMsIHNv dXJjZVJlY3QsIEludFBvaW50Ojp6ZXJvKCksIGltYWdlLmJ5dGVzUGVyTGluZSgpLCBCaXRtYXBU ZXh0dXJlOjpVcGRhdGVDYW5Nb2RpZnlPcmlnaW5hbEltYWdlRGF0YSk7CisgICAgc3RhdGljX2Nh c3Q8Qml0bWFwVGV4dHVyZUdMKj4odGV4dHVyZS5nZXQoKSktPnVwZGF0ZUNvbnRlbnRzTm9Td2l6 emxlKGJpdHMsIHNvdXJjZVJlY3QsIEludFBvaW50Ojp6ZXJvKCksIGltYWdlLmJ5dGVzUGVyTGlu ZSgpKTsKICAgICBkcmF3VGV4dHVyZSgqdGV4dHVyZSwgdGFyZ2V0UmVjdCwgbW9kZWxWaWV3TWF0 cml4LCAxLjBmLCAwLCBBbGxFZGdlcyk7CiAKICNlbGlmIFVTRShDQUlSTykKQEAgLTM2Miw3ICsz NjIsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1JlcGFpbnRDb3VudGVyKGludCB2YWx1 ZSwgaW50IHBvaW50U2l6ZSwgY29uc3QgRmxvYXRQbwogICAgIGNhaXJvX3QqIGNyID0gY2Fpcm9f Y3JlYXRlKHN1cmZhY2UpOwogICAgIGNhaXJvX3N1cmZhY2VfZGVzdHJveShzdXJmYWNlKTsKIAot ICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiKGNyLCAxLCAwLCAwKTsKKyAgICBjYWlyb19zZXRfc291 cmNlX3JnYihjciwgMCwgMCwgMSk7IC8vIFNpbmNlIHdlIHdvbid0IHN3YXAgUitCIGZvciBzcGVl ZCwgdGhpcyB3aWxsIHBhaW50IHJlZC4KICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAsIDAsIHdp ZHRoLCBoZWlnaHQpOwogICAgIGNhaXJvX2ZpbGwoY3IpOwogCkBAIC0zNzksNyArMzc5LDcgQEAg dm9pZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdSZXBhaW50Q291bnRlcihpbnQgdmFsdWUsIGludCBw b2ludFNpemUsIGNvbnN0IEZsb2F0UG8KICAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gdGV4dHVy ZSA9IGFjcXVpcmVUZXh0dXJlRnJvbVBvb2woc2l6ZSk7CiAgICAgY29uc3QgdW5zaWduZWQgY2hh ciogYml0cyA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEoc3VyZmFjZSk7CiAgICAgaW50 IHN0cmlkZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3N0cmlkZShzdXJmYWNlKTsKLSAgICB0 ZXh0dXJlLT51cGRhdGVDb250ZW50cyhiaXRzLCBzb3VyY2VSZWN0LCBJbnRQb2ludDo6emVybygp LCBzdHJpZGUsIEJpdG1hcFRleHR1cmU6OlVwZGF0ZUNhbk1vZGlmeU9yaWdpbmFsSW1hZ2VEYXRh KTsKKyAgICBzdGF0aWNfY2FzdDxCaXRtYXBUZXh0dXJlR0wqPih0ZXh0dXJlLmdldCgpKS0+dXBk YXRlQ29udGVudHNOb1N3aXp6bGUoYml0cywgc291cmNlUmVjdCwgSW50UG9pbnQ6Onplcm8oKSwg c3RyaWRlKTsKICAgICBkcmF3VGV4dHVyZSgqdGV4dHVyZSwgdGFyZ2V0UmVjdCwgbW9kZWxWaWV3 TWF0cml4LCAxLjBmLCAwLCBBbGxFZGdlcyk7CiAKICAgICBjYWlyb19kZXN0cm95KGNyKTsKQEAg LTY4OSw2ICs2ODksMjYgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkKICAgICBt X2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8y RCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90 ZXh0dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxfVFJB TlNGRVJfVFlQRSwgMCk7CiB9CiAKK3ZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50 c05vU3dpenpsZShjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0 LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0LCBpbnQgYnl0ZXNQZXJMaW5lLCB1bnNpZ25l ZCBieXRlc1BlclBpeGVsLCBQbGF0Zm9ybTNET2JqZWN0IGdsRm9ybWF0KQoreworICAgIGlmICgh ZHJpdmVyU3VwcG9ydHNTdWJJbWFnZSgpIC8vIEZvciBFUyBkcml2ZXJzIHRoYXQgZG9uJ3Qgc3Vw cG9ydCBzdWItaW1hZ2VzLgorICAgICAgICB8fCAoYnl0ZXNQZXJMaW5lID09IHN0YXRpY19jYXN0 PGludD4odGFyZ2V0UmVjdC53aWR0aCgpICogYnl0ZXNQZXJQaXhlbCkgJiYgc291cmNlT2Zmc2V0 ID09IEludFBvaW50Ojp6ZXJvKCkpKSB7CisgICAgICAgIG1fY29udGV4dDNELT50ZXhTdWJJbWFn ZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFy Z2V0UmVjdC55KCksIHRhcmdldFJlY3Qud2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xG b3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCBzcmNEYXRhKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworI2lmICFkZWZpbmVkKFRFWE1BUF9PUEVOR0xfRVNfMikK KyAgICAvLyBVc2UgdGhlIE9wZW5HTCBzdWItaW1hZ2UgZXh0ZW5zaW9uLCBub3cgdGhhdCB3ZSBr bm93IGl0J3MgYXZhaWxhYmxlLgorICAgIG1fY29udGV4dDNELT5waXhlbFN0b3JlaShHTF9VTlBB Q0tfUk9XX0xFTkdUSCwgYnl0ZXNQZXJMaW5lIC8gYnl0ZXNQZXJQaXhlbCk7CisgICAgbV9jb250 ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFDS19TS0lQX1JPV1MsIHNvdXJjZU9mZnNldC55KCkp OworICAgIG1fY29udGV4dDNELT5waXhlbFN0b3JlaShHTF9VTlBBQ0tfU0tJUF9QSVhFTFMsIHNv dXJjZU9mZnNldC54KCkpOworICAgIG1fY29udGV4dDNELT50ZXhTdWJJbWFnZTJEKEdyYXBoaWNz Q29udGV4dDNEOjpURVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0UmVjdC55KCks IHRhcmdldFJlY3Qud2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3JtYXQsIERFRkFV TFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCBzcmNEYXRhKTsKKyAgICBtX2NvbnRleHQz RC0+cGl4ZWxTdG9yZWkoR0xfVU5QQUNLX1JPV19MRU5HVEgsIDApOworICAgIG1fY29udGV4dDNE LT5waXhlbFN0b3JlaShHTF9VTlBBQ0tfU0tJUF9ST1dTLCAwKTsKKyAgICBtX2NvbnRleHQzRC0+ cGl4ZWxTdG9yZWkoR0xfVU5QQUNLX1NLSVBfUElYRUxTLCAwKTsKKyNlbmRpZgorfQorCiB2b2lk IEJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCogc3JjRGF0YSwgY29u c3QgSW50UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgSW50UG9pbnQmIHNvdXJjZU9mZnNldCwgaW50 IGJ5dGVzUGVyTGluZSwgVXBkYXRlQ29udGVudHNGbGFnIHVwZGF0ZUNvbnRlbnRzRmxhZykKIHsK ICAgICBQbGF0Zm9ybTNET2JqZWN0IGdsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE7 CkBAIC02OTksOSArNzE5LDEyIEBAIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50 cyhjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSCiAgICAgVmVjdG9y PGNoYXI+IHRlbXBvcmFyeURhdGE7CiAgICAgSW50UG9pbnQgYWRqdXN0ZWRTb3VyY2VPZmZzZXQg PSBzb3VyY2VPZmZzZXQ7CiAKKyAgICAvLyBUZXh0dXJlIHVwbG9hZCByZXF1aXJlcyBzdWJpbWFn ZSBidWZmZXIgaWYgZHJpdmVyIGRvZXNuJ3Qgc3VwcG9ydCBzdWJpbWFnZSBhbmQgd2UgZG9uJ3Qg aGF2ZSBmdWxsIGltYWdlIHVwbG9hZC4KKyAgICBib29sIHJlcXVpcmVTdWJJbWFnZUJ1ZmZlciA9 ICFkcml2ZXJTdXBwb3J0c1N1YkltYWdlKCkKKyAgICAgICAgJiYgIShieXRlc1BlckxpbmUgPT0g c3RhdGljX2Nhc3Q8aW50Pih0YXJnZXRSZWN0LndpZHRoKCkgKiBieXRlc1BlclBpeGVsKSAmJiBh ZGp1c3RlZFNvdXJjZU9mZnNldCA9PSBJbnRQb2ludDo6emVybygpKTsKKwogICAgIC8vIHByZXBh cmUgdGVtcG9yYXJ5RGF0YSBpZiBuZWNlc3NhcnkKLSAgICBpZiAoKCFkcml2ZXJTdXBwb3J0c0JH UkFTd2l6emxpbmcoKSAmJiB1cGRhdGVDb250ZW50c0ZsYWcgPT0gVXBkYXRlQ2Fubm90TW9kaWZ5 T3JpZ2luYWxJbWFnZURhdGEpCi0gICAgICAgIHx8ICFkcml2ZXJTdXBwb3J0c1N1YkltYWdlKCkp IHsKKyAgICBpZiAoKCFkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKSAmJiB1cGRhdGVDb250 ZW50c0ZsYWcgPT0gVXBkYXRlQ2Fubm90TW9kaWZ5T3JpZ2luYWxJbWFnZURhdGEpIHx8IHJlcXVp cmVTdWJJbWFnZUJ1ZmZlcikgewogICAgICAgICB0ZW1wb3JhcnlEYXRhLnJlc2l6ZSh0YXJnZXRS ZWN0LndpZHRoKCkgKiB0YXJnZXRSZWN0LmhlaWdodCgpICogYnl0ZXNQZXJQaXhlbCk7CiAgICAg ICAgIGRhdGEgPSB0ZW1wb3JhcnlEYXRhLmRhdGEoKTsKICAgICAgICAgY29uc3QgY2hhciogYml0 cyA9IHN0YXRpY19jYXN0PGNvbnN0IGNoYXIqPihzcmNEYXRhKTsKQEAgLTcyMywyNyArNzQ2LDcg QEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0IHZvaWQqIHNyY0Rh dGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICBlbHNlCiAgICAgICAgIHN3aXp6bGVCR1JB VG9SR0JBKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QqPihkYXRhKSwgSW50UmVjdChhZGp1c3Rl ZFNvdXJjZU9mZnNldCwgdGFyZ2V0UmVjdC5zaXplKCkpLCBieXRlc1BlckxpbmUgLyBieXRlc1Bl clBpeGVsKTsKIAotICAgIGlmIChieXRlc1BlckxpbmUgPT0gc3RhdGljX2Nhc3Q8aW50Pih0YXJn ZXRSZWN0LndpZHRoKCkgKiBieXRlc1BlclBpeGVsKSAmJiBhZGp1c3RlZFNvdXJjZU9mZnNldCA9 PSBJbnRQb2ludDo6emVybygpKSB7Ci0gICAgICAgIG1fY29udGV4dDNELT50ZXhTdWJJbWFnZTJE KEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0 UmVjdC55KCksIHRhcmdldFJlY3Qud2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3Jt YXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCBkYXRhKTsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KLQotICAgIC8vIEZvciBFUyBkcml2ZXJzIHRoYXQgZG9uJ3Qgc3VwcG9y dCBzdWItaW1hZ2VzLgotICAgIGlmICghZHJpdmVyU3VwcG9ydHNTdWJJbWFnZSgpKSB7Ci0gICAg ICAgIG1fY29udGV4dDNELT50ZXhTdWJJbWFnZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJF XzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0UmVjdC55KCksIHRhcmdldFJlY3Qud2lkdGgo KSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9U UkFOU0ZFUl9UWVBFLCBkYXRhKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotI2lmICFkZWZp bmVkKFRFWE1BUF9PUEVOR0xfRVNfMikKLSAgICAvLyBVc2UgdGhlIE9wZW5HTCBzdWItaW1hZ2Ug ZXh0ZW5zaW9uLCBub3cgdGhhdCB3ZSBrbm93IGl0J3MgYXZhaWxhYmxlLgotICAgIG1fY29udGV4 dDNELT5waXhlbFN0b3JlaShHTF9VTlBBQ0tfUk9XX0xFTkdUSCwgYnl0ZXNQZXJMaW5lIC8gYnl0 ZXNQZXJQaXhlbCk7Ci0gICAgbV9jb250ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFDS19TS0lQ X1JPV1MsIGFkanVzdGVkU291cmNlT2Zmc2V0LnkoKSk7Ci0gICAgbV9jb250ZXh0M0QtPnBpeGVs U3RvcmVpKEdMX1VOUEFDS19TS0lQX1BJWEVMUywgYWRqdXN0ZWRTb3VyY2VPZmZzZXQueCgpKTsK LSAgICBtX2NvbnRleHQzRC0+dGV4U3ViSW1hZ2UyRChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV8yRCwgMCwgdGFyZ2V0UmVjdC54KCksIHRhcmdldFJlY3QueSgpLCB0YXJnZXRSZWN0LndpZHRo KCksIHRhcmdldFJlY3QuaGVpZ2h0KCksIGdsRm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxf VFJBTlNGRVJfVFlQRSwgZGF0YSk7Ci0gICAgbV9jb250ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VO UEFDS19ST1dfTEVOR1RILCAwKTsKLSAgICBtX2NvbnRleHQzRC0+cGl4ZWxTdG9yZWkoR0xfVU5Q QUNLX1NLSVBfUk9XUywgMCk7Ci0gICAgbV9jb250ZXh0M0QtPnBpeGVsU3RvcmVpKEdMX1VOUEFD S19TS0lQX1BJWEVMUywgMCk7Ci0jZW5kaWYKKyAgICB1cGRhdGVDb250ZW50c05vU3dpenpsZShk YXRhLCB0YXJnZXRSZWN0LCBhZGp1c3RlZFNvdXJjZU9mZnNldCwgYnl0ZXNQZXJMaW5lLCBieXRl c1BlclBpeGVsLCBnbEZvcm1hdCk7CiB9CiAKIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVD b250ZW50cyhJbWFnZSogaW1hZ2UsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IElu dFBvaW50JiBvZmZzZXQsIFVwZGF0ZUNvbnRlbnRzRmxhZyB1cGRhdGVDb250ZW50c0ZsYWcpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckdMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlckdMLmgKaW5kZXggY2M1MDU5My4uODgxMGY2OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wu aApAQCAtMTUzLDYgKzE1Myw4IEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcml2YXRlOgorICAgIHZv aWQgdXBkYXRlQ29udGVudHNOb1N3aXp6bGUoY29uc3Qgdm9pZCosIGNvbnN0IEludFJlY3QmIHRh cmdldCwgY29uc3QgSW50UG9pbnQmIHNvdXJjZU9mZnNldCwgaW50IGJ5dGVzUGVyTGluZSwgdW5z aWduZWQgYnl0ZXNQZXJQaXhlbCA9IDQsIFBsYXRmb3JtM0RPYmplY3QgZ2xGb3JtYXQgPSBHcmFw aGljc0NvbnRleHQzRDo6UkdCQSk7CisKICAgICBQbGF0Zm9ybTNET2JqZWN0IG1faWQ7CiAgICAg SW50U2l6ZSBtX3RleHR1cmVTaXplOwogICAgIEludFJlY3QgbV9kaXJ0eVJlY3Q7Cg==