52310 2011-01-12 10:48:19 -0800 [chromium] DrawingBuffer and accel canvas giving GL errors 2011-01-12 13:58:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco cmarrin jamesr kbr webkit.review.bot oldest_to_newest 333159 0 senorblanco 2011-01-12 10:48:19 -0800 Running chromium/linux --enable-accelerated-2d-canvas in Debug, many GL errors are printed to stdout. glRenderbufferStorage() gives INVALID_ENUM on internalformat glFramebufferTexture2D() gives INVALID_ENUM on target glDrawArrays() gives invalid enum (probably due to the first two errors, drawing to an invalid FBO). The first two seem to be issued by DrawingBuffer. This may be related to http://code.google.com/p/chromium/issues/detail?id=65139. 333169 1 78709 senorblanco 2011-01-12 11:03:47 -0800 Created attachment 78709 Patch 333171 2 78709 jamesr 2011-01-12 11:06:27 -0800 Comment on attachment 78709 Patch R=me. Thanks! 333183 3 senorblanco 2011-01-12 11:18:49 -0800 Will wait for mac EWS results, since I made those changes blind. 333197 4 webkit.review.bot 2011-01-12 11:42:30 -0800 Attachment 78709 did not build on mac: Build output: http://queues.webkit.org/results/7342441 333203 5 78709 jamesr 2011-01-12 11:49:21 -0800 Comment on attachment 78709 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78709&action=review > Source/WebCore/platform/graphics/gpu/mac/DrawingBufferMac.mm:45 > + , m_multisampleExtensionSupported(multisampleExtensionSupported), you have a trailing comma here 333232 6 78723 senorblanco 2011-01-12 12:27:46 -0800 Created attachment 78723 Patch 333271 7 senorblanco 2011-01-12 13:58:34 -0800 Committed r75637: <http://trac.webkit.org/changeset/75637> 78709 2011-01-12 11:03:47 -0800 2011-01-12 12:27:41 -0800 Patch bug-52310-20110112140345.patch text/plain 10994 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NjIyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTEtMDEtMTIgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IERyYXdpbmdCdWZmZXIgaXNzdWVzIGZvciBk ZXB0aC9zdGVuY2lsLCBleHRlbnNpb25zLCBldGMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjMxMAorCisgICAgICAgIDEpICBHTF9URVhUVVJFIGlz IG5vdCBhIHZhbGlkIGFyZ3VtZW50IHRvIGdsRnJhbWVidWZmZXJUZXh0dXJlMkQoKQorICAgICAg ICAoc2hvdWxkIGJlIEdMX1RFWFRVUkVfMkQpLgorICAgICAgICAyKSAgU3VwcG9ydCBmb3IgdGhl IG11bHRpc2FtcGxpbmcgZXh0ZW5zaW9uIHdhcyBiZWluZyBjaGVja2VkIGFmdGVyCisgICAgICAg IHRoZSBEcmF3aW5nQnVmZmVyIGNvbnN0cnVjdG9yIHdhcyBjYWxsZWQsIHdoaWNoIGNhbGxzIG11 bHRpc2FtcGxlKCkKKyAgICAgICAgdG8gY2hlY2sgZm9yIHRoZSBleHRlbnNpb24uCisgICAgICAg IDMpICBJZiBkZXB0aCBvciBzdGVuY2lsIGlzIHNldCwgdGhlIGNvcnJlc3BvbmRpbmcgZnJhbWVi dWZmZXJzIG11c3QKKyAgICAgICAgYmUgY3JlYXRlZCBpbiB0aGUgRHJhd2luZ0J1ZmZlciBjb25z dHJ1Y3Rvci4KKyAgICAgICAgNCkgIEdMX0RFUFRIX1NURU5DSUwgaXMgbm90IGEgdmFsaWQgZnJh bWVidWZmZXIgaW50ZXJuYWwgdHlwZSBpbgorICAgICAgICBHTEVTMi4gIE11c3QgdXNlIEdMX09F U19ERVBUSDI0X1NURU5DSUw4LCBhbmQgY2hlY2sgZm9yIHRoZQorICAgICAgICBPRVNfcGFja2Vk X2RlcHRoX3N0ZW5jaWwgZXh0ZW5zaW9uLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRy YXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICBSZWNvcmQgdGhlIGV4dGVuc2lv biBzdXBwb3J0IGluIHRoZSBjb25zdHJ1Y3Rvci4gIENyZWF0ZSBhbGwgdGhlCisgICAgICAgIHNl Y29uZGFyeSBkcmF3aW5nIGJ1ZmZlcnMgKGZvciBtdWx0aXNhbXBsaW5nLCBkZXB0aC9zdGVuY2ls KS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjcmVhdGUpOgorICAgICAgICBDaGVjayBm b3IgdGhlIGV4dGVuc2lvbnMgYmVmb3JlIGNhbGxpbmcgdGhlIERyYXdpbmdCdWZmZXIgY29uc3Ry dWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjcmVhdGVTZWNvbmRhcnlC dWZmZXJzKToKKyAgICAgICAgUmVmYWN0b3IgY3JlYXRpb24gb2YgdGhlIHNlY29uZGFyeSBidWZm ZXJzIGZyb20gRHJhd2luZ0J1ZmZlck1hYy5tbSB0bworICAgICAgICBoZXJlLgorICAgICAgICAo V2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6cmVzZXQpOgorICAgICAgICBVc2UgREVQVEgyNF9TVEVO Q0lMOCBmb3JtYXQsIG5vdCBERVBUSF9TVEVOQ0lMLiAgVXNlCisgICAgICAgIERFUFRIX0NPTVBP TkVOVDE2LCBub3QgREVQVEhfQ09NUE9ORU5ULgorICAgICAgICBVc2UgR0xfVEVYVFVSRV8yRCwg bm90IEdMX1RFWFRVUkUgKGZvciBnbEZyYW1lYnVmZmVyVGV4dHVyZTJEKS4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oOgorICAgICAgICBSZWZhY3RvciBj cmVhdGVTZWNvbmRhcnlCdWZmZXJzKCkuICBBZGQgZXh0ZW5zaW9uIHN1cHBvcnQgYXJndW1lbnRz IHRvCisgICAgICAgIGNvbnN0cnVjdG9yLiAgQWRkIHN1cHBvcnQgZm9yIHBhY2tlZF9kZXB0aF9z dGVuY2lsIGV4dGVuc2lvbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0Ry YXdpbmdCdWZmZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3 aW5nQnVmZmVyKToKKyAgICAgICAgUmVjb3JkIGV4dGVuc2lvbiBzdXBwb3J0IGluIGNvbnN0cnVj dG9yLiAgUmVmYWN0b3Igb3V0IGNyZWF0aW9uIG9mCisgICAgICAgIHNlY29uZGFyeSBidWZmZXJz LgorCiAyMDExLTAxLTEyICBLb2FuLVNpbiBUYW4gIDxrb2Fuc2luLnRhbkBnbWFpbC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9E cmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA3NTYyMikKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY3LDkgKzY3LDE0IEBAIHN0YXRpYyB1bnNpZ25lZCBnZW5lcmF0 ZUNvbG9yVGV4dHVyZShHcmEKIH0KIAogCi1EcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdy YXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBjb25zdCBJbnRTaXplJiBzaXplKQorRHJhd2luZ0J1 ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50U2l6ZSYgc2l6ZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYm9vbCBtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBwYWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25T dXBwb3J0ZWQpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZShzaXplKQor ICAgICwgbV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lv blN1cHBvcnRlZCkKKyAgICAsIG1fcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVk KHBhY2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvblN1cHBvcnRlZCkKICAgICAsIG1fZmJvKDApCiAg ICAgLCBtX2NvbG9yQnVmZmVyKDApCiAgICAgLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcigwKQpAQCAt ODUsNiArOTAsNyBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAg ICAgbV9mYm8gPSBjb250ZXh0LT5jcmVhdGVGcmFtZWJ1ZmZlcigpOwogICAgIGNvbnRleHQtPmJp bmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fZmJvKTsKICAg ICBtX2NvbG9yQnVmZmVyID0gZ2VuZXJhdGVDb2xvclRleHR1cmUoY29udGV4dCwgc2l6ZSk7Cisg ICAgY3JlYXRlU2Vjb25kYXJ5QnVmZmVycygpOwogfQogCiBEcmF3aW5nQnVmZmVyOjp+RHJhd2lu Z0J1ZmZlcigpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJh d2luZ0J1ZmZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwCShyZXZpc2lvbiA3NTYyMikKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDAsMTQgKzQwLDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1JlZlB0 cjxEcmF3aW5nQnVmZmVyPiBEcmF3aW5nQnVmZmVyOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0Qq IGNvbnRleHQsIGNvbnN0IEludFNpemUmIHNpemUpCiB7Ci0gICAgUmVmUHRyPERyYXdpbmdCdWZm ZXI+IGRyYXdpbmdCdWZmZXIgPSBhZG9wdFJlZihuZXcgRHJhd2luZ0J1ZmZlcihjb250ZXh0LCBz aXplKSk7CiAgICAgRXh0ZW5zaW9uczNEKiBleHRlbnNpb25zID0gY29udGV4dC0+Z2V0RXh0ZW5z aW9ucygpOwogICAgIGJvb2wgbXVsdGlzYW1wbGVTdXBwb3J0ZWQgPSBleHRlbnNpb25zLT5zdXBw b3J0cygiR0xfQU5HTEVfZnJhbWVidWZmZXJfYmxpdCIpICYmIGV4dGVuc2lvbnMtPnN1cHBvcnRz KCJHTF9BTkdMRV9mcmFtZWJ1ZmZlcl9tdWx0aXNhbXBsZSIpOwogICAgIGlmIChtdWx0aXNhbXBs ZVN1cHBvcnRlZCkgewogICAgICAgICBleHRlbnNpb25zLT5lbnN1cmVFbmFibGVkKCJHTF9BTkdM RV9mcmFtZWJ1ZmZlcl9ibGl0Iik7CiAgICAgICAgIGV4dGVuc2lvbnMtPmVuc3VyZUVuYWJsZWQo IkdMX0FOR0xFX2ZyYW1lYnVmZmVyX211bHRpc2FtcGxlIik7CiAgICAgfQotICAgIGRyYXdpbmdC dWZmZXItPm1fbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQgPSBtdWx0aXNhbXBsZVN1cHBv cnRlZDsKKyAgICBib29sIHBhY2tlZERlcHRoU3RlbmNpbFN1cHBvcnRlZCA9IGV4dGVuc2lvbnMt PnN1cHBvcnRzKCJHTF9PRVNfcGFja2VkX2RlcHRoX3N0ZW5jaWwiKTsKKyAgICBpZiAocGFja2Vk RGVwdGhTdGVuY2lsU3VwcG9ydGVkKQorICAgICAgICBleHRlbnNpb25zLT5lbnN1cmVFbmFibGVk KCJHTF9PRVNfcGFja2VkX2RlcHRoX3N0ZW5jaWwiKTsKKyAgICBSZWZQdHI8RHJhd2luZ0J1ZmZl cj4gZHJhd2luZ0J1ZmZlciA9IGFkb3B0UmVmKG5ldyBEcmF3aW5nQnVmZmVyKGNvbnRleHQsIHNp emUsIG11bHRpc2FtcGxlU3VwcG9ydGVkLCBwYWNrZWREZXB0aFN0ZW5jaWxTdXBwb3J0ZWQpKTsK ICAgICByZXR1cm4gKGRyYXdpbmdCdWZmZXItPm1fY29udGV4dCkgPyBkcmF3aW5nQnVmZmVyLnJl bGVhc2UoKSA6IDA7CiB9CiAKQEAgLTg4LDYgKzkwLDI0IEBAIHZvaWQgRHJhd2luZ0J1ZmZlcjo6 Y2xlYXIoKQogICAgIG1fY29udGV4dC5jbGVhcigpOwogfQogCit2b2lkIERyYXdpbmdCdWZmZXI6 OmNyZWF0ZVNlY29uZGFyeUJ1ZmZlcnMoKQoreworICAgIGNvbnN0IEdyYXBoaWNzQ29udGV4dDNE OjpBdHRyaWJ1dGVzJiBhdHRyaWJ1dGVzID0gbV9jb250ZXh0LT5nZXRDb250ZXh0QXR0cmlidXRl cygpOworCisgICAgLy8gQ3JlYXRlIHRoZSBzdGVuY2lsIGFuZCBkZXB0aCBidWZmZXIgaWYgbmVl ZGVkCisgICAgaWYgKCFtdWx0aXNhbXBsZSgpICYmIChhdHRyaWJ1dGVzLnN0ZW5jaWwgfHwgYXR0 cmlidXRlcy5kZXB0aCkpCisgICAgICAgIG1fZGVwdGhTdGVuY2lsQnVmZmVyID0gbV9jb250ZXh0 LT5jcmVhdGVSZW5kZXJidWZmZXIoKTsKKworICAgIC8vIGNyZWF0ZSBhIG11bHRpc2FtcGxlIEZC TworICAgIGlmIChtdWx0aXNhbXBsZSgpKSB7CisgICAgICAgIG1fbXVsdGlzYW1wbGVGQk8gPSBt X2NvbnRleHQtPmNyZWF0ZUZyYW1lYnVmZmVyKCk7CisgICAgICAgIG1fY29udGV4dC0+YmluZEZy YW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9tdWx0aXNhbXBsZUZC Tyk7CisgICAgICAgIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlciA9IG1fY29udGV4dC0+Y3JlYXRl UmVuZGVyYnVmZmVyKCk7CisgICAgICAgIGlmIChhdHRyaWJ1dGVzLnN0ZW5jaWwgfHwgYXR0cmli dXRlcy5kZXB0aCkKKyAgICAgICAgICAgIG1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5jaWxCdWZmZXIg PSBtX2NvbnRleHQtPmNyZWF0ZVJlbmRlcmJ1ZmZlcigpOworICAgIH0KK30KKwogdm9pZCBEcmF3 aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIGlmIChtX3Np emUgPT0gbmV3U2l6ZSkKQEAgLTExMSwxMCArMTMxLDEzIEBAIHZvaWQgRHJhd2luZ0J1ZmZlcjo6 cmVzZXQoY29uc3QgSW50U2l6ZSYKICAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsIHx8IGF0dHJp YnV0ZXMuZGVwdGgpIHsKICAgICAgICAgLy8gV2UgZG9uJ3QgYWxsb3cgdGhlIGxvZ2ljIHdoZXJl IHN0ZW5jaWwgaXMgcmVxdWlyZWQgYW5kIGRlcHRoIGlzIG5vdC4KICAgICAgICAgLy8gU2VlIEdy YXBoaWNzQ29udGV4dDNEIGNvbnN0cnVjdG9yLgotICAgICAgICBpZiAoYXR0cmlidXRlcy5zdGVu Y2lsICYmIGF0dHJpYnV0ZXMuZGVwdGgpCi0gICAgICAgICAgICBpbnRlcm5hbERlcHRoU3RlbmNp bEZvcm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9TVEVOQ0lMOworCisgICAgICAgIC8v IEZJWE1FOiAgSWYgcGFja2VkIGRlcHRoL3N0ZW5jaWwgaXMgbm90IHN1cHBvcnRlZCwgd2Ugc2hv dWxkCisgICAgICAgIC8vIGNyZWF0ZSBzZXBhcmF0ZSByZW5kZXJidWZmZXJzIGZvciBkZXB0aCBh bmQgc3RlbmNpbC4KKyAgICAgICAgaWYgKGF0dHJpYnV0ZXMuc3RlbmNpbCAmJiBhdHRyaWJ1dGVz LmRlcHRoICYmIG1fcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVkKQorICAgICAg ICAgICAgaW50ZXJuYWxEZXB0aFN0ZW5jaWxGb3JtYXQgPSBFeHRlbnNpb25zM0Q6OkRFUFRIMjRf U1RFTkNJTDg7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGludGVybmFsRGVwdGhTdGVuY2ls Rm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0NPTVBPTkVOVDsKKyAgICAgICAgICAg IGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0NP TVBPTkVOVDE2OwogICAgIH0KIAogICAgIC8vIHJlc2l6ZSBtdWx0aXNhbXBsZSBGQk8KQEAgLTE1 MCw3ICsxNzMsNyBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IEludFNpemUmCiAK ICAgICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJE LCBtX2NvbG9yQnVmZmVyKTsKICAgICBtX2NvbnRleHQtPnRleEltYWdlMkRSZXNvdXJjZVNhZmUo R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIGludGVybmFsQ29sb3JGb3JtYXQsIG1f c2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCksIDAsIGNvbG9yRm9ybWF0LCBHcmFwaGljc0Nv bnRleHQzRDo6VU5TSUdORURfQllURSk7Ci0gICAgbV9jb250ZXh0LT5mcmFtZWJ1ZmZlclRleHR1 cmUyRChHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpD T0xPUl9BVFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUsIG1fY29sb3JCdWZm ZXIsIDApOworICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJUZXh0dXJlMkQoR3JhcGhpY3NDb250 ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQVRUQUNITUVOVDAs IEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX2NvbG9yQnVmZmVyLCAwKTsKICAgICBt X2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAwKTsK ICAgICBpZiAoIW11bHRpc2FtcGxlKCkgJiYgKGF0dHJpYnV0ZXMuc3RlbmNpbCB8fCBhdHRyaWJ1 dGVzLmRlcHRoKSkgewogICAgICAgICBtX2NvbnRleHQtPmJpbmRSZW5kZXJidWZmZXIoR3JhcGhp Y3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1 ZmZlci5oCShyZXZpc2lvbiA3NTYyMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDYgKzYzLDkgQEAg cHVibGljOgogICAgIC8vIENsZWFyIGFsbCByZXNvdXJjZXMgZnJvbSB0aGlzIG9iamVjdCwgYXMg d2VsbCBhcyBjb250ZXh0LiBDYWxsZWQgd2hlbiBjb250ZXh0IGlzIGRlc3Ryb3llZAogICAgIC8v IHRvIHByZXZlbnQgaW52YWxpZCBhY2Nlc3NlcyB0byB0aGUgcmVzb3VyY2VzLgogICAgIHZvaWQg Y2xlYXIoKTsKKworICAgIC8vIENyZWF0ZSB0aGUgZGVwdGgvc3RlbmNpbCBhbmQgbXVsdGlzYW1w bGUgYnVmZmVycywgaWYgbmVlZGVkLgorICAgIHZvaWQgY3JlYXRlU2Vjb25kYXJ5QnVmZmVycygp OwogICAgIAogICAgIC8vIENvcGllcyB0aGUgbXVsdGlzYW1wbGUgY29sb3IgYnVmZmVyIHRvIHRo ZSBub3JtYWwgY29sb3IgYnVmZmVyIGFuZCBsZWF2ZXMgbV9mYm8gYm91bmQKICAgICB2b2lkIGNv bW1pdChsb25nIHggPSAwLCBsb25nIHkgPSAwLCBsb25nIHdpZHRoID0gLTEsIGxvbmcgaGVpZ2h0 ID0gLTEpOwpAQCAtOTIsNyArOTUsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPERyYXdpbmdCdWZmZXI+IGNyZWF0ZShHcmFwaGljc0NvbnRleHQzRCosIGNvbnN0 IEludFNpemUmKTsKICAgICAKLSAgICBEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEKiwg Y29uc3QgSW50U2l6ZSYpOworICAgIERyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqLCBj b25zdCBJbnRTaXplJiwgYm9vbCBtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCwgYm9vbCBw YWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25TdXBwb3J0ZWQpOwogICAgIAogICAgIC8vIFBsYXRm b3JtIHNwZWNpZmljIGZ1bmN0aW9uIGNhbGxlZCBhZnRlciByZXNldCgpIHNvIGVhY2ggcGxhdGZv cm0gY2FuIGRvIGV4dHJhIHdvcmsgaWYgbmVlZGVkCiAgICAgdm9pZCBkaWRSZXNldCgpOwpAQCAt MTAwLDYgKzEwMyw3IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBt X2NvbnRleHQ7CiAgICAgSW50U2l6ZSBtX3NpemU7CiAgICAgYm9vbCBtX211bHRpc2FtcGxlRXh0 ZW5zaW9uU3VwcG9ydGVkOworICAgIGJvb2wgbV9wYWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25T dXBwb3J0ZWQ7CiAgICAgUGxhdGZvcm0zRE9iamVjdCBtX2ZibzsKICAgICBQbGF0Zm9ybTNET2Jq ZWN0IG1fY29sb3JCdWZmZXI7CiAgICAgUGxhdGZvcm0zRE9iamVjdCBtX2RlcHRoU3RlbmNpbEJ1 ZmZlcjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJh d2luZ0J1ZmZlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW0JKHJldmlzaW9uIDc1NjIyKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L21hYy9EcmF3aW5nQnVmZmVyTWFj Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw5ICszNiwxNCBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLURyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQsIGNvbnN0IEludFNpemUmIHNpemUpCitEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVy KEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBJbnRTaXplJiBzaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29s IG11bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBib29sIHBhY2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvblN1cHBvcnRlZCkKICAgICA6IG1f Y29udGV4dChjb250ZXh0KQogICAgICwgbV9zaXplKHNpemUpCisgICAgLCBtX211bHRpc2FtcGxl RXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKSwKKyAgICAs IG1fcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVkKHBhY2tlZERlcHRoU3RlbmNp bEV4dGVuc2lvblN1cHBvcnRlZCkKICAgICAsIG1fZmJvKGNvbnRleHQtPmNyZWF0ZUZyYW1lYnVm ZmVyKCkpCiAgICAgLCBtX2NvbG9yQnVmZmVyKDApCiAgICAgLCBtX2RlcHRoU3RlbmNpbEJ1ZmZl cigwKQpAQCAtNzcsMjEgKzgyLDcgQEAgRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFw aGljc0NvbgogICAgICAgICByZXR1cm47CiAgICAgfQogICAgICAgICAKLSAgICBjb25zdCBHcmFw aGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyYgYXR0cmlidXRlcyA9IGNvbnRleHQtPmdldENvbnRl eHRBdHRyaWJ1dGVzKCk7Ci0gICAgCi0gICAgLy8gQ3JlYXRlIHRoZSBzdGVuY2lsIGFuZCBkZXB0 aCBidWZmZXIgaWYgbmVlZGVkCi0gICAgaWYgKCFtdWx0aXNhbXBsZSgpICYmIChhdHRyaWJ1dGVz LnN0ZW5jaWwgfHwgYXR0cmlidXRlcy5kZXB0aCkpCi0gICAgICAgIG1fZGVwdGhTdGVuY2lsQnVm ZmVyID0gY29udGV4dC0+Y3JlYXRlUmVuZGVyYnVmZmVyKCk7Ci0KLSAgICAvLyBjcmVhdGUgYSBt dWx0aXNhbXBsZSBGQk8KLSAgICBpZiAobXVsdGlzYW1wbGUoKSkgewotICAgICAgICBtX211bHRp c2FtcGxlRkJPID0gY29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKLSAgICAgICAgY29udGV4 dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9tdWx0 aXNhbXBsZUZCTyk7Ci0gICAgICAgIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlciA9IGNvbnRleHQt PmNyZWF0ZVJlbmRlcmJ1ZmZlcigpOwotICAgICAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsIHx8 IGF0dHJpYnV0ZXMuZGVwdGgpCi0gICAgICAgICAgICBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2ls QnVmZmVyID0gY29udGV4dC0+Y3JlYXRlUmVuZGVyYnVmZmVyKCk7Ci0gICAgfQotICAgIAorICAg IGNyZWF0ZVNlY29uZGFyeUJ1ZmZlcnMoKTsKICAgICByZXNldChzaXplKTsKIH0KIAo= 78723 2011-01-12 12:27:46 -0800 2011-01-12 13:04:23 -0800 Patch bug-52310-20110112152744.patch text/plain 10991 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NjMxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTEtMDEtMTIgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IERyYXdpbmdCdWZmZXIgaXNzdWVzIGZvciBk ZXB0aC9zdGVuY2lsLCBleHRlbnNpb25zLCBldGMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjMxMAorCisgICAgICAgIDEpICBHTF9URVhUVVJFIGlz IG5vdCBhIHZhbGlkIGFyZ3VtZW50IHRvIGdsRnJhbWVidWZmZXJUZXh0dXJlMkQoKQorICAgICAg ICAoc2hvdWxkIGJlIEdMX1RFWFRVUkVfMkQpLgorICAgICAgICAyKSAgU3VwcG9ydCBmb3IgdGhl IG11bHRpc2FtcGxpbmcgZXh0ZW5zaW9uIHdhcyBiZWluZyBjaGVja2VkIGFmdGVyCisgICAgICAg IHRoZSBEcmF3aW5nQnVmZmVyIGNvbnN0cnVjdG9yIHdhcyBjYWxsZWQsIHdoaWNoIGNhbGxzIG11 bHRpc2FtcGxlKCkKKyAgICAgICAgdG8gY2hlY2sgZm9yIHRoZSBleHRlbnNpb24uCisgICAgICAg IDMpICBJZiBkZXB0aCBvciBzdGVuY2lsIGlzIHNldCwgdGhlIGNvcnJlc3BvbmRpbmcgZnJhbWVi dWZmZXJzIG11c3QKKyAgICAgICAgYmUgY3JlYXRlZCBpbiB0aGUgRHJhd2luZ0J1ZmZlciBjb25z dHJ1Y3Rvci4KKyAgICAgICAgNCkgIEdMX0RFUFRIX1NURU5DSUwgaXMgbm90IGEgdmFsaWQgZnJh bWVidWZmZXIgaW50ZXJuYWwgdHlwZSBpbgorICAgICAgICBHTEVTMi4gIE11c3QgdXNlIEdMX09F U19ERVBUSDI0X1NURU5DSUw4LCBhbmQgY2hlY2sgZm9yIHRoZQorICAgICAgICBPRVNfcGFja2Vk X2RlcHRoX3N0ZW5jaWwgZXh0ZW5zaW9uLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRy YXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICBSZWNvcmQgdGhlIGV4dGVuc2lv biBzdXBwb3J0IGluIHRoZSBjb25zdHJ1Y3Rvci4gIENyZWF0ZSBhbGwgdGhlCisgICAgICAgIHNl Y29uZGFyeSBkcmF3aW5nIGJ1ZmZlcnMgKGZvciBtdWx0aXNhbXBsaW5nLCBkZXB0aC9zdGVuY2ls KS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjcmVhdGUpOgorICAgICAgICBDaGVjayBm b3IgdGhlIGV4dGVuc2lvbnMgYmVmb3JlIGNhbGxpbmcgdGhlIERyYXdpbmdCdWZmZXIgY29uc3Ry dWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjcmVhdGVTZWNvbmRhcnlC dWZmZXJzKToKKyAgICAgICAgUmVmYWN0b3IgY3JlYXRpb24gb2YgdGhlIHNlY29uZGFyeSBidWZm ZXJzIGZyb20gRHJhd2luZ0J1ZmZlck1hYy5tbSB0bworICAgICAgICBoZXJlLgorICAgICAgICAo V2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6cmVzZXQpOgorICAgICAgICBVc2UgREVQVEgyNF9TVEVO Q0lMOCBmb3JtYXQsIG5vdCBERVBUSF9TVEVOQ0lMLiAgVXNlCisgICAgICAgIERFUFRIX0NPTVBP TkVOVDE2LCBub3QgREVQVEhfQ09NUE9ORU5ULgorICAgICAgICBVc2UgR0xfVEVYVFVSRV8yRCwg bm90IEdMX1RFWFRVUkUgKGZvciBnbEZyYW1lYnVmZmVyVGV4dHVyZTJEKS4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oOgorICAgICAgICBSZWZhY3RvciBj cmVhdGVTZWNvbmRhcnlCdWZmZXJzKCkuICBBZGQgZXh0ZW5zaW9uIHN1cHBvcnQgYXJndW1lbnRz IHRvCisgICAgICAgIGNvbnN0cnVjdG9yLiAgQWRkIHN1cHBvcnQgZm9yIHBhY2tlZF9kZXB0aF9z dGVuY2lsIGV4dGVuc2lvbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0Ry YXdpbmdCdWZmZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3 aW5nQnVmZmVyKToKKyAgICAgICAgUmVjb3JkIGV4dGVuc2lvbiBzdXBwb3J0IGluIGNvbnN0cnVj dG9yLiAgUmVmYWN0b3Igb3V0IGNyZWF0aW9uIG9mCisgICAgICAgIHNlY29uZGFyeSBidWZmZXJz LgorCiAyMDExLTAxLTEyICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJh d2luZ0J1ZmZlckNocm9taXVtLmNwcAkocmV2aXNpb24gNzU2MzEpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw5ICs2NywxNCBAQCBzdGF0aWMgdW5zaWduZWQgZ2VuZXJhdGVD b2xvclRleHR1cmUoR3JhCiB9CiAKIAotRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKK0RyYXdpbmdCdWZm ZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IEludFNpemUmIHNpemUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvb2wgbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3Vw cG9ydGVkKQogICAgIDogbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX3NpemUoc2l6ZSkKKyAg ICAsIG1fbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQobXVsdGlzYW1wbGVFeHRlbnNpb25T dXBwb3J0ZWQpCisgICAgLCBtX3BhY2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvblN1cHBvcnRlZChw YWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25TdXBwb3J0ZWQpCiAgICAgLCBtX2ZibygwKQogICAg ICwgbV9jb2xvckJ1ZmZlcigwKQogICAgICwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIoMCkKQEAgLTg1 LDYgKzkwLDcgQEAgRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGljc0NvbgogICAg IG1fZmJvID0gY29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKICAgICBjb250ZXh0LT5iaW5k RnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBtX2Zibyk7CiAgICAg bV9jb2xvckJ1ZmZlciA9IGdlbmVyYXRlQ29sb3JUZXh0dXJlKGNvbnRleHQsIHNpemUpOworICAg IGNyZWF0ZVNlY29uZGFyeUJ1ZmZlcnMoKTsKIH0KIAogRHJhd2luZ0J1ZmZlcjo6fkRyYXdpbmdC dWZmZXIoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdp bmdCdWZmZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcAkocmV2aXNpb24gNzU2MzEpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQwLDE0ICs0MCwxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8 RHJhd2luZ0J1ZmZlcj4gRHJhd2luZ0J1ZmZlcjo6Y3JlYXRlKEdyYXBoaWNzQ29udGV4dDNEKiBj b250ZXh0LCBjb25zdCBJbnRTaXplJiBzaXplKQogewotICAgIFJlZlB0cjxEcmF3aW5nQnVmZmVy PiBkcmF3aW5nQnVmZmVyID0gYWRvcHRSZWYobmV3IERyYXdpbmdCdWZmZXIoY29udGV4dCwgc2l6 ZSkpOwogICAgIEV4dGVuc2lvbnMzRCogZXh0ZW5zaW9ucyA9IGNvbnRleHQtPmdldEV4dGVuc2lv bnMoKTsKICAgICBib29sIG11bHRpc2FtcGxlU3VwcG9ydGVkID0gZXh0ZW5zaW9ucy0+c3VwcG9y dHMoIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX2JsaXQiKSAmJiBleHRlbnNpb25zLT5zdXBwb3J0cygi R0xfQU5HTEVfZnJhbWVidWZmZXJfbXVsdGlzYW1wbGUiKTsKICAgICBpZiAobXVsdGlzYW1wbGVT dXBwb3J0ZWQpIHsKICAgICAgICAgZXh0ZW5zaW9ucy0+ZW5zdXJlRW5hYmxlZCgiR0xfQU5HTEVf ZnJhbWVidWZmZXJfYmxpdCIpOwogICAgICAgICBleHRlbnNpb25zLT5lbnN1cmVFbmFibGVkKCJH TF9BTkdMRV9mcmFtZWJ1ZmZlcl9tdWx0aXNhbXBsZSIpOwogICAgIH0KLSAgICBkcmF3aW5nQnVm ZmVyLT5tX211bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkID0gbXVsdGlzYW1wbGVTdXBwb3J0 ZWQ7CisgICAgYm9vbCBwYWNrZWREZXB0aFN0ZW5jaWxTdXBwb3J0ZWQgPSBleHRlbnNpb25zLT5z dXBwb3J0cygiR0xfT0VTX3BhY2tlZF9kZXB0aF9zdGVuY2lsIik7CisgICAgaWYgKHBhY2tlZERl cHRoU3RlbmNpbFN1cHBvcnRlZCkKKyAgICAgICAgZXh0ZW5zaW9ucy0+ZW5zdXJlRW5hYmxlZCgi R0xfT0VTX3BhY2tlZF9kZXB0aF9zdGVuY2lsIik7CisgICAgUmVmUHRyPERyYXdpbmdCdWZmZXI+ IGRyYXdpbmdCdWZmZXIgPSBhZG9wdFJlZihuZXcgRHJhd2luZ0J1ZmZlcihjb250ZXh0LCBzaXpl LCBtdWx0aXNhbXBsZVN1cHBvcnRlZCwgcGFja2VkRGVwdGhTdGVuY2lsU3VwcG9ydGVkKSk7CiAg ICAgcmV0dXJuIChkcmF3aW5nQnVmZmVyLT5tX2NvbnRleHQpID8gZHJhd2luZ0J1ZmZlci5yZWxl YXNlKCkgOiAwOwogfQogCkBAIC04OCw2ICs5MCwyNCBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OmNs ZWFyKCkKICAgICBtX2NvbnRleHQuY2xlYXIoKTsKIH0KIAordm9pZCBEcmF3aW5nQnVmZmVyOjpj cmVhdGVTZWNvbmRhcnlCdWZmZXJzKCkKK3sKKyAgICBjb25zdCBHcmFwaGljc0NvbnRleHQzRDo6 QXR0cmlidXRlcyYgYXR0cmlidXRlcyA9IG1fY29udGV4dC0+Z2V0Q29udGV4dEF0dHJpYnV0ZXMo KTsKKworICAgIC8vIENyZWF0ZSB0aGUgc3RlbmNpbCBhbmQgZGVwdGggYnVmZmVyIGlmIG5lZWRl ZAorICAgIGlmICghbXVsdGlzYW1wbGUoKSAmJiAoYXR0cmlidXRlcy5zdGVuY2lsIHx8IGF0dHJp YnV0ZXMuZGVwdGgpKQorICAgICAgICBtX2RlcHRoU3RlbmNpbEJ1ZmZlciA9IG1fY29udGV4dC0+ Y3JlYXRlUmVuZGVyYnVmZmVyKCk7CisKKyAgICAvLyBjcmVhdGUgYSBtdWx0aXNhbXBsZSBGQk8K KyAgICBpZiAobXVsdGlzYW1wbGUoKSkgeworICAgICAgICBtX211bHRpc2FtcGxlRkJPID0gbV9j b250ZXh0LT5jcmVhdGVGcmFtZWJ1ZmZlcigpOworICAgICAgICBtX2NvbnRleHQtPmJpbmRGcmFt ZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fbXVsdGlzYW1wbGVGQk8p OworICAgICAgICBtX211bHRpc2FtcGxlQ29sb3JCdWZmZXIgPSBtX2NvbnRleHQtPmNyZWF0ZVJl bmRlcmJ1ZmZlcigpOworICAgICAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsIHx8IGF0dHJpYnV0 ZXMuZGVwdGgpCisgICAgICAgICAgICBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVyID0g bV9jb250ZXh0LT5jcmVhdGVSZW5kZXJidWZmZXIoKTsKKyAgICB9Cit9CisKIHZvaWQgRHJhd2lu Z0J1ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBpZiAobV9zaXpl ID09IG5ld1NpemUpCkBAIC0xMTEsMTAgKzEzMSwxMyBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OnJl c2V0KGNvbnN0IEludFNpemUmCiAgICAgaWYgKGF0dHJpYnV0ZXMuc3RlbmNpbCB8fCBhdHRyaWJ1 dGVzLmRlcHRoKSB7CiAgICAgICAgIC8vIFdlIGRvbid0IGFsbG93IHRoZSBsb2dpYyB3aGVyZSBz dGVuY2lsIGlzIHJlcXVpcmVkIGFuZCBkZXB0aCBpcyBub3QuCiAgICAgICAgIC8vIFNlZSBHcmFw aGljc0NvbnRleHQzRCBjb25zdHJ1Y3Rvci4KLSAgICAgICAgaWYgKGF0dHJpYnV0ZXMuc3RlbmNp bCAmJiBhdHRyaWJ1dGVzLmRlcHRoKQotICAgICAgICAgICAgaW50ZXJuYWxEZXB0aFN0ZW5jaWxG b3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfU1RFTkNJTDsKKworICAgICAgICAvLyBG SVhNRTogIElmIHBhY2tlZCBkZXB0aC9zdGVuY2lsIGlzIG5vdCBzdXBwb3J0ZWQsIHdlIHNob3Vs ZAorICAgICAgICAvLyBjcmVhdGUgc2VwYXJhdGUgcmVuZGVyYnVmZmVycyBmb3IgZGVwdGggYW5k IHN0ZW5jaWwuCisgICAgICAgIGlmIChhdHRyaWJ1dGVzLnN0ZW5jaWwgJiYgYXR0cmlidXRlcy5k ZXB0aCAmJiBtX3BhY2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvblN1cHBvcnRlZCkKKyAgICAgICAg ICAgIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gRXh0ZW5zaW9uczNEOjpERVBUSDI0X1NU RU5DSUw4OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBpbnRlcm5hbERlcHRoU3RlbmNpbEZv cm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9DT01QT05FTlQ7CisgICAgICAgICAgICBp bnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9DT01Q T05FTlQxNjsKICAgICB9CiAKICAgICAvLyByZXNpemUgbXVsdGlzYW1wbGUgRkJPCkBAIC0xNTAs NyArMTczLDcgQEAgdm9pZCBEcmF3aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJgogCiAg ICAgbV9jb250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg bV9jb2xvckJ1ZmZlcik7CiAgICAgbV9jb250ZXh0LT50ZXhJbWFnZTJEUmVzb3VyY2VTYWZlKEdy YXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAwLCBpbnRlcm5hbENvbG9yRm9ybWF0LCBtX3Np emUud2lkdGgoKSwgbV9zaXplLmhlaWdodCgpLCAwLCBjb2xvckZvcm1hdCwgR3JhcGhpY3NDb250 ZXh0M0Q6OlVOU0lHTkVEX0JZVEUpOwotICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJUZXh0dXJl MkQoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGljc0NvbnRleHQzRDo6Q09M T1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFLCBtX2NvbG9yQnVmZmVy LCAwKTsKKyAgICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyVGV4dHVyZTJEKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0FUVEFDSE1FTlQwLCBH cmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgbV9jb2xvckJ1ZmZlciwgMCk7CiAgICAgbV9j b250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCk7CiAg ICAgaWYgKCFtdWx0aXNhbXBsZSgpICYmIChhdHRyaWJ1dGVzLnN0ZW5jaWwgfHwgYXR0cmlidXRl cy5kZXB0aCkpIHsKICAgICAgICAgbV9jb250ZXh0LT5iaW5kUmVuZGVyYnVmZmVyKEdyYXBoaWNz Q29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZm ZXIuaAkocmV2aXNpb24gNzU2MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvRHJhd2luZ0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw5IEBAIHB1 YmxpYzoKICAgICAvLyBDbGVhciBhbGwgcmVzb3VyY2VzIGZyb20gdGhpcyBvYmplY3QsIGFzIHdl bGwgYXMgY29udGV4dC4gQ2FsbGVkIHdoZW4gY29udGV4dCBpcyBkZXN0cm95ZWQKICAgICAvLyB0 byBwcmV2ZW50IGludmFsaWQgYWNjZXNzZXMgdG8gdGhlIHJlc291cmNlcy4KICAgICB2b2lkIGNs ZWFyKCk7CisKKyAgICAvLyBDcmVhdGUgdGhlIGRlcHRoL3N0ZW5jaWwgYW5kIG11bHRpc2FtcGxl IGJ1ZmZlcnMsIGlmIG5lZWRlZC4KKyAgICB2b2lkIGNyZWF0ZVNlY29uZGFyeUJ1ZmZlcnMoKTsK ICAgICAKICAgICAvLyBDb3BpZXMgdGhlIG11bHRpc2FtcGxlIGNvbG9yIGJ1ZmZlciB0byB0aGUg bm9ybWFsIGNvbG9yIGJ1ZmZlciBhbmQgbGVhdmVzIG1fZmJvIGJvdW5kCiAgICAgdm9pZCBjb21t aXQobG9uZyB4ID0gMCwgbG9uZyB5ID0gMCwgbG9uZyB3aWR0aCA9IC0xLCBsb25nIGhlaWdodCA9 IC0xKTsKQEAgLTkyLDcgKzk1LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxEcmF3aW5nQnVmZmVyPiBjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqLCBjb25zdCBJ bnRTaXplJik7CiAgICAgCi0gICAgRHJhd2luZ0J1ZmZlcihHcmFwaGljc0NvbnRleHQzRCosIGNv bnN0IEludFNpemUmKTsKKyAgICBEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEKiwgY29u c3QgSW50U2l6ZSYsIGJvb2wgbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQsIGJvb2wgcGFj a2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVkKTsKICAgICAKICAgICAvLyBQbGF0Zm9y bSBzcGVjaWZpYyBmdW5jdGlvbiBjYWxsZWQgYWZ0ZXIgcmVzZXQoKSBzbyBlYWNoIHBsYXRmb3Jt IGNhbiBkbyBleHRyYSB3b3JrIGlmIG5lZWRlZAogICAgIHZvaWQgZGlkUmVzZXQoKTsKQEAgLTEw MCw2ICsxMDMsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gbV9j b250ZXh0OwogICAgIEludFNpemUgbV9zaXplOwogICAgIGJvb2wgbV9tdWx0aXNhbXBsZUV4dGVu c2lvblN1cHBvcnRlZDsKKyAgICBib29sIG1fcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3Vw cG9ydGVkOwogICAgIFBsYXRmb3JtM0RPYmplY3QgbV9mYm87CiAgICAgUGxhdGZvcm0zRE9iamVj dCBtX2NvbG9yQnVmZmVyOwogICAgIFBsYXRmb3JtM0RPYmplY3QgbV9kZXB0aFN0ZW5jaWxCdWZm ZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0RyYXdp bmdCdWZmZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L21hYy9EcmF3aW5nQnVmZmVyTWFjLm1tCShyZXZpc2lvbiA3NTYzMSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtMzYsOSArMzYsMTQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1EcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEKiBjb250 ZXh0LCBjb25zdCBJbnRTaXplJiBzaXplKQorRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihH cmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgSW50U2l6ZSYgc2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBt dWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYm9vbCBwYWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25TdXBwb3J0ZWQpCiAgICAgOiBtX2Nv bnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZShzaXplKQorICAgICwgbV9tdWx0aXNhbXBsZUV4 dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCkKKyAgICAsIG1f cGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVkKHBhY2tlZERlcHRoU3RlbmNpbEV4 dGVuc2lvblN1cHBvcnRlZCkKICAgICAsIG1fZmJvKGNvbnRleHQtPmNyZWF0ZUZyYW1lYnVmZmVy KCkpCiAgICAgLCBtX2NvbG9yQnVmZmVyKDApCiAgICAgLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcigw KQpAQCAtNzcsMjEgKzgyLDcgQEAgRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGlj c0NvbgogICAgICAgICByZXR1cm47CiAgICAgfQogICAgICAgICAKLSAgICBjb25zdCBHcmFwaGlj c0NvbnRleHQzRDo6QXR0cmlidXRlcyYgYXR0cmlidXRlcyA9IGNvbnRleHQtPmdldENvbnRleHRB dHRyaWJ1dGVzKCk7Ci0gICAgCi0gICAgLy8gQ3JlYXRlIHRoZSBzdGVuY2lsIGFuZCBkZXB0aCBi dWZmZXIgaWYgbmVlZGVkCi0gICAgaWYgKCFtdWx0aXNhbXBsZSgpICYmIChhdHRyaWJ1dGVzLnN0 ZW5jaWwgfHwgYXR0cmlidXRlcy5kZXB0aCkpCi0gICAgICAgIG1fZGVwdGhTdGVuY2lsQnVmZmVy ID0gY29udGV4dC0+Y3JlYXRlUmVuZGVyYnVmZmVyKCk7Ci0KLSAgICAvLyBjcmVhdGUgYSBtdWx0 aXNhbXBsZSBGQk8KLSAgICBpZiAobXVsdGlzYW1wbGUoKSkgewotICAgICAgICBtX211bHRpc2Ft cGxlRkJPID0gY29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKLSAgICAgICAgY29udGV4dC0+ YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9tdWx0aXNh bXBsZUZCTyk7Ci0gICAgICAgIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlciA9IGNvbnRleHQtPmNy ZWF0ZVJlbmRlcmJ1ZmZlcigpOwotICAgICAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsIHx8IGF0 dHJpYnV0ZXMuZGVwdGgpCi0gICAgICAgICAgICBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVm ZmVyID0gY29udGV4dC0+Y3JlYXRlUmVuZGVyYnVmZmVyKCk7Ci0gICAgfQotICAgIAorICAgIGNy ZWF0ZVNlY29uZGFyeUJ1ZmZlcnMoKTsKICAgICByZXNldChzaXplKTsKIH0KIAo=