48152 2010-10-22 13:56:30 -0700 Implement copyTextureToParentTextureCHROMIUM in WebGraphicsContext3DDefaultImpl. 2010-11-02 07:09:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco dglazkov eric jamesr kbr vangelis webkit.review.bot oldest_to_newest 298158 0 senorblanco 2010-10-22 13:56:30 -0700 Implement copyTextureToParentTextureCHROMIUM in WebGraphicsContext3DDefaultImpl. 298163 1 71593 senorblanco 2010-10-22 14:02:30 -0700 Created attachment 71593 Patch 298540 2 eric 2010-10-24 01:26:43 -0700 Attachment 71593 did not build on chromium: Build output: http://queues.webkit.org/results/4708053 298627 3 webkit.review.bot 2010-10-24 11:21:02 -0700 Attachment 71593 did not build on chromium: Build output: http://queues.webkit.org/results/4624071 298841 4 71747 senorblanco 2010-10-25 07:44:49 -0700 Created attachment 71747 Patch 299065 5 senorblanco 2010-10-25 13:10:24 -0700 Fix for warning-as-error on chromium/linux, and add chromium DEPS roll to pick up new API. 299238 6 71747 kbr 2010-10-25 19:27:37 -0700 Comment on attachment 71747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71747&action=review This basically looks good but one issue. > WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp:580 > + glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width); Please guard this call either with a call to gfx::GetGLImplementation() (app/gfx/gl/gl_implementation.h) or a test of whether glGetTexLevelParameteriv is NULL. Actually, in the current structure, supportsCopyTextureToParentTextureCHROMIUM should return false if this function is not available. This should prevent crashes when running on ANGLE or a pure GLES2 implementation. See https://bugs.webkit.org/show_bug.cgi?id=48282 . 299529 7 71902 senorblanco 2010-10-26 09:47:25 -0700 Created attachment 71902 Patch 299565 8 71902 kbr 2010-10-26 10:32:50 -0700 Comment on attachment 71902 Patch Looks good. 299678 9 senorblanco 2010-10-26 12:01:50 -0700 Committed r70552: <http://trac.webkit.org/changeset/70552> 303346 10 senorblanco 2010-11-02 07:09:33 -0700 *** Bug 47289 has been marked as a duplicate of this bug. *** 71593 2010-10-22 14:02:30 -0700 2010-10-25 07:44:44 -0700 Patch bug-48152-20101022170228.patch text/plain 6691 senorblanco SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzAzMzApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTAtMTAtMjIgIFN0ZXBo ZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGNvcHktdGV4dHVyZS10by1w YXJlbnQtdGV4dHVyZSBBUEkgZm9yCisgICAgICAgIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVs dEltcGwuICBUaGlzIGFsbG93cyB0aGUgaW4tcHJvY2VzcworICAgICAgICBpbXBsZW1lbnRhdGlv biB0byBkbyBhY2NlbGVyYXRlZCBjYW52YXMgYW5kIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisg ICAgICAgIHRvZ2V0aGVyLgorCisgICAgICAgIENvdmVyZWQgYnkgZmFzdC9jYW52YXMvYXJjMzYw Lmh0bWwsIGFuZCBtYW55IG1vcmUgd2hlbiBydW4gd2l0aAorICAgICAgICAtLWFjY2VsZXJhdGVk LWNvbXBvc2l0aW5nIGFuZCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4KKworICAgICAgICAqIHNy Yy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbCk6CisgICAgICAgIEFkZCBtZW1iZXIgdmFycyB0byBzYXZlIHRoZSBjdXJyZW50bHkt Ym91bmQgdGV4dHVyZSBhbmQgZm9yIHRoZQorICAgICAgICB0ZXh0dXJlLXRvLXRleHR1cmUgRkJP LgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjp+V2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbCk6CisgICAgICAgIERlbGV0ZSB0aGUgdGV4dHVy ZS10by10ZXh0dXJlIEZCTyBvbiBkZXN0cnVjdGlvbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJH cmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjppbml0aWFsaXplKToKKyAgICAgICAgR2VuZXJh dGUgdGhlIHRleHR1cmUtdG8tdGV4dHVyZSBGQk8uCisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBo aWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnN1cHBvcnRzQ29weVRleHR1cmVUb1BhcmVudFRleHR1 cmVDSFJPTUlVTSk6CisgICAgICAgIFdlIG5vdyByZXR1cm4gdHJ1ZSwgc2luY2Ugd2Ugc3VwcG9y dCB0aGlzIGV4dGVuc2lvbi4KKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0RE ZWZhdWx0SW1wbDo6Y29weVRleHR1cmVUb1BhcmVudFRleHR1cmVDSFJPTUlVTSk6CisgICAgICAg IEltcGxlbWVudCB0aGUgZXh0ZW5zaW9uOiAgYmluZCB0aGUgRkJPLCBiaW5kIHRoZSBjaGlsZCB0 ZXh0dXJlLCB0aGVuCisgICAgICAgIGRvIGEgZ2xDb3B5VGV4SW1hZ2UyRCgpIGludG8gdGhlIHBh cmVudCB0ZXh0dXJlLgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1 bHRJbXBsOjpiaW5kVGV4dHVyZSk6CisgICAgICAgIFJlY29yZCB0aGUgbmV3bHktYm91bmQgdGV4 dHVyZSBpbiBtX2JvdW5kVGV4dHVyZS4KKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbC5oOgorICAgICAgICBBZGQgdGhlIHR3byBuZXcgbWVtYmVyIHZhcmlhYmxl cy4KKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6Z3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICBNYWtlIHN1cmUgdGhlIGdyYXBo aWNzIGNvbnRleHQgaXMgcmVzaGFwZWQgdG8gdGhlIGNvcnJlY3Qgc2l6ZSBvbiBhbGwKKyAgICAg ICAgcGxhdGZvcm1zLgorCiAyMDEwLTEwLTIyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcu Ym90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzAzMDEu CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdElt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250 ZXh0M0REZWZhdWx0SW1wbC5jcHAJKHJldmlzaW9uIDcwMzMwKQorKysgV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzcsNiArNzcsOCBAQCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpXZWJHcmFw CiAgICAgLCBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVyKDApCiAgICAgLCBtX211bHRp c2FtcGxlQ29sb3JCdWZmZXIoMCkKICAgICAsIG1fYm91bmRGQk8oMCkKKyAgICAsIG1fYm91bmRU ZXh0dXJlKDApCisgICAgLCBtX2NvcHlUZXh0dXJlVG9QYXJlbnRUZXh0dXJlRkJPKDApCiAjaWZk ZWYgRkxJUF9GUkFNRUJVRkZFUl9WRVJUSUNBTExZCiAgICAgLCBtX3NjYW5saW5lKDApCiAjZW5k aWYKQEAgLTEwMSw2ICsxMDMsNyBAQCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjp+ V2ViR3JhCiAgICAgICAgICAgICAgICAgZ2xEZWxldGVSZW5kZXJidWZmZXJzRVhUKDEsICZtX2Rl cHRoU3RlbmNpbEJ1ZmZlcik7CiAgICAgICAgIH0KICAgICAgICAgZ2xEZWxldGVUZXh0dXJlcygx LCAmbV90ZXh0dXJlKTsKKyAgICAgICAgZ2xEZWxldGVGcmFtZWJ1ZmZlcnNFWFQoMSwgJm1fY29w eVRleHR1cmVUb1BhcmVudFRleHR1cmVGQk8pOwogI2lmZGVmIEZMSVBfRlJBTUVCVUZGRVJfVkVS VElDQUxMWQogICAgICAgICBpZiAobV9zY2FubGluZSkKICAgICAgICAgICAgIGRlbGV0ZVtdIG1f c2NhbmxpbmU7CkBAIC0xNzEsNiArMTc0LDggQEAgYm9vbCBXZWJHcmFwaGljc0NvbnRleHQzRERl ZmF1bHRJbXBsOjppbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgZ2xHZW5G cmFtZWJ1ZmZlcnNFWFQoMSwgJm1fY29weVRleHR1cmVUb1BhcmVudFRleHR1cmVGQk8pOworCiAg ICAgbV9pbml0aWFsaXplZCA9IHRydWU7CiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC01NTgsMTIg KzU2MywzMSBAQCB2b2lkIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnVuCiAKIGJv b2wgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6c3VwcG9ydHNDb3B5VGV4dHVyZVRv UGFyZW50VGV4dHVyZUNIUk9NSVVNKCkKIHsKLSAgICAvLyBXZSBkb24ndCBjbGFpbSBzdXBwb3J0 IGZvciB0aGlzIGV4dGVuc2lvbiBhdCB0aGlzIHRpbWUKLSAgICByZXR1cm4gZmFsc2U7CisgICAg cmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6 Y29weVRleHR1cmVUb1BhcmVudFRleHR1cmVDSFJPTUlVTSh1bnNpZ25lZCBpZCwgdW5zaWduZWQg aWQyKQogeworICAgIG1ha2VDb250ZXh0Q3VycmVudCgpOworICAgIGdsQmluZEZyYW1lYnVmZmVy RVhUKEdMX0ZSQU1FQlVGRkVSX0VYVCwgbV9jb3B5VGV4dHVyZVRvUGFyZW50VGV4dHVyZUZCTyk7 CisgICAgZ2xGcmFtZWJ1ZmZlclRleHR1cmUyREVYVChHTF9GUkFNRUJVRkZFUiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEdMX0NPTE9SX0FUVEFDSE1FTlQwLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgR0xfVEVYVFVSRV8yRCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCk7IC8vIGxldmVsCisg ICAgZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBpZDIpOworICAgIEdMc2l6ZWkgd2lkdGgs IGhlaWdodDsKKyAgICBnbEdldFRleExldmVsUGFyYW1ldGVyaXYoR0xfVEVYVFVSRV8yRCwgMCwg R0xfVEVYVFVSRV9XSURUSCwgJndpZHRoKTsKKyAgICBnbEdldFRleExldmVsUGFyYW1ldGVyaXYo R0xfVEVYVFVSRV8yRCwgMCwgR0xfVEVYVFVSRV9IRUlHSFQsICZoZWlnaHQpOworICAgIGdsQ29w eVRleEltYWdlMkQoR0xfVEVYVFVSRV8yRCwKKyAgICAgICAgICAgICAgICAgICAgIDAsIC8vIGxl dmVsCisgICAgICAgICAgICAgICAgICAgICBHTF9SR0JBLAorICAgICAgICAgICAgICAgICAgICAg MCwgMCwgLy8geCwgeQorICAgICAgICAgICAgICAgICAgICAgd2lkdGgsCisgICAgICAgICAgICAg ICAgICAgICBoZWlnaHQsCisgICAgICAgICAgICAgICAgICAgICAwKTsgLy8gYm9yZGVyCisgICAg Z2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX2JvdW5kVGV4dHVyZSk7CisgICAgZ2xCaW5k RnJhbWVidWZmZXJFWFQoR0xfRlJBTUVCVUZGRVJfRVhULCBtX2JvdW5kRkJPKTsKIH0KIAogLy8g SGVscGVyIG1hY3JvcyB0byByZWR1Y2UgdGhlIGFtb3VudCBvZiBjb2RlLgpAQCAtNjg4LDcgKzcx MiwxMiBAQCB2b2lkIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OmJpCiAKIERFTEVH QVRFX1RPX0dMXzIoYmluZFJlbmRlcmJ1ZmZlciwgQmluZFJlbmRlcmJ1ZmZlckVYVCwgdW5zaWdu ZWQgbG9uZywgV2ViR0xJZCkKIAotREVMRUdBVEVfVE9fR0xfMihiaW5kVGV4dHVyZSwgQmluZFRl eHR1cmUsIHVuc2lnbmVkIGxvbmcsIFdlYkdMSWQpCit2b2lkIFdlYkdyYXBoaWNzQ29udGV4dDNE RGVmYXVsdEltcGw6OmJpbmRUZXh0dXJlKHVuc2lnbmVkIGxvbmcgdGFyZ2V0LCBXZWJHTElkIHRl eHR1cmUpCit7CisgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7CisgICAgZ2xCaW5kVGV4dHVyZSh0 YXJnZXQsIHRleHR1cmUpOworICAgIG1fYm91bmRUZXh0dXJlID0gdGV4dHVyZTsKK30KIAogREVM RUdBVEVfVE9fR0xfNChibGVuZENvbG9yLCBCbGVuZENvbG9yLCBkb3VibGUsIGRvdWJsZSwgZG91 YmxlLCBkb3VibGUpCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250 ZXh0M0REZWZhdWx0SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oCShyZXZpc2lvbiA3MDMzMCkKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNzQsNiArMjc0LDcgQEAgcHJpdmF0ZToKICAgICBXZWJHcmFwaGljc0NvbnRl eHQzRDo6QXR0cmlidXRlcyBtX2F0dHJpYnV0ZXM7CiAgICAgYm9vbCBtX2luaXRpYWxpemVkOwog ICAgIGJvb2wgbV9yZW5kZXJEaXJlY3RseVRvV2ViVmlldzsKKyAgICB1bnNpZ25lZCBtX2NvcHlU ZXh0dXJlVG9QYXJlbnRUZXh0dXJlRkJPOwogCiAgICAgdW5zaWduZWQgaW50IG1fdGV4dHVyZTsK ICAgICB1bnNpZ25lZCBpbnQgbV9mYm87CkBAIC0yODgsNiArMjg5LDkgQEAgcHJpdmF0ZToKICAg ICAvLyBGb3IgdHJhY2tpbmcgd2hpY2ggRkJPIGlzIGJvdW5kCiAgICAgdW5zaWduZWQgaW50IG1f Ym91bmRGQk87CiAKKyAgICAvLyBGb3IgdHJhY2tpbmcgd2hpY2ggdGV4dHVyZSBpcyBib3VuZAor ICAgIHVuc2lnbmVkIGludCBtX2JvdW5kVGV4dHVyZTsKKwogI2lmZGVmIEZMSVBfRlJBTUVCVUZG RVJfVkVSVElDQUxMWQogICAgIHVuc2lnbmVkIGNoYXIqIG1fc2NhbmxpbmU7CiAgICAgdm9pZCBm bGlwVmVydGljYWxseSh1bnNpZ25lZCBjaGFyKiBmcmFtZWJ1ZmZlciwKSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA3MDMzMCkKKysrIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTAzLDEwICsyNTAzLDgg QEAgV2ViR3JhcGhpY3NDb250ZXh0M0QqIFdlYlZpZXdJbXBsOjpncmFwaAogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJpYnV0ZXM7 CiAgICAgICAgICAgICBtX3RlbXBvcmFyeU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0QgPSBHcmFw aGljc0NvbnRleHQzRDo6Y3JlYXRlKEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzKCksIG1f cGFnZS0+Y2hyb21lKCksIEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJEaXJlY3RseVRvSG9zdFdp bmRvdyk7Ci0jaWYgT1MoREFSV0lOKQogICAgICAgICAgICAgaWYgKG1fdGVtcG9yYXJ5T25zY3Jl ZW5HcmFwaGljc0NvbnRleHQzRCkKICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeU9uc2NyZWVu R3JhcGhpY3NDb250ZXh0M0QtPnJlc2hhcGUoc3RkOjptYXgoMSwgbV9zaXplLndpZHRoKSwgc3Rk OjptYXgoMSwgbV9zaXplLmhlaWdodCkpOwotI2VuZGlmCiAgICAgICAgICAgICBjb250ZXh0ID0g bV90ZW1wb3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNELmdldCgpOwogICAgICAgICB9CiAg ICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQzREludGVybmFsOjpleHRyYWN0V2ViR3JhcGhp Y3NDb250ZXh0M0QoY29udGV4dCk7Cg== 71747 2010-10-25 07:44:49 -0700 2010-10-26 09:47:20 -0700 Patch bug-48152-20101025104447.patch text/plain 7070 senorblanco SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzA0NTApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTAtMTAtMjIgIFN0ZXBo ZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGNvcHktdGV4dHVyZS10by1w YXJlbnQtdGV4dHVyZSBBUEkgZm9yIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODE1MgorICAg ICAgICAKKyAgICAgICAgVGhpcyBhbGxvd3MgdGhlIGluLXByb2Nlc3MgaW1wbGVtZW50YXRpb24g dG8gZG8gYWNjZWxlcmF0ZWQgY2FudmFzIGFuZAorICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3Np dGluZyB0b2dldGhlci4gIEl0IHJlcXVpcmVzIHNvbWUgY2hhbmdlcyBsYW5kZWQKKyAgICAgICAg aW4gY2hyb21pdW0gNjM1MjgsIHNvIHRoaXMgcGF0Y2ggYWxzbyByb2xscyBjaHJvbWl1bSBERVBT IHRvIDYzNzIyCisgICAgICAgIChjdXJyZW50IExLR1IpLgorCisgICAgICAgIENvdmVyZWQgYnkg ZmFzdC9jYW52YXMvYXJjMzYwLmh0bWwsIGFuZCBtYW55IG1vcmUgd2hlbiBydW4gd2l0aAorICAg ICAgICAtLWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nIGFuZCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZh cy4KKworICAgICAgICAqIHNyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6V2ViR3Jh cGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbCk6CisgICAgICAgIEFkZCBtZW1iZXIgdmFycyB0byBz YXZlIHRoZSBjdXJyZW50bHktYm91bmQgdGV4dHVyZSBhbmQgZm9yIHRoZQorICAgICAgICB0ZXh0 dXJlLXRvLXRleHR1cmUgRkJPLgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQz RERlZmF1bHRJbXBsOjp+V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbCk6CisgICAgICAg IERlbGV0ZSB0aGUgdGV4dHVyZS10by10ZXh0dXJlIEZCTyBvbiBkZXN0cnVjdGlvbi4KKworICAg ICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjppbml0aWFsaXpl KToKKyAgICAgICAgR2VuZXJhdGUgdGhlIHRleHR1cmUtdG8tdGV4dHVyZSBGQk8uCisgICAgICAg IChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnN1cHBvcnRzQ29weVRl eHR1cmVUb1BhcmVudFRleHR1cmVDSFJPTUlVTSk6CisgICAgICAgIFdlIG5vdyByZXR1cm4gdHJ1 ZSwgc2luY2Ugd2Ugc3VwcG9ydCB0aGlzIGV4dGVuc2lvbi4KKyAgICAgICAgKFdlYktpdDo6V2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6Y29weVRleHR1cmVUb1BhcmVudFRleHR1cmVD SFJPTUlVTSk6CisgICAgICAgIEltcGxlbWVudCB0aGUgZXh0ZW5zaW9uOiAgYmluZCB0aGUgRkJP LCBiaW5kIHRoZSBjaGlsZCB0ZXh0dXJlLCB0aGVuCisgICAgICAgIGRvIGEgZ2xDb3B5VGV4SW1h Z2UyRCgpIGludG8gdGhlIHBhcmVudCB0ZXh0dXJlLgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFw aGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpiaW5kVGV4dHVyZSk6CisgICAgICAgIFJlY29yZCB0 aGUgbmV3bHktYm91bmQgdGV4dHVyZSBpbiBtX2JvdW5kVGV4dHVyZS4KKyAgICAgICAgKiBzcmMv V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oOgorICAgICAgICBBZGQgdGhlIHR3byBu ZXcgbWVtYmVyIHZhcmlhYmxlcy4KKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Z3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICBN YWtlIHN1cmUgdGhlIGdyYXBoaWNzIGNvbnRleHQgaXMgcmVzaGFwZWQgdG8gdGhlIGNvcnJlY3Qg c2l6ZSBvbiBhbGwKKyAgICAgICAgcGxhdGZvcm1zLgorCiAyMDEwLTEwLTIwICBLaW51a28gWWFz dWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKaWFuIExp LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL0RFUFMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL0RFUFMJKHJldmlzaW9uIDcwNDUwKQorKysgV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdvcmtp bmcgY29weSkKQEAgLTMyLDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6 ICdodHRwOi8vc3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jl dic6ICc2MzQzOScKKyAgJ2Nocm9taXVtX3Jldic6ICc2MzcyMicKIH0KIAogZGVwcyA9IHsKSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQz RERlZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNzA0NTApCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 Nyw2ICs3Nyw4IEBAIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OldlYkdyYXAKICAg ICAsIG1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1w bGVDb2xvckJ1ZmZlcigwKQogICAgICwgbV9ib3VuZEZCTygwKQorICAgICwgbV9ib3VuZFRleHR1 cmUoMCkKKyAgICAsIG1fY29weVRleHR1cmVUb1BhcmVudFRleHR1cmVGQk8oMCkKICNpZmRlZiBG TElQX0ZSQU1FQlVGRkVSX1ZFUlRJQ0FMTFkKICAgICAsIG1fc2NhbmxpbmUoMCkKICNlbmRpZgpA QCAtMTAxLDYgKzEwMyw3IEBAIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6On5XZWJH cmEKICAgICAgICAgICAgICAgICBnbERlbGV0ZVJlbmRlcmJ1ZmZlcnNFWFQoMSwgJm1fZGVwdGhT dGVuY2lsQnVmZmVyKTsKICAgICAgICAgfQogICAgICAgICBnbERlbGV0ZVRleHR1cmVzKDEsICZt X3RleHR1cmUpOworICAgICAgICBnbERlbGV0ZUZyYW1lYnVmZmVyc0VYVCgxLCAmbV9jb3B5VGV4 dHVyZVRvUGFyZW50VGV4dHVyZUZCTyk7CiAjaWZkZWYgRkxJUF9GUkFNRUJVRkZFUl9WRVJUSUNB TExZCiAgICAgICAgIGlmIChtX3NjYW5saW5lKQogICAgICAgICAgICAgZGVsZXRlW10gbV9zY2Fu bGluZTsKQEAgLTE3MSw2ICsxNzQsOCBAQCBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVs dEltcGw6OmluCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICBnbEdlbkZyYW1l YnVmZmVyc0VYVCgxLCAmbV9jb3B5VGV4dHVyZVRvUGFyZW50VGV4dHVyZUZCTyk7CisKICAgICBt X2luaXRpYWxpemVkID0gdHJ1ZTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTU1OCwxMiArNTYz LDMxIEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6dW4KIAogYm9vbCBX ZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpzdXBwb3J0c0NvcHlUZXh0dXJlVG9QYXJl bnRUZXh0dXJlQ0hST01JVU0oKQogewotICAgIC8vIFdlIGRvbid0IGNsYWltIHN1cHBvcnQgZm9y IHRoaXMgZXh0ZW5zaW9uIGF0IHRoaXMgdGltZQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1 cm4gdHJ1ZTsKIH0KIAogdm9pZCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpjb3B5 VGV4dHVyZVRvUGFyZW50VGV4dHVyZUNIUk9NSVVNKHVuc2lnbmVkIGlkLCB1bnNpZ25lZCBpZDIp CiB7CisgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7CisgICAgZ2xCaW5kRnJhbWVidWZmZXJFWFQo R0xfRlJBTUVCVUZGRVJfRVhULCBtX2NvcHlUZXh0dXJlVG9QYXJlbnRUZXh0dXJlRkJPKTsKKyAg ICBnbEZyYW1lYnVmZmVyVGV4dHVyZTJERVhUKEdMX0ZSQU1FQlVGRkVSLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgR0xfQ09MT1JfQVRUQUNITUVOVDAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBHTF9URVhUVVJFXzJELAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwKTsgLy8gbGV2ZWwKKyAgICBn bEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIGlkMik7CisgICAgR0xzaXplaSB3aWR0aCwgaGVp Z2h0OworICAgIGdsR2V0VGV4TGV2ZWxQYXJhbWV0ZXJpdihHTF9URVhUVVJFXzJELCAwLCBHTF9U RVhUVVJFX1dJRFRILCAmd2lkdGgpOworICAgIGdsR2V0VGV4TGV2ZWxQYXJhbWV0ZXJpdihHTF9U RVhUVVJFXzJELCAwLCBHTF9URVhUVVJFX0hFSUdIVCwgJmhlaWdodCk7CisgICAgZ2xDb3B5VGV4 SW1hZ2UyRChHTF9URVhUVVJFXzJELAorICAgICAgICAgICAgICAgICAgICAgMCwgLy8gbGV2ZWwK KyAgICAgICAgICAgICAgICAgICAgIEdMX1JHQkEsCisgICAgICAgICAgICAgICAgICAgICAwLCAw LCAvLyB4LCB5CisgICAgICAgICAgICAgICAgICAgICB3aWR0aCwKKyAgICAgICAgICAgICAgICAg ICAgIGhlaWdodCwKKyAgICAgICAgICAgICAgICAgICAgIDApOyAvLyBib3JkZXIKKyAgICBnbEJp bmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1fYm91bmRUZXh0dXJlKTsKKyAgICBnbEJpbmRGcmFt ZWJ1ZmZlckVYVChHTF9GUkFNRUJVRkZFUl9FWFQsIG1fYm91bmRGQk8pOwogfQogCiAvLyBIZWxw ZXIgbWFjcm9zIHRvIHJlZHVjZSB0aGUgYW1vdW50IG9mIGNvZGUuCkBAIC02ODgsNyArNzEyLDEy IEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6YmkKIAogREVMRUdBVEVf VE9fR0xfMihiaW5kUmVuZGVyYnVmZmVyLCBCaW5kUmVuZGVyYnVmZmVyRVhULCB1bnNpZ25lZCBs b25nLCBXZWJHTElkKQogCi1ERUxFR0FURV9UT19HTF8yKGJpbmRUZXh0dXJlLCBCaW5kVGV4dHVy ZSwgdW5zaWduZWQgbG9uZywgV2ViR0xJZCkKK3ZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YmluZFRleHR1cmUodW5zaWduZWQgbG9uZyB0YXJnZXQsIFdlYkdMSWQgdGV4dHVy ZSkKK3sKKyAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKKyAgICBnbEJpbmRUZXh0dXJlKHRhcmdl dCwgdGV4dHVyZSk7CisgICAgbV9ib3VuZFRleHR1cmUgPSB0ZXh0dXJlOworfQogCiBERUxFR0FU RV9UT19HTF80KGJsZW5kQ29sb3IsIEJsZW5kQ29sb3IsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUs IGRvdWJsZSkKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQz RERlZmF1bHRJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFw aGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgJKHJldmlzaW9uIDcwNDUwKQorKysgV2ViS2l0L2No cm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI4OCw2ICsyODgsMTIgQEAgcHJpdmF0ZToKICAgICAvLyBGb3IgdHJhY2tpbmcgd2hp Y2ggRkJPIGlzIGJvdW5kCiAgICAgdW5zaWduZWQgaW50IG1fYm91bmRGQk87CiAKKyAgICAvLyBG b3IgdHJhY2tpbmcgd2hpY2ggdGV4dHVyZSBpcyBib3VuZAorICAgIHVuc2lnbmVkIGludCBtX2Jv dW5kVGV4dHVyZTsKKyAgICAKKyAgICAvLyBGQk8gdXNlZCBmb3IgY29weWluZyBjaGlsZCB0ZXh0 dXJlIHRvIHBhcmVudCB0ZXh0dXJlLgorICAgIHVuc2lnbmVkIG1fY29weVRleHR1cmVUb1BhcmVu dFRleHR1cmVGQk87CisKICNpZmRlZiBGTElQX0ZSQU1FQlVGRkVSX1ZFUlRJQ0FMTFkKICAgICB1 bnNpZ25lZCBjaGFyKiBtX3NjYW5saW5lOwogICAgIHZvaWQgZmxpcFZlcnRpY2FsbHkodW5zaWdu ZWQgY2hhciogZnJhbWVidWZmZXIsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAkocmV2aXNpb24gNzA0NTApCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjUwMywxMCArMjUwMyw4IEBAIFdlYkdyYXBoaWNzQ29udGV4 dDNEKiBXZWJWaWV3SW1wbDo6Z3JhcGgKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBHcmFw aGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyaWJ1dGVzOwogICAgICAgICAgICAgbV90ZW1w b3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNEID0gR3JhcGhpY3NDb250ZXh0M0Q6OmNyZWF0 ZShHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcygpLCBtX3BhZ2UtPmNocm9tZSgpLCBHcmFw aGljc0NvbnRleHQzRDo6UmVuZGVyRGlyZWN0bHlUb0hvc3RXaW5kb3cpOwotI2lmIE9TKERBUldJ TikKICAgICAgICAgICAgIGlmIChtX3RlbXBvcmFyeU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0Qp CiAgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNELT5y ZXNoYXBlKHN0ZDo6bWF4KDEsIG1fc2l6ZS53aWR0aCksIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWln aHQpKTsKLSNlbmRpZgogICAgICAgICAgICAgY29udGV4dCA9IG1fdGVtcG9yYXJ5T25zY3JlZW5H cmFwaGljc0NvbnRleHQzRC5nZXQoKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gR3JhcGhp Y3NDb250ZXh0M0RJbnRlcm5hbDo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKGNvbnRleHQp Owo= 71902 2010-10-26 09:47:25 -0700 2010-10-26 10:32:50 -0700 Patch bug-48152-20101026124724.patch text/plain 7274 senorblanco SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzA1MjIpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTAtMTAtMjIgIFN0ZXBo ZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGNvcHktdGV4dHVyZS10by1w YXJlbnQtdGV4dHVyZSBBUEkgZm9yIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODE1MgorICAg ICAgICAKKyAgICAgICAgVGhpcyBhbGxvd3MgdGhlIGluLXByb2Nlc3MgaW1wbGVtZW50YXRpb24g dG8gZG8gYWNjZWxlcmF0ZWQgY2FudmFzIGFuZAorICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3Np dGluZyB0b2dldGhlci4gIEl0IHJlcXVpcmVzIHNvbWUgY2hhbmdlcyBsYW5kZWQKKyAgICAgICAg aW4gY2hyb21pdW0gNjM1MjgsIHNvIHRoaXMgcGF0Y2ggYWxzbyByb2xscyBjaHJvbWl1bSBERVBT IHRvIDYzNzIyCisgICAgICAgIChjdXJyZW50IExLR1IpLgorCisgICAgICAgIENvdmVyZWQgYnkg ZmFzdC9jYW52YXMvYXJjMzYwLmh0bWwsIGFuZCBtYW55IG1vcmUgd2hlbiBydW4gd2l0aAorICAg ICAgICAtLWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nIGFuZCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZh cy4KKworICAgICAgICAqIHNyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6V2ViR3Jh cGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbCk6CisgICAgICAgIEFkZCBtZW1iZXIgdmFycyB0byBz YXZlIHRoZSBjdXJyZW50bHktYm91bmQgdGV4dHVyZSBhbmQgZm9yIHRoZQorICAgICAgICB0ZXh0 dXJlLXRvLXRleHR1cmUgRkJPLgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQz RERlZmF1bHRJbXBsOjp+V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbCk6CisgICAgICAg IERlbGV0ZSB0aGUgdGV4dHVyZS10by10ZXh0dXJlIEZCTyBvbiBkZXN0cnVjdGlvbi4KKworICAg ICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjppbml0aWFsaXpl KToKKyAgICAgICAgR2VuZXJhdGUgdGhlIHRleHR1cmUtdG8tdGV4dHVyZSBGQk8uCisgICAgICAg IChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnN1cHBvcnRzQ29weVRl eHR1cmVUb1BhcmVudFRleHR1cmVDSFJPTUlVTSk6CisgICAgICAgIENoZWNrIGZvciBzdXBwb3J0 IG9mIHRoZSBnbEdldFRleExldmVsUGFyYW1ldGVyaXYgZnVuY3Rpb24gKHJlcXVpcmVkCisgICAg ICAgIGZvciB0aGlzIGltcGxlbWVudGF0aW9uKS4KKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhp Y3NDb250ZXh0M0REZWZhdWx0SW1wbDo6Y29weVRleHR1cmVUb1BhcmVudFRleHR1cmVDSFJPTUlV TSk6CisgICAgICAgIEltcGxlbWVudCB0aGUgZXh0ZW5zaW9uOiAgYmluZCB0aGUgRkJPLCBiaW5k IHRoZSBjaGlsZCB0ZXh0dXJlLCB0aGVuCisgICAgICAgIGRvIGEgZ2xDb3B5VGV4SW1hZ2UyRCgp IGludG8gdGhlIHBhcmVudCB0ZXh0dXJlLgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0Nv bnRleHQzRERlZmF1bHRJbXBsOjpiaW5kVGV4dHVyZSk6CisgICAgICAgIFJlY29yZCB0aGUgbmV3 bHktYm91bmQgdGV4dHVyZSBpbiBtX2JvdW5kVGV4dHVyZS4KKyAgICAgICAgKiBzcmMvV2ViR3Jh cGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oOgorICAgICAgICBBZGQgdGhlIHR3byBuZXcgbWVt YmVyIHZhcmlhYmxlcy4KKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6Z3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICBNYWtlIHN1 cmUgdGhlIGdyYXBoaWNzIGNvbnRleHQgaXMgcmVzaGFwZWQgdG8gdGhlIGNvcnJlY3Qgc2l6ZSBv biBhbGwKKyAgICAgICAgcGxhdGZvcm1zLgorCiAyMDEwLTEwLTI2ICBKZXJlbXkgT3Jsb3cgIDxq b3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpJ bmRleDogV2ViS2l0L2Nocm9taXVtL0RFUFMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L0RFUFMJKHJldmlzaW9uIDcwNTIyKQorKysgV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdvcmtpbmcg Y29weSkKQEAgLTMyLDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdo dHRwOi8vc3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jldic6 ICc2MzQzOScKKyAgJ2Nocm9taXVtX3Jldic6ICc2MzcyMicKIH0KIAogZGVwcyA9IHsKSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERl ZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNzA1MjIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2 ICs3Nyw4IEBAIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OldlYkdyYXAKICAgICAs IG1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1wbGVD b2xvckJ1ZmZlcigwKQogICAgICwgbV9ib3VuZEZCTygwKQorICAgICwgbV9ib3VuZFRleHR1cmUo MCkKKyAgICAsIG1fY29weVRleHR1cmVUb1BhcmVudFRleHR1cmVGQk8oMCkKICNpZmRlZiBGTElQ X0ZSQU1FQlVGRkVSX1ZFUlRJQ0FMTFkKICAgICAsIG1fc2NhbmxpbmUoMCkKICNlbmRpZgpAQCAt MTAxLDYgKzEwMyw3IEBAIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6On5XZWJHcmEK ICAgICAgICAgICAgICAgICBnbERlbGV0ZVJlbmRlcmJ1ZmZlcnNFWFQoMSwgJm1fZGVwdGhTdGVu Y2lsQnVmZmVyKTsKICAgICAgICAgfQogICAgICAgICBnbERlbGV0ZVRleHR1cmVzKDEsICZtX3Rl eHR1cmUpOworICAgICAgICBnbERlbGV0ZUZyYW1lYnVmZmVyc0VYVCgxLCAmbV9jb3B5VGV4dHVy ZVRvUGFyZW50VGV4dHVyZUZCTyk7CiAjaWZkZWYgRkxJUF9GUkFNRUJVRkZFUl9WRVJUSUNBTExZ CiAgICAgICAgIGlmIChtX3NjYW5saW5lKQogICAgICAgICAgICAgZGVsZXRlW10gbV9zY2FubGlu ZTsKQEAgLTE3MSw2ICsxNzQsOCBAQCBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdElt cGw6OmluCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICBnbEdlbkZyYW1lYnVm ZmVyc0VYVCgxLCAmbV9jb3B5VGV4dHVyZVRvUGFyZW50VGV4dHVyZUZCTyk7CisKICAgICBtX2lu aXRpYWxpemVkID0gdHJ1ZTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTU1OCwxMiArNTYzLDMz IEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6dW4KIAogYm9vbCBXZWJH cmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpzdXBwb3J0c0NvcHlUZXh0dXJlVG9QYXJlbnRU ZXh0dXJlQ0hST01JVU0oKQogewotICAgIC8vIFdlIGRvbid0IGNsYWltIHN1cHBvcnQgZm9yIHRo aXMgZXh0ZW5zaW9uIGF0IHRoaXMgdGltZQotICAgIHJldHVybiBmYWxzZTsKKyAgICAvLyBUaGlz IGV4dGVuc2lvbiByZXF1aXJlcyB0aGlzIGRlc2t0b3BHTC1vbmx5IGZ1bmN0aW9uIChHTEVTMiBk b2Vzbid0CisgICAgLy8gc3VwcG9ydCBpdCksIHNvIGNoZWNrIGZvciBpdHMgZXhpc3RlbmNlIGhl cmUuCisgICAgcmV0dXJuIGdsR2V0VGV4TGV2ZWxQYXJhbWV0ZXJpdjsKIH0KIAogdm9pZCBXZWJH cmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpjb3B5VGV4dHVyZVRvUGFyZW50VGV4dHVyZUNI Uk9NSVVNKHVuc2lnbmVkIGlkLCB1bnNpZ25lZCBpZDIpCiB7CisgICAgbWFrZUNvbnRleHRDdXJy ZW50KCk7CisgICAgZ2xCaW5kRnJhbWVidWZmZXJFWFQoR0xfRlJBTUVCVUZGRVJfRVhULCBtX2Nv cHlUZXh0dXJlVG9QYXJlbnRUZXh0dXJlRkJPKTsKKyAgICBnbEZyYW1lYnVmZmVyVGV4dHVyZTJE RVhUKEdMX0ZSQU1FQlVGRkVSLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xfQ09M T1JfQVRUQUNITUVOVDAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTF9URVhUVVJF XzJELAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAwKTsgLy8gbGV2ZWwKKyAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVf MkQsIGlkMik7CisgICAgR0xzaXplaSB3aWR0aCwgaGVpZ2h0OworICAgIGdsR2V0VGV4TGV2ZWxQ YXJhbWV0ZXJpdihHTF9URVhUVVJFXzJELCAwLCBHTF9URVhUVVJFX1dJRFRILCAmd2lkdGgpOwor ICAgIGdsR2V0VGV4TGV2ZWxQYXJhbWV0ZXJpdihHTF9URVhUVVJFXzJELCAwLCBHTF9URVhUVVJF X0hFSUdIVCwgJmhlaWdodCk7CisgICAgZ2xDb3B5VGV4SW1hZ2UyRChHTF9URVhUVVJFXzJELAor ICAgICAgICAgICAgICAgICAgICAgMCwgLy8gbGV2ZWwKKyAgICAgICAgICAgICAgICAgICAgIEdM X1JHQkEsCisgICAgICAgICAgICAgICAgICAgICAwLCAwLCAvLyB4LCB5CisgICAgICAgICAgICAg ICAgICAgICB3aWR0aCwKKyAgICAgICAgICAgICAgICAgICAgIGhlaWdodCwKKyAgICAgICAgICAg ICAgICAgICAgIDApOyAvLyBib3JkZXIKKyAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQs IG1fYm91bmRUZXh0dXJlKTsKKyAgICBnbEJpbmRGcmFtZWJ1ZmZlckVYVChHTF9GUkFNRUJVRkZF Ul9FWFQsIG1fYm91bmRGQk8pOwogfQogCiAvLyBIZWxwZXIgbWFjcm9zIHRvIHJlZHVjZSB0aGUg YW1vdW50IG9mIGNvZGUuCkBAIC02ODgsNyArNzE0LDEyIEBAIHZvaWQgV2ViR3JhcGhpY3NDb250 ZXh0M0REZWZhdWx0SW1wbDo6YmkKIAogREVMRUdBVEVfVE9fR0xfMihiaW5kUmVuZGVyYnVmZmVy LCBCaW5kUmVuZGVyYnVmZmVyRVhULCB1bnNpZ25lZCBsb25nLCBXZWJHTElkKQogCi1ERUxFR0FU RV9UT19HTF8yKGJpbmRUZXh0dXJlLCBCaW5kVGV4dHVyZSwgdW5zaWduZWQgbG9uZywgV2ViR0xJ ZCkKK3ZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6YmluZFRleHR1cmUodW5z aWduZWQgbG9uZyB0YXJnZXQsIFdlYkdMSWQgdGV4dHVyZSkKK3sKKyAgICBtYWtlQ29udGV4dEN1 cnJlbnQoKTsKKyAgICBnbEJpbmRUZXh0dXJlKHRhcmdldCwgdGV4dHVyZSk7CisgICAgbV9ib3Vu ZFRleHR1cmUgPSB0ZXh0dXJlOworfQogCiBERUxFR0FURV9UT19HTF80KGJsZW5kQ29sb3IsIEJs ZW5kQ29sb3IsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIGRvdWJsZSkKIApJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBs LmgJKHJldmlzaW9uIDcwNTIyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0Nv bnRleHQzRERlZmF1bHRJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4OCw2ICsyODgsMTIgQEAg cHJpdmF0ZToKICAgICAvLyBGb3IgdHJhY2tpbmcgd2hpY2ggRkJPIGlzIGJvdW5kCiAgICAgdW5z aWduZWQgaW50IG1fYm91bmRGQk87CiAKKyAgICAvLyBGb3IgdHJhY2tpbmcgd2hpY2ggdGV4dHVy ZSBpcyBib3VuZAorICAgIHVuc2lnbmVkIGludCBtX2JvdW5kVGV4dHVyZTsKKyAgICAKKyAgICAv LyBGQk8gdXNlZCBmb3IgY29weWluZyBjaGlsZCB0ZXh0dXJlIHRvIHBhcmVudCB0ZXh0dXJlLgor ICAgIHVuc2lnbmVkIG1fY29weVRleHR1cmVUb1BhcmVudFRleHR1cmVGQk87CisKICNpZmRlZiBG TElQX0ZSQU1FQlVGRkVSX1ZFUlRJQ0FMTFkKICAgICB1bnNpZ25lZCBjaGFyKiBtX3NjYW5saW5l OwogICAgIHZvaWQgZmxpcFZlcnRpY2FsbHkodW5zaWduZWQgY2hhciogZnJhbWVidWZmZXIsCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkocmV2aXNpb24gNzA1MjIpCisrKyBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUw MywxMCArMjUwMyw4IEBAIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBXZWJWaWV3SW1wbDo6Z3JhcGgK ICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRl cyBhdHRyaWJ1dGVzOwogICAgICAgICAgICAgbV90ZW1wb3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29u dGV4dDNEID0gR3JhcGhpY3NDb250ZXh0M0Q6OmNyZWF0ZShHcmFwaGljc0NvbnRleHQzRDo6QXR0 cmlidXRlcygpLCBtX3BhZ2UtPmNocm9tZSgpLCBHcmFwaGljc0NvbnRleHQzRDo6UmVuZGVyRGly ZWN0bHlUb0hvc3RXaW5kb3cpOwotI2lmIE9TKERBUldJTikKICAgICAgICAgICAgIGlmIChtX3Rl bXBvcmFyeU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0QpCiAgICAgICAgICAgICAgICAgbV90ZW1w b3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNELT5yZXNoYXBlKHN0ZDo6bWF4KDEsIG1fc2l6 ZS53aWR0aCksIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKTsKLSNlbmRpZgogICAgICAgICAg ICAgY29udGV4dCA9IG1fdGVtcG9yYXJ5T25zY3JlZW5HcmFwaGljc0NvbnRleHQzRC5nZXQoKTsK ICAgICAgICAgfQogICAgICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0M0RJbnRlcm5hbDo6ZXh0 cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKGNvbnRleHQpOwo=