161187 2016-08-25 01:10:43 -0700 [GTK] Provide details on javascript exception 2017-05-30 20:22:12 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Linux RESOLVED FIXED P2 Normal --- 1 keijser webkit-unassigned berto bugs-noreply buildbot cgarcia commit-queue gustavo mcatanzaro webkit-bug-importer oldest_to_newest 1223008 0 keijser 2016-08-25 01:10:43 -0700 Running `webkit_web_view_run_javascript` with a script that fails the error object returned contains no information on what went wrong but only the message "An exception was raised in JavaScript". Having access to at least the javascript error message would help debugging a lot. 1311479 1 310896 keijser 2017-05-22 12:07:31 -0700 Created attachment 310896 Patch 1311481 2 buildbot 2017-05-22 12:10:36 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1311652 3 310896 mcatanzaro 2017-05-22 16:26:59 -0700 Comment on attachment 310896 Patch Wow nice, thanks! This looks perfect to me. I'll let this sit a day to give someone else a chance to review it too; please complain here if nobody else responds soon. Also, you probably want to set the cq? flag to request commit. 1311771 4 310896 cgarcia 2017-05-22 23:11:06 -0700 Comment on attachment 310896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310896&action=review Thanks for the patch. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:3139 > - _("An exception was raised in JavaScript")); > + _("An exception was raised in JavaScript: %s"), exceptionDetails.message.utf8().data()); Now that we have the error details, I think the prefix "An exception was raised in JavaScript" is kind of redundant, we know that from the error code WEBKIT_JAVASCRIPT_ERROR_SCRIPT_FAILED. I think we can use all the details to build a complete error message, consistent with messages shown by the inspector or stdout when setting enable-write-console-messages-to-stdout is enabled. If we have a url, then we add url with line and column, and then error message, if we don't have a url we just show the error message. You can see how the message is built in Source/JavaScriptCore/runtime/ConsoleClient.cpp 1311802 5 310990 keijser 2017-05-23 02:49:03 -0700 Created attachment 310990 Patch 1311804 6 keijser 2017-05-23 02:55:46 -0700 Thanks for the review, I have updated the patch. However I've noted that the sourceURL is always "undefined", line numbers works though. I'm not sure how to get that field properly populated. 1311811 7 cgarcia 2017-05-23 03:43:09 -0700 (In reply to David Keijser from comment #6) > Thanks for the review, I have updated the patch. > > However I've noted that the sourceURL is always "undefined", line numbers > works though. I'm not sure how to get that field properly populated. You mean it's empty or that it's the string "undefined"? It sounds like a bug, then. 1311813 8 310990 cgarcia 2017-05-23 03:44:29 -0700 Comment on attachment 310990 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310990&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:3152 > + builder.append(exceptionDetails.message.utf8().data()); Do not convert to utf8 here builder.append(exceptionDetails.message); 1311814 9 keijser 2017-05-23 03:49:01 -0700 it's always set and always the string "undefined", sry for the confusion :) 1312218 10 311106 keijser 2017-05-24 00:28:11 -0700 Created attachment 311106 Patch 1312291 11 311106 cgarcia 2017-05-24 10:10:10 -0700 Comment on attachment 311106 Patch We need to investigate why source URL is "undefined", but that's a different bug in any case. Could you file a new bug report or that, please? 1312370 12 mcatanzaro 2017-05-24 13:00:44 -0700 (In reply to Michael Catanzaro from comment #3) > Also, you probably want to set the cq? flag to request commit. 1312412 13 311106 commit-queue 2017-05-24 15:00:01 -0700 Comment on attachment 311106 Patch Clearing flags on attachment: 311106 Committed r217389: <http://trac.webkit.org/changeset/217389> 1312413 14 commit-queue 2017-05-24 15:00:03 -0700 All reviewed patches have been landed. Closing bug. 1312603 15 keijser 2017-05-25 03:59:16 -0700 I've created the issue https://bugs.webkit.org/show_bug.cgi?id=172587 310896 2017-05-22 12:07:31 -0700 2017-05-23 02:48:58 -0700 Patch bug-161187-20170522210729.patch text/plain 3958 keijser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmYwYmI5MTU0ZTE4NjMw M2RiNTBkNGYxMWVlNzY1YTYyNzk4YWMxZC4uMjUwYzFiODdiMzVlYjFjMTQ3NjkzYWQ5MGU3OGI5 NTVkMTNlMzE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA1LTIyICBEYXZp ZCBLZWlqc2VyICA8a2VpanNlckBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10gUHJvdmlkZSBk ZXRhaWxzIG9uIGphdmFzY3JpcHQgZXhjZXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjExODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwOgorICAgICAgICAod2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayk6CisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQpOgorICAgICAgICAocmVzb3VyY2Vz U3RyZWFtUmVhZENhbGxiYWNrKToKKwogMjAxNy0wNS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjE2OTc3KTogW0dU S10gRXBoZW1lcmFsIHNlc3Npb25zIGJyb2tlbiBhZnRlciByMjE2OTc3CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGVkZWY0 NTU5OGEwNmI2N2JkNWJjYWFmNjk0ODQ4NWJiODc4ZjhlNTguLjhjZmZkM2E2N2NjMTFiM2YzNzQ3 YTNhZmMxYWFlNjY3MmFmYmE3MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC02OSw2ICs2OSw3IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9HVW5pcXVlUHRyR3RrLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HVW5pcXVlUHRyU291 cC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3RrVXRpbGl0aWVzLmg+CisjaW5jbHVkZSA8V2ViQ29y ZS9KU0RPTUV4Y2VwdGlvbkhhbmRsaW5nLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZWZQdHJDYWly by5oPgogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1Jl ZlB0ci5oPgpAQCAtMzEyOCwxNCArMzEyOSwxNCBAQCBKU0dsb2JhbENvbnRleHRSZWYgd2Via2l0 X3dlYl92aWV3X2dldF9qYXZhc2NyaXB0X2dsb2JhbF9jb250ZXh0KFdlYktpdFdlYlZpZXcqCiAg ICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPmphdmFzY3JpcHRHbG9iYWxDb250ZXh0OwogfQogCi1z dGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQSTo6U2VyaWFs aXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgR1Rhc2sqIHRhc2spCitz dGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQSTo6U2VyaWFs aXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgY29uc3QgV2ViQ29yZTo6 RXhjZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywgR1Rhc2sqIHRhc2spCiB7CiAgICAg aWYgKGdfdGFza19yZXR1cm5fZXJyb3JfaWZfY2FuY2VsbGVkKHRhc2spKQogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAoIXdrU2VyaWFsaXplZFNjcmlwdFZhbHVlKSB7CiAgICAgICAgIGdfdGFz a19yZXR1cm5fbmV3X2Vycm9yKHRhc2ssIFdFQktJVF9KQVZBU0NSSVBUX0VSUk9SLCBXRUJLSVRf SkFWQVNDUklQVF9FUlJPUl9TQ1JJUFRfRkFJTEVELAotICAgICAgICAgICAgXygiQW4gZXhjZXB0 aW9uIHdhcyByYWlzZWQgaW4gSmF2YVNjcmlwdCIpKTsKKyAgICAgICAgICAgIF8oIkFuIGV4Y2Vw dGlvbiB3YXMgcmFpc2VkIGluIEphdmFTY3JpcHQ6ICVzIiksIGV4Y2VwdGlvbkRldGFpbHMubWVz c2FnZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzE2NSw4 ICszMTY2LDggQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQoV2ViS2l0V2Vi Vmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIHNjcmlwdCwKICAgICBnX3JldHVybl9pZl9mYWls KHNjcmlwdCk7CiAKICAgICBHVGFzayogdGFzayA9IGdfdGFza19uZXcod2ViVmlldywgY2FuY2Vs bGFibGUsIGNhbGxiYWNrLCB1c2VyRGF0YSk7Ci0gICAgZ2V0UGFnZSh3ZWJWaWV3KS0+cnVuSmF2 YVNjcmlwdEluTWFpbkZyYW1lKFN0cmluZzo6ZnJvbVVURjgoc2NyaXB0KSwgW3Rhc2tdKEFQSTo6 U2VyaWFsaXplZFNjcmlwdFZhbHVlKiBzZXJpYWxpemVkU2NyaXB0VmFsdWUsIGJvb2wsIGNvbnN0 IFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFpbHMmLCBXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3Ip IHsKLSAgICAgICAgd2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayhzZXJpYWxpemVk U2NyaXB0VmFsdWUsIGFkb3B0R1JlZih0YXNrKS5nZXQoKSk7CisgICAgZ2V0UGFnZSh3ZWJWaWV3 KS0+cnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKFN0cmluZzo6ZnJvbVVURjgoc2NyaXB0KSwgW3Rh c2tdKEFQSTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKiBzZXJpYWxpemVkU2NyaXB0VmFsdWUsIGJv b2wsIGNvbnN0IFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFpbHMmIGV4Y2VwdGlvbkRldGFpbHMsIFdl YktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcikgeworICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2 YVNjcmlwdENhbGxiYWNrKHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgZXhjZXB0aW9uRGV0YWlscywg YWRvcHRHUmVmKHRhc2spLmdldCgpKTsKICAgICB9KTsKIH0KIApAQCAtMzI1Niw4ICszMjU3LDgg QEAgc3RhdGljIHZvaWQgcmVzb3VyY2VzU3RyZWFtUmVhZENhbGxiYWNrKEdPYmplY3QqIG9iamVj dCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGcKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0g V0VCS0lUX1dFQl9WSUVXKGdfdGFza19nZXRfc291cmNlX29iamVjdCh0YXNrLmdldCgpKSk7CiAg ICAgZ3BvaW50ZXIgb3V0cHV0U3RyZWFtRGF0YSA9IGdfbWVtb3J5X291dHB1dF9zdHJlYW1fZ2V0 X2RhdGEoR19NRU1PUllfT1VUUFVUX1NUUkVBTShvYmplY3QpKTsKICAgICBnZXRQYWdlKHdlYlZp ZXcpLT5ydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoU3RyaW5nOjpmcm9tVVRGOChyZWludGVycHJl dF9jYXN0PGNvbnN0IGdjaGFyKj4ob3V0cHV0U3RyZWFtRGF0YSkpLAotICAgICAgICBbdGFza10o QVBJOjpTZXJpYWxpemVkU2NyaXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgYm9vbCwg Y29uc3QgV2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpF cnJvcikgewotICAgICAgICAgICAgd2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayhz ZXJpYWxpemVkU2NyaXB0VmFsdWUsIHRhc2suZ2V0KCkpOworICAgICAgICBbdGFza10oQVBJOjpT ZXJpYWxpemVkU2NyaXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgYm9vbCwgY29uc3Qg V2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywgV2ViS2l0OjpDYWxs YmFja0Jhc2U6OkVycm9yKSB7CisgICAgICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlw dENhbGxiYWNrKHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgZXhjZXB0aW9uRGV0YWlscywgdGFzay5n ZXQoKSk7CiAgICAgICAgIH0pOwogfQogCg== 310990 2017-05-23 02:49:03 -0700 2017-05-24 00:28:02 -0700 Patch bug-161187-20170523114901.patch text/plain 4644 keijser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmYwYmI5MTU0ZTE4NjMw M2RiNTBkNGYxMWVlNzY1YTYyNzk4YWMxZC4uMjUwYzFiODdiMzVlYjFjMTQ3NjkzYWQ5MGU3OGI5 NTVkMTNlMzE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA1LTIyICBEYXZp ZCBLZWlqc2VyICA8a2VpanNlckBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10gUHJvdmlkZSBk ZXRhaWxzIG9uIGphdmFzY3JpcHQgZXhjZXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjExODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwOgorICAgICAgICAod2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayk6CisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQpOgorICAgICAgICAocmVzb3VyY2Vz U3RyZWFtUmVhZENhbGxiYWNrKToKKwogMjAxNy0wNS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjE2OTc3KTogW0dU S10gRXBoZW1lcmFsIHNlc3Npb25zIGJyb2tlbiBhZnRlciByMjE2OTc3CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGVkZWY0 NTU5OGEwNmI2N2JkNWJjYWFmNjk0ODQ4NWJiODc4ZjhlNTguLjlmOWQ1MzI2YmZjYWU5YTJmZjIz MmM2YzkzODc3YTFhODk5OWQyNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC02OSwxMCArNjksMTIgQEAKICNpbmNsdWRl IDxXZWJDb3JlL0dVbmlxdWVQdHJHdGsuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dVbmlxdWVQdHJT b3VwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KKyNpbmNsdWRlIDxXZWJD b3JlL0pTRE9NRXhjZXB0aW9uSGFuZGxpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1JlZlB0ckNh aXJvLmg+CiAjaW5jbHVkZSA8Z2xpYi9naTE4bi1saWIuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9H UmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgorI2luY2x1ZGUgPHd0Zi90 ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogI2lmIFVTRShMSUJOT1RJRlkpCiAjaW5jbHVkZSA8bGli bm90aWZ5L25vdGlmeS5oPgpAQCAtMzEyOCwxNCArMzEzMCwyOCBAQCBKU0dsb2JhbENvbnRleHRS ZWYgd2Via2l0X3dlYl92aWV3X2dldF9qYXZhc2NyaXB0X2dsb2JhbF9jb250ZXh0KFdlYktpdFdl YlZpZXcqCiAgICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPmphdmFzY3JpcHRHbG9iYWxDb250ZXh0 OwogfQogCi1zdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQ STo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgR1Rhc2sq IHRhc2spCitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQ STo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgY29uc3Qg V2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywgR1Rhc2sqIHRhc2sp CiB7CiAgICAgaWYgKGdfdGFza19yZXR1cm5fZXJyb3JfaWZfY2FuY2VsbGVkKHRhc2spKQogICAg ICAgICByZXR1cm47CiAKICAgICBpZiAoIXdrU2VyaWFsaXplZFNjcmlwdFZhbHVlKSB7CisgICAg ICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICAgICAgaWYgKCFleGNlcHRpb25EZXRhaWxz LnNvdXJjZVVSTC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGV4Y2Vw dGlvbkRldGFpbHMuc291cmNlVVJMKTsKKyAgICAgICAgICAgIGlmIChleGNlcHRpb25EZXRhaWxz LmxpbmVOdW1iZXIgPiAwKSB7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoJzonKTsK KyAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE51bWJlcihleGNlcHRpb25EZXRhaWxzLmxp bmVOdW1iZXIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGV4Y2VwdGlvbkRldGFp bHMuY29sdW1uTnVtYmVyID4gMCkgeworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCc6 Jyk7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmROdW1iZXIoZXhjZXB0aW9uRGV0YWls cy5jb2x1bW5OdW1iZXIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCI6ICIpOworICAgICAgICB9CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGV4Y2Vw dGlvbkRldGFpbHMubWVzc2FnZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgZ190YXNrX3JldHVy bl9uZXdfZXJyb3IodGFzaywgV0VCS0lUX0pBVkFTQ1JJUFRfRVJST1IsIFdFQktJVF9KQVZBU0NS SVBUX0VSUk9SX1NDUklQVF9GQUlMRUQsCi0gICAgICAgICAgICBfKCJBbiBleGNlcHRpb24gd2Fz IHJhaXNlZCBpbiBKYXZhU2NyaXB0IikpOworICAgICAgICAgICAgIiVzIiwgYnVpbGRlci50b1N0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0zMTY1 LDggKzMxODEsOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19ydW5famF2YXNjcmlwdChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogc2NyaXB0LAogICAgIGdfcmV0dXJuX2lmX2Zh aWwoc2NyaXB0KTsKIAogICAgIEdUYXNrKiB0YXNrID0gZ190YXNrX25ldyh3ZWJWaWV3LCBjYW5j ZWxsYWJsZSwgY2FsbGJhY2ssIHVzZXJEYXRhKTsKLSAgICBnZXRQYWdlKHdlYlZpZXcpLT5ydW5K YXZhU2NyaXB0SW5NYWluRnJhbWUoU3RyaW5nOjpmcm9tVVRGOChzY3JpcHQpLCBbdGFza10oQVBJ OjpTZXJpYWxpemVkU2NyaXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgYm9vbCwgY29u c3QgV2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJv cikgewotICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKHNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZSwgYWRvcHRHUmVmKHRhc2spLmdldCgpKTsKKyAgICBnZXRQYWdlKHdlYlZp ZXcpLT5ydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoU3RyaW5nOjpmcm9tVVRGOChzY3JpcHQpLCBb dGFza10oQVBJOjpTZXJpYWxpemVkU2NyaXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwg Ym9vbCwgY29uc3QgV2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywg V2ViS2l0OjpDYWxsYmFja0Jhc2U6OkVycm9yKSB7CisgICAgICAgIHdlYmtpdFdlYlZpZXdSdW5K YXZhU2NyaXB0Q2FsbGJhY2soc2VyaWFsaXplZFNjcmlwdFZhbHVlLCBleGNlcHRpb25EZXRhaWxz LCBhZG9wdEdSZWYodGFzaykuZ2V0KCkpOwogICAgIH0pOwogfQogCkBAIC0zMjU2LDggKzMyNzIs OCBAQCBzdGF0aWMgdm9pZCByZXNvdXJjZXNTdHJlYW1SZWFkQ2FsbGJhY2soR09iamVjdCogb2Jq ZWN0LCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZwogICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcg PSBXRUJLSVRfV0VCX1ZJRVcoZ190YXNrX2dldF9zb3VyY2Vfb2JqZWN0KHRhc2suZ2V0KCkpKTsK ICAgICBncG9pbnRlciBvdXRwdXRTdHJlYW1EYXRhID0gZ19tZW1vcnlfb3V0cHV0X3N0cmVhbV9n ZXRfZGF0YShHX01FTU9SWV9PVVRQVVRfU1RSRUFNKG9iamVjdCkpOwogICAgIGdldFBhZ2Uod2Vi VmlldyktPnJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShTdHJpbmc6OmZyb21VVEY4KHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgZ2NoYXIqPihvdXRwdXRTdHJlYW1EYXRhKSksCi0gICAgICAgIFt0YXNr XShBUEk6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogc2VyaWFsaXplZFNjcmlwdFZhbHVlLCBib29s LCBjb25zdCBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzJiwgV2ViS2l0OjpDYWxsYmFja0Jhc2U6 OkVycm9yKSB7Ci0gICAgICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNr KHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgdGFzay5nZXQoKSk7CisgICAgICAgIFt0YXNrXShBUEk6 OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogc2VyaWFsaXplZFNjcmlwdFZhbHVlLCBib29sLCBjb25z dCBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzJiBleGNlcHRpb25EZXRhaWxzLCBXZWJLaXQ6OkNh bGxiYWNrQmFzZTo6RXJyb3IpIHsKKyAgICAgICAgICAgIHdlYmtpdFdlYlZpZXdSdW5KYXZhU2Ny aXB0Q2FsbGJhY2soc2VyaWFsaXplZFNjcmlwdFZhbHVlLCBleGNlcHRpb25EZXRhaWxzLCB0YXNr LmdldCgpKTsKICAgICAgICAgfSk7CiB9CiAK 311106 2017-05-24 00:28:11 -0700 2017-05-24 15:00:01 -0700 Patch bug-161187-20170524092809.patch text/plain 4630 keijser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmYwYmI5MTU0ZTE4NjMw M2RiNTBkNGYxMWVlNzY1YTYyNzk4YWMxZC4uMjUwYzFiODdiMzVlYjFjMTQ3NjkzYWQ5MGU3OGI5 NTVkMTNlMzE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA1LTIyICBEYXZp ZCBLZWlqc2VyICA8a2VpanNlckBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10gUHJvdmlkZSBk ZXRhaWxzIG9uIGphdmFzY3JpcHQgZXhjZXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjExODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwOgorICAgICAgICAod2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayk6CisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQpOgorICAgICAgICAocmVzb3VyY2Vz U3RyZWFtUmVhZENhbGxiYWNrKToKKwogMjAxNy0wNS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjE2OTc3KTogW0dU S10gRXBoZW1lcmFsIHNlc3Npb25zIGJyb2tlbiBhZnRlciByMjE2OTc3CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGVkZWY0 NTU5OGEwNmI2N2JkNWJjYWFmNjk0ODQ4NWJiODc4ZjhlNTguLmM4YjE4NzIxMTQ0OTM5MjQ4Njdh MWVhZTJiNmI2YzI5MzA1NmY2N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC02OSwxMCArNjksMTIgQEAKICNpbmNsdWRl IDxXZWJDb3JlL0dVbmlxdWVQdHJHdGsuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dVbmlxdWVQdHJT b3VwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KKyNpbmNsdWRlIDxXZWJD b3JlL0pTRE9NRXhjZXB0aW9uSGFuZGxpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1JlZlB0ckNh aXJvLmg+CiAjaW5jbHVkZSA8Z2xpYi9naTE4bi1saWIuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9H UmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgorI2luY2x1ZGUgPHd0Zi90 ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogI2lmIFVTRShMSUJOT1RJRlkpCiAjaW5jbHVkZSA8bGli bm90aWZ5L25vdGlmeS5oPgpAQCAtMzEyOCwxNCArMzEzMCwyOCBAQCBKU0dsb2JhbENvbnRleHRS ZWYgd2Via2l0X3dlYl92aWV3X2dldF9qYXZhc2NyaXB0X2dsb2JhbF9jb250ZXh0KFdlYktpdFdl YlZpZXcqCiAgICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPmphdmFzY3JpcHRHbG9iYWxDb250ZXh0 OwogfQogCi1zdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQ STo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgR1Rhc2sq IHRhc2spCitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKEFQ STo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKiB3a1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgY29uc3Qg V2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywgR1Rhc2sqIHRhc2sp CiB7CiAgICAgaWYgKGdfdGFza19yZXR1cm5fZXJyb3JfaWZfY2FuY2VsbGVkKHRhc2spKQogICAg ICAgICByZXR1cm47CiAKICAgICBpZiAoIXdrU2VyaWFsaXplZFNjcmlwdFZhbHVlKSB7CisgICAg ICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICAgICAgaWYgKCFleGNlcHRpb25EZXRhaWxz LnNvdXJjZVVSTC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGV4Y2Vw dGlvbkRldGFpbHMuc291cmNlVVJMKTsKKyAgICAgICAgICAgIGlmIChleGNlcHRpb25EZXRhaWxz LmxpbmVOdW1iZXIgPiAwKSB7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoJzonKTsK KyAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE51bWJlcihleGNlcHRpb25EZXRhaWxzLmxp bmVOdW1iZXIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGV4Y2VwdGlvbkRldGFp bHMuY29sdW1uTnVtYmVyID4gMCkgeworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCc6 Jyk7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmROdW1iZXIoZXhjZXB0aW9uRGV0YWls cy5jb2x1bW5OdW1iZXIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCI6ICIpOworICAgICAgICB9CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGV4Y2Vw dGlvbkRldGFpbHMubWVzc2FnZSk7CiAgICAgICAgIGdfdGFza19yZXR1cm5fbmV3X2Vycm9yKHRh c2ssIFdFQktJVF9KQVZBU0NSSVBUX0VSUk9SLCBXRUJLSVRfSkFWQVNDUklQVF9FUlJPUl9TQ1JJ UFRfRkFJTEVELAotICAgICAgICAgICAgXygiQW4gZXhjZXB0aW9uIHdhcyByYWlzZWQgaW4gSmF2 YVNjcmlwdCIpKTsKKyAgICAgICAgICAgICIlcyIsIGJ1aWxkZXIudG9TdHJpbmcoKS51dGY4KCku ZGF0YSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzE2NSw4ICszMTgxLDggQEAg dm9pZCB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQoV2ViS2l0V2ViVmlldyogd2ViVmll dywgY29uc3QgZ2NoYXIqIHNjcmlwdCwKICAgICBnX3JldHVybl9pZl9mYWlsKHNjcmlwdCk7CiAK ICAgICBHVGFzayogdGFzayA9IGdfdGFza19uZXcod2ViVmlldywgY2FuY2VsbGFibGUsIGNhbGxi YWNrLCB1c2VyRGF0YSk7Ci0gICAgZ2V0UGFnZSh3ZWJWaWV3KS0+cnVuSmF2YVNjcmlwdEluTWFp bkZyYW1lKFN0cmluZzo6ZnJvbVVURjgoc2NyaXB0KSwgW3Rhc2tdKEFQSTo6U2VyaWFsaXplZFNj cmlwdFZhbHVlKiBzZXJpYWxpemVkU2NyaXB0VmFsdWUsIGJvb2wsIGNvbnN0IFdlYkNvcmU6OkV4 Y2VwdGlvbkRldGFpbHMmLCBXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3IpIHsKLSAgICAgICAg d2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayhzZXJpYWxpemVkU2NyaXB0VmFsdWUs IGFkb3B0R1JlZih0YXNrKS5nZXQoKSk7CisgICAgZ2V0UGFnZSh3ZWJWaWV3KS0+cnVuSmF2YVNj cmlwdEluTWFpbkZyYW1lKFN0cmluZzo6ZnJvbVVURjgoc2NyaXB0KSwgW3Rhc2tdKEFQSTo6U2Vy aWFsaXplZFNjcmlwdFZhbHVlKiBzZXJpYWxpemVkU2NyaXB0VmFsdWUsIGJvb2wsIGNvbnN0IFdl YkNvcmU6OkV4Y2VwdGlvbkRldGFpbHMmIGV4Y2VwdGlvbkRldGFpbHMsIFdlYktpdDo6Q2FsbGJh Y2tCYXNlOjpFcnJvcikgeworICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxi YWNrKHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgZXhjZXB0aW9uRGV0YWlscywgYWRvcHRHUmVmKHRh c2spLmdldCgpKTsKICAgICB9KTsKIH0KIApAQCAtMzI1Niw4ICszMjcyLDggQEAgc3RhdGljIHZv aWQgcmVzb3VyY2VzU3RyZWFtUmVhZENhbGxiYWNrKEdPYmplY3QqIG9iamVjdCwgR0FzeW5jUmVz dWx0KiByZXN1bHQsIGcKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9W SUVXKGdfdGFza19nZXRfc291cmNlX29iamVjdCh0YXNrLmdldCgpKSk7CiAgICAgZ3BvaW50ZXIg b3V0cHV0U3RyZWFtRGF0YSA9IGdfbWVtb3J5X291dHB1dF9zdHJlYW1fZ2V0X2RhdGEoR19NRU1P UllfT1VUUFVUX1NUUkVBTShvYmplY3QpKTsKICAgICBnZXRQYWdlKHdlYlZpZXcpLT5ydW5KYXZh U2NyaXB0SW5NYWluRnJhbWUoU3RyaW5nOjpmcm9tVVRGOChyZWludGVycHJldF9jYXN0PGNvbnN0 IGdjaGFyKj4ob3V0cHV0U3RyZWFtRGF0YSkpLAotICAgICAgICBbdGFza10oQVBJOjpTZXJpYWxp emVkU2NyaXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgYm9vbCwgY29uc3QgV2ViQ29y ZTo6RXhjZXB0aW9uRGV0YWlscyYsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcikgewotICAg ICAgICAgICAgd2Via2l0V2ViVmlld1J1bkphdmFTY3JpcHRDYWxsYmFjayhzZXJpYWxpemVkU2Ny aXB0VmFsdWUsIHRhc2suZ2V0KCkpOworICAgICAgICBbdGFza10oQVBJOjpTZXJpYWxpemVkU2Ny aXB0VmFsdWUqIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSwgYm9vbCwgY29uc3QgV2ViQ29yZTo6RXhj ZXB0aW9uRGV0YWlscyYgZXhjZXB0aW9uRGV0YWlscywgV2ViS2l0OjpDYWxsYmFja0Jhc2U6OkVy cm9yKSB7CisgICAgICAgICAgICB3ZWJraXRXZWJWaWV3UnVuSmF2YVNjcmlwdENhbGxiYWNrKHNl cmlhbGl6ZWRTY3JpcHRWYWx1ZSwgZXhjZXB0aW9uRGV0YWlscywgdGFzay5nZXQoKSk7CiAgICAg ICAgIH0pOwogfQogCg==