99315 2012-10-15 05:58:02 -0700 Add GTK+ API to set a WebKitWebView in view source mode to WebKit2 2012-12-31 04:51:46 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned andersca darin eric gustavo gyuyoung.kim mario mrobinson rakuco sam xan.lopez oldest_to_newest 741979 0 cgarcia 2012-10-15 05:58:02 -0700 ssia 741988 1 168696 cgarcia 2012-10-15 06:08:31 -0700 Created attachment 168696 Patch 742012 2 168696 mario 2012-10-15 06:47:11 -0700 Comment on attachment 168696 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168696&action=review > Source/WebKit2/UIProcess/WebFrameProxy.h:111 > + bool inViewSourceMode() const { return m_inViewSourceMode; } What about implementing this method through a (new) message to the Web process that would end up calling coreFrame->inViewSourceMode() to get the actual state of the web view from the value of WebCore::Frame's m_inViewSourceMode? I know it's probably too much stuff for just keeping track of this property and that doing that in the UI process will probably be good enough, but that might change if in the future we decide to call WebCore::Frame::setInViewSourceMode() from somewhere else in WebCore. 742352 3 eric 2012-10-15 13:19:23 -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 742353 4 eric 2012-10-15 13:19:55 -0700 Attachment 168696 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 WARNING: File exempt from style guide. Skipping: "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h" Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:641: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:643: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:644: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:645: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:646: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:647: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 6 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 749204 5 mrobinson 2012-10-23 18:35:22 -0700 (In reply to comment #4) > Attachment 168696 [details] did not pass style-queue: I'm removing the [GTK] tag since this patch changes platform-independent code. This change looks good to me, but I'd feel more comfortable if a reviewer from Apple could look at the platform-indepndent WebKit2 bits. > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > WARNING: File exempt from style guide. Skipping: "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h" > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:641: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:643: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:644: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:645: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:646: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:647: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Total errors found: 6 in 12 files I don't think we should introduce new style errors, if we can help it. :/ 749462 6 mario 2012-10-24 01:22:50 -0700 (In reply to comment #5) > > [...] > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:647: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > > Total errors found: 6 in 12 files > > I don't think we should introduce new style errors, if we can help it. :/ There seems to be an (not solved yet) issue with the current implementation of check-webkit-style, as it's not 100% clear whether the current behavior (implemented as a patch for bug 97602 [1]) is the right one or not. I've posted a comment in the bug originating the confusion [2] and we are currently waiting for Darin (added now to CC) for clarifying this before proceeding either with fixing the check-webkit-style script or to adopt the new style for GTK code too (as I agree making exceptions is probably not the best solution). For the time being, and even if I agree it's weird to ignore these errors, I'd lean more towards ignoring them since it was the way we used to code until now, and I'm not sure it's wise to embrace the new style without a clear statement saying that it's the right one (and at the moment such a statement hasn't happened yet, there's only some confusion :)) My 2 cents to unblock these situations. [1]https://bugs.webkit.org/show_bug.cgi?id=97602 [2]https://bugs.webkit.org/show_bug.cgi?id=95930#c22 786554 7 168696 mrobinson 2012-12-08 10:40:27 -0800 Comment on attachment 168696 Patch This looks good to me, apart from the style errors. Before landing though, do you think you could get a nod from one of the WebKit2 developers though? 798327 8 cgarcia 2012-12-31 04:51:46 -0800 Committed r138593: <http://trac.webkit.org/changeset/138593> 168696 2012-10-15 06:08:31 -0700 2012-12-08 10:40:26 -0800 Patch wk2-view-source-mode.diff text/plain 15345 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZTBhMGQ0Li40NWYyYzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTMg QEAKIDIwMTItMTAtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gc2V0IGEgV2ViS2l0V2ViVmlldyBpbiB2aWV3 IHNvdXJjZSBtb2RlIHRvIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk5MzE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgZ2VuZXJpYyBBUEkgdG8gc2V0L2dldCBhIHZpZXcgbW9kZS4g Rm9yIG5vdyB0aGVyZSBhcmUgb25seQorICAgICAgICB0d28gbW9kZXMsIFdlYiBhbmQgU291cmNl LCBidXQgdGhlIEFQSSBjYW4gYmUgZXh0ZW5kZWQgaWYgd2UKKyAgICAgICAgZXZlbnR1YWxseSBz dXBwb3J0IG90aGVyIHZpZXcgbW9kZXMgbGlrZSBQcmludGluZyBmb3IgZXhhbXBsZS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Vi a2l0V2ViVmlld1NldFByb3BlcnR5KTogSW1wbGVtZW50IHNldHRlciBmb3Igdmlldy1tb2RlCisg ICAgICAgIHByb3BlcnR5LgorICAgICAgICAod2Via2l0V2ViVmlld0dldFByb3BlcnR5KTogSW1w bGVtZW50IGdldHRlciBmb3Igdmlldy1tb2RlCisgICAgICAgIHByb3BlcnR5LgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQpOiBBZGQgdmlldy1zb3VyY2UgcHJvcGVydHkuCisg ICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZSk6IFB1YmxpYyBtZXRob2QgdG8g c2V0IHRoZSB2aWV3CisgICAgICAgIG1vZGUuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3ZpZXdfbW9kZSk6IFB1YmxpYyBtZXRob2QgdG8gZ2V0IHRoZSB2aWV3CisgICAgICAgIG1vZGUu CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBBZGQgV2ViS2l0 Vmlld01vZGUgZW51bS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJn dGstc2VjdGlvbnMudHh0OiBBZGQgbmV3IHN5bWJvbHMuCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAodGVzdFdlYlZpZXdN b2RlKToKKyAgICAgICAgKGJlZm9yZUFsbCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkZyYW1l UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpXZWJGcmFtZVByb3h5 KTogSW5pdGlhbGl6ZQorICAgICAgICBtX2luVmlld1NvdXJjZU1vZGUuCisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lUHJveHk6OnNldEluVmlld1NvdXJjZU1vZGUpOiBTZXQKKyAgICAgICAgbV9p blZpZXdTb3VyY2VNb2RlIGlmIGl0IGhhcyBjaGFuZ2VkIGFuZCBjYWxsCisgICAgICAgIFdlYlBh Z2VQcm94eTo6c2V0RnJhbWVJblZpZXdTb3VyY2VNb2RlKCkgdG8gbm90aWZ5IHRoZSBXZWJQcm9j ZXNzLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5Lmg6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lUHJveHk6OmluVmlld1NvdXJjZU1vZGUpOiBSZXR1cm4gd2hldGhlciB0aGUK KyAgICAgICAgZnJhbWUgaXMgY3VycmVudGx5IGluIHZpZXcgc291cmNlIG1vZGUuCisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6c2V0RnJhbWVJblZpZXdTb3VyY2VNb2RlKTogU2VuZCBhIG1lc3NhZ2UKKyAgICAgICAg dG8gdGhlIFdlYlByb2Nlc3MgdG8gc2V0IHRoZSBnaXZlbiBmcmFtZSBpbiB2aWV3IHNvdXJjZSBt b2RlIG9yIG5vdC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg IChXZWJQYWdlUHJveHkpOiBBZGQgc2V0RnJhbWVJblZpZXdTb3VyY2VNb2RlKCkuCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzZXRGcmFtZUluVmlld1NvdXJjZU1vZGUpOiBDYWxsCisgICAgICAgIHNldEluVmlld1Nv dXJjZU1vZGUgZm9yIHRoZSBtYWluIGZyYW1lLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgIChXZWJQYWdlKTogQWRkIHNldEZyYW1lSW5WaWV3U291cmNl TW9kZSgpLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu OiBBZGQgbmV3IG1lc3NhZ2UKKyAgICAgICAgU2V0RnJhbWVJblZpZXdTb3VyY2VNb2RlLgorCisy MDEyLTEwLTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwog ICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hlY2suCiAKICAgICAgICAgKiBHTlVt YWtlZmlsZS5hbTogQWRkIC5pbiBmaWxlcyBpbiBXZWJLaXQyL1NoYXJlZCB0byBFWFRSQV9ESVNU LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmNwcAppbmRleCAyMzZhNGYzLi5hOGMxNTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMTA3LDcgKzEwNyw4IEBAIGVu dW0gewogICAgIFBST1BfRkFWSUNPTiwKICAgICBQUk9QX1VSSSwKICAgICBQUk9QX1pPT01fTEVW RUwsCi0gICAgUFJPUF9JU19MT0FESU5HCisgICAgUFJPUF9JU19MT0FESU5HLAorICAgIFBST1Bf VklFV19NT0RFCiB9OwogCiB0eXBlZGVmIEhhc2hNYXA8dWludDY0X3QsIEdSZWZQdHI8V2ViS2l0 V2ViUmVzb3VyY2U+ID4gTG9hZGluZ1Jlc291cmNlc01hcDsKQEAgLTEyMCw2ICsxMjEsNyBAQCBz dHJ1Y3QgX1dlYktpdFdlYlZpZXdQcml2YXRlIHsKICAgICBkb3VibGUgZXN0aW1hdGVkTG9hZFBy b2dyZXNzOwogICAgIENTdHJpbmcgYWN0aXZlVVJJOwogICAgIGJvb2wgaXNMb2FkaW5nOworICAg IFdlYktpdFZpZXdNb2RlIHZpZXdNb2RlOwogCiAgICAgYm9vbCB3YWl0aW5nRm9yTWFpblJlc291 cmNlOwogICAgIGd1bG9uZyBtYWluUmVzb3VyY2VSZXNwb25zZUhhbmRsZXJJRDsKQEAgLTQyNyw2 ICs0MjksOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3U2V0UHJvcGVydHkoR09iamVjdCog b2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1ZQogICAgIGNhc2UgUFJPUF9aT09NX0xF VkVMOgogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwod2ViVmlldywgZ192 YWx1ZV9nZXRfZG91YmxlKHZhbHVlKSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9W SUVXX01PREU6CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRfdmlld19tb2RlKHdlYlZpZXcs IHN0YXRpY19jYXN0PFdlYktpdFZpZXdNb2RlPihnX3ZhbHVlX2dldF9lbnVtKHZhbHVlKSkpOwor ICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFM SURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAgICAgfQpAQCAtNDU4 LDYgKzQ2Myw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdHZXRQcm9wZXJ0eShHT2JqZWN0 KiBvYmplY3QsIGd1aW50IHByb3BJZCwgR1ZhbHVlKiB2YWx1CiAgICAgY2FzZSBQUk9QX0lTX0xP QURJTkc6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF93ZWJfdmll d19pc19sb2FkaW5nKHdlYlZpZXcpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1ZJ RVdfTU9ERToKKyAgICAgICAgZ192YWx1ZV9zZXRfZW51bSh2YWx1ZSwgd2Via2l0X3dlYl92aWV3 X2dldF92aWV3X21vZGUod2ViVmlldykpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0Ogog ICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQs IHBhcmFtU3BlYyk7CiAgICAgfQpAQCAtNjI0LDYgKzYzMiwyMSBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdFQktJVF9QQVJBTV9SRUFEQUJMRSkpOwogCiAgICAgLyoqCisgICAgICogV2ViS2l0V2ViVmll dzp2aWV3LW1vZGU6CisgICAgICoKKyAgICAgKiBUaGUgI1dlYktpdFZpZXdNb2RlIHRoYXQgaXMg dXNlZCB0byBkaXNwbGF5IHRoZSBjb250ZW50cyBvZiBhICNXZWJLaXRXZWJWaWV3LgorICAgICAq IFNlZSBhbHNvIHdlYmtpdF93ZWJfdmlld19zZXRfdmlld19tb2RlKCkuCisgICAgICovCisgICAg Z19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1ZJRVdfTU9ERSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19lbnVtKCJ2aWV3LW1vZGUiLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlZpZXcg TW9kZSIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBfKCJUaGUgdmlldyBtb2RlIHRvIGRpc3BsYXkgdGhlIHdlYiB2aWV3IGNvbnRlbnRzIiks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX RUJLSVRfVFlQRV9WSUVXX01PREUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBXRUJLSVRfVklFV19NT0RFX1dFQiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFE V1JJVEUpKTsKKworICAgIC8qKgogICAgICAqIFdlYktpdFdlYlZpZXc6OmxvYWQtY2hhbmdlZDoK ICAgICAgKiBAd2ViX3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyBvbiB3aGljaCB0aGUgc2lnbmFs IGlzIGVtaXR0ZWQKICAgICAgKiBAbG9hZF9ldmVudDogdGhlICNXZWJLaXRMb2FkRXZlbnQKQEAg LTI3NTcsMyArMjc4MCw0NCBAQCBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfc2F2ZV90b19maWxl X2ZpbmlzaChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHQXN5bmNSZXN1bAogCiAgICAgcmV0dXJu IFRSVUU7CiB9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGU6CisgKiBA d2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqIEB2aWV3X21vZGU6IGEgI1dlYktpdFZpZXdN b2RlCisgKgorICogU2V0IHRoZSB2aWV3IG1vZGUgb2YgQHdlYl92aWV3IHRvIEB2aWV3X21vZGUu IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBjYWxsZWQKKyAqIGJlZm9yZSBsb2FkaW5nIG5ldyBjb250 ZW50cyBvbiBAd2ViX3ZpZXcgc28gdGhhdCB0aGUgbmV3ICNXZWJLaXRWaWV3TW9kZSB3aWxsCisg KiBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92 aWV3X3NldF92aWV3X21vZGUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0Vmlld01vZGUg dmlld01vZGUpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2Vi VmlldykpOworCisgICAgaWYgKHdlYlZpZXctPnByaXYtPnZpZXdNb2RlID09IHZpZXdNb2RlKQor ICAgICAgICByZXR1cm47CisKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IGdldFBhZ2Uod2Vi VmlldyktPm1haW5GcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybjsKKwor ICAgIGZyYW1lLT5zZXRJblZpZXdTb3VyY2VNb2RlKHZpZXdNb2RlID09IFdFQktJVF9WSUVXX01P REVfU09VUkNFKTsKKworICAgIHdlYlZpZXctPnByaXYtPnZpZXdNb2RlID0gdmlld01vZGU7Cisg ICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAidmlldy1tb2RlIik7Cit9CisK Ky8qKgorICogd2Via2l0X3dlYl92aWV3X2dldF92aWV3X21vZGU6CisgKiBAd2ViX3ZpZXc6IGEg I1dlYktpdFdlYlZpZXcKKyAqCisgKiBHZXQgdGhlIHZpZXcgbW9kZSBvZiBAd2ViX3ZpZXcuCisg KgorICogUmV0dXJuczogdGhlICNXZWJLaXRWaWV3TW9kZSBvZiBAd2ViX3ZpZXcuCisgKi8KK1dl YktpdFZpZXdNb2RlIHdlYmtpdF93ZWJfdmlld19nZXRfdmlld19tb2RlKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVX KHdlYlZpZXcpLCBXRUJLSVRfVklFV19NT0RFX1dFQik7CisKKyAgICByZXR1cm4gd2ViVmlldy0+ cHJpdi0+dmlld01vZGU7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3LmgKaW5kZXggYWMyZTI4MS4uNDc0N2RmZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaApAQCAtMTI5LDYgKzEy OSwxOSBAQCB0eXBlZGVmIGVudW0gewogICAgIFdFQktJVF9TQVZFX01PREVfTUhUTUwKIH0gV2Vi S2l0U2F2ZU1vZGU7CiAKKy8qKgorICogV2ViS2l0Vmlld01vZGU6CisgKiBAV0VCS0lUX1ZJRVdf TU9ERV9XRUI6IFRoZSBub3JtYWwgdmlldyBtb2RlIHRvIGRpc3BsYXkgd2ViIGNvbnRlbnRzLgor ICogQFdFQktJVF9WSUVXX01PREVfU09VUkNFOiBUaGUgc291cmNlIG1vZGUgdG8gZGlzcGxheSB3 ZWIgc291cmNlIGNvZGUuCisgKgorICogRW51bSB2YWx1ZXMgdG8gc3BlY2lmeSB0aGUgZGlmZmVy ZW50IHdheXMgaW4gd2hpY2ggYSAjV2ViS2l0V2ViVmlldworICogY2FuIGRpc3BsYXkgYSB3ZWIg cGFnZS4KKyAqLwordHlwZWRlZiBlbnVtIHsKKyAgICBXRUJLSVRfVklFV19NT0RFX1dFQiwKKyAg ICBXRUJLSVRfVklFV19NT0RFX1NPVVJDRQorfSBXZWJLaXRWaWV3TW9kZTsKKwogc3RydWN0IF9X ZWJLaXRXZWJWaWV3IHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSBwYXJlbnQ7CiAKQEAgLTM3MSw2 ICszODQsMTMgQEAgd2Via2l0X3dlYl92aWV3X3NhdmVfdG9fZmlsZV9maW5pc2ggICAgICAgICAg ICAgICAgICAoV2ViS2l0V2ViVmlldwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgR0FzeW5jUmVzdWx0ICAgICAgICAgICAgICAqcmVzdWx0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0Vy cm9yICAgICAgICAgICAgICAgICAgICoqZXJyb3IpOwogCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtp dF93ZWJfdmlld19zZXRfdmlld19tb2RlICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YlZpZXcgICAgICAgICAgICAgKndlYl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgV2ViS2l0Vmlld01vZGUgICAgICAgICAgICAgdmll d19tb2RlKTsKKworV0VCS0lUX0FQSSBXZWJLaXRWaWV3TW9kZQord2Via2l0X3dlYl92aWV3X2dl dF92aWV3X21vZGUgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAg ICAgICAqd2ViX3ZpZXcpOworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50 eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2Vj dGlvbnMudHh0CmluZGV4IGY1NjI2N2IuLjVlNTZmODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25z LnR4dApAQCAtNjgsNiArNjgsNyBAQCBXZWJLaXRXZWJWaWV3CiBXZWJLaXRMb2FkRXZlbnQKIFdl YktpdFBvbGljeURlY2lzaW9uVHlwZQogV2ViS2l0U2F2ZU1vZGUKK1dlYktpdFZpZXdNb2RlCiAK IDxTVUJTRUNUSU9OIEVkaXRpbmcgQ29tbWFuZHM+CiBXRUJLSVRfRURJVElOR19DT01NQU5EX0NV VApAQCAtMTIyLDYgKzEyMyw4IEBAIHdlYmtpdF93ZWJfdmlld19zYXZlCiB3ZWJraXRfd2ViX3Zp ZXdfc2F2ZV9maW5pc2gKIHdlYmtpdF93ZWJfdmlld19zYXZlX3RvX2ZpbGUKIHdlYmtpdF93ZWJf dmlld19zYXZlX3RvX2ZpbGVfZmluaXNoCit3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZQor d2Via2l0X3dlYl92aWV3X2dldF92aWV3X21vZGUKIAogPFNVQlNFQ1RJT04gV2ViS2l0SmF2YXNj cmlwdFJlc3VsdD4KIFdlYktpdEphdmFzY3JpcHRSZXN1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNw cAppbmRleCBmNTE5N2I5Li45YzM5YzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYlZpZXcuY3BwCkBAIC0x MDM2LDYgKzEwMzYsMjcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdTYXZlKFNhdmVXZWJWaWV3 VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydF9jbXBpbnQoZ19maWxlX2lu Zm9fZ2V0X3NpemUoZmlsZUluZm8uZ2V0KCkpLCA9PSwgdG90YWxCeXRlc0Zyb21TdHJlYW0pOwog fQogCitzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld01vZGUoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCit7CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGluZGV4SFRNTCA9ICI8aHRtbD48 Ym9keT48cD5UZXN0IFdlYiBWaWV3IE1vZGU8L3A+PC9ib2R5PjwvaHRtbD4iOworCisgICAgLy8g V2ViIG1vZGUuCisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3ZpZXdf bW9kZSh0ZXN0LT5tX3dlYlZpZXcpLCA9PSwgV0VCS0lUX1ZJRVdfTU9ERV9XRUIpOworICAgIHRl c3QtPmxvYWRIdG1sKGluZGV4SFRNTCwgMCk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlz aGVkKCk7CisgICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCogamF2YXNjcmlwdFJlc3VsdCA9IHRl c3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgid2luZG93LmRvY3VtZW50LmJv ZHkudGV4dENvbnRlbnQ7IiwgMCk7CisgICAgR093blB0cjxjaGFyPiB2YWx1ZVN0cmluZyhXZWJW aWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0UmVzdWx0KSk7Cisg ICAgZ19hc3NlcnRfY21wc3RyKHZhbHVlU3RyaW5nLmdldCgpLCA9PSwgIlRlc3QgV2ViIFZpZXcg TW9kZSIpOworCisgICAgLy8gU291cmNlIG1vZGUuCisgICAgd2Via2l0X3dlYl92aWV3X3NldF92 aWV3X21vZGUodGVzdC0+bV93ZWJWaWV3LCBXRUJLSVRfVklFV19NT0RFX1NPVVJDRSk7CisgICAg dGVzdC0+bG9hZEh0bWwoaW5kZXhIVE1MLCAwKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmlu aXNoZWQoKTsKKyAgICBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+cnVuSmF2YVNjcmlwdEFuZFdh aXRVbnRpbEZpbmlzaGVkKCJ3aW5kb3cuZG9jdW1lbnQuYm9keS50ZXh0Q29udGVudDsiLCAwKTsK KyAgICB2YWx1ZVN0cmluZy5zZXQoV2ViVmlld1Rlc3Q6OmphdmFzY3JpcHRSZXN1bHRUb0NTdHJp bmcoamF2YXNjcmlwdFJlc3VsdCkpOworICAgIGdfYXNzZXJ0X2NtcHN0cih2YWx1ZVN0cmluZy5n ZXQoKSwgPT0sIGluZGV4SFRNTCk7Cit9CisKIHZvaWQgYmVmb3JlQWxsKCkKIHsKICAgICBXZWJW aWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImRlZmF1bHQtY29udGV4dCIsIHRlc3RXZWJW aWV3RGVmYXVsdENvbnRleHQpOwpAQCAtMTA1NSw2ICsxMDc2LDcgQEAgdm9pZCBiZWZvcmVBbGwo KQogICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiY2FuLXNob3ctbWltZS10 eXBlIiwgdGVzdFdlYlZpZXdDYW5TaG93TUlNRVR5cGUpOwogICAgIEZvcm1DbGllbnRUZXN0Ojph ZGQoIldlYktpdFdlYlZpZXciLCAic3VibWl0LWZvcm0iLCB0ZXN0V2ViVmlld1N1Ym1pdEZvcm0p OwogICAgIFNhdmVXZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInNhdmUiLCB0ZXN0 V2ViVmlld1NhdmUpOworICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAidmll dy1tb2RlIiwgdGVzdFdlYlZpZXdNb2RlKTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggZjYwZmFiMC4uZmIzNGFi NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtNTEs NiArNTEsNyBAQCBXZWJGcmFtZVByb3h5OjpXZWJGcmFtZVByb3h5KFdlYlBhZ2VQcm94eSogcGFn ZSwgdWludDY0X3QgZnJhbWVJRCkKICAgICAsIG1fbGFzdENoaWxkKDApCiAgICAgLCBtX2xvYWRT dGF0ZShMb2FkU3RhdGVGaW5pc2hlZCkKICAgICAsIG1faXNGcmFtZVNldChmYWxzZSkKKyAgICAs IG1faW5WaWV3U291cmNlTW9kZShmYWxzZSkKICAgICAsIG1fZnJhbWVJRChmcmFtZUlEKQogewog ICAgIFdlYkNvbnRleHQ6OnN0YXRpc3RpY3MoKS53a0ZyYW1lQ291bnQrKzsKQEAgLTEzNyw2ICsx MzgsMTUgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc0Rpc3BsYXlpbmdQREZEb2N1bWVudCgpIGNv bnN0CiAgICAgcmV0dXJuIFdlYkNvbnRleHQ6OnBkZkFuZFBvc3RTY3JpcHRNSU1FVHlwZXMoKS5j b250YWlucyhtX01JTUVUeXBlKTsKIH0KIAordm9pZCBXZWJGcmFtZVByb3h5OjpzZXRJblZpZXdT b3VyY2VNb2RlKGJvb2wgbW9kZSkKK3sKKyAgICBpZiAobV9pblZpZXdTb3VyY2VNb2RlID09IG1v ZGUpCisgICAgICAgIHJldHVybjsKKworICAgIG1faW5WaWV3U291cmNlTW9kZSA9IG1vZGU7Cisg ICAgbV9wYWdlLT5zZXRGcmFtZUluVmlld1NvdXJjZU1vZGUodGhpcywgbV9pblZpZXdTb3VyY2VN b2RlKTsKK30KKwogdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZChj b25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBBU1NFUlQobV9sb2FkU3RhdGUgPT0gTG9hZFN0YXRl RmluaXNoZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1l UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKaW5kZXgg ZGU1YTU4Yy4uMjBjY2MzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkZyYW1lUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5oCkBAIC0xMDgsNiArMTA4LDkgQEAgcHVibGljOgogICAgIGJvb2wgaXNEaXNwbGF5aW5nTWFy a3VwRG9jdW1lbnQoKSBjb25zdDsKICAgICBib29sIGlzRGlzcGxheWluZ1BERkRvY3VtZW50KCkg Y29uc3Q7CiAKKyAgICBib29sIGluVmlld1NvdXJjZU1vZGUoKSBjb25zdCB7IHJldHVybiBtX2lu Vmlld1NvdXJjZU1vZGU7IH0KKyAgICB2b2lkIHNldEluVmlld1NvdXJjZU1vZGUoYm9vbCk7CisK ICAgICB2b2lkIGdldFdlYkFyY2hpdmUoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+KTsKICAgICB2 b2lkIGdldE1haW5SZXNvdXJjZURhdGEoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+KTsKICAgICB2 b2lkIGdldFJlc291cmNlRGF0YShXZWJVUkwqLCBQYXNzUmVmUHRyPERhdGFDYWxsYmFjaz4pOwpA QCAtMTU0LDYgKzE1Nyw3IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fTUlNRVR5cGU7CiAgICAg U3RyaW5nIG1fdGl0bGU7CiAgICAgYm9vbCBtX2lzRnJhbWVTZXQ7CisgICAgYm9vbCBtX2luVmll d1NvdXJjZU1vZGU7CiAgICAgUmVmUHRyPFdlYkNlcnRpZmljYXRlSW5mbz4gbV9jZXJ0aWZpY2F0 ZUluZm87CiAgICAgUmVmUHRyPFdlYkZyYW1lTGlzdGVuZXJQcm94eT4gbV9hY3RpdmVMaXN0ZW5l cjsKICAgICB1aW50NjRfdCBtX2ZyYW1lSUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IDdlZjRhMjQuLjUzYmI4NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MTE1LDQgKzQxMTUsOSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkUmVjZWl2ZVVSSVJlcXVlc3QoU3RyaW5nIHVyaVN0cmluZywgdWludDY0X3Qg cmVxdWVzdElEKQogfQogI2VuZGlmCiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRGcmFtZUluVmll d1NvdXJjZU1vZGUoV2ViRnJhbWVQcm94eSogZnJhbWUsIGJvb2wgaW5WaWV3U291cmNlTW9kZSkK K3sKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEZyYW1lSW5WaWV3 U291cmNlTW9kZShmcmFtZS0+ZnJhbWVJRCgpLCBpblZpZXdTb3VyY2VNb2RlKSwgbV9wYWdlSUQp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAppbmRleCBlZWRlNmI5Li5mY2MwNTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03MzUsNiArNzM1LDggQEAgcHVibGljOgogICAgIHZvaWQg ZW5kQ29sb3JDaG9vc2VyKCk7CiAjZW5kaWYKIAorICAgIHZvaWQgc2V0RnJhbWVJblZpZXdTb3Vy Y2VNb2RlKFdlYkZyYW1lUHJveHkqLCBib29sIGluVmlld1NvdXJjZU1vZGUpOworCiBwcml2YXRl OgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJv eHk+LCBXZWJQYWdlR3JvdXAqLCB1aW50NjRfdCBwYWdlSUQpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZWE0NzEyNy4uN2QyYmQ2MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt MzQ1OCw0ICszNDU4LDEwIEBAIGJvb2wgV2ViUGFnZTo6c2hvdWxkVXNlQ3VzdG9tUmVwcmVzZW50 YXRpb25Gb3JSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByCiAgICAgcmV0dXJuICFj YW5QbHVnaW5IYW5kbGVSZXNwb25zZShyZXNwb25zZSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6c2V0 RnJhbWVJblZpZXdTb3VyY2VNb2RlKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaW5WaWV3U291cmNl TW9kZSkKK3sKKyAgICBpZiAoV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2hhcmVkKCku d2ViRnJhbWUoZnJhbWVJRCkpCisgICAgICAgIGZyYW1lLT5jb3JlRnJhbWUoKS0+c2V0SW5WaWV3 U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAwYTVm MmJiLi43MGY1ZTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgKQEAgLTc3Niw2ICs3NzYsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgY2hhbmdlU2VsZWN0 ZWRJbmRleChpbnQzMl90IGluZGV4KTsKICAgICB2b2lkIHNldENhblN0YXJ0TWVkaWFUaW1lckZp cmVkKCk7CiAKKyAgICB2b2lkIHNldEZyYW1lSW5WaWV3U291cmNlTW9kZSh1aW50NjRfdCBmcmFt ZUlELCBib29sIGluVmlld1NvdXJjZU1vZGUpOworCiAgICAgc3RhdGljIGJvb2wgcGxhdGZvcm1D YW5IYW5kbGVSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYpOwogCiAgICAg T3duUHRyPFdlYkNvcmU6OlBhZ2U+IG1fcGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggZTg5MTg5MC4uYTc5 NWUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW4KQEAgLTMwNyw0ICszMDcsNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdl IHsKICNpZiBQTEFURk9STShHVEspICYmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKICAgICBTZXRB Y2NlbGVyYXRlZENvbXBvc2l0aW5nV2luZG93SWQoaW50NjRfdCBpZCkKICNlbmRpZgorCisgICAg U2V0RnJhbWVJblZpZXdTb3VyY2VNb2RlKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaW5WaWV3U291 cmNlTW9kZSkKIH0K