89545 2012-06-19 20:07:01 -0700 [Chromium] Missing setCookieEnabled accessor in WebView 2012-06-20 16:50:15 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gdk gdk abarth dglazkov eric.carlson feature-media-reviews fishd jamesr jochen mihaip tkent+wkapi webkit.review.bot oldest_to_newest 653119 0 gdk 2012-06-19 20:07:01 -0700 There's currently no way of modifying the cookieEnabled state of a Page, which is leading to a lot of DOM Exception 18s for renderers that haven't disabled cookies when they should have. 653125 1 148492 gdk 2012-06-19 20:18:12 -0700 Created attachment 148492 Patch 653126 2 webkit.review.bot 2012-06-19 20:21:08 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 653127 3 webkit.review.bot 2012-06-19 20:21:31 -0700 Attachment 148492 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/public/WebView.h:490: The parameter name "enabled" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/chromium/src/WebViewImpl.h:573: The parameter name "enabled" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 653144 4 148492 abarth 2012-06-19 20:35:50 -0700 Comment on attachment 148492 Patch This patch is OK, but a better patch would be to move the cookieEnabled setting to the Settings object. I did a quick look and this isn't used in many places, so it should be easy to move. Would you be willing to move it so we can put the API in the right place (i.e., WebSettings)? 653276 5 jochen 2012-06-20 01:01:06 -0700 What is this supposed to be used for? Maybe it should be an addition to the WebPermissionClient? 653490 6 gdk 2012-06-20 08:20:44 -0700 (In reply to comment #4) > (From update of attachment 148492 [details]) > This patch is OK, but a better patch would be to move the cookieEnabled setting to the Settings object. I did a quick look and this isn't used in many places, so it should be easy to move. Would you be willing to move it so we can put the API in the right place (i.e., WebSettings)? Absolutely! I'll update with a revised patch. 653597 7 abarth 2012-06-20 10:20:26 -0700 For context about jochen's question, we already have a mechanism for disabling cookies via the WebPermissionClient. I wonder whether that addresses your use case... 653600 8 148593 gdk 2012-06-20 10:22:18 -0700 Created attachment 148593 Patch 653607 9 mihaip 2012-06-20 10:24:00 -0700 (In reply to comment #7) > For context about jochen's question, we already have a mechanism for disabling cookies via the WebPermissionClient. I wonder whether that addresses your use case... We do? I'm not seeing any cookie-related methods on it. In general, is there a guidelines for what should go on WebSettings vs. WebPermissionClient? I see that JavaScript can be disabled by both, globally by WebSettings and in a more fine-grained level by WebPermissionClient. In this case, we'd like all cookies to be disabled for Chrome apps, so WebSettings seems like a better fit. 653633 10 abarth 2012-06-20 10:45:54 -0700 > We do? I'm not seeing any cookie-related methods on it. Oh, you're right. Sorry, the function is on http://trac.webkit.org/browser/trunk/Source/Platform/chromium/public/WebCookieJar.h > In general, is there a guidelines for what should go on WebSettings vs. WebPermissionClient? I see that JavaScript can be disabled by both, globally by WebSettings and in a more fine-grained level by WebPermissionClient. In this case, we'd like all cookies to be disabled for Chrome apps, so WebSettings seems like a better fit. We use WebPermissionClient when we need something fine-grained (e.g., depending on which Frame rather than which Page). It sounds like you want to disable things on a per-page basis, in which case WebSettings does sound appropriate (especially after we move this bool from Page to Settings). jochen might have further thoughts given that he's worked a bunch on cookie blocking. 653885 11 148593 abarth 2012-06-20 14:20:34 -0700 Comment on attachment 148593 Patch This patch looks good from a technical point of view. Let's give jochen a chance to comment before landing it. 653935 12 jochen 2012-06-20 15:18:25 -0700 ok, thanks for the clarification. the patch looks good. For the record, the difference of disabling javascript via settings vs. via webpermissionclient is that the former disables all javascript, whereas the latter only disables execution of javascript from the web page (but still allows content scripts injected by an extension etc) 654008 13 148593 webkit.review.bot 2012-06-20 16:50:09 -0700 Comment on attachment 148593 Patch Clearing flags on attachment: 148593 Committed r120885: <http://trac.webkit.org/changeset/120885> 654009 14 webkit.review.bot 2012-06-20 16:50:15 -0700 All reviewed patches have been landed. Closing bug. 148492 2012-06-19 20:18:12 -0700 2012-06-20 10:22:13 -0700 Patch bug-89545-20120619231811.patch text/plain 2724 gdk U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI2YzM3ZTFjOWE2Njk3MzM3NmUzZmE3OWNjNmI5ZWE1OTE0MzQ2MTIuLjk4MWZjMGIyNWM1OTVm NGNkNzA3MGYxODUwMzFlZGYwMDNmNzJjNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMDYtMTkgIEdhcnJldCBLZWxseSAgPGdka0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgRXhwb3Npbmcgc2V0Q29va2llRW5hYmxlZCBhbmQgY29va2llRW5hYmxl ZCBtZXRob2RzIHRvIFdlYlZpZXcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04OTU0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcHVibGljL1dlYlZpZXcuaDoKKyAgICAgICAgKFdlYlZpZXcpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBs Ojpjb29raWVFbmFibGVkKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpzZXRDb29raWVFbmFibGVkKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu aDoKKyAgICAgICAgKFdlYlZpZXdJbXBsKToKKwogMjAxMi0wNi0xOSAgS2VubmV0aCBSdXNzZWxs ICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEy MDc3Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcu aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA1NDJiMTAy MWE2NDQ2NWUzODZhYjQzZjRhY2NlM2IwZjgzNjFjZTkzLi40ZjFhZDBkODBmZjk3YWY0N2RhNjY2 NjY2YzgzOTAxZWQxOTdjNDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmll dy5oCkBAIC00ODQsNiArNDg0LDExIEBAIHB1YmxpYzoKICAgICAvLyBTaW11bGF0ZXMgYSBjb21w b3NpdG9yIGxvc3QgY29udGV4dC4KICAgICB2aXJ0dWFsIHZvaWQgbG9zZUNvbXBvc2l0b3JDb250 ZXh0KGludCBudW1UaW1lcykgPSAwOwogCisgICAgLy8gQ29va2llIGhhbmRsaW5nIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCisgICAgdmly dHVhbCBib29sIGNvb2tpZUVuYWJsZWQoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldENvb2tp ZUVuYWJsZWQoY29uc3QgYm9vbCBlbmFibGVkKSA9IDA7CisKIHByb3RlY3RlZDoKICAgICB+V2Vi VmlldygpIHt9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IDY3YjdjMDQxZTYyODM1MjZiMDcwZWNlYWE5MWQ4NDkxYjI3OTRhNzUuLjM1NDg2YTc1 NzE3ZjExOTBlNWRhYTUwNTJmZWMwZTNhYzg2NDJiNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTM3MjksNCArMzcyOSwxNyBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpwb2ludGVyTG9ja01vdXNlRXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYgZXZlbnQp CiB9CiAjZW5kaWYKIAorYm9vbCBXZWJWaWV3SW1wbDo6Y29va2llRW5hYmxlZCgpCit7CisgICAg aWYgKHBhZ2UoKSkKKyAgICAgICAgcmV0dXJuIHBhZ2UoKS0+Y29va2llRW5hYmxlZCgpOworICAg IHJldHVybiBmYWxzZTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6c2V0Q29va2llRW5hYmxlZChj b25zdCBib29sIGVuYWJsZWQpCit7CisgICAgaWYgKHBhZ2UoKSkKKyAgICAgICAgcGFnZSgpLT5z ZXRDb29raWVFbmFibGVkKGVuYWJsZWQpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDRmNWMwNDhkOTc3NDJh ZDU5YjE1ZWNiMzQzZDg1YzhkM2EwMzE4NmYuLjg1ODgyNWQxOTU0ODBmNWY5NzYzNGU5NjIwMzdj MzUwOTI4ZTRlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApA QCAtNTY5LDYgKzU2OSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNQb2ludGVyTG9j a2VkKCk7CiAjZW5kaWYKIAorICAgIHZpcnR1YWwgYm9vbCBjb29raWVFbmFibGVkKCk7CisgICAg dmlydHVhbCB2b2lkIHNldENvb2tpZUVuYWJsZWQoY29uc3QgYm9vbCBlbmFibGVkKTsKKwogcHJp dmF0ZToKICAgICBib29sIGNvbXB1dGVQYWdlU2NhbGVGYWN0b3JMaW1pdHMoKTsKICAgICBmbG9h dCBjbGFtcFBhZ2VTY2FsZUZhY3RvclRvTGltaXRzKGZsb2F0IHNjYWxlKTsK 148593 2012-06-20 10:22:18 -0700 2012-06-20 16:50:09 -0700 Patch bug-89545-20120620132218.patch text/plain 11428 gdk U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FkM2Q0NWJmZWU1OTRh YTBhMjg3NmIwYTFkZjg4NDZhZTc2OTU2My4uNjliNDA4MjZiOGE0NGNkZDlmMGJiYzhlMGFhNDhk ZDA4MTk1ODI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTIwICBHYXJy ZXQgS2VsbHkgIDxnZGtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmluZyBjb29raWVFbmFi bGVkL3NldENvb2tpZUVuYWJsZWQgZnJvbSBQYWdlIHRvIFNldHRpbmdzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1NDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6Y29va2llKToKKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50OjpzZXRDb29raWUpOgorICAgICAgICAqIHBhZ2UvTmF2aWdhdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok5hdmlnYXRvcjo6Y29va2llRW5hYmxlZCk6CisgICAgICAgICogcGFnZS9Q YWdlLmg6CisgICAgICAgIChQYWdlKToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6CisgICAgICAgICogcGFnZS9TZXR0 aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNldENvb2tpZUVuYWJsZWQpOgor ICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmNvb2tpZUVuYWJsZWQpOgorICAgICAgICAoU2V0 dGluZ3MpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZh dGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQ6OnNldFVwQ29va2llc0ZvclF1aWNrVGlt ZSk6CisKIDIwMTItMDYtMTggIEpvb25lIEh1ciAgPGpvb25lLmh1ckBpbnRlbC5jb20+CiAKICAg ICAgICAgW0VGTF0gRm9udGNvbmZpZyBjYW4ndCBiZSBsaW5rZWQgcHJvcGVybHkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKaW5kZXggOTk5MmUyOGU3MTM4OTA5ZTEyNTBlMGIyNjA2MGZkMjUwYWNj ODQ0NS4uY2U4ZDgyMTk2ZjQ4YmQ0YWI2NjVmMDYwYWIwYmM0OTRiYTNjMzJmNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNi0yMCAgR2FycmV0IEtl bGx5ICA8Z2RrQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZpbmcgY29va2llRW5hYmxlZC9z ZXRDb29raWVFbmFibGVkIGZyb20gUGFnZSB0byBTZXR0aW5ncywgYW5kCisgICAgICAgIGV4cG9z aW5nIHRocm91Z2ggV2ViU2V0dGluZ3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04OTU0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcHVibGljL1dlYlNldHRpbmdzLmg6CisgICAgICAgICogc3JjL1dl YlNldHRpbmdzSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0 Q29va2llRW5hYmxlZCk6CisgICAgICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5oOgorICAgICAg ICAoV2ViU2V0dGluZ3NJbXBsKToKKwogMjAxMi0wNi0xOCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gR2VzdHVyZVBpbmNoQmVnaW4gYW5kIGZy aWVuZHMgYXJlIGdlc3R1cmUgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMDg1YmJmMWVhYWY4 ZDBlNTlmZDIxOTI2ZDAyNTc5ODQ0NTRjN2NkNC4uZTI5ZmFmMDI1MzgyYmRhZTY4OTZlYzI1OTkz MGZkMmVkNmZjZDdlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA2 LTIwICBHYXJyZXQgS2VsbHkgIDxnZGtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmluZyBj b29raWVFbmFibGVkL3NldENvb2tpZUVuYWJsZWQgZnJvbSBQYWdlIHRvIFNldHRpbmdzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfY29va2llRW5hYmxlZF0pOgorICAgICAgICAo LVtXZWJWaWV3IF9zZXRDb29raWVFbmFibGVkOl0pOgorCiAyMDEyLTA2LTE0ICBKaWEgUHUgIDxq cHVAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcmsgdGV4dCB3aXRoIHRleHQgYWx0ZXJuYXRpdmUg d2l0aCBibHVlIHVuZGVybGluZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBiYmJkYjc1YjViNDA2YmM5 MWJkMzU5YTliOGY2MGMwM2UzNDNlYTIwLi5kNzQ1NzNhYjI1OGMxYjVmMzdjZGUzM2EzNjQwOTRh ZDI0OWNkY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDYtMjAg IEdhcnJldCBLZWxseSAgPGdka0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTW92aW5nIGNvb2tp ZUVuYWJsZWQvc2V0Q29va2llRW5hYmxlZCBmcm9tIFBhZ2UgdG8gU2V0dGluZ3MuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTU0NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy5jcHA6Cisg ICAgICAgIChXZWJWaWV3OjpzZXRDb29raWVFbmFibGVkKToKKyAgICAgICAgKFdlYlZpZXc6OmNv b2tpZUVuYWJsZWQpOgorCiAyMDEyLTA2LTExICBLYXVzdHViaCBBdHJhd2Fsa2FyICA8a2F1c3R1 YmhAbW90b3JvbGEuY29tPgogCiAgICAgICAgIFtEUlRdIExUQzo6IGNvdW50ZXJWYWx1ZUZvckVs ZW1lbnRCeUlkKCkgY291bGQgYmUgbW92ZWQgdG8gSW50ZXJuYWxzLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKaW5kZXggYjkzYzZiMGE4NjQ4ZTUzMGQ3ZTJkZWRhMjVjYWU3ZTE1ODg1ZDc4MC4uODQx OGMwOTZmN2Q5YmIzNmIwZWI3NTk2ZTE3MTNlOTljZGNhMGY0NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCkBAIC00MTI2LDcgKzQxMjYsNyBAQCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIERvY3Vt ZW50Ojpvd25lckVsZW1lbnQoKSBjb25zdAogCiBTdHJpbmcgRG9jdW1lbnQ6OmNvb2tpZShFeGNl cHRpb25Db2RlJiBlYykgY29uc3QKIHsKLSAgICBpZiAocGFnZSgpICYmICFwYWdlKCktPmNvb2tp ZUVuYWJsZWQoKSkKKyAgICBpZiAocGFnZSgpICYmICFwYWdlKCktPnNldHRpbmdzKCktPmNvb2tp ZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCiAgICAgLy8gRklYTUU6IFRo ZSBIVE1MNSBET00gc3BlYyBzdGF0ZXMgdGhhdCB0aGlzIGF0dHJpYnV0ZSBjYW4gcmFpc2UgYW4K QEAgLTQxNDcsNyArNDE0Nyw3IEBAIFN0cmluZyBEb2N1bWVudDo6Y29va2llKEV4Y2VwdGlvbkNv ZGUmIGVjKSBjb25zdAogCiB2b2lkIERvY3VtZW50OjpzZXRDb29raWUoY29uc3QgU3RyaW5nJiB2 YWx1ZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgaWYgKHBhZ2UoKSAmJiAhcGFnZSgpLT5j b29raWVFbmFibGVkKCkpCisgICAgaWYgKHBhZ2UoKSAmJiAhcGFnZSgpLT5zZXR0aW5ncygpLT5j b29raWVFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJWE1FOiBUaGUgSFRN TDUgRE9NIHNwZWMgc3RhdGVzIHRoYXQgdGhpcyBhdHRyaWJ1dGUgY2FuIHJhaXNlIGFuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL05hdmlnYXRvci5jcHAKaW5kZXggM2FmNmYwN2U5ZmIxMGZjN2U0Y2UxMTM5ZGM0M2M3 NmUxYzUzZjgwNC4uMWFmMTViZTQ5MzNlMjU0NzUwYTMyYjZlZjYxZDQ0ZGZhMDU5NDNmZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9OYXZpZ2F0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvTmF2aWdhdG9yLmNwcApAQCAtMTE1LDggKzExNSw4IEBAIGJvb2wgTmF2aWdh dG9yOjpjb29raWVFbmFibGVkKCkgY29uc3QKIHsKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgCi0gICAgaWYgKG1fZnJhbWUtPnBhZ2UoKSAmJiAhbV9m cmFtZS0+cGFnZSgpLT5jb29raWVFbmFibGVkKCkpCisKKyAgICBpZiAobV9mcmFtZS0+cGFnZSgp ICYmICFtX2ZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCktPmNvb2tpZUVuYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIGNvb2tpZXNFbmFibGVkKG1fZnJhbWUtPmRv Y3VtZW50KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCBiNmRlZDgyODNlYWFmMTI1YWEyNGNkOGVhZTgw OTY4OWJiM2ZmMDBjLi4wODQxMGI0ZmYyNTUxZmU5OTNkMTczNTdlMzlhNGEzNTFiNDNhNWZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuaApAQCAtMjM3LDkgKzIzNyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgYm9vbCBpbkxvd1F1YWxpdHlJbWFnZUludGVycG9sYXRpb25Nb2RlKCkgY29uc3Q7CiAg ICAgICAgIHZvaWQgc2V0SW5Mb3dRdWFsaXR5SW1hZ2VJbnRlcnBvbGF0aW9uTW9kZShib29sID0g dHJ1ZSk7CiAKLSAgICAgICAgYm9vbCBjb29raWVFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9j b29raWVFbmFibGVkOyB9Ci0gICAgICAgIHZvaWQgc2V0Q29va2llRW5hYmxlZChib29sIGVuYWJs ZWQpIHsgbV9jb29raWVFbmFibGVkID0gZW5hYmxlZDsgfQotCiAgICAgICAgIGZsb2F0IG1lZGlh Vm9sdW1lKCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYVZvbHVtZTsgfQogICAgICAgICB2b2lkIHNl dE1lZGlhVm9sdW1lKGZsb2F0IHZvbHVtZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5k ZXggZDkzOWIyYzM4ODQxMzc4OTNmNDBkNTgyMzU5NDc2MmM0NjhiNTljYy4uZWRkM2Q3OTMxZDQ0 OGI0ZTYzZDgwZWJhZmFiZGY0MzViYjk3YWI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAK QEAgLTI3MCw2ICsyNzAsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAs IG1fbmVlZHNEaWRGaW5pc2hMb2FkT3JkZXJRdWlyayhmYWxzZSkKICAgICAsIG1fZml4ZWRQb3Np dGlvbkNyZWF0ZXNTdGFja2luZ0NvbnRleHQoZmFsc2UpCiAgICAgLCBtX3N5bmNYSFJJbkRvY3Vt ZW50c0VuYWJsZWQodHJ1ZSkKKyAgICAsIG1fY29va2llRW5hYmxlZCh0cnVlKQogICAgICwgbV93 aW5kb3dGb2N1c1Jlc3RyaWN0ZWQodHJ1ZSkKICAgICAsIG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNh bGx5VGltZXIodGhpcywgJlNldHRpbmdzOjpsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lckZp cmVkKQogICAgICwgbV9pbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vj b25kcyhkZWZhdWx0SW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29u ZHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKaW5kZXggYTAxN2Q4ZmUyMDIyMDNlY2Y3Yjg1NTQzZjM5 OTEwMmQ4NGFiYmM3ZS4uZDg0NmZhMDdhYzEwZTg5YTIyNjc3MDdiZjkwODhiZmEzYTJmNTlmZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtNTg2LDYgKzU4Niw5IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgc3RhdGljIGJvb2wgc2hvdWxkUmVzcGVjdFByaW9yaXR5SW5DU1NBdHRy aWJ1dGVTZXR0ZXJzKCk7CiAjZW5kaWYKIAorICAgICAgICB2b2lkIHNldENvb2tpZUVuYWJsZWQo Ym9vbCBlbmFibGVkKSB7IG1fY29va2llRW5hYmxlZCA9IGVuYWJsZWQ7IH0KKyAgICAgICAgYm9v bCBjb29raWVFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9jb29raWVFbmFibGVkOyB9CisKICAg ICBwcml2YXRlOgogICAgICAgICBTZXR0aW5ncyhQYWdlKik7CiAKQEAgLTc1MCw2ICs3NTMsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgYm9vbCBtX2ZpeGVkUG9zaXRpb25DcmVh dGVzU3RhY2tpbmdDb250ZXh0IDogMTsKICAgICAgICAgYm9vbCBtX3N5bmNYSFJJbkRvY3VtZW50 c0VuYWJsZWQgOiAxOworICAgICAgICBib29sIG1fY29va2llRW5hYmxlZCA6IDE7CiAKICAgICAg ICAgYm9vbCBtX3dpbmRvd0ZvY3VzUmVzdHJpY3RlZCA6IDE7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1Rp bWVWaXN1YWxDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcAppbmRleCA3ZDlk Y2FmZTY2N2Y1NzMzNzRjYmVhYTVhNjNlY2Q3ZGIwMjI4MzIyLi4xMzA0OTYzMDRkN2YyN2JlNmNm NWI4NWQ0NWEyZmI3NTA2YmMwMTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlzdWFsQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVy UHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuY3BwCkBAIC0yNjMsNyArMjYzLDcgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0OjpzZXRVcENvb2tpZXNG b3JRdWlja1RpbWUoY29uc3QgU3QKICAgICAvLyBkb3dubG9hZCB0aGUgbW92aWUgaW50byBXaW5J bmV0IGJlZm9yZSBhc2tpbmcgUXVpY2tUaW1lIHRvIG9wZW4gaXQuCiAgICAgRG9jdW1lbnQqIGRv Y3VtZW50ID0gbV9wbGF5ZXItPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyT3duaW5n RG9jdW1lbnQoKTsKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudCA/IGRvY3VtZW50LT5mcmFt ZSgpIDogMDsKLSAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+cGFnZSgpIHx8ICFmcmFtZS0+cGFn ZSgpLT5jb29raWVFbmFibGVkKCkpCisgICAgaWYgKCFmcmFtZSB8fCAhZnJhbWUtPnBhZ2UoKSB8 fCAhZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+Y29va2llRW5hYmxlZCgpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBLVVJMIG1vdmllVVJMID0gS1VSTChLVVJMKCksIHVybCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAppbmRleCAwNTI4ZDhlZjRlYWJj NmZmOGQ3ZTI3MDgxNDIwYWZhMDZkYzkyMDVhLi5iYWI1YzM4ZGMwOGM2MjUwOTlmMTUxMTkwNDM2 YWUxZDhjOTAxNmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRp bmdzLmgKQEAgLTE1NCw2ICsxNTQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldE1h eFVudGlsZWRMYXllclNpemUoV2ViU2l6ZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhl ZFBvc2l0aW9uQ3JlYXRlc1N0YWNraW5nQ29udGV4dChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIHNldFN5bmNYSFJJbkRvY3VtZW50c0VuYWJsZWQoYm9vbCkgPSAwOworICAgIHZpcnR1YWwg dm9pZCBzZXRDb29raWVFbmFibGVkKGJvb2wpID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBmb3Jj ZVNvZnR3YXJlQ29tcG9zaXRpbmcoKSBjb25zdCA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCmluZGV4IDVmODc3NmI1OGEzNTg4NWE5YWE1 MjJlNTY5NTNjNGIwZGRiYmExNmMuLjQzYzQzM2MzMDY0MjQ5YTE1YmUyMjJmY2U5NzRlMzU3ZTEz MzUzODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdz SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBs LmNwcApAQCAtNjIyLDUgKzYyMiw5IEBAIHZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTeW5jWEhS SW5Eb2N1bWVudHNFbmFibGVkKGJvb2wgZW5hYmxlZCkKICAgICBtX3NldHRpbmdzLT5zZXRTeW5j WEhSSW5Eb2N1bWVudHNFbmFibGVkKGVuYWJsZWQpOwogfQogCit2b2lkIFdlYlNldHRpbmdzSW1w bDo6c2V0Q29va2llRW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgbV9zZXR0aW5ncy0+c2V0 Q29va2llRW5hYmxlZChlbmFibGVkKTsKK30KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCmluZGV4IDJiNThjMDQ0 M2I5ZjEwNzdjYTI0ODdiNzAyNjdkMDU0MWM1ZGRiODguLjlhNjVjMmFjNmFkOWIzN2U5MTU3N2Fm MTI1MWNkMTQ3OTgzYTMzMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl dHRpbmdzSW1wbC5oCkBAIC0xNDksNiArMTQ5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBzZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShib29sKTsKICAgICB2aXJ0dWFs IGJvb2wgdmlld3BvcnRFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV92aWV3cG9ydEVuYWJsZWQ7 IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0U3luY1hIUkluRG9jdW1lbnRzRW5hYmxlZChib29sKTsK KyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29va2llRW5hYmxlZChib29sKTsKIAogICAgIGJvb2wgc2hv d0ZQU0NvdW50ZXIoKSBjb25zdCB7IHJldHVybiBtX3Nob3dGUFNDb3VudGVyOyB9CiAgICAgYm9v bCBzaG93UGxhdGZvcm1MYXllclRyZWUoKSBjb25zdCB7IHJldHVybiBtX3Nob3dQbGF0Zm9ybUxh eWVyVHJlZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDE1MTEwOTQ1 ZTI0NTk4YzViYTNhMTJkZTdmMzZlZTNmNjczOTc5YTcuLjFjMjc0NDhlYzQ1MjJmNjc0MjgzNzJj Y2ZkMWU4NmM5MjI2ZWYwMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAg LTIyNDMsMTQgKzIyNDMsMTQgQEAgc3RhdGljIGlubGluZSBJTVAgZ2V0TWV0aG9kKGlkIG8sIFNF TCBzKQogLSAoQk9PTClfY29va2llRW5hYmxlZAogewogICAgIGlmIChfcHJpdmF0ZS0+cGFnZSkK LSAgICAgICAgcmV0dXJuIF9wcml2YXRlLT5wYWdlLT5jb29raWVFbmFibGVkKCk7CisgICAgICAg IHJldHVybiBfcHJpdmF0ZS0+cGFnZS0+c2V0dGluZ3MoKS0+Y29va2llRW5hYmxlZCgpOwogICAg IHJldHVybiBZRVM7CiB9CiAKIC0gKHZvaWQpX3NldENvb2tpZUVuYWJsZWQ6KEJPT0wpZW5hYmxl CiB7CiAgICAgaWYgKF9wcml2YXRlLT5wYWdlKQotICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0 Q29va2llRW5hYmxlZChlbmFibGUpOworICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0dGluZ3Mo KS0+c2V0Q29va2llRW5hYmxlZChlbmFibGUpOwogfQogCiAtICh2b2lkKV9zZXRBZGRpdGlvbmFs V2ViUGx1Z0luUGF0aHM6KE5TQXJyYXkgKiluZXdQYXRocwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAppbmRl eCBjYzJkZjMyOWI3ZDNhOTc0YzgwODdmZWIwMWZlYjc0MmIzM2M4MmIxLi43ZTM2ZDJlNzM5MThi OTJjY2MxNjQ4ZmVmNzAzNTAwMDkwMTUyOTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcApAQCAtNjAy MCw3ICs2MDIwLDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpzZXRDb29r aWVFbmFibGVkKEJPT0wgZW5hYmxlKQogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4g RV9GQUlMOwogCi0gICAgbV9wYWdlLT5zZXRDb29raWVFbmFibGVkKGVuYWJsZSk7CisgICAgbV9w YWdlLT5zZXR0aW5ncygpLT5zZXRDb29raWVFbmFibGVkKGVuYWJsZSk7CiAgICAgcmV0dXJuIFNf T0s7CiB9CiAKQEAgLTYwMzIsNyArNjAzMiw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg V2ViVmlldzo6Y29va2llRW5hYmxlZChCT09MKiBlbmFibGVkKQogICAgIGlmICghbV9wYWdlKQog ICAgICAgICByZXR1cm4gRV9GQUlMOwogCi0gICAgKmVuYWJsZWQgPSBtX3BhZ2UtPmNvb2tpZUVu YWJsZWQoKTsKKyAgICAqZW5hYmxlZCA9IG1fcGFnZS0+c2V0dGluZ3MoKS0+Y29va2llRW5hYmxl ZCgpOwogICAgIHJldHVybiBTX09LOwogfQogCg==