84066 2012-04-16 13:07:36 -0700 [chromium] Move paintRenderedResultsToCanvas code into DrawingBuffer 2012-04-16 22:37:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs enne jbauman kbr senorblanco webkit.review.bot oldest_to_newest 603369 0 jamesr 2012-04-16 13:07:36 -0700 [chromium] Move paintRenderedResultsToCanvas code into DrawingBuffer 603371 1 137387 jamesr 2012-04-16 13:11:15 -0700 Created attachment 137387 Patch 603377 2 jamesr 2012-04-16 13:20:10 -0700 Tested on the layout tests and by manually checking printing of san angeles and http://trac.webkit.org/export/114291/trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html. On http://trac.webkit.org/export/114291/trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html, after printing the 4 leftmost canvases (preservesDrawingBuffer==false) vanish. This happens with or without this patch. 603672 3 137387 enne 2012-04-16 18:49:33 -0700 Comment on attachment 137387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137387&action=review > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:173 > + if (!m_platformLayer || !m_platformLayer->drawsContent()) > + return; This code made more sense in WebGLLayerChromium. Would it make more sense just to check for context lost explicitly than go back to the platform layer, since that really doesn't have anything to do with this function anymore? 603683 4 jamesr 2012-04-16 19:13:06 -0700 (In reply to comment #3) > (From update of attachment 137387 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=137387&action=review > > > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:173 > > + if (!m_platformLayer || !m_platformLayer->drawsContent()) > > + return; > > This code made more sense in WebGLLayerChromium. Would it make more sense just to check for context lost explicitly than go back to the platform layer, since that really doesn't have anything to do with this function anymore? This check in particular? This check is actually kind of silly - we never get here without having a layer (see WebGLRenderingContext::paintRenderingResultsToCanvas()) and I agree it'd be better to check explicitly for a lost context here. 603711 5 137463 jamesr 2012-04-16 19:41:58 -0700 Created attachment 137463 tweak checks in DrawingBufferChromium 603715 6 137465 jamesr 2012-04-16 19:45:57 -0700 Created attachment 137465 with more of teh compile 603774 7 137465 enne 2012-04-16 21:46:23 -0700 Comment on attachment 137465 with more of teh compile R=me. 603804 8 137465 webkit.review.bot 2012-04-16 22:37:04 -0700 Comment on attachment 137465 with more of teh compile Clearing flags on attachment: 137465 Committed r114344: <http://trac.webkit.org/changeset/114344> 603805 9 webkit.review.bot 2012-04-16 22:37:11 -0700 All reviewed patches have been landed. Closing bug. 137387 2012-04-16 13:11:15 -0700 2012-04-16 19:41:55 -0700 Patch bug-84066-20120416131114.patch text/plain 6072 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MzBhM2I1MTA1ODFh M2NkZjc3YjM5NzRhZmIzNzQ1YzlmN2MxNC4uZjE5NGRiZjlmMDU0YTVmN2E1OTUzNWJmZTdiNGY5 ZTkyMGRmMjA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTE2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBN b3ZlIHBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMgY29kZSBpbnRvIERyYXdpbmdCdWZmZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0MDY2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViR0xMYXll ckNocm9taXVtIHVzZWQgdG8gYmUgcmVzcG9uc2libGUgZm9yIHRoZSByZWFkYmFjayBwYXRoIGZv ciBzb2Z0d2FyZSBwYWludGluZyBXZWJHTCBjYW52YXNlcyAoZm9yCisgICAgICAgIHByaW50aW5n LCBldGMpLCBidXQgdGhpcyBwYXRoIG5vIGxvbmdlciBoYXMgYW55IGNvbXBvc2l0b3IgaW50ZXJh Y3Rpb24uIFRoaXMgbW92ZXMgdGhlIGNvZGUgaW50bworICAgICAgICBEcmF3aW5nQnVmZmVyQ2hy b21pdW0gd2hpY2ggaXMgcmVzcG9uc2libGUgZm9yIG1hbmFnaW5nIHRoZSBmcm9udCAvIGJhY2sg YnVmZmVycyBmb3IgV2ViR0wuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1 ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAo V2ViR0xMYXllckNocm9taXVtKToKKwogMjAxMi0wNC0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGJ1aWxkIGZpeCBh ZnRlciByMTE0MjY5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKaW5kZXgg NjE1NzZmY2M0MDVkZjczNDgxYzA2YjIwZGY5NTFiZGEzMGMyNmI4Mi4uOGEzMTQ4ZTk5NTAzOTRi NWI1YzQyMWMwZWRhZjAzOWJiNjMwZGYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hy b21pdW0uY3BwCkBAIC0xNjksOCArMTY5LDI2IEBAIFBsYXRmb3JtM0RPYmplY3QgRHJhd2luZ0J1 ZmZlcjo6ZnJhbWVidWZmZXIoKSBjb25zdAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKIHZvaWQgRHJhd2luZ0J1ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKENh bnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgaWYgKG1fcGxhdGZvcm1MYXll cikKLSAgICAgICAgbV9wbGF0Zm9ybUxheWVyLT5wYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFz KGNvbnRleHQtPmNhbnZhcygpLT5idWZmZXIoKSk7CisgICAgaWYgKCFtX3BsYXRmb3JtTGF5ZXIg fHwgIW1fcGxhdGZvcm1MYXllci0+ZHJhd3NDb250ZW50KCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIEludFNpemUgZnJhbWVidWZmZXJTaXplID0gbV9jb250ZXh0LT5nZXRJbnRlcm5hbEZyYW1l YnVmZmVyU2l6ZSgpOworCisgICAgLy8gU2luY2Ugd2UncmUgdXNpbmcgdGhlIHNhbWUgY29udGV4 dCBhcyBXZWJHTCwgd2UgaGF2ZSB0byByZXN0b3JlIGFueSBzdGF0ZSB3ZSBjaGFuZ2UgKGluIHRo aXMgY2FzZSwganVzdCB0aGUgZnJhbWVidWZmZXIgYmluZGluZykuCisgICAgLy8gRklYTUU6IFRo ZSBXZWJHTFJlbmRlcmluZ0NvbnRleHQgdHJhY2tzIHRoZSBjdXJyZW50IGZyYW1lYnVmZmVyIGJp bmRpbmcsIGl0IHdvdWxkIGJlIHNsaWdodGx5IG1vcmUgZWZmaWNpZW50IHRvIHVzZSB0aGlzIHZh bHVlCisgICAgLy8gcmF0aGVyIHRoYW4gcXVlcnlpbmcgaXQgb2ZmIG9mIHRoZSBjb250ZXh0Lgor ICAgIEdDM0RpbnQgcHJldmlvdXNGcmFtZWJ1ZmZlciA9IDA7CisgICAgbV9jb250ZXh0LT5nZXRJ bnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQklORElORywgJnByZXZpb3Vz RnJhbWVidWZmZXIpOworCisgICAgUGxhdGZvcm0zRE9iamVjdCBmcmFtZWJ1ZmZlciA9IG1fY29u dGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKKyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZl cihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIGZyYW1lYnVmZmVyKTsKKyAgICBtX2Nv bnRleHQtPmZyYW1lYnVmZmVyVGV4dHVyZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZF UiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0FUVEFDSE1FTlQwLCBHcmFwaGljc0NvbnRleHQz RDo6VEVYVFVSRV8yRCwgZnJvbnRDb2xvckJ1ZmZlcigpLCAwKTsKKworICAgIEV4dGVuc2lvbnMz RENocm9taXVtKiBleHRlbnNpb25zID0gc3RhdGljX2Nhc3Q8RXh0ZW5zaW9uczNEQ2hyb21pdW0q PihtX2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKSk7CisgICAgZXh0ZW5zaW9ucy0+cGFpbnRGcmFt ZWJ1ZmZlclRvQ2FudmFzKGZyYW1lYnVmZmVyLCBmcmFtZWJ1ZmZlclNpemUud2lkdGgoKSwgZnJh bWVidWZmZXJTaXplLmhlaWdodCgpLCAhbV9jb250ZXh0LT5nZXRDb250ZXh0QXR0cmlidXRlcygp LnByZW11bHRpcGxpZWRBbHBoYSwgY29udGV4dC0+Y2FudmFzKCktPmJ1ZmZlcigpKTsKKyAgICBt X2NvbnRleHQtPmRlbGV0ZUZyYW1lYnVmZmVyKGZyYW1lYnVmZmVyKTsKKworICAgIG1fY29udGV4 dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgcHJldmlv dXNGcmFtZWJ1ZmZlcik7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5j cHAKaW5kZXggMjBmZjVlMWViODE2ZGY4YWMxYTdlOTVjNDI2MzE3NWFlNGViOTlmZS4uMmNmOWUz ODZiNjk4YWZmNDY4MGFhYTYwZDJiNTZmM2M4ZGRlMmQ5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVy Q2hyb21pdW0uY3BwCkBAIC05OCwzMSArOTgsNiBAQCB2b2lkIFdlYkdMTGF5ZXJDaHJvbWl1bTo6 cHVzaFByb3BlcnRpZXNUbyhDQ0xheWVySW1wbCogbGF5ZXIpCiAgICAgdGV4dHVyZUxheWVyLT5z ZXRQcmVtdWx0aXBsaWVkQWxwaGEobV9wcmVtdWx0aXBsaWVkQWxwaGEpOwogfQogCi1ib29sIFdl YkdMTGF5ZXJDaHJvbWl1bTo6cGFpbnRSZW5kZXJlZFJlc3VsdHNUb0NhbnZhcyhJbWFnZUJ1ZmZl ciogaW1hZ2VCdWZmZXIpCi17Ci0gICAgaWYgKCFtX2RyYXdpbmdCdWZmZXIgfHwgIWRyYXdzQ29u dGVudCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBJbnRTaXplIGZyYW1lYnVmZmVy U2l6ZSA9IGNvbnRleHQoKS0+Z2V0SW50ZXJuYWxGcmFtZWJ1ZmZlclNpemUoKTsKLQotICAgIC8v IFNpbmNlIHdlJ3JlIHVzaW5nIHRoZSBzYW1lIGNvbnRleHQgYXMgV2ViR0wsIHdlIGhhdmUgdG8g cmVzdG9yZSBhbnkgc3RhdGUgd2UgY2hhbmdlIChpbiB0aGlzIGNhc2UsIGp1c3QgdGhlIGZyYW1l YnVmZmVyIGJpbmRpbmcpLgotICAgIC8vIEZJWE1FOiBUaGUgV2ViR0xSZW5kZXJpbmdDb250ZXh0 IHRyYWNrcyB0aGUgY3VycmVudCBmcmFtZWJ1ZmZlciBiaW5kaW5nLCBpdCB3b3VsZCBiZSBzbGln aHRseSBtb3JlIGVmZmljaWVudCB0byB1c2UgdGhpcyB2YWx1ZQotICAgIC8vIHJhdGhlciB0aGFu IHF1ZXJ5aW5nIGl0IG9mZiBvZiB0aGUgY29udGV4dC4KLSAgICBHQzNEaW50IHByZXZpb3VzRnJh bWVidWZmZXIgPSAwOwotICAgIGNvbnRleHQoKS0+Z2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0 M0Q6OkZSQU1FQlVGRkVSX0JJTkRJTkcsICZwcmV2aW91c0ZyYW1lYnVmZmVyKTsKLQotICAgIFBs YXRmb3JtM0RPYmplY3QgZnJhbWVidWZmZXIgPSBjb250ZXh0KCktPmNyZWF0ZUZyYW1lYnVmZmVy KCk7Ci0gICAgY29udGV4dCgpLT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZS QU1FQlVGRkVSLCBmcmFtZWJ1ZmZlcik7Ci0gICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclRleHR1 cmUyRChHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpD T0xPUl9BVFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG1fdGV4dHVy ZUlkLCAwKTsKLQotICAgIEV4dGVuc2lvbnMzRENocm9taXVtKiBleHRlbnNpb25zID0gc3RhdGlj X2Nhc3Q8RXh0ZW5zaW9uczNEQ2hyb21pdW0qPihjb250ZXh0KCktPmdldEV4dGVuc2lvbnMoKSk7 Ci0gICAgZXh0ZW5zaW9ucy0+cGFpbnRGcmFtZWJ1ZmZlclRvQ2FudmFzKGZyYW1lYnVmZmVyLCBm cmFtZWJ1ZmZlclNpemUud2lkdGgoKSwgZnJhbWVidWZmZXJTaXplLmhlaWdodCgpLCAhY29udGV4 dCgpLT5nZXRDb250ZXh0QXR0cmlidXRlcygpLnByZW11bHRpcGxpZWRBbHBoYSwgaW1hZ2VCdWZm ZXIpOwotICAgIGNvbnRleHQoKS0+ZGVsZXRlRnJhbWVidWZmZXIoZnJhbWVidWZmZXIpOwotCi0g ICAgY29udGV4dCgpLT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVG RkVSLCBwcmV2aW91c0ZyYW1lYnVmZmVyKTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogdm9pZCBX ZWJHTExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0JiBk aXJ0eVJlY3QpCiB7CiAgICAgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNEaXNwbGF5UmVjdChkaXJ0 eVJlY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vV2ViR0xMYXllckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uaAppbmRleCBmMjk1ZmI4MmRjMzNlYzQ0 ODcyYjZjOWJkMDE4NjFhMjRjMTcyOWMzLi5iMTVmNTYzNjIzNThmMWMyNDYyY2FmZjgzZDAwODgz YjYxY2NkYzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uaApAQCAtNTMsNyArNTMsNiBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZShDQ1RleHR1cmVVcGRhdGVyJiwgY29u c3QgQ0NPY2NsdXNpb25UcmFja2VyKikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHB1c2hQ cm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 TmVlZHNEaXNwbGF5UmVjdChjb25zdCBGbG9hdFJlY3QmKSBPVkVSUklERTsKLSAgICBib29sIHBh aW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMoSW1hZ2VCdWZmZXIqKTsKIAogICAgIEdyYXBoaWNz Q29udGV4dDNEKiBjb250ZXh0KCkgY29uc3Q7CiAK 137463 2012-04-16 19:41:58 -0700 2012-04-16 19:45:53 -0700 tweak checks in DrawingBufferChromium bug-84066-20120416194157.patch text/plain 6142 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MzBhM2I1MTA1ODFh M2NkZjc3YjM5NzRhZmIzNzQ1YzlmN2MxNC4uZjE5NGRiZjlmMDU0YTVmN2E1OTUzNWJmZTdiNGY5 ZTkyMGRmMjA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTE2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBN b3ZlIHBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMgY29kZSBpbnRvIERyYXdpbmdCdWZmZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0MDY2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViR0xMYXll ckNocm9taXVtIHVzZWQgdG8gYmUgcmVzcG9uc2libGUgZm9yIHRoZSByZWFkYmFjayBwYXRoIGZv ciBzb2Z0d2FyZSBwYWludGluZyBXZWJHTCBjYW52YXNlcyAoZm9yCisgICAgICAgIHByaW50aW5n LCBldGMpLCBidXQgdGhpcyBwYXRoIG5vIGxvbmdlciBoYXMgYW55IGNvbXBvc2l0b3IgaW50ZXJh Y3Rpb24uIFRoaXMgbW92ZXMgdGhlIGNvZGUgaW50bworICAgICAgICBEcmF3aW5nQnVmZmVyQ2hy b21pdW0gd2hpY2ggaXMgcmVzcG9uc2libGUgZm9yIG1hbmFnaW5nIHRoZSBmcm9udCAvIGJhY2sg YnVmZmVycyBmb3IgV2ViR0wuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1 ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAo V2ViR0xMYXllckNocm9taXVtKToKKwogMjAxMi0wNC0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGJ1aWxkIGZpeCBh ZnRlciByMTE0MjY5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKaW5kZXgg NjE1NzZmY2M0MDVkZjczNDgxYzA2YjIwZGY5NTFiZGEzMGMyNmI4Mi4uYTQ5YjUyOWU2NjhkNjZl ZTA4OTRlZmJmN2NlNTUwMTA2OGJlMTJiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hy b21pdW0uY3BwCkBAIC0xNjksOCArMTY5LDI2IEBAIFBsYXRmb3JtM0RPYmplY3QgRHJhd2luZ0J1 ZmZlcjo6ZnJhbWVidWZmZXIoKSBjb25zdAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKIHZvaWQgRHJhd2luZ0J1ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKENh bnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgaWYgKG1fcGxhdGZvcm1MYXll cikKLSAgICAgICAgbV9wbGF0Zm9ybUxheWVyLT5wYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFz KGNvbnRleHQtPmNhbnZhcygpLT5idWZmZXIoKSk7CisgICAgaWYgKCFtX2NvbnRleHQtPm1ha2VD b250ZXh0Q3VycmVudCgpIHx8IGNvbnRleHQoKS0+Z2V0RXh0ZW5zaW9ucygpLT5nZXRHcmFwaGlj c1Jlc2V0U3RhdHVzQVJCKCkgIT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SKQorICAgICAg ICByZXR1cm47CisKKyAgICBJbnRTaXplIGZyYW1lYnVmZmVyU2l6ZSA9IG1fY29udGV4dC0+Z2V0 SW50ZXJuYWxGcmFtZWJ1ZmZlclNpemUoKTsKKworICAgIC8vIFNpbmNlIHdlJ3JlIHVzaW5nIHRo ZSBzYW1lIGNvbnRleHQgYXMgV2ViR0wsIHdlIGhhdmUgdG8gcmVzdG9yZSBhbnkgc3RhdGUgd2Ug Y2hhbmdlIChpbiB0aGlzIGNhc2UsIGp1c3QgdGhlIGZyYW1lYnVmZmVyIGJpbmRpbmcpLgorICAg IC8vIEZJWE1FOiBUaGUgV2ViR0xSZW5kZXJpbmdDb250ZXh0IHRyYWNrcyB0aGUgY3VycmVudCBm cmFtZWJ1ZmZlciBiaW5kaW5nLCBpdCB3b3VsZCBiZSBzbGlnaHRseSBtb3JlIGVmZmljaWVudCB0 byB1c2UgdGhpcyB2YWx1ZQorICAgIC8vIHJhdGhlciB0aGFuIHF1ZXJ5aW5nIGl0IG9mZiBvZiB0 aGUgY29udGV4dC4KKyAgICBHQzNEaW50IHByZXZpb3VzRnJhbWVidWZmZXIgPSAwOworICAgIG1f Y29udGV4dC0+Z2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0JJTkRJ TkcsICZwcmV2aW91c0ZyYW1lYnVmZmVyKTsKKworICAgIFBsYXRmb3JtM0RPYmplY3QgZnJhbWVi dWZmZXIgPSBtX2NvbnRleHQtPmNyZWF0ZUZyYW1lYnVmZmVyKCk7CisgICAgbV9jb250ZXh0LT5i aW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBmcmFtZWJ1ZmZl cik7CisgICAgbV9jb250ZXh0LT5mcmFtZWJ1ZmZlclRleHR1cmUyRChHcmFwaGljc0NvbnRleHQz RDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9BVFRBQ0hNRU5UMCwgR3Jh cGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIGZyb250Q29sb3JCdWZmZXIoKSwgMCk7CisKKyAg ICBFeHRlbnNpb25zM0RDaHJvbWl1bSogZXh0ZW5zaW9ucyA9IHN0YXRpY19jYXN0PEV4dGVuc2lv bnMzRENocm9taXVtKj4obV9jb250ZXh0LT5nZXRFeHRlbnNpb25zKCkpOworICAgIGV4dGVuc2lv bnMtPnBhaW50RnJhbWVidWZmZXJUb0NhbnZhcyhmcmFtZWJ1ZmZlciwgZnJhbWVidWZmZXJTaXpl LndpZHRoKCksIGZyYW1lYnVmZmVyU2l6ZS5oZWlnaHQoKSwgIW1fY29udGV4dC0+Z2V0Q29udGV4 dEF0dHJpYnV0ZXMoKS5wcmVtdWx0aXBsaWVkQWxwaGEsIGNvbnRleHQtPmNhbnZhcygpLT5idWZm ZXIoKSk7CisgICAgbV9jb250ZXh0LT5kZWxldGVGcmFtZWJ1ZmZlcihmcmFtZWJ1ZmZlcik7CisK KyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVC VUZGRVIsIHByZXZpb3VzRnJhbWVidWZmZXIpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1 bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExh eWVyQ2hyb21pdW0uY3BwCmluZGV4IDIwZmY1ZTFlYjgxNmRmOGFjMWE3ZTk1YzQyNjMxNzVhZTRl Yjk5ZmUuLjJjZjllMzg2YjY5OGFmZjQ2ODBhYWE2MGQyYjU2ZjNjOGRkZTJkOTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJD aHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vV2ViR0xMYXllckNocm9taXVtLmNwcApAQCAtOTgsMzEgKzk4LDYgQEAgdm9pZCBXZWJHTExh eWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqIGxheWVyKQogICAgIHRl eHR1cmVMYXllci0+c2V0UHJlbXVsdGlwbGllZEFscGhhKG1fcHJlbXVsdGlwbGllZEFscGhhKTsK IH0KIAotYm9vbCBXZWJHTExheWVyQ2hyb21pdW06OnBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52 YXMoSW1hZ2VCdWZmZXIqIGltYWdlQnVmZmVyKQotewotICAgIGlmICghbV9kcmF3aW5nQnVmZmVy IHx8ICFkcmF3c0NvbnRlbnQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgSW50U2l6 ZSBmcmFtZWJ1ZmZlclNpemUgPSBjb250ZXh0KCktPmdldEludGVybmFsRnJhbWVidWZmZXJTaXpl KCk7Ci0KLSAgICAvLyBTaW5jZSB3ZSdyZSB1c2luZyB0aGUgc2FtZSBjb250ZXh0IGFzIFdlYkdM LCB3ZSBoYXZlIHRvIHJlc3RvcmUgYW55IHN0YXRlIHdlIGNoYW5nZSAoaW4gdGhpcyBjYXNlLCBq dXN0IHRoZSBmcmFtZWJ1ZmZlciBiaW5kaW5nKS4KLSAgICAvLyBGSVhNRTogVGhlIFdlYkdMUmVu ZGVyaW5nQ29udGV4dCB0cmFja3MgdGhlIGN1cnJlbnQgZnJhbWVidWZmZXIgYmluZGluZywgaXQg d291bGQgYmUgc2xpZ2h0bHkgbW9yZSBlZmZpY2llbnQgdG8gdXNlIHRoaXMgdmFsdWUKLSAgICAv LyByYXRoZXIgdGhhbiBxdWVyeWluZyBpdCBvZmYgb2YgdGhlIGNvbnRleHQuCi0gICAgR0MzRGlu dCBwcmV2aW91c0ZyYW1lYnVmZmVyID0gMDsKLSAgICBjb250ZXh0KCktPmdldEludGVnZXJ2KEdy YXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9CSU5ESU5HLCAmcHJldmlvdXNGcmFtZWJ1ZmZl cik7Ci0KLSAgICBQbGF0Zm9ybTNET2JqZWN0IGZyYW1lYnVmZmVyID0gY29udGV4dCgpLT5jcmVh dGVGcmFtZWJ1ZmZlcigpOwotICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNz Q29udGV4dDNEOjpGUkFNRUJVRkZFUiwgZnJhbWVidWZmZXIpOwotICAgIGNvbnRleHQoKS0+ZnJh bWVidWZmZXJUZXh0dXJlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGlj c0NvbnRleHQzRDo6Q09MT1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJF XzJELCBtX3RleHR1cmVJZCwgMCk7Ci0KLSAgICBFeHRlbnNpb25zM0RDaHJvbWl1bSogZXh0ZW5z aW9ucyA9IHN0YXRpY19jYXN0PEV4dGVuc2lvbnMzRENocm9taXVtKj4oY29udGV4dCgpLT5nZXRF eHRlbnNpb25zKCkpOwotICAgIGV4dGVuc2lvbnMtPnBhaW50RnJhbWVidWZmZXJUb0NhbnZhcyhm cmFtZWJ1ZmZlciwgZnJhbWVidWZmZXJTaXplLndpZHRoKCksIGZyYW1lYnVmZmVyU2l6ZS5oZWln aHQoKSwgIWNvbnRleHQoKS0+Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKS5wcmVtdWx0aXBsaWVkQWxw aGEsIGltYWdlQnVmZmVyKTsKLSAgICBjb250ZXh0KCktPmRlbGV0ZUZyYW1lYnVmZmVyKGZyYW1l YnVmZmVyKTsKLQotICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgcHJldmlvdXNGcmFtZWJ1ZmZlcik7Ci0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIHZvaWQgV2ViR0xMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KGNvbnN0 IEZsb2F0UmVjdCYgZGlydHlSZWN0KQogewogICAgIExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlz cGxheVJlY3QoZGlydHlSZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKaW5kZXggZjI5 NWZiODJkYzMzZWM0NDg3MmI2YzliZDAxODYxYTI0YzE3MjljMy4uYjE1ZjU2MzYyMzU4ZjFjMjQ2 MmNhZmY4M2QwMDg4M2I2MWNjZGMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKQEAg LTUzLDcgKzUzLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJl VXBkYXRlciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7 Ci0gICAgYm9vbCBwYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFzKEltYWdlQnVmZmVyKik7CiAK ICAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCgpIGNvbnN0OwogCg== 137465 2012-04-16 19:45:57 -0700 2012-04-16 22:37:04 -0700 with more of teh compile bug-84066-20120416194556.patch text/plain 6142 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MzBhM2I1MTA1ODFh M2NkZjc3YjM5NzRhZmIzNzQ1YzlmN2MxNC4uZjE5NGRiZjlmMDU0YTVmN2E1OTUzNWJmZTdiNGY5 ZTkyMGRmMjA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTE2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBN b3ZlIHBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMgY29kZSBpbnRvIERyYXdpbmdCdWZmZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0MDY2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViR0xMYXll ckNocm9taXVtIHVzZWQgdG8gYmUgcmVzcG9uc2libGUgZm9yIHRoZSByZWFkYmFjayBwYXRoIGZv ciBzb2Z0d2FyZSBwYWludGluZyBXZWJHTCBjYW52YXNlcyAoZm9yCisgICAgICAgIHByaW50aW5n LCBldGMpLCBidXQgdGhpcyBwYXRoIG5vIGxvbmdlciBoYXMgYW55IGNvbXBvc2l0b3IgaW50ZXJh Y3Rpb24uIFRoaXMgbW92ZXMgdGhlIGNvZGUgaW50bworICAgICAgICBEcmF3aW5nQnVmZmVyQ2hy b21pdW0gd2hpY2ggaXMgcmVzcG9uc2libGUgZm9yIG1hbmFnaW5nIHRoZSBmcm9udCAvIGJhY2sg YnVmZmVycyBmb3IgV2ViR0wuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1 ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAo V2ViR0xMYXllckNocm9taXVtKToKKwogMjAxMi0wNC0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGJ1aWxkIGZpeCBh ZnRlciByMTE0MjY5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKaW5kZXgg NjE1NzZmY2M0MDVkZjczNDgxYzA2YjIwZGY5NTFiZGEzMGMyNmI4Mi4uNGNkODk0MjZkNmNkYzk1 ZGEwZDAxNGNkNjE1YmE0OGVlNTEyNWU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hy b21pdW0uY3BwCkBAIC0xNjksOCArMTY5LDI2IEBAIFBsYXRmb3JtM0RPYmplY3QgRHJhd2luZ0J1 ZmZlcjo6ZnJhbWVidWZmZXIoKSBjb25zdAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKIHZvaWQgRHJhd2luZ0J1ZmZlcjo6cGFpbnRDb21wb3NpdGVkUmVzdWx0c1RvQ2FudmFzKENh bnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgaWYgKG1fcGxhdGZvcm1MYXll cikKLSAgICAgICAgbV9wbGF0Zm9ybUxheWVyLT5wYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFz KGNvbnRleHQtPmNhbnZhcygpLT5idWZmZXIoKSk7CisgICAgaWYgKCFtX2NvbnRleHQtPm1ha2VD b250ZXh0Q3VycmVudCgpIHx8IG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5nZXRHcmFwaGlj c1Jlc2V0U3RhdHVzQVJCKCkgIT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SKQorICAgICAg ICByZXR1cm47CisKKyAgICBJbnRTaXplIGZyYW1lYnVmZmVyU2l6ZSA9IG1fY29udGV4dC0+Z2V0 SW50ZXJuYWxGcmFtZWJ1ZmZlclNpemUoKTsKKworICAgIC8vIFNpbmNlIHdlJ3JlIHVzaW5nIHRo ZSBzYW1lIGNvbnRleHQgYXMgV2ViR0wsIHdlIGhhdmUgdG8gcmVzdG9yZSBhbnkgc3RhdGUgd2Ug Y2hhbmdlIChpbiB0aGlzIGNhc2UsIGp1c3QgdGhlIGZyYW1lYnVmZmVyIGJpbmRpbmcpLgorICAg IC8vIEZJWE1FOiBUaGUgV2ViR0xSZW5kZXJpbmdDb250ZXh0IHRyYWNrcyB0aGUgY3VycmVudCBm cmFtZWJ1ZmZlciBiaW5kaW5nLCBpdCB3b3VsZCBiZSBzbGlnaHRseSBtb3JlIGVmZmljaWVudCB0 byB1c2UgdGhpcyB2YWx1ZQorICAgIC8vIHJhdGhlciB0aGFuIHF1ZXJ5aW5nIGl0IG9mZiBvZiB0 aGUgY29udGV4dC4KKyAgICBHQzNEaW50IHByZXZpb3VzRnJhbWVidWZmZXIgPSAwOworICAgIG1f Y29udGV4dC0+Z2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0JJTkRJ TkcsICZwcmV2aW91c0ZyYW1lYnVmZmVyKTsKKworICAgIFBsYXRmb3JtM0RPYmplY3QgZnJhbWVi dWZmZXIgPSBtX2NvbnRleHQtPmNyZWF0ZUZyYW1lYnVmZmVyKCk7CisgICAgbV9jb250ZXh0LT5i aW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBmcmFtZWJ1ZmZl cik7CisgICAgbV9jb250ZXh0LT5mcmFtZWJ1ZmZlclRleHR1cmUyRChHcmFwaGljc0NvbnRleHQz RDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9BVFRBQ0hNRU5UMCwgR3Jh cGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIGZyb250Q29sb3JCdWZmZXIoKSwgMCk7CisKKyAg ICBFeHRlbnNpb25zM0RDaHJvbWl1bSogZXh0ZW5zaW9ucyA9IHN0YXRpY19jYXN0PEV4dGVuc2lv bnMzRENocm9taXVtKj4obV9jb250ZXh0LT5nZXRFeHRlbnNpb25zKCkpOworICAgIGV4dGVuc2lv bnMtPnBhaW50RnJhbWVidWZmZXJUb0NhbnZhcyhmcmFtZWJ1ZmZlciwgZnJhbWVidWZmZXJTaXpl LndpZHRoKCksIGZyYW1lYnVmZmVyU2l6ZS5oZWlnaHQoKSwgIW1fY29udGV4dC0+Z2V0Q29udGV4 dEF0dHJpYnV0ZXMoKS5wcmVtdWx0aXBsaWVkQWxwaGEsIGNvbnRleHQtPmNhbnZhcygpLT5idWZm ZXIoKSk7CisgICAgbV9jb250ZXh0LT5kZWxldGVGcmFtZWJ1ZmZlcihmcmFtZWJ1ZmZlcik7CisK KyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVC VUZGRVIsIHByZXZpb3VzRnJhbWVidWZmZXIpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1 bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExh eWVyQ2hyb21pdW0uY3BwCmluZGV4IDIwZmY1ZTFlYjgxNmRmOGFjMWE3ZTk1YzQyNjMxNzVhZTRl Yjk5ZmUuLjJjZjllMzg2YjY5OGFmZjQ2ODBhYWE2MGQyYjU2ZjNjOGRkZTJkOTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJD aHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vV2ViR0xMYXllckNocm9taXVtLmNwcApAQCAtOTgsMzEgKzk4LDYgQEAgdm9pZCBXZWJHTExh eWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqIGxheWVyKQogICAgIHRl eHR1cmVMYXllci0+c2V0UHJlbXVsdGlwbGllZEFscGhhKG1fcHJlbXVsdGlwbGllZEFscGhhKTsK IH0KIAotYm9vbCBXZWJHTExheWVyQ2hyb21pdW06OnBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52 YXMoSW1hZ2VCdWZmZXIqIGltYWdlQnVmZmVyKQotewotICAgIGlmICghbV9kcmF3aW5nQnVmZmVy IHx8ICFkcmF3c0NvbnRlbnQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgSW50U2l6 ZSBmcmFtZWJ1ZmZlclNpemUgPSBjb250ZXh0KCktPmdldEludGVybmFsRnJhbWVidWZmZXJTaXpl KCk7Ci0KLSAgICAvLyBTaW5jZSB3ZSdyZSB1c2luZyB0aGUgc2FtZSBjb250ZXh0IGFzIFdlYkdM LCB3ZSBoYXZlIHRvIHJlc3RvcmUgYW55IHN0YXRlIHdlIGNoYW5nZSAoaW4gdGhpcyBjYXNlLCBq dXN0IHRoZSBmcmFtZWJ1ZmZlciBiaW5kaW5nKS4KLSAgICAvLyBGSVhNRTogVGhlIFdlYkdMUmVu ZGVyaW5nQ29udGV4dCB0cmFja3MgdGhlIGN1cnJlbnQgZnJhbWVidWZmZXIgYmluZGluZywgaXQg d291bGQgYmUgc2xpZ2h0bHkgbW9yZSBlZmZpY2llbnQgdG8gdXNlIHRoaXMgdmFsdWUKLSAgICAv LyByYXRoZXIgdGhhbiBxdWVyeWluZyBpdCBvZmYgb2YgdGhlIGNvbnRleHQuCi0gICAgR0MzRGlu dCBwcmV2aW91c0ZyYW1lYnVmZmVyID0gMDsKLSAgICBjb250ZXh0KCktPmdldEludGVnZXJ2KEdy YXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9CSU5ESU5HLCAmcHJldmlvdXNGcmFtZWJ1ZmZl cik7Ci0KLSAgICBQbGF0Zm9ybTNET2JqZWN0IGZyYW1lYnVmZmVyID0gY29udGV4dCgpLT5jcmVh dGVGcmFtZWJ1ZmZlcigpOwotICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNz Q29udGV4dDNEOjpGUkFNRUJVRkZFUiwgZnJhbWVidWZmZXIpOwotICAgIGNvbnRleHQoKS0+ZnJh bWVidWZmZXJUZXh0dXJlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGlj c0NvbnRleHQzRDo6Q09MT1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJF XzJELCBtX3RleHR1cmVJZCwgMCk7Ci0KLSAgICBFeHRlbnNpb25zM0RDaHJvbWl1bSogZXh0ZW5z aW9ucyA9IHN0YXRpY19jYXN0PEV4dGVuc2lvbnMzRENocm9taXVtKj4oY29udGV4dCgpLT5nZXRF eHRlbnNpb25zKCkpOwotICAgIGV4dGVuc2lvbnMtPnBhaW50RnJhbWVidWZmZXJUb0NhbnZhcyhm cmFtZWJ1ZmZlciwgZnJhbWVidWZmZXJTaXplLndpZHRoKCksIGZyYW1lYnVmZmVyU2l6ZS5oZWln aHQoKSwgIWNvbnRleHQoKS0+Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKS5wcmVtdWx0aXBsaWVkQWxw aGEsIGltYWdlQnVmZmVyKTsKLSAgICBjb250ZXh0KCktPmRlbGV0ZUZyYW1lYnVmZmVyKGZyYW1l YnVmZmVyKTsKLQotICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgcHJldmlvdXNGcmFtZWJ1ZmZlcik7Ci0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIHZvaWQgV2ViR0xMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KGNvbnN0 IEZsb2F0UmVjdCYgZGlydHlSZWN0KQogewogICAgIExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlz cGxheVJlY3QoZGlydHlSZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKaW5kZXggZjI5 NWZiODJkYzMzZWM0NDg3MmI2YzliZDAxODYxYTI0YzE3MjljMy4uYjE1ZjU2MzYyMzU4ZjFjMjQ2 MmNhZmY4M2QwMDg4M2I2MWNjZGMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKQEAg LTUzLDcgKzUzLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJl VXBkYXRlciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7 Ci0gICAgYm9vbCBwYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFzKEltYWdlQnVmZmVyKik7CiAK ICAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCgpIGNvbnN0OwogCg==