78821 2012-02-16 08:15:16 -0800 [Qt] API changes to QWebNavigationRequest 2012-03-07 04:54:18 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78867 79800 80164 74403 1 hausmann cmarcelo laszlo.gombos maheshk menard ossy webkit.review.bot zoltan oldest_to_newest 558205 0 hausmann 2012-02-16 08:15:16 -0800 As discussed in the API review session in Szeged, there are a few simple API changes we should do before the release: * Try to change the type of the action property to the real enum * Removing originatingUrl property (no clear use-case known. miight be useful, but we should add it if we have a real use-case) * Rename modifiers to keyboardModifiers * Rename button to mouseButton 565953 1 129096 cmarcelo 2012-02-27 14:01:28 -0800 Created attachment 129096 Patch 566586 2 129096 kenneth 2012-02-28 04:51:01 -0800 Comment on attachment 129096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129096&action=review > Source/WebKit2/ChangeLog:7 > + [Qt] API changes to QWebNavigationRequest > + https://bugs.webkit.org/show_bug.cgi?id=78821 > + > + Reviewed by NOBODY (OOPS!). > + A summarized info about what changes are being made would be nice 566605 3 129236 cmarcelo 2012-02-28 05:58:26 -0800 Created attachment 129236 Patch 566606 4 129236 kenneth 2012-02-28 06:02:14 -0800 Comment on attachment 129236 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129236&action=review > Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp:29 > + QWebNavigationRequestPrivate(const QUrl& url, Qt::MouseButton mouseButton, > + Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType) I beliuve that the coding style tell to not split up these up into two lines, but keep them as one > Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp:50 > +QWebNavigationRequest::QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, > + Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, QObject* parent) Same here > Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h:41 > + QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, > QQuickWebView::NavigationType navigationType, QObject* parent = 0); and here > Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp:45 > +void QtWebPagePolicyClient::decidePolicyForNavigationAction(const QUrl& url, Qt::MouseButton mouseButton, > Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, WKFramePolicyListenerRef listener) And here 566692 5 cmarcelo 2012-02-28 08:12:14 -0800 Committed r109106: <http://trac.webkit.org/changeset/109106> 566709 6 ossy 2012-02-28 08:31:02 -0800 (In reply to comment #5) > Committed r109106: <http://trac.webkit.org/changeset/109106> Reopen, because it broke the build: cc1plus: warnings being treated as errors /ramdisk/qt-linux-32-release-webkit2/build/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp: In member function ‘void QtWebPagePolicyClient::decidePolicyForNavigationAction(const QUrl&, Qt::MouseButton, Qt::KeyboardModifiers, QQuickWebView::NavigationType, const OpaqueWKFramePolicyListener*)’: /ramdisk/qt-linux-32-release-webkit2/build/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp:55: error: case label value exceeds maximum value for type 566776 7 cmarcelo 2012-02-28 09:14:03 -0800 I reverted the part that changes action to be an enum type in bug 79800 because was making our bot GCC unhappy when switching one type with labels from the other. The 'int' solution works and is OK since we are taking values from 2 different enums (one in WebView other in Experimental). It might be the price to pay for having the Experimental enums, but I wonder if there are other approaches we could take. Simon, Kenneth: do you have other ideas? 566781 8 cmarcelo 2012-02-28 09:20:04 -0800 For reference: https://bugs.webkit.org/show_bug.cgi?id=73818 moved the DownloadRequest to a separate enum in experimental and http://trac.webkit.org/changeset/103331 fixes the build afterwards in a "similar" way we did here. 569691 9 cmarcelo 2012-03-02 09:09:56 -0800 Patch for bug 80164 changes the 'action' property to the proper enum. 129096 2012-02-27 14:01:28 -0800 2012-02-28 05:58:19 -0800 Patch bug-78821-20120227190126.patch text/plain 13438 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjE2M2QyNzFiYTg3NzQ5 ODQyMzlhZDlkNGQ1M2ZlZmViMmJmMTU5OS4uMDY0MzAzYzE1YmJjMWQ4NzI3MzllMjNhYzkzN2Jl M2M3OTdiNjllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTAyLTI3ICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XSBBUEkgY2hhbmdlcyB0byBRV2ViTmF2aWdhdGlvblJlcXVlc3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4ODIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdC5jcHA6CisgICAgICAgIChRV2ViTmF2aWdhdGlv blJlcXVlc3RQcml2YXRlOjpRV2ViTmF2aWdhdGlvblJlcXVlc3RQcml2YXRlKToKKyAgICAgICAg KFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUpOgorICAgICAgICAoUVdlYk5hdmlnYXRpb25S ZXF1ZXN0OjpRV2ViTmF2aWdhdGlvblJlcXVlc3QpOgorICAgICAgICAoUVdlYk5hdmlnYXRpb25S ZXF1ZXN0OjpzZXRBY3Rpb24pOgorICAgICAgICAoUVdlYk5hdmlnYXRpb25SZXF1ZXN0Ojptb3Vz ZUJ1dHRvbik6CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OmtleWJvYXJkTW9kaWZp ZXJzKToKKyAgICAgICAgKFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6YWN0aW9uKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdF9wLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9wdWJsaWNhcGkvdHN0X3B1YmxpY2FwaS5jcHA6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wQmVoYXZpb3IvdHN0 X25hdmlnYXRpb25SZXF1ZXN0ZWQucW1sOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQb2xpY3lDbGllbnQuY3BwOgorICAgICAgICAoUXRXZWJQYWdlUG9saWN5Q2xpZW50OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRX ZWJQYWdlUG9saWN5Q2xpZW50Lmg6CisgICAgICAgIChRdFdlYlBhZ2VQb2xpY3lDbGllbnQpOgor CiAyMDEyLTAyLTI2ICBZb3VuZ1RhZWNrIFNvbmcgIDx5b3VuZ3RhZWNrLnNvbmdAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgW0VGTF1bV0syXSBBZGQgSW5qZWN0ZWRCdW5kbGVFZmwuY3BwCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9u cmVxdWVzdC5jcHAKaW5kZXggM2E2M2Y4MGUzNWZhMGM0YWY5MDFhNDBjYTI2ODkxNDdmOTAzMWQy Ny4uODQ1YWFjZmUzZTQyYWQ5YTNiZTAzODUyYjc0Y2UwZTdmZGRhZTkwMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbnJlcXVlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1 ZXN0LmNwcApAQCAtMjUsMTIgKzI1LDExIEBACiAKIGNsYXNzIFFXZWJOYXZpZ2F0aW9uUmVxdWVz dFByaXZhdGUgewogcHVibGljOgotICAgIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUoY29u c3QgUVVybCYgdXJsLCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1VybCwgUXQ6Ok1vdXNlQnV0dG9u IGJ1dHRvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFF0OjpLZXlib2FyZE1v ZGlmaWVycyBtb2RpZmllcnMsIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRp b25UeXBlKQorICAgIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUoY29uc3QgUVVybCYgdXJs LCBRdDo6TW91c2VCdXR0b24gbW91c2VCdXR0b24sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBRdDo6S2V5Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dl YlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlKQogICAgICAgICA6IHVybCh1cmwp Ci0gICAgICAgICwgb3JpZ2luYXRpbmdVcmwob3JpZ2luYXRpbmdVcmwpCi0gICAgICAgICwgYnV0 dG9uKGJ1dHRvbikKLSAgICAgICAgLCBtb2RpZmllcnMobW9kaWZpZXJzKQorICAgICAgICAsIG1v dXNlQnV0dG9uKG1vdXNlQnV0dG9uKQorICAgICAgICAsIGtleWJvYXJkTW9kaWZpZXJzKGtleWJv YXJkTW9kaWZpZXJzKQogICAgICAgICAsIGFjdGlvbihRUXVpY2tXZWJWaWV3OjpBY2NlcHRSZXF1 ZXN0KQogICAgICAgICAsIG5hdmlnYXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKQogICAgIHsKQEAg LTQxLDE3ICs0MCwxNiBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgUVVybCB1cmw7Ci0gICAgUVVy bCBvcmlnaW5hdGluZ1VybDsKLSAgICBRdDo6TW91c2VCdXR0b24gYnV0dG9uOwotICAgIFF0OjpL ZXlib2FyZE1vZGlmaWVycyBtb2RpZmllcnM7Ci0gICAgaW50IGFjdGlvbjsKKyAgICBRdDo6TW91 c2VCdXR0b24gbW91c2VCdXR0b247CisgICAgUXQ6OktleWJvYXJkTW9kaWZpZXJzIGtleWJvYXJk TW9kaWZpZXJzOworICAgIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFj dGlvbjsKICAgICBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZTsK IH07CiAKLVFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6UVdlYk5hdmlnYXRpb25SZXF1ZXN0KGNvbnN0 IFFVcmwmIHVybCwgY29uc3QgUVVybCYgb3JpZ2luYXRpbmdVcmwsIFF0OjpNb3VzZUJ1dHRvbiBi dXR0b24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRdDo6 S2V5Ym9hcmRNb2RpZmllcnMgbW9kaWZpZXJzLCBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlw ZSBuYXZpZ2F0aW9uVHlwZSwgUU9iamVjdCogcGFyZW50KQorUVdlYk5hdmlnYXRpb25SZXF1ZXN0 OjpRV2ViTmF2aWdhdGlvblJlcXVlc3QoY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VCdXR0b24g bW91c2VCdXR0b24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBRdDo6S2V5Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dlYlZpZXc6 Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlLCBRT2JqZWN0KiBwYXJlbnQpCiAgICAgOiBR T2JqZWN0KHBhcmVudCkKLSAgICAsIGQobmV3IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUo dXJsLCBvcmlnaW5hdGluZ1VybCwgYnV0dG9uLCBtb2RpZmllcnMsIG5hdmlnYXRpb25UeXBlKSkK KyAgICAsIGQobmV3IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUodXJsLCBtb3VzZUJ1dHRv biwga2V5Ym9hcmRNb2RpZmllcnMsIG5hdmlnYXRpb25UeXBlKSkKIHsKIH0KIApAQCAtNjAsNyAr NTgsNyBAQCBRV2ViTmF2aWdhdGlvblJlcXVlc3Q6On5RV2ViTmF2aWdhdGlvblJlcXVlc3QoKQog ICAgIGRlbGV0ZSBkOwogfQogCi12b2lkIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6c2V0QWN0aW9u KGludCBhY3Rpb24pCit2b2lkIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6c2V0QWN0aW9uKFFRdWlj a1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbikKIHsKICAgICBpZiAoZC0+ YWN0aW9uID09IGFjdGlvbikKICAgICAgICAgcmV0dXJuOwpAQCAtNzQsMjQgKzcyLDE5IEBAIFFV cmwgUVdlYk5hdmlnYXRpb25SZXF1ZXN0Ojp1cmwoKSBjb25zdAogICAgIHJldHVybiBkLT51cmw7 CiB9CiAKLVFVcmwgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpvcmlnaW5hdGluZ1VybCgpIGNvbnN0 CitpbnQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0Ojptb3VzZUJ1dHRvbigpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGQtPm9yaWdpbmF0aW5nVXJsOworICAgIHJldHVybiBpbnQoZC0+bW91c2VCdXR0b24p OwogfQogCi1pbnQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpidXR0b24oKSBjb25zdAoraW50IFFX ZWJOYXZpZ2F0aW9uUmVxdWVzdDo6a2V5Ym9hcmRNb2RpZmllcnMoKSBjb25zdAogewotICAgIHJl dHVybiBpbnQoZC0+YnV0dG9uKTsKKyAgICByZXR1cm4gaW50KGQtPmtleWJvYXJkTW9kaWZpZXJz KTsKIH0KIAotaW50IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6bW9kaWZpZXJzKCkgY29uc3QKK1FR dWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIFFXZWJOYXZpZ2F0aW9uUmVxdWVz dDo6YWN0aW9uKCkgY29uc3QKIHsKLSAgICByZXR1cm4gaW50KGQtPm1vZGlmaWVycyk7Ci19Ci0K LWludCBRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OmFjdGlvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJu IGludChkLT5hY3Rpb24pOworICAgIHJldHVybiBkLT5hY3Rpb247CiB9CiAKIFFRdWlja1dlYlZp ZXc6Ok5hdmlnYXRpb25UeXBlIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6bmF2aWdhdGlvblR5cGUo KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vi bmF2aWdhdGlvbnJlcXVlc3RfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbnJlcXVlc3RfcC5oCmluZGV4IDQ2MzMzZjBlODU0ZWEyZmJhMmY0NTFkZDg4 MzNkYmEwMmZkZjM1YWUuLmJiMjQ1YTA4NGRkMjUzYTg3NzYzZTU1NDQ5MjkwMTMwNTRiYTY3OGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRp b25yZXF1ZXN0X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJu YXZpZ2F0aW9ucmVxdWVzdF9wLmgKQEAgLTMxLDI0ICszMSwyMiBAQCBjbGFzcyBRV2ViTmF2aWdh dGlvblJlcXVlc3RQcml2YXRlOwogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYk5hdmlnYXRpb25S ZXF1ZXN0IDogcHVibGljIFFPYmplY3QgewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShR VXJsIHVybCBSRUFEIHVybCBDT05TVEFOVCBGSU5BTCkKLSAgICBRX1BST1BFUlRZKFFVcmwgb3Jp Z2luYXRpbmdVcmwgUkVBRCBvcmlnaW5hdGluZ1VybCBDT05TVEFOVCBGSU5BTCkKLSAgICBRX1BS T1BFUlRZKGludCBidXR0b24gUkVBRCBidXR0b24gQ09OU1RBTlQgRklOQUwpCi0gICAgUV9QUk9Q RVJUWShpbnQgbW9kaWZpZXJzIFJFQUQgbW9kaWZpZXJzIENPTlNUQU5UIEZJTkFMKQotICAgIFFf UFJPUEVSVFkoaW50IGFjdGlvbiBSRUFEIGFjdGlvbiBXUklURSBzZXRBY3Rpb24gTk9USUZZIGFj dGlvbkNoYW5nZWQgRklOQUwpCisgICAgUV9QUk9QRVJUWShpbnQgbW91c2VCdXR0b24gUkVBRCBt b3VzZUJ1dHRvbiBDT05TVEFOVCBGSU5BTCkKKyAgICBRX1BST1BFUlRZKGludCBrZXlib2FyZE1v ZGlmaWVycyBSRUFEIGtleWJvYXJkTW9kaWZpZXJzIENPTlNUQU5UIEZJTkFMKQorICAgIFFfUFJP UEVSVFkoUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uIFJFQUQg YWN0aW9uIFdSSVRFIHNldEFjdGlvbiBOT1RJRlkgYWN0aW9uQ2hhbmdlZCBGSU5BTCkKICAgICBR X1BST1BFUlRZKFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlIFJF QUQgbmF2aWdhdGlvblR5cGUgQ09OU1RBTlQgRklOQUwpCiAKIHB1YmxpYzoKLSAgICBRV2ViTmF2 aWdhdGlvblJlcXVlc3QoY29uc3QgUVVybCYgdXJsLCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1Vy bCwgUXQ6Ok1vdXNlQnV0dG9uIGJ1dHRvbiwgUXQ6OktleWJvYXJkTW9kaWZpZXJzIG1vZGlmaWVy cywKKyAgICBRV2ViTmF2aWdhdGlvblJlcXVlc3QoY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VC dXR0b24gbW91c2VCdXR0b24sIFF0OjpLZXlib2FyZE1vZGlmaWVycyBrZXlib2FyZE1vZGlmaWVy cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5 cGUgbmF2aWdhdGlvblR5cGUsIFFPYmplY3QqIHBhcmVudCA9IDApOwogICAgIH5RV2ViTmF2aWdh dGlvblJlcXVlc3QoKTsKIAogICAgIFFVcmwgdXJsKCkgY29uc3Q7Ci0gICAgUVVybCBvcmlnaW5h dGluZ1VybCgpIGNvbnN0OwotICAgIGludCBidXR0b24oKSBjb25zdDsKLSAgICBpbnQgbW9kaWZp ZXJzKCkgY29uc3Q7Ci0gICAgaW50IGFjdGlvbigpIGNvbnN0OworICAgIGludCBtb3VzZUJ1dHRv bigpIGNvbnN0OworICAgIGludCBrZXlib2FyZE1vZGlmaWVycygpIGNvbnN0OworICAgIFFRdWlj a1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbigpIGNvbnN0OwogCi0gICAg dm9pZCBzZXRBY3Rpb24oaW50IGFjdGlvbik7CisgICAgdm9pZCBzZXRBY3Rpb24oUVF1aWNrV2Vi Vmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uKTsKICAgICBRUXVpY2tXZWJWaWV3 OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSgpIGNvbnN0OwogCiBRX1NJR05BTFM6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1YmxpY2Fw aS90c3RfcHVibGljYXBpLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVz dHMvcHVibGljYXBpL3RzdF9wdWJsaWNhcGkuY3BwCmluZGV4IDg3ZTZiZjY0NThkZjMxYzc2Y2Qz NzhlYTE5OGM5MGNjZGZmNzIyYjEuLmJiODAzZTY3NTc3NTRlNjNiMWYzYjRhYWI2ZTdjN2U4OTZl NTdlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMv cHVibGljYXBpL3RzdF9wdWJsaWNhcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvdGVzdHMvcHVibGljYXBpL3RzdF9wdWJsaWNhcGkuY3BwCkBAIC04MywxMCArODMs OSBAQCBzdGF0aWMgUVN0cmluZ0xpc3QgZXhwZWN0ZWRBUEkgPSBRU3RyaW5nTGlzdCgpCiAgICAg PDwgIlFXZWJMb2FkUmVxdWVzdC5lcnJvckRvbWFpbiAtLT4gUVF1aWNrV2ViVmlldzo6RXJyb3JE b21haW4iCiAgICAgPDwgIlFXZWJMb2FkUmVxdWVzdC5lcnJvckNvZGUgLS0+IGludCIKICAgICA8 PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LnVybCAtLT4gUVVybCIKLSAgICA8PCAiUVdlYk5hdmln YXRpb25SZXF1ZXN0Lm9yaWdpbmF0aW5nVXJsIC0tPiBRVXJsIgotICAgIDw8ICJRV2ViTmF2aWdh dGlvblJlcXVlc3QuYnV0dG9uIC0tPiBpbnQiCi0gICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVz dC5tb2RpZmllcnMgLS0+IGludCIKLSAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmFjdGlv biAtLT4gaW50IgorICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QubW91c2VCdXR0b24gLS0+ IGludCIKKyAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmtleWJvYXJkTW9kaWZpZXJzIC0t PiBpbnQiCisgICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5hY3Rpb24gLS0+IFFRdWlja1dl YlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIgogICAgIDw8ICJRV2ViTmF2aWdhdGlvblJl cXVlc3QubmF2aWdhdGlvblR5cGUgLS0+IFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIgog ICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QuYWN0aW9uQ2hhbmdlZCgpIC0tPiB2b2lkIgog ICAgIDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMv cW1sdGVzdHMvRGVza3RvcEJlaGF2aW9yL3RzdF9uYXZpZ2F0aW9uUmVxdWVzdGVkLnFtbCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvRGVza3RvcEJlaGF2 aW9yL3RzdF9uYXZpZ2F0aW9uUmVxdWVzdGVkLnFtbAppbmRleCAwMThiZmE2NmQxM2E0ZGI4MjQ1 NjE1MDdiZmI2ZWVlZmVlNDU4YzY0Li40NjdiM2EwNzNiZWYzODcxOGEyYzAwNDU4ZDk3MDQyMjli MGIxYzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3Rz L3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbmF2aWdhdGlvblJlcXVlc3RlZC5xbWwKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9w QmVoYXZpb3IvdHN0X25hdmlnYXRpb25SZXF1ZXN0ZWQucW1sCkBAIC04LDcgKzgsNiBAQCBJdGVt IHsKICAgICBwcm9wZXJ0eSBpbnQgZXhwZWN0ZWRMZW5ndGg6IDAKICAgICBwcm9wZXJ0eSBpbnQg dG90YWxCeXRlczogMAogICAgIHByb3BlcnR5IGJvb2wgc2hvdWxkRG93bmxvYWQ6IGZhbHNlCi0g ICAgcHJvcGVydHkgc3RyaW5nIG9yaWdpbmF0aW5nVXJsOiAiIgogICAgIHByb3BlcnR5IHVybCBi ZWdpblVybDogUXQucmVzb2x2ZWRVcmwoIi4uL2NvbW1vbi90ZXN0Mi5odG1sIikKICAgICBwcm9w ZXJ0eSB1cmwgZW5kVXJsOiBRdC5yZXNvbHZlZFVybCgiLi4vY29tbW9uL3Rlc3QxLmh0bWwiKQog CkBAIC0yMiwxMSArMjEsMTAgQEAgSXRlbSB7CiAgICAgICAgIG9uTmF2aWdhdGlvblJlcXVlc3Rl ZDogewogICAgICAgICAgICAgaWYgKHNob3VsZERvd25sb2FkKQogICAgICAgICAgICAgICAgIHJl cXVlc3QuYWN0aW9uID0gV2ViVmlld0V4cGVyaW1lbnRhbC5Eb3dubG9hZFJlcXVlc3QKLSAgICAg ICAgICAgIGVsc2UgaWYgKHJlcXVlc3QuYnV0dG9uID09IFF0Lk1pZGRsZUJ1dHRvbiAmJiByZXF1 ZXN0Lm1vZGlmaWVycyAmIFF0LkNvbnRyb2xNb2RpZmllcikgeworICAgICAgICAgICAgZWxzZSBp ZiAocmVxdWVzdC5tb3VzZUJ1dHRvbiA9PSBRdC5NaWRkbGVCdXR0b24gJiYgcmVxdWVzdC5rZXli b2FyZE1vZGlmaWVycyAmIFF0LkNvbnRyb2xNb2RpZmllcikgewogICAgICAgICAgICAgICAgIG90 aGVyV2ViVmlldy5sb2FkKHJlcXVlc3QudXJsKQogICAgICAgICAgICAgICAgIHJlcXVlc3QuYWN0 aW9uID0gV2ViVmlldy5JZ25vcmVSZXF1ZXN0CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBv cmlnaW5hdGluZ1VybCA9IHJlcXVlc3Qub3JpZ2luYXRpbmdVcmwKICAgICAgICAgfQogCiAgICAg ICAgIGV4cGVyaW1lbnRhbC5vbkRvd25sb2FkUmVxdWVzdGVkOiB7CkBAIC03OCw3ICs3Niw2IEBA IEl0ZW0gewogICAgICAgICAgICAgZG93bmxvYWRTcHkuY2xlYXIoKQogICAgICAgICAgICAgZG93 bmxvYWRGaW5pc2hlZFNweS5jbGVhcigpCiAgICAgICAgICAgICBzaG91bGREb3dubG9hZCA9IGZh bHNlCi0gICAgICAgICAgICBvcmlnaW5hdGluZ1VybCA9ICIiCiAgICAgICAgIH0KIAogICAgICAg ICBmdW5jdGlvbiB0ZXN0X3VzZVBvbGljeSgpIHsKQEAgLTExNSwxNSArMTEyLDUgQEAgSXRlbSB7 CiAgICAgICAgICAgICBjb21wYXJlKGRvd25sb2FkRmluaXNoZWRTcHkuY291bnQsIDEpCiAgICAg ICAgICAgICBjb21wYXJlKHRvdGFsQnl0ZXMsIGV4cGVjdGVkTGVuZ3RoKQogICAgICAgICB9Ci0K LSAgICAgICAgZnVuY3Rpb24gdGVzdF9vcmlnaW5hdGluZ1VybCgpIHsKLSAgICAgICAgICAgIHdl YlZpZXcubG9hZChiZWdpblVybCkKLSAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3LndhaXRGb3JM b2FkU3VjY2VlZGVkKCkpCi0gICAgICAgICAgICBtb3VzZUNsaWNrKHdlYlZpZXcsIDEwMCwgMTAw LCBRdC5MZWZ0QnV0dG9uKQotICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRT dWNjZWVkZWQoKSkKLSAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy50aXRsZSwgIlRlc3QgcGFn ZSAxIikKLSAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy51cmwsIGVuZFVybCkKLSAgICAgICAg ICAgIGNvbXBhcmUob3JpZ2luYXRpbmdVcmwsIGJlZ2luVXJsKQotICAgICAgICB9CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBvbGlj eUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5 Q2xpZW50LmNwcAppbmRleCBhZDhjZWQ3M2YzODdlNjJlYTJjMThiNzQzYmIwZGVkOTUzMDY3MDNm Li45MTQ0ODU4OTE4MWY4NTZhZmJhYjYzZDQ1ZGU2MDY1N2EyMjMxYTA1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmNwcApA QCAtNDEsMTIgKzQxLDEyIEBAIFF0V2ViUGFnZVBvbGljeUNsaWVudDo6UXRXZWJQYWdlUG9saWN5 Q2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBRUXVpY2tXZWJWaWV3KiB3CiAgICAgV0tQYWdlU2V0 UGFnZVBvbGljeUNsaWVudChwYWdlUmVmLCAmcG9saWN5Q2xpZW50KTsKIH0KIAotdm9pZCBRdFdl YlBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oY29uc3Qg UVVybCYgdXJsLCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1VybCwgUXQ6Ok1vdXNlQnV0dG9uIG1v dXNlQnV0dG9uLAordm9pZCBRdFdlYlBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24oY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VCdXR0b24gbW91c2VCdXR0 b24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBRdDo6S2V5Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dl YlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlLCBXS0ZyYW1lUG9saWN5TGlzdGVu ZXJSZWYgbGlzdGVuZXIpCiB7CiAgICAgLy8gTk9URTogZXZlbiB0aG91Z2ggdGhlIEMgQVBJIChh bmQgdGhlIFdlYktpdDIgSVBDKSBzdXBwb3J0cyBhbiBhc3luY2hyb25vdXMgYW5zd2VyLCB0aGlz IGlzIG5vdCBjdXJyZW50bHkgd29ya2luZy4KICAgICAvLyBXZSBhcmUgZXhwZWN0ZWQgdG8gY2Fs bCB0aGUgbGlzdGVuZXIgaW1tZWRpYXRlbHkuIFNlZSB0aGUgcGF0Y2ggZm9yIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzc4NS4KLSAgICBRV2ViTmF2aWdhdGlvblJl cXVlc3QgbmF2aWdhdGlvblJlcXVlc3QodXJsLCBvcmlnaW5hdGluZ1VybCwgbW91c2VCdXR0b24s IGtleWJvYXJkTW9kaWZpZXJzLCBuYXZpZ2F0aW9uVHlwZSk7CisgICAgUVdlYk5hdmlnYXRpb25S ZXF1ZXN0IG5hdmlnYXRpb25SZXF1ZXN0KHVybCwgbW91c2VCdXR0b24sIGtleWJvYXJkTW9kaWZp ZXJzLCBuYXZpZ2F0aW9uVHlwZSk7CiAgICAgZW1pdCBtX3dlYlZpZXctPm5hdmlnYXRpb25SZXF1 ZXN0ZWQoJm5hdmlnYXRpb25SZXF1ZXN0KTsKIAogICAgIHN3aXRjaCAobmF2aWdhdGlvblJlcXVl c3QuYWN0aW9uKCkpIHsKQEAgLTEyMyw5ICsxMjMsOCBAQCB2b2lkIFF0V2ViUGFnZVBvbGljeUNs aWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVS ZQogewogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBmcmFtZVVSTChBZG9wdFdLLCBXS0ZyYW1l Q29weVVSTChmcmFtZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiByZXF1ZXN0VVJMKEFk b3B0V0ssIFdLVVJMUmVxdWVzdENvcHlVUkwocmVxdWVzdCkpOwotICAgIFFVcmwgcVVybEZyYW1l ID0gV0tVUkxDb3B5UVVybChmcmFtZVVSTC5nZXQoKSk7CiAgICAgUVVybCBxVXJsID0gV0tVUkxD b3B5UVVybChyZXF1ZXN0VVJMLmdldCgpKTsKLSAgICB0b1F0V2ViUGFnZVBvbGljeUNsaWVudChj bGllbnRJbmZvKS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihxVXJsLCBxVXJsRnJh bWUsIHRvUXRNb3VzZUJ1dHRvbihtb3VzZUJ1dHRvbiksIHRvUXRLZXlib2FyZE1vZGlmaWVycyht b2RpZmllcnMpLCB0b1F1aWNrV2ViVmlld05hdmlnYXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKSwg bGlzdGVuZXIpOworICAgIHRvUXRXZWJQYWdlUG9saWN5Q2xpZW50KGNsaWVudEluZm8pLT5kZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHFVcmwsIHRvUXRNb3VzZUJ1dHRvbihtb3VzZUJ1 dHRvbiksIHRvUXRLZXlib2FyZE1vZGlmaWVycyhtb2RpZmllcnMpLCB0b1F1aWNrV2ViVmlld05h dmlnYXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKSwgbGlzdGVuZXIpOwogfQogCiB2b2lkIFF0V2Vi UGFnZVBvbGljeUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdlUmVmIHBhZ2Us IFdLRnJhbWVSZWYgZnJhbWUsIFdLVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2UsIFdLVVJMUmVxdWVz dFJlZiwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYsIGNvbnN0 IHZvaWQqKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFn ZVBvbGljeUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBv bGljeUNsaWVudC5oCmluZGV4IGUzOTNkNTRmMzdjYjdmNWU5YzcxMTVkZDA5YTkyNDkyZDg2MjVk ZGMuLjllMzk3ZmI3N2I5YTkzMzFhNWZmNTQyNzM4NDBmODk4MTRlMzFmMGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQb2xpY3lDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmgKQEAg LTMxLDcgKzMxLDcgQEAgcHVibGljOgogICAgIFF0V2ViUGFnZVBvbGljeUNsaWVudChXS1BhZ2VS ZWYsIFFRdWlja1dlYlZpZXcqKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oY29uc3QgUVVybCYsIGNvbnN0IFFVcmwmLCBRdDo6TW91c2VCdXR0 b24sIFF0OjpLZXlib2FyZE1vZGlmaWVycywgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUs IFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZik7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKGNvbnN0IFFVcmwmLCBRdDo6TW91c2VCdXR0b24sIFF0OjpLZXlib2FyZE1v ZGlmaWVycywgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUsIFdLRnJhbWVQb2xpY3lMaXN0 ZW5lclJlZik7CiAKICAgICAvLyBXS1BhZ2VQb2xpY3lDbGllbnQgY2FsbGJhY2tzLgogICAgIHN0 YXRpYyB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQYWdlUmVmLCBXS0Zy YW1lUmVmLCBXS0ZyYW1lTmF2aWdhdGlvblR5cGUsIFdLRXZlbnRNb2RpZmllcnMsIFdLRXZlbnRN b3VzZUJ1dHRvbiwgV0tVUkxSZXF1ZXN0UmVmLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYsIFdL VHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Cg== 129236 2012-02-28 05:58:26 -0800 2012-02-28 06:02:14 -0800 Patch bug-78821-20120228105826.patch text/plain 13657 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWQ1MmNlZDZjZTBiYzYz ZWFmNDYzNzU0NzZjNDM5YTI2MDdkZDEzZC4uYjA3OWYyMmYwZGM2MmViMTM1MjRjMWRiNzYxMDNl MTc1MDI1ZTFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAyLTI3ICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XSBBUEkgY2hhbmdlcyB0byBRV2ViTmF2aWdhdGlvblJlcXVlc3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4ODIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlcyBkaXNj dXNzZWQgaW4gQVBJIHJldmlldyBhdCBTemVnZWQ6IHJlbmFtZSAnYnV0dG9uJyB0byAnbW91c2VC dXR0b24nLAorICAgICAgICByZW5hbWUgJ21vZGlmaWVycycgdG8gJ2tleWJvYXJkTW9kaWZpZXJz JywgcmVtb3ZlICdvcmlnaW5hdGluZ1VybCcgYW5kCisgICAgICAgIHVzZSB0aGUgZW51bSB0eXBl IGZvciAnYWN0aW9uJy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRp b25yZXF1ZXN0LmNwcDoKKyAgICAgICAgKFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGU6OlFX ZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUpOgorICAgICAgICAoUVdlYk5hdmlnYXRpb25SZXF1 ZXN0UHJpdmF0ZSk6CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OlFXZWJOYXZpZ2F0 aW9uUmVxdWVzdCk6CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OnNldEFjdGlvbik6 CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVlc3Q6Om1vdXNlQnV0dG9uKToKKyAgICAgICAg KFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6a2V5Ym9hcmRNb2RpZmllcnMpOgorICAgICAgICAoUVdl Yk5hdmlnYXRpb25SZXF1ZXN0OjphY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv cXdlYm5hdmlnYXRpb25yZXF1ZXN0X3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3B1YmxpY2FwaS90c3RfcHVibGljYXBpLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbmF2aWdhdGlvblJlcXVlc3Rl ZC5xbWw6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBvbGljeUNsaWVudC5jcHA6 CisgICAgICAgIChRdFdlYlBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQb2xpY3lDbGllbnQu aDoKKyAgICAgICAgKFF0V2ViUGFnZVBvbGljeUNsaWVudCk6CisKIDIwMTItMDItMjggIFNoaW55 YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEVsZW1lbnQgc2hv dWxkIGJlIGFibGUgdG8gaGF2ZSBtdWx0aXBsZSBzaGFkb3cgcm9vdHMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdC5j cHAKaW5kZXggM2E2M2Y4MGUzNWZhMGM0YWY5MDFhNDBjYTI2ODkxNDdmOTAzMWQyNy4uODQ1YWFj ZmUzZTQyYWQ5YTNiZTAzODUyYjc0Y2UwZTdmZGRhZTkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbnJlcXVlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1ZXN0LmNwcApA QCAtMjUsMTIgKzI1LDExIEBACiAKIGNsYXNzIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUg ewogcHVibGljOgotICAgIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUoY29uc3QgUVVybCYg dXJsLCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1VybCwgUXQ6Ok1vdXNlQnV0dG9uIGJ1dHRvbiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFF0OjpLZXlib2FyZE1vZGlmaWVycyBt b2RpZmllcnMsIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlKQor ICAgIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUoY29uc3QgUVVybCYgdXJsLCBRdDo6TW91 c2VCdXR0b24gbW91c2VCdXR0b24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBR dDo6S2V5Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dlYlZpZXc6Ok5h dmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlKQogICAgICAgICA6IHVybCh1cmwpCi0gICAgICAg ICwgb3JpZ2luYXRpbmdVcmwob3JpZ2luYXRpbmdVcmwpCi0gICAgICAgICwgYnV0dG9uKGJ1dHRv bikKLSAgICAgICAgLCBtb2RpZmllcnMobW9kaWZpZXJzKQorICAgICAgICAsIG1vdXNlQnV0dG9u KG1vdXNlQnV0dG9uKQorICAgICAgICAsIGtleWJvYXJkTW9kaWZpZXJzKGtleWJvYXJkTW9kaWZp ZXJzKQogICAgICAgICAsIGFjdGlvbihRUXVpY2tXZWJWaWV3OjpBY2NlcHRSZXF1ZXN0KQogICAg ICAgICAsIG5hdmlnYXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKQogICAgIHsKQEAgLTQxLDE3ICs0 MCwxNiBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgUVVybCB1cmw7Ci0gICAgUVVybCBvcmlnaW5h dGluZ1VybDsKLSAgICBRdDo6TW91c2VCdXR0b24gYnV0dG9uOwotICAgIFF0OjpLZXlib2FyZE1v ZGlmaWVycyBtb2RpZmllcnM7Ci0gICAgaW50IGFjdGlvbjsKKyAgICBRdDo6TW91c2VCdXR0b24g bW91c2VCdXR0b247CisgICAgUXQ6OktleWJvYXJkTW9kaWZpZXJzIGtleWJvYXJkTW9kaWZpZXJz OworICAgIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbjsKICAg ICBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZTsKIH07CiAKLVFX ZWJOYXZpZ2F0aW9uUmVxdWVzdDo6UVdlYk5hdmlnYXRpb25SZXF1ZXN0KGNvbnN0IFFVcmwmIHVy bCwgY29uc3QgUVVybCYgb3JpZ2luYXRpbmdVcmwsIFF0OjpNb3VzZUJ1dHRvbiBidXR0b24sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRdDo6S2V5Ym9hcmRN b2RpZmllcnMgbW9kaWZpZXJzLCBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0 aW9uVHlwZSwgUU9iamVjdCogcGFyZW50KQorUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpRV2ViTmF2 aWdhdGlvblJlcXVlc3QoY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VCdXR0b24gbW91c2VCdXR0 b24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRdDo6S2V5 Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRp b25UeXBlIG5hdmlnYXRpb25UeXBlLCBRT2JqZWN0KiBwYXJlbnQpCiAgICAgOiBRT2JqZWN0KHBh cmVudCkKLSAgICAsIGQobmV3IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUodXJsLCBvcmln aW5hdGluZ1VybCwgYnV0dG9uLCBtb2RpZmllcnMsIG5hdmlnYXRpb25UeXBlKSkKKyAgICAsIGQo bmV3IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUodXJsLCBtb3VzZUJ1dHRvbiwga2V5Ym9h cmRNb2RpZmllcnMsIG5hdmlnYXRpb25UeXBlKSkKIHsKIH0KIApAQCAtNjAsNyArNTgsNyBAQCBR V2ViTmF2aWdhdGlvblJlcXVlc3Q6On5RV2ViTmF2aWdhdGlvblJlcXVlc3QoKQogICAgIGRlbGV0 ZSBkOwogfQogCi12b2lkIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6c2V0QWN0aW9uKGludCBhY3Rp b24pCit2b2lkIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6c2V0QWN0aW9uKFFRdWlja1dlYlZpZXc6 Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbikKIHsKICAgICBpZiAoZC0+YWN0aW9uID09 IGFjdGlvbikKICAgICAgICAgcmV0dXJuOwpAQCAtNzQsMjQgKzcyLDE5IEBAIFFVcmwgUVdlYk5h dmlnYXRpb25SZXF1ZXN0Ojp1cmwoKSBjb25zdAogICAgIHJldHVybiBkLT51cmw7CiB9CiAKLVFV cmwgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpvcmlnaW5hdGluZ1VybCgpIGNvbnN0CitpbnQgUVdl Yk5hdmlnYXRpb25SZXF1ZXN0Ojptb3VzZUJ1dHRvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGQt Pm9yaWdpbmF0aW5nVXJsOworICAgIHJldHVybiBpbnQoZC0+bW91c2VCdXR0b24pOwogfQogCi1p bnQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpidXR0b24oKSBjb25zdAoraW50IFFXZWJOYXZpZ2F0 aW9uUmVxdWVzdDo6a2V5Ym9hcmRNb2RpZmllcnMoKSBjb25zdAogewotICAgIHJldHVybiBpbnQo ZC0+YnV0dG9uKTsKKyAgICByZXR1cm4gaW50KGQtPmtleWJvYXJkTW9kaWZpZXJzKTsKIH0KIAot aW50IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6bW9kaWZpZXJzKCkgY29uc3QKK1FRdWlja1dlYlZp ZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6YWN0aW9u KCkgY29uc3QKIHsKLSAgICByZXR1cm4gaW50KGQtPm1vZGlmaWVycyk7Ci19Ci0KLWludCBRV2Vi TmF2aWdhdGlvblJlcXVlc3Q6OmFjdGlvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGludChkLT5h Y3Rpb24pOworICAgIHJldHVybiBkLT5hY3Rpb247CiB9CiAKIFFRdWlja1dlYlZpZXc6Ok5hdmln YXRpb25UeXBlIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6bmF2aWdhdGlvblR5cGUoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlv bnJlcXVlc3RfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdh dGlvbnJlcXVlc3RfcC5oCmluZGV4IDQ2MzMzZjBlODU0ZWEyZmJhMmY0NTFkZDg4MzNkYmEwMmZk ZjM1YWUuLmJiMjQ1YTA4NGRkMjUzYTg3NzYzZTU1NDQ5MjkwMTMwNTRiYTY3OGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1ZXN0 X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9u cmVxdWVzdF9wLmgKQEAgLTMxLDI0ICszMSwyMiBAQCBjbGFzcyBRV2ViTmF2aWdhdGlvblJlcXVl c3RQcml2YXRlOwogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0IDog cHVibGljIFFPYmplY3QgewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShRVXJsIHVybCBS RUFEIHVybCBDT05TVEFOVCBGSU5BTCkKLSAgICBRX1BST1BFUlRZKFFVcmwgb3JpZ2luYXRpbmdV cmwgUkVBRCBvcmlnaW5hdGluZ1VybCBDT05TVEFOVCBGSU5BTCkKLSAgICBRX1BST1BFUlRZKGlu dCBidXR0b24gUkVBRCBidXR0b24gQ09OU1RBTlQgRklOQUwpCi0gICAgUV9QUk9QRVJUWShpbnQg bW9kaWZpZXJzIFJFQUQgbW9kaWZpZXJzIENPTlNUQU5UIEZJTkFMKQotICAgIFFfUFJPUEVSVFko aW50IGFjdGlvbiBSRUFEIGFjdGlvbiBXUklURSBzZXRBY3Rpb24gTk9USUZZIGFjdGlvbkNoYW5n ZWQgRklOQUwpCisgICAgUV9QUk9QRVJUWShpbnQgbW91c2VCdXR0b24gUkVBRCBtb3VzZUJ1dHRv biBDT05TVEFOVCBGSU5BTCkKKyAgICBRX1BST1BFUlRZKGludCBrZXlib2FyZE1vZGlmaWVycyBS RUFEIGtleWJvYXJkTW9kaWZpZXJzIENPTlNUQU5UIEZJTkFMKQorICAgIFFfUFJPUEVSVFkoUVF1 aWNrV2ViVmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uIFJFQUQgYWN0aW9uIFdS SVRFIHNldEFjdGlvbiBOT1RJRlkgYWN0aW9uQ2hhbmdlZCBGSU5BTCkKICAgICBRX1BST1BFUlRZ KFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlIFJFQUQgbmF2aWdh dGlvblR5cGUgQ09OU1RBTlQgRklOQUwpCiAKIHB1YmxpYzoKLSAgICBRV2ViTmF2aWdhdGlvblJl cXVlc3QoY29uc3QgUVVybCYgdXJsLCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1VybCwgUXQ6Ok1v dXNlQnV0dG9uIGJ1dHRvbiwgUXQ6OktleWJvYXJkTW9kaWZpZXJzIG1vZGlmaWVycywKKyAgICBR V2ViTmF2aWdhdGlvblJlcXVlc3QoY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VCdXR0b24gbW91 c2VCdXR0b24sIFF0OjpLZXlib2FyZE1vZGlmaWVycyBrZXlib2FyZE1vZGlmaWVycywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUgbmF2aWdh dGlvblR5cGUsIFFPYmplY3QqIHBhcmVudCA9IDApOwogICAgIH5RV2ViTmF2aWdhdGlvblJlcXVl c3QoKTsKIAogICAgIFFVcmwgdXJsKCkgY29uc3Q7Ci0gICAgUVVybCBvcmlnaW5hdGluZ1VybCgp IGNvbnN0OwotICAgIGludCBidXR0b24oKSBjb25zdDsKLSAgICBpbnQgbW9kaWZpZXJzKCkgY29u c3Q7Ci0gICAgaW50IGFjdGlvbigpIGNvbnN0OworICAgIGludCBtb3VzZUJ1dHRvbigpIGNvbnN0 OworICAgIGludCBrZXlib2FyZE1vZGlmaWVycygpIGNvbnN0OworICAgIFFRdWlja1dlYlZpZXc6 Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbigpIGNvbnN0OwogCi0gICAgdm9pZCBzZXRB Y3Rpb24oaW50IGFjdGlvbik7CisgICAgdm9pZCBzZXRBY3Rpb24oUVF1aWNrV2ViVmlldzo6TmF2 aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uKTsKICAgICBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0 aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSgpIGNvbnN0OwogCiBRX1NJR05BTFM6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1YmxpY2FwaS90c3RfcHVi bGljYXBpLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcHVibGlj YXBpL3RzdF9wdWJsaWNhcGkuY3BwCmluZGV4IDg3ZTZiZjY0NThkZjMxYzc2Y2QzNzhlYTE5OGM5 MGNjZGZmNzIyYjEuLmJiODAzZTY3NTc3NTRlNjNiMWYzYjRhYWI2ZTdjN2U4OTZlNTdlNzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcHVibGljYXBp L3RzdF9wdWJsaWNhcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcHVibGljYXBpL3RzdF9wdWJsaWNhcGkuY3BwCkBAIC04MywxMCArODMsOSBAQCBzdGF0 aWMgUVN0cmluZ0xpc3QgZXhwZWN0ZWRBUEkgPSBRU3RyaW5nTGlzdCgpCiAgICAgPDwgIlFXZWJM b2FkUmVxdWVzdC5lcnJvckRvbWFpbiAtLT4gUVF1aWNrV2ViVmlldzo6RXJyb3JEb21haW4iCiAg ICAgPDwgIlFXZWJMb2FkUmVxdWVzdC5lcnJvckNvZGUgLS0+IGludCIKICAgICA8PCAiUVdlYk5h dmlnYXRpb25SZXF1ZXN0LnVybCAtLT4gUVVybCIKLSAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1 ZXN0Lm9yaWdpbmF0aW5nVXJsIC0tPiBRVXJsIgotICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVl c3QuYnV0dG9uIC0tPiBpbnQiCi0gICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5tb2RpZmll cnMgLS0+IGludCIKLSAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmFjdGlvbiAtLT4gaW50 IgorICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QubW91c2VCdXR0b24gLS0+IGludCIKKyAg ICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmtleWJvYXJkTW9kaWZpZXJzIC0tPiBpbnQiCisg ICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5hY3Rpb24gLS0+IFFRdWlja1dlYlZpZXc6Ok5h dmlnYXRpb25SZXF1ZXN0QWN0aW9uIgogICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QubmF2 aWdhdGlvblR5cGUgLS0+IFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIgogICAgIDw8ICJR V2ViTmF2aWdhdGlvblJlcXVlc3QuYWN0aW9uQ2hhbmdlZCgpIC0tPiB2b2lkIgogICAgIDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv RGVza3RvcEJlaGF2aW9yL3RzdF9uYXZpZ2F0aW9uUmVxdWVzdGVkLnFtbCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvRGVza3RvcEJlaGF2aW9yL3RzdF9u YXZpZ2F0aW9uUmVxdWVzdGVkLnFtbAppbmRleCAwMThiZmE2NmQxM2E0ZGI4MjQ1NjE1MDdiZmI2 ZWVlZmVlNDU4YzY0Li40NjdiM2EwNzNiZWYzODcxOGEyYzAwNDU4ZDk3MDQyMjliMGIxYzNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3Rz L0Rlc2t0b3BCZWhhdmlvci90c3RfbmF2aWdhdGlvblJlcXVlc3RlZC5xbWwKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wQmVoYXZpb3Iv dHN0X25hdmlnYXRpb25SZXF1ZXN0ZWQucW1sCkBAIC04LDcgKzgsNiBAQCBJdGVtIHsKICAgICBw cm9wZXJ0eSBpbnQgZXhwZWN0ZWRMZW5ndGg6IDAKICAgICBwcm9wZXJ0eSBpbnQgdG90YWxCeXRl czogMAogICAgIHByb3BlcnR5IGJvb2wgc2hvdWxkRG93bmxvYWQ6IGZhbHNlCi0gICAgcHJvcGVy dHkgc3RyaW5nIG9yaWdpbmF0aW5nVXJsOiAiIgogICAgIHByb3BlcnR5IHVybCBiZWdpblVybDog UXQucmVzb2x2ZWRVcmwoIi4uL2NvbW1vbi90ZXN0Mi5odG1sIikKICAgICBwcm9wZXJ0eSB1cmwg ZW5kVXJsOiBRdC5yZXNvbHZlZFVybCgiLi4vY29tbW9uL3Rlc3QxLmh0bWwiKQogCkBAIC0yMiwx MSArMjEsMTAgQEAgSXRlbSB7CiAgICAgICAgIG9uTmF2aWdhdGlvblJlcXVlc3RlZDogewogICAg ICAgICAgICAgaWYgKHNob3VsZERvd25sb2FkKQogICAgICAgICAgICAgICAgIHJlcXVlc3QuYWN0 aW9uID0gV2ViVmlld0V4cGVyaW1lbnRhbC5Eb3dubG9hZFJlcXVlc3QKLSAgICAgICAgICAgIGVs c2UgaWYgKHJlcXVlc3QuYnV0dG9uID09IFF0Lk1pZGRsZUJ1dHRvbiAmJiByZXF1ZXN0Lm1vZGlm aWVycyAmIFF0LkNvbnRyb2xNb2RpZmllcikgeworICAgICAgICAgICAgZWxzZSBpZiAocmVxdWVz dC5tb3VzZUJ1dHRvbiA9PSBRdC5NaWRkbGVCdXR0b24gJiYgcmVxdWVzdC5rZXlib2FyZE1vZGlm aWVycyAmIFF0LkNvbnRyb2xNb2RpZmllcikgewogICAgICAgICAgICAgICAgIG90aGVyV2ViVmll dy5sb2FkKHJlcXVlc3QudXJsKQogICAgICAgICAgICAgICAgIHJlcXVlc3QuYWN0aW9uID0gV2Vi Vmlldy5JZ25vcmVSZXF1ZXN0CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBvcmlnaW5hdGlu Z1VybCA9IHJlcXVlc3Qub3JpZ2luYXRpbmdVcmwKICAgICAgICAgfQogCiAgICAgICAgIGV4cGVy aW1lbnRhbC5vbkRvd25sb2FkUmVxdWVzdGVkOiB7CkBAIC03OCw3ICs3Niw2IEBAIEl0ZW0gewog ICAgICAgICAgICAgZG93bmxvYWRTcHkuY2xlYXIoKQogICAgICAgICAgICAgZG93bmxvYWRGaW5p c2hlZFNweS5jbGVhcigpCiAgICAgICAgICAgICBzaG91bGREb3dubG9hZCA9IGZhbHNlCi0gICAg ICAgICAgICBvcmlnaW5hdGluZ1VybCA9ICIiCiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlv biB0ZXN0X3VzZVBvbGljeSgpIHsKQEAgLTExNSwxNSArMTEyLDUgQEAgSXRlbSB7CiAgICAgICAg ICAgICBjb21wYXJlKGRvd25sb2FkRmluaXNoZWRTcHkuY291bnQsIDEpCiAgICAgICAgICAgICBj b21wYXJlKHRvdGFsQnl0ZXMsIGV4cGVjdGVkTGVuZ3RoKQogICAgICAgICB9Ci0KLSAgICAgICAg ZnVuY3Rpb24gdGVzdF9vcmlnaW5hdGluZ1VybCgpIHsKLSAgICAgICAgICAgIHdlYlZpZXcubG9h ZChiZWdpblVybCkKLSAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3LndhaXRGb3JMb2FkU3VjY2Vl ZGVkKCkpCi0gICAgICAgICAgICBtb3VzZUNsaWNrKHdlYlZpZXcsIDEwMCwgMTAwLCBRdC5MZWZ0 QnV0dG9uKQotICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRTdWNjZWVkZWQo KSkKLSAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy50aXRsZSwgIlRlc3QgcGFnZSAxIikKLSAg ICAgICAgICAgIGNvbXBhcmUod2ViVmlldy51cmwsIGVuZFVybCkKLSAgICAgICAgICAgIGNvbXBh cmUob3JpZ2luYXRpbmdVcmwsIGJlZ2luVXJsKQotICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBvbGljeUNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmNw cAppbmRleCBhZDhjZWQ3M2YzODdlNjJlYTJjMThiNzQzYmIwZGVkOTUzMDY3MDNmLi45MTQ0ODU4 OTE4MWY4NTZhZmJhYjYzZDQ1ZGU2MDY1N2EyMjMxYTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmNwcApAQCAtNDEsMTIg KzQxLDEyIEBAIFF0V2ViUGFnZVBvbGljeUNsaWVudDo6UXRXZWJQYWdlUG9saWN5Q2xpZW50KFdL UGFnZVJlZiBwYWdlUmVmLCBRUXVpY2tXZWJWaWV3KiB3CiAgICAgV0tQYWdlU2V0UGFnZVBvbGlj eUNsaWVudChwYWdlUmVmLCAmcG9saWN5Q2xpZW50KTsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQb2xp Y3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oY29uc3QgUVVybCYgdXJs LCBjb25zdCBRVXJsJiBvcmlnaW5hdGluZ1VybCwgUXQ6Ok1vdXNlQnV0dG9uIG1vdXNlQnV0dG9u LAordm9pZCBRdFdlYlBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24oY29uc3QgUVVybCYgdXJsLCBRdDo6TW91c2VCdXR0b24gbW91c2VCdXR0b24sCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBR dDo6S2V5Ym9hcmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnMsIFFRdWlja1dlYlZpZXc6Ok5h dmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlz dGVuZXIpCiB7CiAgICAgLy8gTk9URTogZXZlbiB0aG91Z2ggdGhlIEMgQVBJIChhbmQgdGhlIFdl YktpdDIgSVBDKSBzdXBwb3J0cyBhbiBhc3luY2hyb25vdXMgYW5zd2VyLCB0aGlzIGlzIG5vdCBj dXJyZW50bHkgd29ya2luZy4KICAgICAvLyBXZSBhcmUgZXhwZWN0ZWQgdG8gY2FsbCB0aGUgbGlz dGVuZXIgaW1tZWRpYXRlbHkuIFNlZSB0aGUgcGF0Y2ggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01Mzc4NS4KLSAgICBRV2ViTmF2aWdhdGlvblJlcXVlc3QgbmF2 aWdhdGlvblJlcXVlc3QodXJsLCBvcmlnaW5hdGluZ1VybCwgbW91c2VCdXR0b24sIGtleWJvYXJk TW9kaWZpZXJzLCBuYXZpZ2F0aW9uVHlwZSk7CisgICAgUVdlYk5hdmlnYXRpb25SZXF1ZXN0IG5h dmlnYXRpb25SZXF1ZXN0KHVybCwgbW91c2VCdXR0b24sIGtleWJvYXJkTW9kaWZpZXJzLCBuYXZp Z2F0aW9uVHlwZSk7CiAgICAgZW1pdCBtX3dlYlZpZXctPm5hdmlnYXRpb25SZXF1ZXN0ZWQoJm5h dmlnYXRpb25SZXF1ZXN0KTsKIAogICAgIHN3aXRjaCAobmF2aWdhdGlvblJlcXVlc3QuYWN0aW9u KCkpIHsKQEAgLTEyMyw5ICsxMjMsOCBAQCB2b2lkIFF0V2ViUGFnZVBvbGljeUNsaWVudDo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVSZQogewogICAg IFdLUmV0YWluUHRyPFdLVVJMUmVmPiBmcmFtZVVSTChBZG9wdFdLLCBXS0ZyYW1lQ29weVVSTChm cmFtZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiByZXF1ZXN0VVJMKEFkb3B0V0ssIFdL VVJMUmVxdWVzdENvcHlVUkwocmVxdWVzdCkpOwotICAgIFFVcmwgcVVybEZyYW1lID0gV0tVUkxD b3B5UVVybChmcmFtZVVSTC5nZXQoKSk7CiAgICAgUVVybCBxVXJsID0gV0tVUkxDb3B5UVVybChy ZXF1ZXN0VVJMLmdldCgpKTsKLSAgICB0b1F0V2ViUGFnZVBvbGljeUNsaWVudChjbGllbnRJbmZv KS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihxVXJsLCBxVXJsRnJhbWUsIHRvUXRN b3VzZUJ1dHRvbihtb3VzZUJ1dHRvbiksIHRvUXRLZXlib2FyZE1vZGlmaWVycyhtb2RpZmllcnMp LCB0b1F1aWNrV2ViVmlld05hdmlnYXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKSwgbGlzdGVuZXIp OworICAgIHRvUXRXZWJQYWdlUG9saWN5Q2xpZW50KGNsaWVudEluZm8pLT5kZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uKHFVcmwsIHRvUXRNb3VzZUJ1dHRvbihtb3VzZUJ1dHRvbiksIHRv UXRLZXlib2FyZE1vZGlmaWVycyhtb2RpZmllcnMpLCB0b1F1aWNrV2ViVmlld05hdmlnYXRpb25U eXBlKG5hdmlnYXRpb25UeXBlKSwgbGlzdGVuZXIpOwogfQogCiB2b2lkIFF0V2ViUGFnZVBvbGlj eUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVS ZWYgZnJhbWUsIFdLVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2UsIFdLVVJMUmVxdWVzdFJlZiwgV0tG cmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBvbGljeUNs aWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBvbGljeUNsaWVu dC5oCmluZGV4IGUzOTNkNTRmMzdjYjdmNWU5YzcxMTVkZDA5YTkyNDkyZDg2MjVkZGMuLjllMzk3 ZmI3N2I5YTkzMzFhNWZmNTQyNzM4NDBmODk4MTRlMzFmMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQb2xpY3lDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmgKQEAgLTMxLDcgKzMx LDcgQEAgcHVibGljOgogICAgIFF0V2ViUGFnZVBvbGljeUNsaWVudChXS1BhZ2VSZWYsIFFRdWlj a1dlYlZpZXcqKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oY29uc3QgUVVybCYsIGNvbnN0IFFVcmwmLCBRdDo6TW91c2VCdXR0b24sIFF0OjpL ZXlib2FyZE1vZGlmaWVycywgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUsIFdLRnJhbWVQ b2xpY3lMaXN0ZW5lclJlZik7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKGNvbnN0IFFVcmwmLCBRdDo6TW91c2VCdXR0b24sIFF0OjpLZXlib2FyZE1vZGlmaWVycywg UVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUsIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZik7 CiAKICAgICAvLyBXS1BhZ2VQb2xpY3lDbGllbnQgY2FsbGJhY2tzLgogICAgIHN0YXRpYyB2b2lk IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBX S0ZyYW1lTmF2aWdhdGlvblR5cGUsIFdLRXZlbnRNb2RpZmllcnMsIFdLRXZlbnRNb3VzZUJ1dHRv biwgV0tVUkxSZXF1ZXN0UmVmLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYsIFdLVHlwZVJlZiB1 c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Cg==