73815 2011-12-05 03:23:43 -0800 [Qt] Improve QQuickWebView error handling API 2011-12-20 00:57:02 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 74403 1 hausmann jesus cmarcelo gopal.1.raghavan jesus laszlo.gombos menard vestbo webkit.review.bot zoltan oldest_to_newest 515007 0 hausmann 2011-12-05 03:23:43 -0800 In WebKit the error consists of three components: 1) The domain 2) The domain specific error code 3) A (localized) description This is visible in the public WK2 API, it is also used as internal representation and it maps exactly to how NSError in the public ObjC WebKit API works. The current QQuickWebView API exposes the domain and error code through a signal and an enum: enum ErrorType { EngineError, NetworkError, HttpError, DownloadError }; void loadFailed(QQuickWebView::ErrorType errorType, int errorCode, const QUrl& url); I suggest we adapt our API to the WebKit/NSError way by changing the error type to a domain string. In addition we need to document the domains as well as some domain specific error codes. Perhaps we should also expose the localized description? Let's discuss here. 515034 1 hausmann 2011-12-05 04:46:13 -0800 I suggest to rename errorType also to errorDomain and use WebView.HTTPErrorDomain for example, so that the reads: onLoadingFailed: { if (errorDomain = WebView.HTTPErrorDomain) { if (errorCode == 401) ... // interpret errorCode as http error code } } 520340 2 119077 jesus 2011-12-13 13:33:42 -0800 Created attachment 119077 Patch 520343 3 jesus 2011-12-13 13:40:26 -0800 (In reply to comment #2) > Created an attachment (id=119077) [details] > Patch I'm not asking for review yet since we are still open for discussions here, but feedback on this patch is more than welcome. Simon, I kept the enum instead of a string for the domain mainly because I didn't really get the advantage of using strings for this, since all need is a comparison in the end. From the application perspective, what is the use case of exposing an error domain string? Moreover, I couldn't think of a way of exposing something like WebView.HTTPErrorDomain to QML, being it a constant static string part of the WebView type. =/ Or maybe I misunderstood something here... Nevertheless, this patch modifies the enum ErrorType to ErrorDomain and adds the localized error description string as a parameter of loadFailed. How do you feel about it? 520742 4 119077 kenneth 2011-12-14 00:16:46 -0800 Comment on attachment 119077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119077&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:73 > + EngineErrorDomain, Internal? 522934 5 119077 hausmann 2011-12-16 12:33:38 -0800 Comment on attachment 119077 Patch I think this is a step in the right direction. I see that I'm the only one favouring strings, I believe Tor Arne also prefers the enum. Perhaps we should go that route then :) 523897 6 jesus 2011-12-19 07:05:16 -0800 (In reply to comment #5) > (From update of attachment 119077 [details]) > I think this is a step in the right direction. I see that I'm the only one favouring strings, I believe Tor Arne also prefers the enum. Perhaps we should go that route then :) Ok! :) Is there anything else missing here? (In reply to comment #4) > > Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:73 > > + EngineErrorDomain, > > Internal? InternalErrorDomain, then? Thanks for the reviews, folks! 523902 7 hausmann 2011-12-19 07:28:33 -0800 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 119077 [details] [details]) > > I think this is a step in the right direction. I see that I'm the only one favouring strings, I believe Tor Arne also prefers the enum. Perhaps we should go that route then :) > > Ok! :) > > Is there anything else missing here? I don't think so. 524156 8 119912 jesus 2011-12-19 13:41:48 -0800 Created attachment 119912 Patch 524470 9 119912 webkit.review.bot 2011-12-20 00:56:57 -0800 Comment on attachment 119912 Patch Clearing flags on attachment: 119912 Committed r103310: <http://trac.webkit.org/changeset/103310> 524471 10 webkit.review.bot 2011-12-20 00:57:02 -0800 All reviewed patches have been landed. Closing bug. 119077 2011-12-13 13:33:42 -0800 2011-12-19 13:41:41 -0800 Patch bug-73815-20111213183327.patch text/plain 4107 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmZiMDM2MGM4NjNjMGQz YTkyNzVhZGViZDE2MzU2YmVlOTY1Y2RkOS4uNGExMzRlYzAyYjAwY2VmNjg2M2ZkM2E2ZTk3NjUw M2U4OTg0ZGVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEyLTEzICBKZXN1 cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBbUXRdIEltcHJvdmUgUVF1aWNrV2ViVmlldyBlcnJvciBoYW5kbGluZyBBUEkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczODE1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW9kaWZ5aW5nIGxvYWRG YWlsIHNpZ25hbCB0byBpbmNsdWRlIHRoZSBlcnJvciBkZXNjcmlwdGlvbgorICAgICAgICBhbmQg Y2hhbmdpbmcgdGhlIEVycm9yVHlwZSBlbnVtIHRvIEVycm9yRG9tYWluLCB0byBzdGF5IGFsaWdu ZWQKKyAgICAgICAgd2l0aCBSZXNvdXJjZUVycm9yIEFQSSBpdHNlbGYuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfbG9hZEZhaWwucW1sOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcDoKKyAgICAgICAgKFF0V2ViUGFn ZUxvYWRDbGllbnQ6OmRpc3BhdGNoTG9hZEZhaWxlZCk6CisKIDIwMTEtMTItMTMgIENhaW8gTWFy Y2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KIAog ICAgICAgICBbUXRdW1dLMl0gTWFrZSBRdFBhZ2VDbGllbnQgZGlzcGF0Y2ggZGlyZWN0bHkgdG8g V2ViVmlldyB3aGVuIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAppbmRleCA1Mzk1ZTZkYmE5ZTViZWMyMmZjMzU2NWM3YzQ1 N2ZlNjBjYzI1MTY0Li43NDQ0N2VjMDE1NjEwODRhZDUxMzlhZWZkMjgxYTJlMGE4ZGM4YTEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdf cC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19w LmgKQEAgLTYwLDcgKzYwLDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVF1aWNrV2ViVmlldyA6 IHB1YmxpYyBRUXVpY2tJdGVtIHsKICAgICBRX1BST1BFUlRZKFFXZWJQcmVmZXJlbmNlcyogcHJl ZmVyZW5jZXMgUkVBRCBwcmVmZXJlbmNlcyBDT05TVEFOVCBGSU5BTCkKICAgICBRX1BST1BFUlRZ KFFRdWlja1dlYlBhZ2UqIHBhZ2UgUkVBRCBwYWdlIENPTlNUQU5UIEZJTkFMKQogICAgIFFfRU5V TVMoTmF2aWdhdGlvblJlcXVlc3RBY3Rpb24pCi0gICAgUV9FTlVNUyhFcnJvclR5cGUpCisgICAg UV9FTlVNUyhFcnJvckRvbWFpbikKIAogcHVibGljOgogICAgIGVudW0gTmF2aWdhdGlvblJlcXVl c3RBY3Rpb24gewpAQCAtNjksMTEgKzY5LDExIEBAIHB1YmxpYzoKICAgICAgICAgRG93bmxvYWRS ZXF1ZXN0CiAgICAgfTsKIAotICAgIGVudW0gRXJyb3JUeXBlIHsKLSAgICAgICAgRW5naW5lRXJy b3IsCi0gICAgICAgIE5ldHdvcmtFcnJvciwKLSAgICAgICAgSHR0cEVycm9yLAotICAgICAgICBE b3dubG9hZEVycm9yCisgICAgZW51bSBFcnJvckRvbWFpbiB7CisgICAgICAgIEVuZ2luZUVycm9y RG9tYWluLAorICAgICAgICBOZXR3b3JrRXJyb3JEb21haW4sCisgICAgICAgIEh0dHBFcnJvckRv bWFpbiwKKyAgICAgICAgRG93bmxvYWRFcnJvckRvbWFpbgogICAgIH07CiAgICAgUVF1aWNrV2Vi VmlldyhRUXVpY2tJdGVtKiBwYXJlbnQgPSAwKTsKICAgICB2aXJ0dWFsIH5RUXVpY2tXZWJWaWV3 KCk7CkBAIC0xMDksNyArMTA5LDcgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgc3RhdHVzQmFyTWVz c2FnZUNoYW5nZWQoY29uc3QgUVN0cmluZyYgbWVzc2FnZSk7CiAgICAgdm9pZCBsb2FkU3RhcnRl ZCgpOwogICAgIHZvaWQgbG9hZFN1Y2NlZWRlZCgpOwotICAgIHZvaWQgbG9hZEZhaWxlZChRUXVp Y2tXZWJWaWV3OjpFcnJvclR5cGUgZXJyb3JUeXBlLCBpbnQgZXJyb3JDb2RlLCBjb25zdCBRVXJs JiB1cmwpOworICAgIHZvaWQgbG9hZEZhaWxlZChRUXVpY2tXZWJWaWV3OjpFcnJvckRvbWFpbiBl cnJvckRvbWFpbiwgaW50IGVycm9yQ29kZSwgY29uc3QgUVVybCYgdXJsLCBjb25zdCBRU3RyaW5n JiBkZXNjcmlwdGlvbik7CiAgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVz cyk7CiAgICAgdm9pZCB1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmIHVybCk7CiAgICAgdm9pZCBsaW5r SG92ZXJlZChjb25zdCBRVXJsJiB1cmwsIGNvbnN0IFFTdHJpbmcmIHRpdGxlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmll dy90c3RfbG9hZEZhaWwucW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0 cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9sb2FkRmFpbC5xbWwKaW5kZXggNWY1NjVhM2NjYmVlZTY3 NTgwNjg0OGUzYjU4MGI3YTcwZDk0NDczYS4uMjZhNDJjMGI3ZTg5MDNhZDBmMjQ1Yzk1M2YxMmM0 OTQ4N2ExOTY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90 ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9sb2FkRmFpbC5xbWwKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9sb2FkRmFpbC5x bWwKQEAgLTMwLDYgKzMwLDYgQEAgV2ViVmlldyB7CiAgICAgb25Mb2FkRmFpbGVkOiB7CiAgICAg ICAgIHRlc3QuY29tcGFyZSh1cmwsIHRlc3RVcmwpCiAgICAgICAgIHRlc3QuY29tcGFyZShlcnJv ckNvZGUsIE5ldHdvcmtSZXBseS5Db250ZW50Tm90Rm91bmRFcnJvcikKLSAgICAgICAgdGVzdC5j b21wYXJlKGVycm9yVHlwZSwgV2ViVmlldy5OZXR3b3JrRXJyb3IpCisgICAgICAgIHRlc3QuY29t cGFyZShlcnJvckRvbWFpbiwgV2ViVmlldy5OZXR3b3JrRXJyb3JEb21haW4pCiAgICAgfQogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGllbnQu Y3BwCmluZGV4IDEzYWZiMjE0MDI3YjI5Zjg1Y2RlYjMxZTdlZWFiMmI2ODkyNDdjN2UuLjc3ZmI5 YjUxMDE4N2U1NmE0ZTEyMTQwODc1ODgwZmVhZWY1YzU4MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENsaWVudC5jcHAKQEAgLTk4LDcgKzk4 LDcgQEAgdm9pZCBRdFdlYlBhZ2VMb2FkQ2xpZW50OjpkaXNwYXRjaExvYWRGYWlsZWQoV0tFcnJv clJlZiBlcnJvcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgUXRXZWJFcnJvciBxdEVycm9yKGVy cm9yKTsKLSAgICBlbWl0IG1fd2ViVmlldy0+bG9hZEZhaWxlZChzdGF0aWNfY2FzdDxRUXVpY2tX ZWJWaWV3OjpFcnJvclR5cGU+KHF0RXJyb3IudHlwZSgpKSwgcXRFcnJvci5lcnJvckNvZGUoKSwg cXRFcnJvci51cmwoKSk7CisgICAgZW1pdCBtX3dlYlZpZXctPmxvYWRGYWlsZWQoc3RhdGljX2Nh c3Q8UVF1aWNrV2ViVmlldzo6RXJyb3JEb21haW4+KHF0RXJyb3IudHlwZSgpKSwgcXRFcnJvci5l cnJvckNvZGUoKSwgcXRFcnJvci51cmwoKSwgcXRFcnJvci5kZXNjcmlwdGlvbigpKTsKIH0KIAog dm9pZCBRdFdlYlBhZ2VMb2FkQ2xpZW50OjpzZXRMb2FkUHJvZ3Jlc3MoaW50IGxvYWRQcm9ncmVz cykK 119912 2011-12-19 13:41:48 -0800 2011-12-20 00:56:57 -0800 Patch bug-73815-20111219184136.patch text/plain 5135 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdjMTZjNzk2ZjNkYzg1 YTA0NzgzNzdhZDE0MzY0MTA5NDZlMTc0Ni4uZDIyNGU1MjA3ZjI3YWUzN2IwMTQxZTM0MTlkMTFh ZjRjNDE3YjkwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEyLTE5ICBKZXN1 cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBbUXRdIEltcHJvdmUgUVF1aWNrV2ViVmlldyBlcnJvciBoYW5kbGluZyBBUEkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczODE1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW9kaWZ5aW5nIGxvYWRG YWlsIHNpZ25hbCB0byBpbmNsdWRlIHRoZSBlcnJvciBkZXNjcmlwdGlvbgorICAgICAgICBhbmQg Y2hhbmdpbmcgdGhlIEVycm9yVHlwZSBlbnVtIHRvIEVycm9yRG9tYWluLCB0byBzdGF5IGFsaWdu ZWQKKyAgICAgICAgd2l0aCBSZXNvdXJjZUVycm9yIEFQSSBpdHNlbGYuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfbG9hZEZhaWwucW1sOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcDoKKyAgICAgICAgKFF0V2ViUGFn ZUxvYWRDbGllbnQ6OmRpc3BhdGNoTG9hZEZhaWxlZCk6CisKIDIwMTEtMTItMTkgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIDx0cmFjaz4g Zm9yIE1hYyBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3X3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlld19wLmgKaW5kZXggZTQ0ODQzNzQzNjc1ZTRhMmY3MGE5M2ViYWU1YjQzYTdkNmM2 YzQ2Yi4uNWYxZjMyOGZiYTZkNjQ0MTAwM2I4NDMzMTVhMTMxYThkNGI4M2Q0MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCkBAIC01 OSw3ICs1OSw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFRdWlja1dlYlZpZXcgOiBwdWJsaWMg UVF1aWNrSXRlbSB7CiAgICAgUV9QUk9QRVJUWShib29sIGxvYWRpbmcgUkVBRCBsb2FkaW5nIE5P VElGWSBuYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoYm9vbCBj YW5SZWxvYWQgUkVBRCBjYW5SZWxvYWQgTk9USUZZIG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQgRklO QUwpCiAgICAgUV9FTlVNUyhOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbikKLSAgICBRX0VOVU1TKEVy cm9yVHlwZSkKKyAgICBRX0VOVU1TKEVycm9yRG9tYWluKQogCiBwdWJsaWM6CiAgICAgZW51bSBO YXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiB7CkBAIC02OCwxMSArNjgsMTEgQEAgcHVibGljOgogICAg ICAgICBEb3dubG9hZFJlcXVlc3QKICAgICB9OwogCi0gICAgZW51bSBFcnJvclR5cGUgewotICAg ICAgICBFbmdpbmVFcnJvciwKLSAgICAgICAgTmV0d29ya0Vycm9yLAotICAgICAgICBIdHRwRXJy b3IsCi0gICAgICAgIERvd25sb2FkRXJyb3IKKyAgICBlbnVtIEVycm9yRG9tYWluIHsKKyAgICAg ICAgSW50ZXJuYWxFcnJvckRvbWFpbiwKKyAgICAgICAgTmV0d29ya0Vycm9yRG9tYWluLAorICAg ICAgICBIdHRwRXJyb3JEb21haW4sCisgICAgICAgIERvd25sb2FkRXJyb3JEb21haW4KICAgICB9 OwogICAgIFFRdWlja1dlYlZpZXcoUVF1aWNrSXRlbSogcGFyZW50ID0gMCk7CiAgICAgdmlydHVh bCB+UVF1aWNrV2ViVmlldygpOwpAQCAtMTA3LDcgKzEwNyw3IEBAIFFfU0lHTkFMUzoKICAgICB2 b2lkIHN0YXR1c0Jhck1lc3NhZ2VDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpOwogICAg IHZvaWQgbG9hZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRTdWNjZWVkZWQoKTsKLSAgICB2b2lk IGxvYWRGYWlsZWQoUVF1aWNrV2ViVmlldzo6RXJyb3JUeXBlIGVycm9yVHlwZSwgaW50IGVycm9y Q29kZSwgY29uc3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIGxvYWRGYWlsZWQoUVF1aWNrV2ViVmll dzo6RXJyb3JEb21haW4gZXJyb3JEb21haW4sIGludCBlcnJvckNvZGUsIGNvbnN0IFFVcmwmIHVy bCwgY29uc3QgUVN0cmluZyYgZGVzY3JpcHRpb24pOwogICAgIHZvaWQgbG9hZFByb2dyZXNzQ2hh bmdlZChpbnQgcHJvZ3Jlc3MpOwogICAgIHZvaWQgdXJsQ2hhbmdlZChjb25zdCBRVXJsJiB1cmwp OwogICAgIHZvaWQgbGlua0hvdmVyZWQoY29uc3QgUVVybCYgdXJsLCBjb25zdCBRU3RyaW5nJiB0 aXRsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3Rz L3FtbHRlc3RzL1dlYlZpZXcvdHN0X2xvYWRGYWlsLnFtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfbG9hZEZhaWwucW1sCmluZGV4 IDVmNTY1YTNjY2JlZWU2NzU4MDY4NDhlM2I1ODBiN2E3MGQ5NDQ3M2EuLjI2YTQyYzBiN2U4OTAz YWQwZjI0NWM5NTNmMTJjNDk0ODdhMTk2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfbG9hZEZhaWwucW1sCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmll dy90c3RfbG9hZEZhaWwucW1sCkBAIC0zMCw2ICszMCw2IEBAIFdlYlZpZXcgewogICAgIG9uTG9h ZEZhaWxlZDogewogICAgICAgICB0ZXN0LmNvbXBhcmUodXJsLCB0ZXN0VXJsKQogICAgICAgICB0 ZXN0LmNvbXBhcmUoZXJyb3JDb2RlLCBOZXR3b3JrUmVwbHkuQ29udGVudE5vdEZvdW5kRXJyb3Ip Ci0gICAgICAgIHRlc3QuY29tcGFyZShlcnJvclR5cGUsIFdlYlZpZXcuTmV0d29ya0Vycm9yKQor ICAgICAgICB0ZXN0LmNvbXBhcmUoZXJyb3JEb21haW4sIFdlYlZpZXcuTmV0d29ya0Vycm9yRG9t YWluKQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFdlYkVycm9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkVycm9yLmNw cAppbmRleCA2ZDJlMTBkODExMTQ1MGE2MmFjZmNkOGE0ODQwYjZjMTNkMDA4MmU0Li5kNWIxY2Jk MWJiNTNhMzc3YTJiMWRkMGQ4Y2MzMmY1MGY0NDZkMmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJFcnJvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViRXJyb3IuY3BwCkBAIC00Nyw3ICs0Nyw3IEBAIFF0V2ViRXJyb3I6OlR5 cGUgUXRXZWJFcnJvcjo6dHlwZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBRdFdlYkVycm9yOjpI dHRwRXJyb3I7CiAgICAgaWYgKGVycm9yRG9tYWluID09ICJEb3dubG9hZCIpCiAgICAgICAgIHJl dHVybiBRdFdlYkVycm9yOjpEb3dubG9hZEVycm9yOwotICAgIHJldHVybiBRdFdlYkVycm9yOjpF bmdpbmVFcnJvcjsKKyAgICByZXR1cm4gUXRXZWJFcnJvcjo6SW50ZXJuYWxFcnJvcjsKIH0KIAog aW50IFF0V2ViRXJyb3I6OmVycm9yQ29kZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJFcnJvci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViRXJyb3IuaAppbmRleCAzODliNTBmZDVmZmY3OGJhZDgyNWRhZmI0MjJhZTk0Y2Iz NmE3NTZlLi4zYmQ3YmQ1MDhiNzdjMjc4ODcyYzk5MGRhMjBlY2EzZWY1NjhjMjE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJFcnJvci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkVycm9yLmgKQEAgLTM0LDcgKzM0LDcgQEAgUVRf RU5EX05BTUVTUEFDRQogY2xhc3MgUXRXZWJFcnJvciB7CiBwdWJsaWM6CiAgICAgZW51bSBUeXBl IHsKLSAgICAgICAgRW5naW5lRXJyb3IsCisgICAgICAgIEludGVybmFsRXJyb3IsCiAgICAgICAg IE5ldHdvcmtFcnJvciwKICAgICAgICAgSHR0cEVycm9yLAogICAgICAgICBEb3dubG9hZEVycm9y CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENs aWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENsaWVu dC5jcHAKaW5kZXggMTNhZmIyMTQwMjdiMjlmODVjZGViMzFlN2VlYWIyYjY4OTI0N2M3ZS4uNzdm YjliNTEwMTg3ZTU2YTRlMTIxNDA4NzU4ODBmZWFlZjVjNTgyNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcApAQCAtOTgsNyAr OTgsNyBAQCB2b2lkIFF0V2ViUGFnZUxvYWRDbGllbnQ6OmRpc3BhdGNoTG9hZEZhaWxlZChXS0Vy cm9yUmVmIGVycm9yKQogICAgICAgICByZXR1cm47CiAKICAgICBRdFdlYkVycm9yIHF0RXJyb3Io ZXJyb3IpOwotICAgIGVtaXQgbV93ZWJWaWV3LT5sb2FkRmFpbGVkKHN0YXRpY19jYXN0PFFRdWlj a1dlYlZpZXc6OkVycm9yVHlwZT4ocXRFcnJvci50eXBlKCkpLCBxdEVycm9yLmVycm9yQ29kZSgp LCBxdEVycm9yLnVybCgpKTsKKyAgICBlbWl0IG1fd2ViVmlldy0+bG9hZEZhaWxlZChzdGF0aWNf Y2FzdDxRUXVpY2tXZWJWaWV3OjpFcnJvckRvbWFpbj4ocXRFcnJvci50eXBlKCkpLCBxdEVycm9y LmVycm9yQ29kZSgpLCBxdEVycm9yLnVybCgpLCBxdEVycm9yLmRlc2NyaXB0aW9uKCkpOwogfQog CiB2b2lkIFF0V2ViUGFnZUxvYWRDbGllbnQ6OnNldExvYWRQcm9ncmVzcyhpbnQgbG9hZFByb2dy ZXNzKQo=