125332 2013-12-05 20:31:09 -0800 Hook into some shader symbol logic following the ANGLE update in r159533 2013-12-06 09:25:56 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong roger_fong bfulgham commit-queue dino esprehn+autocc gyuyoung.kim kondapallykalyan noam roger_fong oldest_to_newest 957142 0 roger_fong 2013-12-05 20:31:09 -0800 In order to fix conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html and conformance/glsl/misc/shaders-with-varyings.html we need to first hook into some new shader symbol fields provided by the angle update in r159533. We also need to start taking varyings into consideration as a symbol type. Fixes for the actual conformance failures will come in a different patch. 957145 1 218567 roger_fong 2013-12-05 21:04:29 -0800 Created attachment 218567 Patch 957146 2 commit-queue 2013-12-05 21:06:07 -0800 Attachment 218567 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/html/canvas/WebGLRenderingContext.cpp', u'Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp', u'Source/WebCore/platform/graphics/ANGLEWebKitBridge.h', u'Source/WebCore/platform/graphics/GraphicsContext3D.h', u'Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp', u'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:50: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] Total errors found: 18 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 957249 3 bfulgham 2013-12-06 08:55:26 -0800 (In reply to comment #2) > Attachment 218567 [details] did not pass style-queue: > > ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] > ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:50: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Looks like these are to match existing WebGL declarations. > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] [...] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:329: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] Something is very wrong with check-webkit-style here. I don't even see how the patch could generate these complaints about this section of the code. 957250 4 218567 bfulgham 2013-12-06 08:57:07 -0800 Comment on attachment 218567 Patch Looks great to me! r=me. 957260 5 218567 commit-queue 2013-12-06 09:25:54 -0800 Comment on attachment 218567 Patch Clearing flags on attachment: 218567 Committed r160223: <http://trac.webkit.org/changeset/160223> 957261 6 commit-queue 2013-12-06 09:25:56 -0800 All reviewed patches have been landed. Closing bug. 218567 2013-12-05 21:04:29 -0800 2013-12-06 09:25:54 -0800 Patch bug-125332-20131205210428.patch text/plain 9166 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDIxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTA1ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgSG9vayBpbnRvIHNvbWUgc2hh ZGVyIHN5bWJvbCBsb2dpYyBmb2xsb3dpbmcgdGhlIEFOR0xFIHVwZGF0ZSBpbiByMTU5NTMzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MzMyLgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyBm dW5jdGlvbmFsaXR5IGFkZGVkLgorCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJp bmdDb250ZXh0LmNwcDogQWRkIHNvbWUgZXJyb3IgY2hlY2tpbmcgZm9yIGVycm9ycyByZWxhdGVk IHRvIAorICAgICAgICAgICAgc2hhZGVyIHN5bWJvbHMgdGhhdCBleGlzdCBhY3Jvc3MgYm90aCB2 ZXJ0ZXggYW5kIGZyYWdtZW50IHNoYWRlcnMuCisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OmxpbmtQcm9ncmFtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9B TkdMRVdlYktpdEJyaWRnZS5jcHA6IEFkZCBsb2dpYyBmb3IgaGFuZGxpbmcgdmFyeWluZ3MgCisg ICAgICAgICAgICBhbmQgYWRkIG5ldyBmaWVsZHMgdG8gdGhlIEFOR0xFU2hhZGVyU3ltYm9sIHN0 cnVjdC4KKyAgICAgICAgKFdlYkNvcmU6OmdldFN5bWJvbEluZm8pOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaDogQWRkIHRob3NlIHNhbWUgZmllbGRzIHRvIHRoZSBT eW1ib2xJbmZvIHN0cnVjdCAKKyAgICAgICAgICAgIGFzIHdlbGwgc28gdGhhdCB3ZSBjYW4gYWNj ZXNzIHRoZW0gZnJvbSBvdXIgc2hhZGVyIHNvdXJjZSBtYXAuCisgICAgICAgICAgICBBbHNvIGFk ZCBhIG1hcCBvZiB2YXJ5aW5ncyBhbG9uZyBzaWRlIHRoZSB1bmlmb3JtcyBhbmQgYXR0cmlidXRl cy4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpTeW1ib2xJbmZvOjpTeW1i b2xJbmZvKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpTaGFkZXJTb3Vy Y2VFbnRyeTo6c3ltYm9sTWFwKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV4dGVuc2lv bnMzRE9wZW5HTENvbW1vbjo6Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZUFOR0xFKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21t b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmFyZVByb2dyYW1T eW1ib2xzVmFsaWQpOiBXaWxsIGJlIGZpbGxlZCBpbiBsYXRlciwgdGhpcyBtZXRob2QgCisgICAg ICAgICAgICB3aWxsIHVzZSB0aGUgc2hhZGVyIHNvdXJjZSBtYXAgdG8gY2hlY2sgZm9yIGlzc3Vl cyB3aXRoIHVudXNlZCB2YXJ5aW5ncyBhbmQgcHJlY2lzaW9ucyAKKyAgICAgICAgICAgIG1pc21h dGNoZXMgb2Ygc2hhZGVyIHN5bWJvbHMgdGhhdCBleGlzdCBhY3Jvc3MgYm90aCB0aGUgdmVydGV4 IGFuZCBmcmFnbWVudCBzaGFkZXJzLgorCiAyMDEzLTEyLTA1ICBab2x0YW4gSG9ydmF0aCAgPHpv bHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIENsZWFuIHVwIHRoZSBmb3J3YXJkaW5nIGhlYWRl cnMgb2YgUmVuZGVyQmxvY2suaApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNjAxOTgpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMzQ5LDcgKzMzNDksNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4 dDo6bGlua1Byb2dyYW0oCiAgICAgaWYgKCFpc0dMRVMyQ29tcGxpYW50KCkpIHsKICAgICAgICAg V2ViR0xTaGFkZXIqIHZlcnRleFNoYWRlciA9IHByb2dyYW0tPmdldEF0dGFjaGVkU2hhZGVyKEdy YXBoaWNzQ29udGV4dDNEOjpWRVJURVhfU0hBREVSKTsKICAgICAgICAgV2ViR0xTaGFkZXIqIGZy YWdtZW50U2hhZGVyID0gcHJvZ3JhbS0+Z2V0QXR0YWNoZWRTaGFkZXIoR3JhcGhpY3NDb250ZXh0 M0Q6OkZSQUdNRU5UX1NIQURFUik7Ci0gICAgICAgIGlmICghdmVydGV4U2hhZGVyIHx8ICF2ZXJ0 ZXhTaGFkZXItPmlzVmFsaWQoKSB8fCAhZnJhZ21lbnRTaGFkZXIgfHwgIWZyYWdtZW50U2hhZGVy LT5pc1ZhbGlkKCkpIHsKKyAgICAgICAgaWYgKCF2ZXJ0ZXhTaGFkZXIgfHwgIXZlcnRleFNoYWRl ci0+aXNWYWxpZCgpIHx8ICFmcmFnbWVudFNoYWRlciB8fCAhZnJhZ21lbnRTaGFkZXItPmlzVmFs aWQoKSB8fCAhbV9jb250ZXh0LT5hcmVQcm9ncmFtU3ltYm9sc1ZhbGlkKG9iamVjdE9yWmVybyh2 ZXJ0ZXhTaGFkZXIpLCBvYmplY3RPclplcm8oZnJhZ21lbnRTaGFkZXIpKSkgewogICAgICAgICAg ICAgcHJvZ3JhbS0+c2V0TGlua1N0YXR1cyhmYWxzZSk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2Vi S2l0QnJpZGdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9BTkdMRVdlYktpdEJyaWRnZS5jcHAJKHJldmlzaW9uIDE2MDE5OCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTgsNiArNTgsOCBAQCBzdGF0aWMgYm9vbCBnZXRTeW1ib2xJbmZvKFNoSGFuZGxl IGNvbXBpCiAgICAgY2FzZSBTSF9BQ1RJVkVfVU5JRk9STVM6CiAgICAgICAgIHN5bWJvbE1heE5h bWVMZW5ndGhUeXBlID0gU0hfQUNUSVZFX1VOSUZPUk1fTUFYX0xFTkdUSDsKICAgICAgICAgYnJl YWs7CisgICAgY2FzZSBTSF9WQVJZSU5HUzoKKyAgICAgICAgc3ltYm9sTWF4TmFtZUxlbmd0aFR5 cGUgPSBTSF9WQVJZSU5HX01BWF9MRU5HVEg7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTkxLDYgKzkzLDEwIEBA IHN0YXRpYyBib29sIGdldFN5bWJvbEluZm8oU2hIYW5kbGUgY29tcGkKICAgICAgICAgICAgIHN5 bWJvbC5zeW1ib2xUeXBlID0gU0hBREVSX1NZTUJPTF9UWVBFX1VOSUZPUk07CiAgICAgICAgICAg ICBTaEdldFZhcmlhYmxlSW5mbyhjb21waWxlciwgc3ltYm9sVHlwZSwgaSwgJm5hbWVMZW5ndGgs ICZzeW1ib2wuc2l6ZSwgJnN5bWJvbC5kYXRhVHlwZSwgJnByZWNpc2lvbiwgJnN0YXRpY1VzZSwg bmFtZUJ1ZmZlci5kYXRhKCksIG1hcHBlZE5hbWVCdWZmZXIuZGF0YSgpKTsKICAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIFNIX1ZBUllJTkdTOgorICAgICAgICAgICAgc3ltYm9sLnN5 bWJvbFR5cGUgPSBTSEFERVJfU1lNQk9MX1RZUEVfVkFSWUlORzsKKyAgICAgICAgICAgIFNoR2V0 VmFyaWFibGVJbmZvKGNvbXBpbGVyLCBzeW1ib2xUeXBlLCBpLCAmbmFtZUxlbmd0aCwgJnN5bWJv bC5zaXplLCAmc3ltYm9sLmRhdGFUeXBlLCAmcHJlY2lzaW9uLCAmc3RhdGljVXNlLCBuYW1lQnVm ZmVyLmRhdGEoKSwgbWFwcGVkTmFtZUJ1ZmZlci5kYXRhKCkpOworICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTExOSw2ICsxMjUsOCBAQCBzdGF0aWMgYm9vbCBn ZXRTeW1ib2xJbmZvKFNoSGFuZGxlIGNvbXBpCiAKICAgICAgICAgc3ltYm9sLm5hbWUgPSBuYW1l OwogICAgICAgICBzeW1ib2wubWFwcGVkTmFtZSA9IG1hcHBlZE5hbWU7CisgICAgICAgIHN5bWJv bC5wcmVjaXNpb24gPSBwcmVjaXNpb247CisgICAgICAgIHN5bWJvbC5zdGF0aWNVc2UgPSBzdGF0 aWNVc2U7CiAgICAgICAgIHN5bWJvbHMuYXBwZW5kKHN5bWJvbCk7CiAgICAgCiAgICAgICAgIGlm IChzeW1ib2wuaXNBcnJheSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvQU5HTEVXZWJLaXRCcmlkZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9BTkdMRVdlYktpdEJyaWRnZS5oCShyZXZpc2lvbiAxNjAxOTgpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9BTkdMRVdlYktpdEJyaWRnZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00Niw3ICs0Niw4IEBAIGVudW0gQU5HTEVTaGFkZXJUeXBlIHsKIAogZW51 bSBBTkdMRVNoYWRlclN5bWJvbFR5cGUgewogICAgIFNIQURFUl9TWU1CT0xfVFlQRV9BVFRSSUJV VEUsCi0gICAgU0hBREVSX1NZTUJPTF9UWVBFX1VOSUZPUk0KKyAgICBTSEFERVJfU1lNQk9MX1RZ UEVfVU5JRk9STSwKKyAgICBTSEFERVJfU1lNQk9MX1RZUEVfVkFSWUlORwogfTsKIAogc3RydWN0 IEFOR0xFU2hhZGVyU3ltYm9sIHsKQEAgLTU2LDYgKzU3LDggQEAgc3RydWN0IEFOR0xFU2hhZGVy U3ltYm9sIHsKICAgICBTaERhdGFUeXBlIGRhdGFUeXBlOwogICAgIGludCBzaXplOwogICAgIGJv b2wgaXNBcnJheTsKKyAgICBTaFByZWNpc2lvblR5cGUgcHJlY2lzaW9uOworICAgIGludCBzdGF0 aWNVc2U7CiAKICAgICBib29sIGlzU2FtcGxlcigpIGNvbnN0CiAgICAgewpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5o CShyZXZpc2lvbiAxNjAxOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCSh3b3JraW5nIGNvcHkpCkBAIC03NTgsNiArNzU4LDcgQEAgcHVi bGljOgogCiAgICAgdm9pZCB1c2VQcm9ncmFtKFBsYXRmb3JtM0RPYmplY3QpOwogICAgIHZvaWQg dmFsaWRhdGVQcm9ncmFtKFBsYXRmb3JtM0RPYmplY3QpOworICAgIGJvb2wgYXJlUHJvZ3JhbVN5 bWJvbHNWYWxpZChQbGF0Zm9ybTNET2JqZWN0IHZlcnRleFNoYWRlciwgUGxhdGZvcm0zRE9iamVj dCBmcmFnbWVudFNoYWRlcikgY29uc3Q7CiAKICAgICB2b2lkIHZlcnRleEF0dHJpYjFmKEdDM0R1 aW50IGluZGV4LCBHQzNEZmxvYXQgeCk7CiAgICAgdm9pZCB2ZXJ0ZXhBdHRyaWIxZnYoR0MzRHVp bnQgaW5kZXgsIEdDM0RmbG9hdCogdmFsdWVzKTsKQEAgLTk2MywxMyArOTY0LDE3IEBAIHByaXZh dGU6CiAgICAgICAgIFN5bWJvbEluZm8oKQogICAgICAgICAgICAgOiB0eXBlKDApCiAgICAgICAg ICAgICAsIHNpemUoMCkKKyAgICAgICAgICAgICwgcHJlY2lzaW9uKFNIX1BSRUNJU0lPTl9VTkRF RklORUQpCisgICAgICAgICAgICAsIHN0YXRpY1VzZSgwKQogICAgICAgICB7CiAgICAgICAgIH0K IAotICAgICAgICBTeW1ib2xJbmZvKEdDM0RlbnVtIHR5cGUsIGludCBzaXplLCBjb25zdCBTdHJp bmcmIG1hcHBlZE5hbWUpCisgICAgICAgIFN5bWJvbEluZm8oR0MzRGVudW0gdHlwZSwgaW50IHNp emUsIGNvbnN0IFN0cmluZyYgbWFwcGVkTmFtZSwgU2hQcmVjaXNpb25UeXBlIHByZWNpc2lvbiwg aW50IHN0YXRpY1VzZSkKICAgICAgICAgICAgIDogdHlwZSh0eXBlKQogICAgICAgICAgICAgLCBz aXplKHNpemUpCiAgICAgICAgICAgICAsIG1hcHBlZE5hbWUobWFwcGVkTmFtZSkKKyAgICAgICAg ICAgICwgcHJlY2lzaW9uKHByZWNpc2lvbikKKyAgICAgICAgICAgICwgc3RhdGljVXNlKHN0YXRp Y1VzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTk4MSw2ICs5ODYsOCBAQCBwcml2YXRl OgogICAgICAgICBHQzNEZW51bSB0eXBlOwogICAgICAgICBpbnQgc2l6ZTsKICAgICAgICAgU3Ry aW5nIG1hcHBlZE5hbWU7CisgICAgICAgIFNoUHJlY2lzaW9uVHlwZSBwcmVjaXNpb247CisgICAg ICAgIGludCBzdGF0aWNVc2U7CiAgICAgfTsKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcs IFN5bWJvbEluZm8+IFNoYWRlclN5bWJvbE1hcDsKQEAgLTk5Myw2ICsxMDAwLDcgQEAgcHJpdmF0 ZToKICAgICAgICAgYm9vbCBpc1ZhbGlkOwogICAgICAgICBTaGFkZXJTeW1ib2xNYXAgYXR0cmli dXRlTWFwOwogICAgICAgICBTaGFkZXJTeW1ib2xNYXAgdW5pZm9ybU1hcDsKKyAgICAgICAgU2hh ZGVyU3ltYm9sTWFwIHZhcnlpbmdNYXA7CiAgICAgICAgIFNoYWRlclNvdXJjZUVudHJ5KCkKICAg ICAgICAgICAgIDogdHlwZShWRVJURVhfU0hBREVSKQogICAgICAgICAgICAgLCBpc1ZhbGlkKGZh bHNlKQpAQCAtMTAwMSw5ICsxMDA5LDExIEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAgICBT aGFkZXJTeW1ib2xNYXAmIHN5bWJvbE1hcChlbnVtIEFOR0xFU2hhZGVyU3ltYm9sVHlwZSBzeW1i b2xUeXBlKQogICAgICAgICB7Ci0gICAgICAgICAgICBBU1NFUlQoc3ltYm9sVHlwZSA9PSBTSEFE RVJfU1lNQk9MX1RZUEVfQVRUUklCVVRFIHx8IHN5bWJvbFR5cGUgPT0gU0hBREVSX1NZTUJPTF9U WVBFX1VOSUZPUk0pOworICAgICAgICAgICAgQVNTRVJUKHN5bWJvbFR5cGUgPT0gU0hBREVSX1NZ TUJPTF9UWVBFX0FUVFJJQlVURSB8fCBzeW1ib2xUeXBlID09IFNIQURFUl9TWU1CT0xfVFlQRV9V TklGT1JNIHx8IHN5bWJvbFR5cGUgPT0gU0hBREVSX1NZTUJPTF9UWVBFX1ZBUllJTkcpOwogICAg ICAgICAgICAgaWYgKHN5bWJvbFR5cGUgPT0gU0hBREVSX1NZTUJPTF9UWVBFX0FUVFJJQlVURSkK ICAgICAgICAgICAgICAgICByZXR1cm4gYXR0cmlidXRlTWFwOworICAgICAgICAgICAgaWYgKHN5 bWJvbFR5cGUgPT0gU0hBREVSX1NZTUJPTF9UWVBFX1ZBUllJTkcpCisgICAgICAgICAgICAgICAg cmV0dXJuIHZhcnlpbmdNYXA7CiAgICAgICAgICAgICByZXR1cm4gdW5pZm9ybU1hcDsKICAgICAg ICAgfQogICAgIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNw cAkocmV2aXNpb24gMTYwMTk5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4 NCw3ICsxODQsNyBAQCBTdHJpbmcgRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjpnZXRUcmFuCiAg ICAgc2l6ZV90IG51bVN5bWJvbHMgPSBzeW1ib2xzLnNpemUoKTsKICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IG51bVN5bWJvbHM7ICsraSkgewogICAgICAgICBBTkdMRVNoYWRlclN5bWJvbCBz aGFkZXJTeW1ib2wgPSBzeW1ib2xzW2ldOwotICAgICAgICBHcmFwaGljc0NvbnRleHQzRDo6U3lt Ym9sSW5mbyBzeW1ib2xJbmZvKHNoYWRlclN5bWJvbC5kYXRhVHlwZSwgc2hhZGVyU3ltYm9sLnNp emUsIHNoYWRlclN5bWJvbC5tYXBwZWROYW1lKTsKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Q6 OlN5bWJvbEluZm8gc3ltYm9sSW5mbyhzaGFkZXJTeW1ib2wuZGF0YVR5cGUsIHNoYWRlclN5bWJv bC5zaXplLCBzaGFkZXJTeW1ib2wubWFwcGVkTmFtZSwgc2hhZGVyU3ltYm9sLnByZWNpc2lvbiwg c2hhZGVyU3ltYm9sLnN0YXRpY1VzZSk7CiAgICAgICAgIGVudHJ5LnN5bWJvbE1hcChzaGFkZXJT eW1ib2wuc3ltYm9sVHlwZSkuc2V0KHNoYWRlclN5bWJvbC5uYW1lLCBzeW1ib2xJbmZvKTsKICAg ICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFw aGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9u LmNwcAkocmV2aXNpb24gMTYwMTk4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzI2LDYgKzMyNiwxNCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZXNoYXBlKGlu dCB3aWR0CiAgICAgOjpnbEZsdXNoKCk7CiB9CiAKK2Jvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OmFy ZVByb2dyYW1TeW1ib2xzVmFsaWQoUGxhdGZvcm0zRE9iamVjdCB2ZXJ0ZXhTaGFkZXIsIFBsYXRm b3JtM0RPYmplY3QgZnJhZ21lbnRTaGFkZXIpIGNvbnN0Cit7CisgICAgVU5VU0VEX1BBUkFNKHZl cnRleFNoYWRlcik7CisgICAgVU5VU0VEX1BBUkFNKGZyYWdtZW50U2hhZGVyKTsKKyAgICAvLyBU T0RPOiBGaWxsIG1lIGluLgorICAgIHJldHVybiB0cnVlOworfQorCiBJbnRTaXplIEdyYXBoaWNz Q29udGV4dDNEOjpnZXRJbnRlcm5hbEZyYW1lYnVmZmVyU2l6ZSgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIEludFNpemUobV9jdXJyZW50V2lkdGgsIG1fY3VycmVudEhlaWdodCk7Cg==