117786 2013-06-19 01:42:26 -0700 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ 2013-07-10 00:42:40 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 k.swiniarsk2 webkit-unassigned ap cdumez commit-queue dino esprehn+autocc kalyan.kondapally kbr noam rwlbuis simon.fraser oldest_to_newest 901699 0 k.swiniarsk2 2013-06-19 01:42:26 -0700 According to WebGL's revision 10, extensions should be named: WEBGL_lose_context, WEBGL_depth_texture, WEBGL_compressed_texture_s3tc. 901700 1 204975 k.swiniarsk2 2013-06-19 01:46:05 -0700 Created attachment 204975 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ 903234 2 204975 kalyan.kondapally 2013-06-25 01:18:10 -0700 Comment on attachment 204975 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:-2414 > - || equalIgnoringCase(name, "WEBKIT_WEBGL_lose_context") Is it safe to remove these checks?? Seems blink still has the checks in place. 903246 3 k.swiniarsk2 2013-06-25 02:38:25 -0700 (In reply to comment #2) > (From update of attachment 204975 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:-2414 > > - || equalIgnoringCase(name, "WEBKIT_WEBGL_lose_context") > > Is it safe to remove these checks?? Seems blink still has the checks in place. It is clear that it may break some backward-compatibility in web applications that use this extension with WEBKIT_WEBGL_ prefix. However latest official specification from Khronos http://www.khronos.org/registry/webgl/extensions/ does not mention any WEBKIT_ extensions anymore. The code should be kept clean and compliant with spec all the time and this backward-compatibility, should be removed. If not now, then when? 903321 4 kalyan.kondapally 2013-06-25 06:50:27 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 204975 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > The code should be kept clean and compliant with spec all the time and this backward-compatibility, should be removed. If not now, then when? I am sure there is a process in place to handle these kind of issues in WebKit. It's just that I am not so familiar with the process. From the comments it clearly states that we are keeping them around for a certain grace period. 903691 5 k.swiniarsk2 2013-06-26 07:01:59 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 204975 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > > The code should be kept clean and compliant with spec all the time and this backward-compatibility, should be removed. If not now, then when? > > I am sure there is a process in place to handle these kind of issues in WebKit. It's just that I am not so familiar with the process. From the comments it clearly states that we are keeping them around for a certain grace period. These comments were made on december 2011 (almost 2 years ago). Isn't the grace period long enough? What process exactly are you talking about? Do you know anyone we should consult about this? 903699 6 k.swiniarsk2 2013-06-26 07:26:38 -0700 (In reply to comment #2) > (From update of attachment 204975 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:-2414 > > - || equalIgnoringCase(name, "WEBKIT_WEBGL_lose_context") > > Is it safe to remove these checks?? Seems blink still has the checks in place. Hey, i dug recently into blink/chrom code, and found out, that they are not using WEBKIT_ prefix anymore: https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLLoseContext.cpp&q=WEBGL_lose_context&sq=package:chromium&type=cs&l=79 https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLDepthTexture.cpp&q=WEBGL_depth_texture&sq=package:chromium&type=cs https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLCompressedTextureS3TC.cpp&q=WEBGL_compressed_texture_s3tc&sq=package:chromium&type=cs 903702 7 cdumez 2013-06-26 07:29:06 -0700 (In reply to comment #6) > (In reply to comment #2) > > (From update of attachment 204975 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > > > > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:-2414 > > > - || equalIgnoringCase(name, "WEBKIT_WEBGL_lose_context") > > > > Is it safe to remove these checks?? Seems blink still has the checks in place. > > Hey, i dug recently into blink/chrom code, and found out, that they are not using WEBKIT_ prefix anymore: > > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLLoseContext.cpp&q=WEBGL_lose_context&sq=package:chromium&type=cs&l=79 > > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLDepthTexture.cpp&q=WEBGL_depth_texture&sq=package:chromium&type=cs > > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/html/canvas/WebGLCompressedTextureS3TC.cpp&q=WEBGL_compressed_texture_s3tc&sq=package:chromium&type=cs This is inaccurate I believe, take a look at WebGLRenderingContext::ExtensionTracker::matchesNameWithPrefixes(). The code was merely refactored. 903847 8 kalyan.kondapally 2013-06-26 12:16:58 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #2) > > > > (From update of attachment 204975 [details] [details] [details] [details]) > > > > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > > > The code should be kept clean and compliant with spec all the time and this backward-compatibility, should be removed. If not now, then when? > > > > I am sure there is a process in place to handle these kind of issues in WebKit. It's just that I am not so familiar with the process. From the comments it clearly states that we are keeping them around for a certain grace period. > > These comments were made on december 2011 (almost 2 years ago). Isn't the grace period long enough? > What process exactly are you talking about? Do you know anyone we should consult about this? As said, I am not familiar with how we should decide to do these kind of changes (which effect backward compatibility etc). Sending a mail to webkit mailing list might help here. 905379 9 kalyan.kondapally 2013-07-02 06:06:36 -0700 (In reply to comment #8) > (In reply to comment #5) > > (In reply to comment #4) > > > (In reply to comment #3) > > > > (In reply to comment #2) > > > > > (From update of attachment 204975 [details] [details] [details] [details] [details]) > > > > > View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > As said, I am not familiar with how we should decide to do these kind of changes (which effect backward compatibility etc). Sending a mail to webkit mailing list might help here. LGTM. https://lists.webkit.org/pipermail/webkit-dev/2013-July/025127.html 907234 10 204975 dino 2013-07-09 16:08:45 -0700 Comment on attachment 204975 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ Thanks! 907235 11 204975 commit-queue 2013-07-09 16:10:39 -0700 Comment on attachment 204975 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ Rejecting attachment 204975 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 204975, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/994753 907284 12 k.swiniarsk2 2013-07-09 23:42:19 -0700 (In reply to comment #10) > (From update of attachment 204975 [details]) > Thanks! hi dean, commit-bot says there is OOPS! (no reviewer put in changelog) can i put you name there? 907287 13 204975 cdumez 2013-07-09 23:47:21 -0700 Comment on attachment 204975 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ View in context: https://bugs.webkit.org/attachment.cgi?id=204975&action=review > Source/WebCore/ChangeLog:6 > + Reviewed by (OOPS!! NOBODY). It is because this line is badly formatted. Add Dean's name here and reupload. Then request only cq, not review. 907293 14 206371 k.swiniarsk2 2013-07-10 00:11:44 -0700 Created attachment 206371 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ the old one didn't have reviewer put inside attached new patch 907298 15 206371 commit-queue 2013-07-10 00:42:36 -0700 Comment on attachment 206371 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ Clearing flags on attachment: 206371 Committed r152527: <http://trac.webkit.org/changeset/152527> 907299 16 commit-queue 2013-07-10 00:42:40 -0700 All reviewed patches have been landed. Closing bug. 204975 2013-06-19 01:46:05 -0700 2013-07-10 00:11:44 -0700 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ extensions.patch text/plain 3955 k.swiniarsk2 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNWY4MTQzLi41MjZmYTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTMtMDYtMTggIEthcm9sIMWad2luaWFyc2tpICA8ay5zd2luaWFyc2syQHNhbXN1bmcu Y29tPgorCisgICAgICAgIENoYW5nZSByZWNlbnRseSByYXRpZmllZCBleHRlbnNpb25zIHByZWZp eGVzIGZyb20gV0VCS0lUX1dFQkdMXyB0byBXRUJHTF8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzc4NgorCisgICAgICAgIFJldmlld2VkIGJ5IChP T1BTISEgTk9CT0RZKS4KKworICAgICAgICBBY2NvcmRpbmcgdG8gV2ViR0wncyByZXZpc2lvbiAx MCwgZXh0ZW5zaW9ucyBzaG91bGQgYmUgbmFtZWQ6IFdFQkdMX2xvc2VfY29udGV4dCwKKyAgICAg ICAgV0VCR0xfZGVwdGhfdGV4dHVyZSwgV0VCR0xfY29tcHJlc3NlZF90ZXh0dXJlX3MzdGMuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzOgorICAgICAg ICBMYXlvdXRUZXN0cy93ZWJnbC9jb25mb3JtYW5jZS9leHRlbnNpb25zL2dldC1leHRlbnNpb24u aHRtbAorICAgICAgICBMYXlvdXRUZXN0cy93ZWJnbC9jb25mb3JtYW5jZS9jb250ZXh0L2NvbnRl eHQtbG9zdC5odG1sCisgICAgICAgIExheW91dFRlc3RzL3dlYmdsL2NvbmZvcm1hbmNlL2V4dGVu c2lvbnMvd2ViZ2wtZGVwdGgtdGV4dHVyZS5odG1sCisgICAgICAgIExheW91dFRlc3RzL3dlYmds L2NvbmZvcm1hbmNlL2V4dGVuc2lvbnMvd2ViZ2wtY29tcHJlc3NlZC10ZXh0dXJlLXMzdGMuaHRt bAorCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0RXh0ZW5zaW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U3VwcG9ydGVkRXh0ZW5z aW9ucyk6CisKIDIwMTMtMDYtMTggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgSW5wdXQgdHlwZSByYW5nZSBzbGlkZXIgaXMgbm90IHVwZGF0ZWQgd2hlbiBtaW4g b3IgbWF4IGFyZSBjaGFuZ2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCBhZTY5YmQ5Li4xOTJhMmU1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5j cHAKQEAgLTI0MDksMTEgKzI0MDksNyBAQCBXZWJHTEV4dGVuc2lvbiogV2ViR0xSZW5kZXJpbmdD b250ZXh0OjpnZXRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBuYW1lKQogICAgICAgICB9CiAgICAg ICAgIHJldHVybiBtX29lc0VsZW1lbnRJbmRleFVpbnQuZ2V0KCk7CiAgICAgfQotICAgIGlmIChl cXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCR0xfbG9zZV9jb250ZXh0IikKLSAgICAgICAgLy8g RklYTUU6IHJlbW92ZSB0aGlzIGFmdGVyIGEgY2VydGFpbiBncmFjZSBwZXJpb2QuCi0gICAgICAg IHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJXRUJLSVRfV0VCR0xfbG9zZV9jb250ZXh0IikK LSAgICAgICAgLy8gRklYTUU6IElzIGl0IHNhZmUgdG8gcmVtb3ZlIFdFQktJVF9sb3NlX2NvbnRl eHQgbm93PwotICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCS0lUX2xvc2Vf Y29udGV4dCIpKSB7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJXRUJHTF9sb3Nl X2NvbnRleHQiKSkgewogICAgICAgICBpZiAoIW1fd2ViZ2xMb3NlQ29udGV4dCkKICAgICAgICAg ICAgIG1fd2ViZ2xMb3NlQ29udGV4dCA9IFdlYkdMTG9zZUNvbnRleHQ6OmNyZWF0ZSh0aGlzKTsK ICAgICAgICAgcmV0dXJuIG1fd2ViZ2xMb3NlQ29udGV4dC5nZXQoKTsKQEAgLTI0MjksMTcgKzI0 MjUsMTMgQEAgV2ViR0xFeHRlbnNpb24qIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0RXh0ZW5z aW9uKGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICAgICAgaWYgKCFtX3dlYmdsQ29tcHJlc3NlZFRl eHR1cmVQVlJUQykKICAgICAgICAgICAgIG1fd2ViZ2xDb21wcmVzc2VkVGV4dHVyZVBWUlRDID0g V2ViR0xDb21wcmVzc2VkVGV4dHVyZVBWUlRDOjpjcmVhdGUodGhpcyk7CiAgICAgfQotICAgIGlm ICgoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQkdMX2NvbXByZXNzZWRfdGV4dHVyZV9zM3Rj IikKLSAgICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBhZnRlciBhIGNlcnRhaW4gZ3JhY2Ug cGVyaW9kLgotICAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQktJVF9XRUJH TF9jb21wcmVzc2VkX3RleHR1cmVfczN0YyIpKQorICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShu YW1lLCAiV0VCR0xfY29tcHJlc3NlZF90ZXh0dXJlX3MzdGMiKQogICAgICAgICAmJiBXZWJHTENv bXByZXNzZWRUZXh0dXJlUzNUQzo6c3VwcG9ydGVkKHRoaXMpKSB7CiAgICAgICAgIGlmICghbV93 ZWJnbENvbXByZXNzZWRUZXh0dXJlUzNUQykKICAgICAgICAgICAgIG1fd2ViZ2xDb21wcmVzc2Vk VGV4dHVyZVMzVEMgPSBXZWJHTENvbXByZXNzZWRUZXh0dXJlUzNUQzo6Y3JlYXRlKHRoaXMpOwog ICAgICAgICByZXR1cm4gbV93ZWJnbENvbXByZXNzZWRUZXh0dXJlUzNUQy5nZXQoKTsKICAgICB9 Ci0gICAgaWYgKChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCR0xfZGVwdGhfdGV4dHVyZSIp Ci0gICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBhZnRlciBhIGNlcnRhaW4gZ3JhY2UgcGVy aW9kLgotICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCS0lUX1dFQkdMX2Rl cHRoX3RleHR1cmUiKSkKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQkdMX2Rl cHRoX3RleHR1cmUiKQogICAgICAgICAmJiBXZWJHTERlcHRoVGV4dHVyZTo6c3VwcG9ydGVkKGdy YXBoaWNzQ29udGV4dDNEKCkpKSB7CiAgICAgICAgIGlmICghbV93ZWJnbERlcHRoVGV4dHVyZSkg ewogICAgICAgICAgICAgbV9jb250ZXh0LT5nZXRFeHRlbnNpb25zKCktPmVuc3VyZUVuYWJsZWQo IkdMX0NIUk9NSVVNX2RlcHRoX3RleHR1cmUiKTsKQEAgLTI5NjIsOSArMjk1NCw5IEBAIFZlY3Rv cjxTdHJpbmc+IFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U3VwcG9ydGVkRXh0ZW5zaW9ucygp CiAgICAgaWYgKFdlYkdMQ29tcHJlc3NlZFRleHR1cmVQVlJUQzo6c3VwcG9ydGVkKHRoaXMpKQog ICAgICAgICByZXN1bHQuYXBwZW5kKCJXRUJLSVRfV0VCR0xfY29tcHJlc3NlZF90ZXh0dXJlX3B2 cnRjIik7CiAgICAgaWYgKFdlYkdMQ29tcHJlc3NlZFRleHR1cmVTM1RDOjpzdXBwb3J0ZWQodGhp cykpCi0gICAgICAgIHJlc3VsdC5hcHBlbmQoIldFQktJVF9XRUJHTF9jb21wcmVzc2VkX3RleHR1 cmVfczN0YyIpOworICAgICAgICByZXN1bHQuYXBwZW5kKCJXRUJHTF9jb21wcmVzc2VkX3RleHR1 cmVfczN0YyIpOwogICAgIGlmIChXZWJHTERlcHRoVGV4dHVyZTo6c3VwcG9ydGVkKGdyYXBoaWNz Q29udGV4dDNEKCkpKQotICAgICAgICByZXN1bHQuYXBwZW5kKCJXRUJLSVRfV0VCR0xfZGVwdGhf dGV4dHVyZSIpOworICAgICAgICByZXN1bHQuYXBwZW5kKCJXRUJHTF9kZXB0aF90ZXh0dXJlIik7 CiAgICAgaWYgKHN1cHBvcnRzRHJhd0J1ZmZlcnMoKSkKICAgICAgICAgcmVzdWx0LmFwcGVuZCgi RVhUX2RyYXdfYnVmZmVycyIpOwogCg== 206371 2013-07-10 00:11:44 -0700 2013-07-10 00:42:36 -0700 Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_ 0001-Change-recently-ratified-extensions-prefixes-from-WE.patch text/plain 3955 k.swiniarsk2 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNTk2ODJlLi4yMjk1NzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTMtMDctMTAgIEthcm9sIMWad2luaWFyc2tpICA8ay5zd2luaWFyc2syQHNhbXN1bmcu Y29tPgorCisgICAgICAgIENoYW5nZSByZWNlbnRseSByYXRpZmllZCBleHRlbnNpb25zIHByZWZp eGVzIGZyb20gV0VCS0lUX1dFQkdMXyB0byBXRUJHTF8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzc4NgorCisgICAgICAgIFJldmlld2VkIGJ5IERl YW4gSmFja3Nvbi4KKworICAgICAgICBBY2NvcmRpbmcgdG8gV2ViR0wncyByZXZpc2lvbiAxMCwg ZXh0ZW5zaW9ucyBzaG91bGQgYmUgbmFtZWQ6IFdFQkdMX2xvc2VfY29udGV4dCwKKyAgICAgICAg V0VCR0xfZGVwdGhfdGV4dHVyZSwgV0VCR0xfY29tcHJlc3NlZF90ZXh0dXJlX3MzdGMuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLiBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzOgorICAgICAgICBM YXlvdXRUZXN0cy93ZWJnbC9jb25mb3JtYW5jZS9leHRlbnNpb25zL2dldC1leHRlbnNpb24uaHRt bAorICAgICAgICBMYXlvdXRUZXN0cy93ZWJnbC9jb25mb3JtYW5jZS9jb250ZXh0L2NvbnRleHQt bG9zdC5odG1sCisgICAgICAgIExheW91dFRlc3RzL3dlYmdsL2NvbmZvcm1hbmNlL2V4dGVuc2lv bnMvd2ViZ2wtZGVwdGgtdGV4dHVyZS5odG1sCisgICAgICAgIExheW91dFRlc3RzL3dlYmdsL2Nv bmZvcm1hbmNlL2V4dGVuc2lvbnMvd2ViZ2wtY29tcHJlc3NlZC10ZXh0dXJlLXMzdGMuaHRtbAor CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0RXh0ZW5zaW9uKToKKyAgICAg ICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U3VwcG9ydGVkRXh0ZW5zaW9u cyk6CisKIDIwMTMtMDctMDkgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNv bT4KIAogICAgICAgICBJbnRyb2R1Y2UgaXNTVkdGb250RWxlbWVudCgpIGFuZCBpc1NWR0ltYWdl RWxlbWVudCgpLCB1c2UgdGhlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggYzliMTE2ZS4uOTBiZWI2OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQu Y3BwCkBAIC0yNDA1LDExICsyNDA1LDcgQEAgV2ViR0xFeHRlbnNpb24qIFdlYkdMUmVuZGVyaW5n Q29udGV4dDo6Z2V0RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICAgICAgfQogICAg ICAgICByZXR1cm4gbV9vZXNFbGVtZW50SW5kZXhVaW50LmdldCgpOwogICAgIH0KLSAgICBpZiAo ZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQkdMX2xvc2VfY29udGV4dCIpCi0gICAgICAgIC8v IEZJWE1FOiByZW1vdmUgdGhpcyBhZnRlciBhIGNlcnRhaW4gZ3JhY2UgcGVyaW9kLgotICAgICAg ICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCS0lUX1dFQkdMX2xvc2VfY29udGV4dCIp Ci0gICAgICAgIC8vIEZJWE1FOiBJcyBpdCBzYWZlIHRvIHJlbW92ZSBXRUJLSVRfbG9zZV9jb250 ZXh0IG5vdz8KLSAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQktJVF9sb3Nl X2NvbnRleHQiKSkgeworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAiV0VCR0xfbG9z ZV9jb250ZXh0IikpIHsKICAgICAgICAgaWYgKCFtX3dlYmdsTG9zZUNvbnRleHQpCiAgICAgICAg ICAgICBtX3dlYmdsTG9zZUNvbnRleHQgPSBXZWJHTExvc2VDb250ZXh0OjpjcmVhdGUodGhpcyk7 CiAgICAgICAgIHJldHVybiBtX3dlYmdsTG9zZUNvbnRleHQuZ2V0KCk7CkBAIC0yNDI1LDE3ICsy NDIxLDEzIEBAIFdlYkdMRXh0ZW5zaW9uKiBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldEV4dGVu c2lvbihjb25zdCBTdHJpbmcmIG5hbWUpCiAgICAgICAgIGlmICghbV93ZWJnbENvbXByZXNzZWRU ZXh0dXJlUFZSVEMpCiAgICAgICAgICAgICBtX3dlYmdsQ29tcHJlc3NlZFRleHR1cmVQVlJUQyA9 IFdlYkdMQ29tcHJlc3NlZFRleHR1cmVQVlJUQzo6Y3JlYXRlKHRoaXMpOwogICAgIH0KLSAgICBp ZiAoKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJXRUJHTF9jb21wcmVzc2VkX3RleHR1cmVfczN0 YyIpCi0gICAgICAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMgYWZ0ZXIgYSBjZXJ0YWluIGdyYWNl IHBlcmlvZC4KLSAgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJXRUJLSVRfV0VC R0xfY29tcHJlc3NlZF90ZXh0dXJlX3MzdGMiKSkKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo bmFtZSwgIldFQkdMX2NvbXByZXNzZWRfdGV4dHVyZV9zM3RjIikKICAgICAgICAgJiYgV2ViR0xD b21wcmVzc2VkVGV4dHVyZVMzVEM6OnN1cHBvcnRlZCh0aGlzKSkgewogICAgICAgICBpZiAoIW1f d2ViZ2xDb21wcmVzc2VkVGV4dHVyZVMzVEMpCiAgICAgICAgICAgICBtX3dlYmdsQ29tcHJlc3Nl ZFRleHR1cmVTM1RDID0gV2ViR0xDb21wcmVzc2VkVGV4dHVyZVMzVEM6OmNyZWF0ZSh0aGlzKTsK ICAgICAgICAgcmV0dXJuIG1fd2ViZ2xDb21wcmVzc2VkVGV4dHVyZVMzVEMuZ2V0KCk7CiAgICAg fQotICAgIGlmICgoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQkdMX2RlcHRoX3RleHR1cmUi KQotICAgICAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMgYWZ0ZXIgYSBjZXJ0YWluIGdyYWNlIHBl cmlvZC4KLSAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgIldFQktJVF9XRUJHTF9k ZXB0aF90ZXh0dXJlIikpCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJXRUJHTF9k ZXB0aF90ZXh0dXJlIikKICAgICAgICAgJiYgV2ViR0xEZXB0aFRleHR1cmU6OnN1cHBvcnRlZChn cmFwaGljc0NvbnRleHQzRCgpKSkgewogICAgICAgICBpZiAoIW1fd2ViZ2xEZXB0aFRleHR1cmUp IHsKICAgICAgICAgICAgIG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5lbnN1cmVFbmFibGVk KCJHTF9DSFJPTUlVTV9kZXB0aF90ZXh0dXJlIik7CkBAIC0yOTU4LDkgKzI5NTAsOSBAQCBWZWN0 b3I8U3RyaW5nPiBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFN1cHBvcnRlZEV4dGVuc2lvbnMo KQogICAgIGlmIChXZWJHTENvbXByZXNzZWRUZXh0dXJlUFZSVEM6OnN1cHBvcnRlZCh0aGlzKSkK ICAgICAgICAgcmVzdWx0LmFwcGVuZCgiV0VCS0lUX1dFQkdMX2NvbXByZXNzZWRfdGV4dHVyZV9w dnJ0YyIpOwogICAgIGlmIChXZWJHTENvbXByZXNzZWRUZXh0dXJlUzNUQzo6c3VwcG9ydGVkKHRo aXMpKQotICAgICAgICByZXN1bHQuYXBwZW5kKCJXRUJLSVRfV0VCR0xfY29tcHJlc3NlZF90ZXh0 dXJlX3MzdGMiKTsKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgiV0VCR0xfY29tcHJlc3NlZF90ZXh0 dXJlX3MzdGMiKTsKICAgICBpZiAoV2ViR0xEZXB0aFRleHR1cmU6OnN1cHBvcnRlZChncmFwaGlj c0NvbnRleHQzRCgpKSkKLSAgICAgICAgcmVzdWx0LmFwcGVuZCgiV0VCS0lUX1dFQkdMX2RlcHRo X3RleHR1cmUiKTsKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgiV0VCR0xfZGVwdGhfdGV4dHVyZSIp OwogICAgIGlmIChzdXBwb3J0c0RyYXdCdWZmZXJzKCkpCiAgICAgICAgIHJlc3VsdC5hcHBlbmQo IkVYVF9kcmF3X2J1ZmZlcnMiKTsKCg==