79387 2012-02-23 12:13:07 -0800 Limit WebGL Errors in Console to 10 per context 2012-02-24 16:03:37 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 gman gman kbr webkit.review.bot oldest_to_newest 563347 0 gman 2012-02-23 12:13:07 -0800 Limit WebGL Errors in Console to 10 per context 563350 1 128529 gman 2012-02-23 12:15:03 -0800 Created attachment 128529 Patch 563750 2 128529 kbr 2012-02-23 17:37:14 -0800 Comment on attachment 128529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128529&action=review Looks good but would you mind doing one small refactoring to make maintenance easier? > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:429 > + , m_numGLErrorsToConsoleAllowed(10) Could you define a const int maxGLErrorsAllowedToConsole at the top of the file and initialize this to that? > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:470 > + m_numGLErrorsToConsoleAllowed = 10; Same here. 564535 3 128779 gman 2012-02-24 11:58:09 -0800 Created attachment 128779 Patch 564536 4 128779 gman 2012-02-24 12:00:37 -0800 Comment on attachment 128779 Patch added constant. Just fyi though, It's frustrating to be held to a different standard than the existing code. The reason I didn't use a constant is because the code just a few lines above is not using a constant. The #1 rule I've been taught is to be consistent and follow the style of the code being modified which is what I did. The point is, if you want a certain style, make sure the code is already following that style and people will follow by example. 564670 5 128779 kbr 2012-02-24 14:57:52 -0800 Comment on attachment 128779 Patch Looks good. r=me 564678 6 kbr 2012-02-24 15:01:04 -0800 (In reply to comment #4) > (From update of attachment 128779 [details]) > added constant. > > Just fyi though, It's frustrating to be held to a different standard than the existing code. The reason I didn't use a constant is because the code just a few lines above is not using a constant. The #1 rule I've been taught is to be consistent and follow the style of the code being modified which is what I did. > > The point is, if you want a certain style, make sure the code is already following that style and people will follow by example. I don't mean to hold you to a different standard. I'm probably personally responsible for many style issues in that file. The issue I saw during the review was a constant replicated twice. If you're referring to the 4 that's passed to the initializer of m_videoCache, note that it is only present in that one location. If you see other cleanups that should be made please file a bug and assign it to me, and I'll clean them up. 564731 7 128779 webkit.review.bot 2012-02-24 16:03:33 -0800 Comment on attachment 128779 Patch Clearing flags on attachment: 128779 Committed r108861: <http://trac.webkit.org/changeset/108861> 564732 8 webkit.review.bot 2012-02-24 16:03:37 -0800 All reviewed patches have been landed. Closing bug. 128529 2012-02-23 12:15:03 -0800 2012-02-24 11:58:07 -0800 Patch bug-79387-20120223121502.patch text/plain 4985 gman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFmZDJhODEyOTVkNzg5 NTE1YTJjZDM2MzVmMmZiNDRhZjkxNDI3YS4uZDhlMDYxZWE3ZTc5NWFiMzI4Mjg2ODgyNGQzM2Y3 MGJhNzllZmUxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTIzICBHcmVn ZyBUYXZhcmVzICA8Z21hbkBnb29nbGUuY29tPgorCisgICAgICAgIExpbWl0IFdlYkdMIEVycm9y cyBpbiBDb25zb2xlIHRvIDEwIHBlciBjb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTM4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU29tZSBhcHBzIGdlbmVyYXRlZCBlbm91Z2gg ZXJyb3JzIHRvIG92ZXJsb2FkCisgICAgICAgIHRoZSBEZXYgVG9vbHMgc28gbGltaXQgdGhlIG51 bWJlciBvZiBlcnJvcnMuCisgICAgICAgIEZvciBhIGNvcnJlY3QgYXBwIHRoZXJlIHNob3VsZCBu ZXZlciBiZSBhbnkKKyAgICAgICAgZXJyb3JzIHNvIHNlZWluZyB0aGUgZmlyc3QgZmV3IHNob3Vs ZCBiZSBlbm91Z2gKKyAgICAgICAgdG8gZGVidWcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFz IG5vIG5ldyBmdW5jdGlvbmFsaXR5CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpX ZWJHTFJlbmRlcmluZ0NvbnRleHRFcnJvck1lc3NhZ2VDYWxsYmFjazo6b25FcnJvck1lc3NhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpXZWJHTFJlbmRlcmlu Z0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojppbml0 aWFsaXplTmV3Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OnByaW50R0xFcnJvclRvQ29uc29sZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OnN5bnRoZXNpemVHTEVycm9yKToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9X ZWJHTFJlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkdMUmVuZGVyaW5nQ29udGV4dCk6 CisKIDIwMTItMDItMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW0NNYWtlXSBBZGQgV0VCS0lUX0lOQ0xVREVfQ09ORklHX0ZJTEVTX0lGX0VYSVNU UyBtYWNybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dC5jcHAKaW5kZXggY2ZiNjUwNWE5OTg2MzY3YTI5MWRmOTA2MzA2ZWNkY2VjYmRj ZjhkZC4uYzJiZmU5ZTFhODgxZTZmYThiZWNiN2QyNzA5OTM4MjFkYzNlMDM0MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3Bw CkBAIC0zNzgsNyArMzc4LDcgQEAgcHJpdmF0ZToKIGNsYXNzIFdlYkdMUmVuZGVyaW5nQ29udGV4 dEVycm9yTWVzc2FnZUNhbGxiYWNrIDogcHVibGljIEdyYXBoaWNzQ29udGV4dDNEOjpFcnJvck1l c3NhZ2VDYWxsYmFjayB7CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgV2ViR0xSZW5kZXJpbmdDb250 ZXh0RXJyb3JNZXNzYWdlQ2FsbGJhY2soV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjYikgOiBtX2Nv bnRleHQoY2IpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBvbkVycm9yTWVzc2FnZShjb25zdCBTdHJp bmcmIG1lc3NhZ2UsIEdDM0RpbnQpIHsgbV9jb250ZXh0LT5wcmludFdhcm5pbmdUb0NvbnNvbGUo bWVzc2FnZSk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgb25FcnJvck1lc3NhZ2UoY29uc3QgU3RyaW5n JiBtZXNzYWdlLCBHQzNEaW50KSB7IG1fY29udGV4dC0+cHJpbnRHTEVycm9yVG9Db25zb2xlKG1l c3NhZ2UpOyB9CiAgICAgdmlydHVhbCB+V2ViR0xSZW5kZXJpbmdDb250ZXh0RXJyb3JNZXNzYWdl Q2FsbGJhY2soKSB7IH0KIHByaXZhdGU6CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBtX2Nv bnRleHQ7CkBAIC00MjYsNiArNDI2LDcgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpXZWJHTFJl bmRlcmluZ0NvbnRleHQoSFRNTENhbnZhc0VsZW1lbnQqIHBhc3NlZENhbnZhcywgUGEKICAgICAs IG1fY29udGV4dExvc3RNb2RlKFN5bnRoZXRpY0xvc3RDb250ZXh0KQogICAgICwgbV9hdHRyaWJ1 dGVzKGF0dHJpYnV0ZXMpCiAgICAgLCBtX3N5bnRoZXNpemVkRXJyb3JzVG9Db25zb2xlKGZhbHNl KQorICAgICwgbV9udW1HTEVycm9yc1RvQ29uc29sZUFsbG93ZWQoMTApCiB7CiAgICAgQVNTRVJU KG1fY29udGV4dCk7CiAgICAgbV9jb250ZXh0R3JvdXAgPSBXZWJHTENvbnRleHRHcm91cDo6Y3Jl YXRlKCk7CkBAIC00NjYsNiArNDY3LDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6Omlu aXRpYWxpemVOZXdDb250ZXh0KCkKICAgICBtX3N0ZW5jaWxGdW5jTWFzayA9IDB4RkZGRkZGRkY7 CiAgICAgbV9zdGVuY2lsRnVuY01hc2tCYWNrID0gMHhGRkZGRkZGRjsKICAgICBtX2xheWVyQ2xl YXJlZCA9IGZhbHNlOworICAgIG1fbnVtR0xFcnJvcnNUb0NvbnNvbGVBbGxvd2VkID0gMTA7CiAg ICAgCiAgICAgbV9jbGVhckNvbG9yWzBdID0gbV9jbGVhckNvbG9yWzFdID0gbV9jbGVhckNvbG9y WzJdID0gbV9jbGVhckNvbG9yWzNdID0gMDsKICAgICBtX3NjaXNzb3JFbmFibGVkID0gZmFsc2U7 CkBAIC00ODgzLDYgKzQ4ODUsMTggQEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlk YXRlU3RlbmNpbEZ1bmMoY29uc3QgY2hhciogZnVuY3Rpb25OYW1lLCBHQzNEZW4KICAgICB9CiB9 CiAKK3ZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpwcmludEdMRXJyb3JUb0NvbnNvbGUoY29u c3QgU3RyaW5nJiBtZXNzYWdlKQoreworICAgIGlmICghbV9udW1HTEVycm9yc1RvQ29uc29sZUFs bG93ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIC0tbV9udW1HTEVycm9yc1RvQ29uc29sZUFs bG93ZWQ7CisgICAgcHJpbnRXYXJuaW5nVG9Db25zb2xlKG1lc3NhZ2UpOworCisgICAgaWYgKCFt X251bUdMRXJyb3JzVG9Db25zb2xlQWxsb3dlZCkKKyAgICAgICAgcHJpbnRXYXJuaW5nVG9Db25z b2xlKCJXZWJHTDogdG9vIG1hbnkgZXJyb3JzLCBubyBtb3JlIGVycm9ycyB3aWxsIGJlIHJlcG9y dGVkIHRvIHRoZSBjb25zb2xlIGZvciB0aGlzIGNvbnRleHQuIik7Cit9CisKIHZvaWQgV2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpwcmludFdhcm5pbmdUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNz YWdlKQogewogICAgIGlmICghY2FudmFzKCkpCkBAIC01MzY2LDcgKzUzODAsNyBAQCB2b2lkIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6c3ludGhlc2l6ZUdMRXJyb3IoR0MzRGVudW0gZXJyb3IsIGNv bnN0IGNoYXIqIGZ1bmN0aQogewogICAgIGlmIChtX3N5bnRoZXNpemVkRXJyb3JzVG9Db25zb2xl KSB7CiAgICAgICBTdHJpbmcgc3RyID0gU3RyaW5nKCJXZWJHTDogIikgKyBHZXRFcnJvclN0cmlu ZyhlcnJvcikgKyAgIjogIiArIFN0cmluZyhmdW5jdGlvbk5hbWUpICsgIjogIiArIFN0cmluZyhk ZXNjcmlwdGlvbik7Ci0gICAgICBwcmludFdhcm5pbmdUb0NvbnNvbGUoc3RyKTsKKyAgICAgIHBy aW50R0xFcnJvclRvQ29uc29sZShzdHIpOwogICAgIH0KICAgICBtX2NvbnRleHQtPnN5bnRoZXNp emVHTEVycm9yKGVycm9yKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKaW5kZXggYmU5YzhjZjNjZjY2NTUwZWI3NTMzYmVkMTI5 NWI1NjU3YzgyODUwNC4uNmM4MWFmZjY2YWFiZTkzOWUwZjhjZDFlOGJiYmNiOGEwMTU1ZjNmOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmgKQEAgLTQ5Niw2ICs0OTYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBtX2lzRGVwdGhTdGVu Y2lsU3VwcG9ydGVkOwogCiAgICAgYm9vbCBtX3N5bnRoZXNpemVkRXJyb3JzVG9Db25zb2xlOwor ICAgIGludCBtX251bUdMRXJyb3JzVG9Db25zb2xlQWxsb3dlZDsKIAogICAgIC8vIEVuYWJsZWQg ZXh0ZW5zaW9uIG9iamVjdHMuCiAgICAgT3duUHRyPE9FU1RleHR1cmVGbG9hdD4gbV9vZXNUZXh0 dXJlRmxvYXQ7CkBAIC02MjIsNiArNjIzLDkgQEAgcHVibGljOgogICAgIC8vIEhlbHBlciBmdW5j dGlvbiBmb3IgdGV4UGFyYW1ldGVyZiBhbmQgdGV4UGFyYW1ldGVyaS4KICAgICB2b2lkIHRleFBh cmFtZXRlcihHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIHBuYW1lLCBHQzNEZmxvYXQgcGFyYW1p LCBHQzNEaW50IHBhcmFtZiwgYm9vbCBpc0Zsb2F0KTsKIAorICAgIC8vIEhlbHBlciBmdW5jdGlv biB0byBwcmludCBHTCBlcnJvcnMgdG8gY29uc29sZS4KKyAgICB2b2lkIHByaW50R0xFcnJvclRv Q29uc29sZShjb25zdCBTdHJpbmcmKTsKKwogICAgIC8vIEhlbHBlciBmdW5jdGlvbiB0byBwcmlu dCB3YXJuaW5ncyB0byBjb25zb2xlLiBDdXJyZW50bHkKICAgICAvLyB1c2VkIG9ubHkgdG8gd2Fy biBhYm91dCB1c2Ugb2Ygb2Jzb2xldGUgZnVuY3Rpb25zLgogICAgIHZvaWQgcHJpbnRXYXJuaW5n VG9Db25zb2xlKGNvbnN0IFN0cmluZyYpOwo= 128779 2012-02-24 11:58:09 -0800 2012-02-24 16:03:32 -0800 Patch bug-79387-20120224115808.patch text/plain 5210 gman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQyOTZiYTkzYmYxMmRm NzMwOGU0MmRjMGExYTZkYWYxZjljMTY2OS4uYzU5ZDE4NWIyYTkyZTMzZWVhMjQ2NGQ2OGFmMDlh MTQxYjUzMDczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTIzICBHcmVn ZyBUYXZhcmVzICA8Z21hbkBnb29nbGUuY29tPgorCisgICAgICAgIExpbWl0IFdlYkdMIEVycm9y cyBpbiBDb25zb2xlIHRvIDEwIHBlciBjb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTM4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU29tZSBhcHBzIGdlbmVyYXRlZCBlbm91Z2gg ZXJyb3JzIHRvIG92ZXJsb2FkCisgICAgICAgIHRoZSBEZXYgVG9vbHMgc28gbGltaXQgdGhlIG51 bWJlciBvZiBlcnJvcnMuCisgICAgICAgIEZvciBhIGNvcnJlY3QgYXBwIHRoZXJlIHNob3VsZCBu ZXZlciBiZSBhbnkKKyAgICAgICAgZXJyb3JzIHNvIHNlZWluZyB0aGUgZmlyc3QgZmV3IHNob3Vs ZCBiZSBlbm91Z2gKKyAgICAgICAgdG8gZGVidWcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFz IG5vIG5ldyBmdW5jdGlvbmFsaXR5CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpX ZWJHTFJlbmRlcmluZ0NvbnRleHRFcnJvck1lc3NhZ2VDYWxsYmFjazo6b25FcnJvck1lc3NhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpXZWJHTFJlbmRlcmlu Z0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojppbml0 aWFsaXplTmV3Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OnByaW50R0xFcnJvclRvQ29uc29sZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OnN5bnRoZXNpemVHTEVycm9yKToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9X ZWJHTFJlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkdMUmVuZGVyaW5nQ29udGV4dCk6 CisKIDIwMTItMDItMjQgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBVc2UgeGNydW4gdG8gZmluZCBjb21waWxlciBwYXRocyBmb3IgR2VuZXJhdGUgRGVyaXZl ZCBTb3VyY2VzIGJ1aWxkIHBoYXNlIHNjcmlwdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggY2ZiNjUwNWE5OTg2MzY3 YTI5MWRmOTA2MzA2ZWNkY2VjYmRjZjhkZC4uM2IwZDU5MGM5YWY2ZmVkZjNjMWE1OWZlNTAxMmU4 YjVhMzFlNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH TFJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC04Miw2ICs4Miw3IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNvbnN0IGRvdWJsZSBzZWNvbmRzQmV0d2VlblJlc3RvcmVBdHRlbXB0cyA9IDEuMDsK K2NvbnN0IGludCBtYXhHTEVycm9yc0FsbG93ZWRUb0NvbnNvbGUgPSAxMDsKIAogbmFtZXNwYWNl IHsKIApAQCAtMzc4LDcgKzM3OSw3IEBAIHByaXZhdGU6CiBjbGFzcyBXZWJHTFJlbmRlcmluZ0Nv bnRleHRFcnJvck1lc3NhZ2VDYWxsYmFjayA6IHB1YmxpYyBHcmFwaGljc0NvbnRleHQzRDo6RXJy b3JNZXNzYWdlQ2FsbGJhY2sgewogcHVibGljOgogICAgIGV4cGxpY2l0IFdlYkdMUmVuZGVyaW5n Q29udGV4dEVycm9yTWVzc2FnZUNhbGxiYWNrKFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY2IpIDog bV9jb250ZXh0KGNiKSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgb25FcnJvck1lc3NhZ2UoY29uc3Qg U3RyaW5nJiBtZXNzYWdlLCBHQzNEaW50KSB7IG1fY29udGV4dC0+cHJpbnRXYXJuaW5nVG9Db25z b2xlKG1lc3NhZ2UpOyB9CisgICAgdmlydHVhbCB2b2lkIG9uRXJyb3JNZXNzYWdlKGNvbnN0IFN0 cmluZyYgbWVzc2FnZSwgR0MzRGludCkgeyBtX2NvbnRleHQtPnByaW50R0xFcnJvclRvQ29uc29s ZShtZXNzYWdlKTsgfQogICAgIHZpcnR1YWwgfldlYkdMUmVuZGVyaW5nQ29udGV4dEVycm9yTWVz c2FnZUNhbGxiYWNrKCkgeyB9CiBwcml2YXRlOgogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCog bV9jb250ZXh0OwpAQCAtNDI2LDYgKzQyNyw3IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6V2Vi R0xSZW5kZXJpbmdDb250ZXh0KEhUTUxDYW52YXNFbGVtZW50KiBwYXNzZWRDYW52YXMsIFBhCiAg ICAgLCBtX2NvbnRleHRMb3N0TW9kZShTeW50aGV0aWNMb3N0Q29udGV4dCkKICAgICAsIG1fYXR0 cmlidXRlcyhhdHRyaWJ1dGVzKQogICAgICwgbV9zeW50aGVzaXplZEVycm9yc1RvQ29uc29sZShm YWxzZSkKKyAgICAsIG1fbnVtR0xFcnJvcnNUb0NvbnNvbGVBbGxvd2VkKG1heEdMRXJyb3JzQWxs b3dlZFRvQ29uc29sZSkKIHsKICAgICBBU1NFUlQobV9jb250ZXh0KTsKICAgICBtX2NvbnRleHRH cm91cCA9IFdlYkdMQ29udGV4dEdyb3VwOjpjcmVhdGUoKTsKQEAgLTQ2Niw2ICs0NjgsNyBAQCB2 b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6aW5pdGlhbGl6ZU5ld0NvbnRleHQoKQogICAgIG1f c3RlbmNpbEZ1bmNNYXNrID0gMHhGRkZGRkZGRjsKICAgICBtX3N0ZW5jaWxGdW5jTWFza0JhY2sg PSAweEZGRkZGRkZGOwogICAgIG1fbGF5ZXJDbGVhcmVkID0gZmFsc2U7CisgICAgbV9udW1HTEVy cm9yc1RvQ29uc29sZUFsbG93ZWQgPSBtYXhHTEVycm9yc0FsbG93ZWRUb0NvbnNvbGU7CiAgICAg CiAgICAgbV9jbGVhckNvbG9yWzBdID0gbV9jbGVhckNvbG9yWzFdID0gbV9jbGVhckNvbG9yWzJd ID0gbV9jbGVhckNvbG9yWzNdID0gMDsKICAgICBtX3NjaXNzb3JFbmFibGVkID0gZmFsc2U7CkBA IC00ODgzLDYgKzQ4ODYsMTggQEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRl U3RlbmNpbEZ1bmMoY29uc3QgY2hhciogZnVuY3Rpb25OYW1lLCBHQzNEZW4KICAgICB9CiB9CiAK K3ZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpwcmludEdMRXJyb3JUb0NvbnNvbGUoY29uc3Qg U3RyaW5nJiBtZXNzYWdlKQoreworICAgIGlmICghbV9udW1HTEVycm9yc1RvQ29uc29sZUFsbG93 ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIC0tbV9udW1HTEVycm9yc1RvQ29uc29sZUFsbG93 ZWQ7CisgICAgcHJpbnRXYXJuaW5nVG9Db25zb2xlKG1lc3NhZ2UpOworCisgICAgaWYgKCFtX251 bUdMRXJyb3JzVG9Db25zb2xlQWxsb3dlZCkKKyAgICAgICAgcHJpbnRXYXJuaW5nVG9Db25zb2xl KCJXZWJHTDogdG9vIG1hbnkgZXJyb3JzLCBubyBtb3JlIGVycm9ycyB3aWxsIGJlIHJlcG9ydGVk IHRvIHRoZSBjb25zb2xlIGZvciB0aGlzIGNvbnRleHQuIik7Cit9CisKIHZvaWQgV2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpwcmludFdhcm5pbmdUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdl KQogewogICAgIGlmICghY2FudmFzKCkpCkBAIC01MzY2LDcgKzUzODEsNyBAQCB2b2lkIFdlYkdM UmVuZGVyaW5nQ29udGV4dDo6c3ludGhlc2l6ZUdMRXJyb3IoR0MzRGVudW0gZXJyb3IsIGNvbnN0 IGNoYXIqIGZ1bmN0aQogewogICAgIGlmIChtX3N5bnRoZXNpemVkRXJyb3JzVG9Db25zb2xlKSB7 CiAgICAgICBTdHJpbmcgc3RyID0gU3RyaW5nKCJXZWJHTDogIikgKyBHZXRFcnJvclN0cmluZyhl cnJvcikgKyAgIjogIiArIFN0cmluZyhmdW5jdGlvbk5hbWUpICsgIjogIiArIFN0cmluZyhkZXNj cmlwdGlvbik7Ci0gICAgICBwcmludFdhcm5pbmdUb0NvbnNvbGUoc3RyKTsKKyAgICAgIHByaW50 R0xFcnJvclRvQ29uc29sZShzdHIpOwogICAgIH0KICAgICBtX2NvbnRleHQtPnN5bnRoZXNpemVH TEVycm9yKGVycm9yKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmgKaW5kZXggYmU5YzhjZjNjZjY2NTUwZWI3NTMzYmVkMTI5NWI1 NjU3YzgyODUwNC4uNmM4MWFmZjY2YWFiZTkzOWUwZjhjZDFlOGJiYmNiOGEwMTU1ZjNmOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 LmgKQEAgLTQ5Niw2ICs0OTYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBtX2lzRGVwdGhTdGVuY2ls U3VwcG9ydGVkOwogCiAgICAgYm9vbCBtX3N5bnRoZXNpemVkRXJyb3JzVG9Db25zb2xlOworICAg IGludCBtX251bUdMRXJyb3JzVG9Db25zb2xlQWxsb3dlZDsKIAogICAgIC8vIEVuYWJsZWQgZXh0 ZW5zaW9uIG9iamVjdHMuCiAgICAgT3duUHRyPE9FU1RleHR1cmVGbG9hdD4gbV9vZXNUZXh0dXJl RmxvYXQ7CkBAIC02MjIsNiArNjIzLDkgQEAgcHVibGljOgogICAgIC8vIEhlbHBlciBmdW5jdGlv biBmb3IgdGV4UGFyYW1ldGVyZiBhbmQgdGV4UGFyYW1ldGVyaS4KICAgICB2b2lkIHRleFBhcmFt ZXRlcihHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIHBuYW1lLCBHQzNEZmxvYXQgcGFyYW1pLCBH QzNEaW50IHBhcmFtZiwgYm9vbCBpc0Zsb2F0KTsKIAorICAgIC8vIEhlbHBlciBmdW5jdGlvbiB0 byBwcmludCBHTCBlcnJvcnMgdG8gY29uc29sZS4KKyAgICB2b2lkIHByaW50R0xFcnJvclRvQ29u c29sZShjb25zdCBTdHJpbmcmKTsKKwogICAgIC8vIEhlbHBlciBmdW5jdGlvbiB0byBwcmludCB3 YXJuaW5ncyB0byBjb25zb2xlLiBDdXJyZW50bHkKICAgICAvLyB1c2VkIG9ubHkgdG8gd2FybiBh Ym91dCB1c2Ugb2Ygb2Jzb2xldGUgZnVuY3Rpb25zLgogICAgIHZvaWQgcHJpbnRXYXJuaW5nVG9D b25zb2xlKGNvbnN0IFN0cmluZyYpOwo=