65315 2011-07-28 07:19:01 -0700 [Qt] Make QDesktopWebView/QTouchWebView loadProgress property more usable in QML. 2011-07-29 13:27:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 menard menard benjamin cmarcelo kling luiz oldest_to_newest 443476 0 menard 2011-07-28 07:19:01 -0700 [Qt] Make QDesktopWebView loadProgress property more usable in QML. 443477 1 102254 menard 2011-07-28 07:21:55 -0700 Created attachment 102254 Patch 443479 2 102254 noam 2011-07-28 07:26:11 -0700 Comment on attachment 102254 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102254&action=review > Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:54 > + Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgress) Shouldn't NOTIFY point to a signal? 443484 3 102254 benjamin 2011-07-28 07:34:15 -0700 Comment on attachment 102254 Patch I am pretty sure the other view could enjoy the same kind of love :) Please update both view together when they provide the same API. Storing the loadProgress should probably be done on QtWebPageProxy. 443491 4 102254 cmarcelo 2011-07-28 07:43:22 -0700 Comment on attachment 102254 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102254&action=review >> Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:54 >> + Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgress) > > Shouldn't NOTIFY point to a signal? Yes, and it does :-)... The problem here is that the signal and the getter have the same name. Alexis, what about changing the signal name to loadProgressChanged? 443496 5 102259 menard 2011-07-28 07:56:49 -0700 Created attachment 102259 Patch 443512 6 102259 benjamin 2011-07-28 09:10:33 -0700 Comment on attachment 102259 Patch QTouchWebPage already has the property. qtouchwebview_p.h is not the implementation of ViewInterface like on the desktop case. The update should be on QTouchWebPage :) Would you mind addind an API test on the way? :-D 443534 7 102267 menard 2011-07-28 10:08:28 -0700 Created attachment 102267 Patch 443873 8 102267 benjamin 2011-07-29 04:02:05 -0700 Comment on attachment 102267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102267&action=review > Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp:160 > + QVERIFY(waitForSignal(viewAbstraction.data(), SIGNAL(loadProgressChanged(int)))); > + I think this should be a signal spy over loadProgressChanged(), then you check that you got the signal. The wait for signal should be on the loadSucceeded only, like the next line. This is just for robustness, in case a future refactoring make it simultaneous to have loadProgressChanged(100) and loadSucceeded() for local file. 443890 9 menard 2011-07-29 04:55:24 -0700 Committed r91985: <http://trac.webkit.org/changeset/91985> 102254 2011-07-28 07:21:55 -0700 2011-07-28 07:56:41 -0700 Patch bug-65315-20110728112057.patch text/plain 3449 menard U3VidmVyc2lvbiBSZXZpc2lvbjogOTE5MTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNGMxOTUzYjI3NDc2NDgy NmQzY2RiYzI5ODZlNDU5MjA4NTA1OWFkLi4zNDA2MTdhYmQ1NDllMmI2Mzg4MGMzZDNlY2I0OGVk MjVmZTNiODhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDctMjggIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBN YWtlIFFEZXNrdG9wV2ViVmlldyBsb2FkUHJvZ3Jlc3MgcHJvcGVydHkgbW9yZSB1c2FibGUgaW4g UU1MLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBv cmRlciB0byB1c2UgdGhlIGxvYWRQcm9ncmVzcyB2YWx1ZSBpbiBRTUwgd2UgbmVlZCB0byBtYWtl IGl0CisgICAgICAgIGEgUV9QUk9QRVJUWSwgdGhlcmVmb3JlIHdlIG5lZWQgYSBnZXR0ZXIgdG8g Z2V0IGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuY3Bw OgorICAgICAgICAoUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6UURlc2t0b3BXZWJWaWV3UHJpdmF0 ZSk6CisgICAgICAgIChRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VMb2FkUHJvZ3Jl c3MpOgorICAgICAgICAoUURlc2t0b3BXZWJWaWV3Ojpsb2FkUHJvZ3Jlc3MpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oOgorCiAyMDExLTA3LTI3ICBNYXJrIEhhaG5lbmJl cmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG9wZXJhdG9yIG5l dyBmcm9tIEpTQ2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZGVza3RvcHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x ZGVza3RvcHdlYnZpZXcuY3BwCmluZGV4IDAzYmE5MzZjMDM0MzkxNWRiOGZlMjgwYzU2OWJlYjBh ZTM4ZjliZDAuLmJmNzYxOWNiOGNlYTQ2MjlkYjhiYjU2MTI0YTllOWI4MDE2ZGFkZjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5j cHAKQEAgLTQxLDYgKzQxLDcgQEAgUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6UURlc2t0b3BXZWJW aWV3UHJpdmF0ZShRRGVza3RvcFdlYlZpZXcqIHEsIFdLQ29udGV4dFJlZgogICAgIDogcShxKQog ICAgICwgcGFnZSh0aGlzLCBjb250ZXh0UmVmID8gbmV3IFFXS0NvbnRleHQoY29udGV4dFJlZikg OiBkZWZhdWx0V0tDb250ZXh0KCksIHBhZ2VHcm91cFJlZikKICAgICAsIGlzQ3Jhc2hlZChmYWxz ZSkKKyAgICAsIGxvYWRQcm9ncmVzcygwKQogewogfQogCkBAIC0xMzIsNiArMTMzLDcgQEAgdm9p ZCBRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpsb2FkRGlkRmFpbChjb25zdCBRV2ViRXJyb3ImIGVy cm9yKQogCiB2b2lkIFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6OmRpZENoYW5nZUxvYWRQcm9ncmVz cyhpbnQgcGVyY2VudGFnZUxvYWRlZCkKIHsKKyAgICBsb2FkUHJvZ3Jlc3MgPSBwZXJjZW50YWdl TG9hZGVkOwogICAgIGVtaXQgcS0+bG9hZFByb2dyZXNzKHBlcmNlbnRhZ2VMb2FkZWQpOwogfQog CkBAIC0xOTgsNiArMjAwLDExIEBAIFFVcmwgUURlc2t0b3BXZWJWaWV3Ojp1cmwoKSBjb25zdAog ICAgIHJldHVybiBkLT5wYWdlLnVybCgpOwogfQogCitpbnQgUURlc2t0b3BXZWJWaWV3Ojpsb2Fk UHJvZ3Jlc3MoKSBjb25zdAoreworICAgIHJldHVybiBkLT5sb2FkUHJvZ3Jlc3M7Cit9CisKIFFT dHJpbmcgUURlc2t0b3BXZWJWaWV3Ojp0aXRsZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGQtPnBh Z2UudGl0bGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cWRlc2t0b3B3ZWJ2aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNr dG9wd2Vidmlldy5oCmluZGV4IDYyMzZiODViOGU1YTA0MmQ3NjZmNTgzZWFmNjYwMDMzYmFiYWI5 NDUuLjk3ODRkZDVlNmU4ZGM2OTZlMTc3ODQwNWI5NWYxNjZhN2RhZTAxYmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaApAQCAtNTEs NiArNTEsNyBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRRGVza3RvcFdlYlZpZXcgOiBwdWJsaWMg UVNHUGFpbnRlZEl0ZW0gewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRp dGxlIFJFQUQgdGl0bGUgTk9USUZZIHRpdGxlQ2hhbmdlZCkKICAgICBRX1BST1BFUlRZKFFVcmwg dXJsIFJFQUQgdXJsIE5PVElGWSB1cmxDaGFuZ2VkKQorICAgIFFfUFJPUEVSVFkoaW50IGxvYWRQ cm9ncmVzcyBSRUFEIGxvYWRQcm9ncmVzcyBOT1RJRlkgbG9hZFByb2dyZXNzKQogCiAgICAgUV9F TlVNUyhOYXZpZ2F0aW9uQWN0aW9uKQogCkBAIC02MCw2ICs2MSw3IEBAIHB1YmxpYzoKIAogICAg IFFVcmwgdXJsKCkgY29uc3Q7CiAgICAgUVN0cmluZyB0aXRsZSgpIGNvbnN0OworICAgIGludCBs b2FkUHJvZ3Jlc3MoKSBjb25zdDsKIAogICAgIFFfSU5WT0tBQkxFIFFBY3Rpb24qIG5hdmlnYXRp b25BY3Rpb24oUXRXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb24gd2hpY2gpIGNvbnN0OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlld19w LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlld19wLmgK aW5kZXggODc5Nzg3ZTIyYWYwZTZiZGU4OWI2OTljOTIwMzQ1YmYyMjNkZDRlYi4uNWUyYzY0OGJh NDFhMDMwYzc0MjQzMDVjNWRlODk5Mjk2ZmFmYWMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3X3AuaApAQCAtMzcsNiArMzcsNyBA QCBwdWJsaWM6CiAgICAgUURlc2t0b3BXZWJQYWdlUHJveHkgcGFnZTsKIAogICAgIGJvb2wgaXND cmFzaGVkOworICAgIGludCBsb2FkUHJvZ3Jlc3M7CiAKIHByaXZhdGU6CiAgICAgLyogSW1wbGVt ZW50YXRpb24gb2YgVmlld0ludGVyZmFjZSAqLwo= 102259 2011-07-28 07:56:49 -0700 2011-07-28 10:08:21 -0700 Patch bug-65315-20110728115551.patch text/plain 7590 menard U3VidmVyc2lvbiBSZXZpc2lvbjogOTE5MTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNGMxOTUzYjI3NDc2NDgy NmQzY2RiYzI5ODZlNDU5MjA4NTA1OWFkLi42ZDRhNWFlMGY0M2Y4ZmI0ZTA2NzEzNjk1YjUxYzVk YTI4ZmZjNzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDctMjggIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBN YWtlIFFEZXNrdG9wV2ViVmlldy9RVG91Y2hXZWJWaWV3IGxvYWRQcm9ncmVzcyBwcm9wZXJ0eSBt b3JlIHVzYWJsZSBpbiBRTUwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEluIG9yZGVyIHRvIHVzZSB0aGUgbG9hZFByb2dyZXNzIHZhbHVlIGluIFFNTCB3 ZSBuZWVkIHRvIG1ha2UgaXQKKyAgICAgICAgYSBRX1BST1BFUlRZLCB0aGVyZWZvcmUgd2UgbmVl ZCBhIGdldHRlciB0byBnZXQgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FkZXNr dG9wd2Vidmlldy5jcHA6CisgICAgICAgIChRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpkaWRDaGFu Z2VMb2FkUHJvZ3Jlc3MpOgorICAgICAgICAoUURlc2t0b3BXZWJWaWV3Ojpsb2FkUHJvZ3Jlc3Mp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFUb3VjaFdl YlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VMb2FkUHJvZ3Jlc3MpOgorICAgICAgICAoUVRvdWNoV2Vi Vmlldzo6bG9hZFByb2dyZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdl YnZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdl YlBhZ2VQcm94eTo6UXRXZWJQYWdlUHJveHkpOgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6OmRp ZENoYW5nZUxvYWRQcm9ncmVzcyk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBy b3h5Lmg6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6bG9hZFByb2dyZXNzKToKKwogMjAxMS0w Ny0yNyAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBvcGVyYXRvciBuZXcgZnJvbSBKU0NlbGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNwcAppbmRleCAwM2JhOTM2YzAzNDM5 MTVkYjhmZTI4MGM1NjliZWIwYWUzOGY5YmQwLi5jNDYwOGE5YzkzZTBiMWRkOWVjYTliNzM0Nzk4 OTFhZmVhZDBhNWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FkZXNrdG9wd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZGVza3RvcHdlYnZpZXcuY3BwCkBAIC0xMzIsNyArMTMyLDcgQEAgdm9pZCBRRGVza3RvcFdl YlZpZXdQcml2YXRlOjpsb2FkRGlkRmFpbChjb25zdCBRV2ViRXJyb3ImIGVycm9yKQogCiB2b2lk IFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6OmRpZENoYW5nZUxvYWRQcm9ncmVzcyhpbnQgcGVyY2Vu dGFnZUxvYWRlZCkKIHsKLSAgICBlbWl0IHEtPmxvYWRQcm9ncmVzcyhwZXJjZW50YWdlTG9hZGVk KTsKKyAgICBlbWl0IHEtPmxvYWRQcm9ncmVzc0NoYW5nZWQocGVyY2VudGFnZUxvYWRlZCk7CiB9 CiAKIHZvaWQgUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6c2hvd0NvbnRleHRNZW51KFFTaGFyZWRQ b2ludGVyPFFNZW51PiBtZW51KQpAQCAtMTk4LDYgKzE5OCwxMSBAQCBRVXJsIFFEZXNrdG9wV2Vi Vmlldzo6dXJsKCkgY29uc3QKICAgICByZXR1cm4gZC0+cGFnZS51cmwoKTsKIH0KIAoraW50IFFE ZXNrdG9wV2ViVmlldzo6bG9hZFByb2dyZXNzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+cGFn ZS5sb2FkUHJvZ3Jlc3MoKTsKK30KKwogUVN0cmluZyBRRGVza3RvcFdlYlZpZXc6OnRpdGxlKCkg Y29uc3QKIHsKICAgICByZXR1cm4gZC0+cGFnZS50aXRsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmgKaW5kZXggNjIzNmI4NWI4ZTVh MDQyZDc2NmY1ODNlYWY2NjAwMzNiYWJhYjk0NS4uOGVkZDkyMWQwZTRlOTU3YmQwOTk3YTJkOTRm MWViM2U0NzVlNjgyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZGVza3RvcHdlYnZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FkZXNrdG9wd2Vidmlldy5oCkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JU IFFEZXNrdG9wV2ViVmlldyA6IHB1YmxpYyBRU0dQYWludGVkSXRlbSB7CiAgICAgUV9PQkpFQ1QK ICAgICBRX1BST1BFUlRZKFFTdHJpbmcgdGl0bGUgUkVBRCB0aXRsZSBOT1RJRlkgdGl0bGVDaGFu Z2VkKQogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgTk9USUZZIHVybENoYW5nZWQp CisgICAgUV9QUk9QRVJUWShpbnQgbG9hZFByb2dyZXNzIFJFQUQgbG9hZFByb2dyZXNzIE5PVElG WSBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKQogCiAgICAgUV9FTlVNUyhOYXZpZ2F0aW9uQWN0aW9uKQog CkBAIC02MCw2ICs2MSw3IEBAIHB1YmxpYzoKIAogICAgIFFVcmwgdXJsKCkgY29uc3Q7CiAgICAg UVN0cmluZyB0aXRsZSgpIGNvbnN0OworICAgIGludCBsb2FkUHJvZ3Jlc3MoKSBjb25zdDsKIAog ICAgIFFfSU5WT0tBQkxFIFFBY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24oUXRXZWJLaXQ6Ok5hdmln YXRpb25BY3Rpb24gd2hpY2gpIGNvbnN0OwogCkBAIC03Miw3ICs3NCw3IEBAIFFfU0lHTkFMUzoK ICAgICB2b2lkIGxvYWRTdGFydGVkKCk7CiAgICAgdm9pZCBsb2FkU3VjY2VlZGVkKCk7CiAgICAg dm9pZCBsb2FkRmFpbGVkKGNvbnN0IFFXZWJFcnJvciYpOwotICAgIHZvaWQgbG9hZFByb2dyZXNz KGludCBwcm9ncmVzcyk7CisgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVz cyk7CiAgICAgdm9pZCB1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKTsKIAogcHJvdGVjdGVkOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAKaW5k ZXggYzFiZTVhYjVhYjFiMWY1MjA4MjA3MmI4NzM1ZDY5M2Q5M2IxM2JkNy4uMjBiNTdjYmNmZWUy YmY4ZjZkZWEzZWQ4OWU0NGVjZWQ0MTY3MDRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCkBAIC00NCw2ICs0NCwxMSBAQCB2b2lk IFFUb3VjaFdlYlZpZXdQcml2YXRlOjpzY3JvbGwocXJlYWwgZGVsdGFYLCBxcmVhbCBkZWx0YVkp CiAgICAgdmlld3BvcnRSZWN0VXBkYXRlZCgpOwogfQogCit2b2lkIFFUb3VjaFdlYlZpZXdQcml2 YXRlOjpkaWRDaGFuZ2VMb2FkUHJvZ3Jlc3MoaW50IHBlcmNlbnRhZ2VMb2FkZWQpCit7CisgICAg ZW1pdCBxLT5sb2FkUHJvZ3Jlc3NDaGFuZ2VkKHBlcmNlbnRhZ2VMb2FkZWQpOworfQorCiB2b2lk IFFUb3VjaFdlYlZpZXdQcml2YXRlOjp2aWV3cG9ydFJlY3RVcGRhdGVkKCkKIHsKICAgICBRVG91 Y2hXZWJQYWdlUHJpdmF0ZSogY29uc3QgcGFnZVZpZXdQcml2YXRlID0gUVRvdWNoV2ViUGFnZVBy aXZhdGU6OmdldFBhZ2VWaWV3UHJpdmF0ZShwYWdlVmlldy5kYXRhKCkpOwpAQCAtNjgsNiArNzMs MTEgQEAgUVRvdWNoV2ViUGFnZSogUVRvdWNoV2ViVmlldzo6cGFnZSgpCiAgICAgcmV0dXJuIGQt PnBhZ2VWaWV3LmRhdGEoKTsKIH0KIAoraW50IFFUb3VjaFdlYlZpZXc6OmxvYWRQcm9ncmVzcygp IGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPnBhZ2UubG9hZFByb2dyZXNzKCk7Cit9CisKIHZvaWQg UVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFuZ2VkKGNvbnN0IFFSZWN0RiYgbmV3R2VvbWV0cnks IGNvbnN0IFFSZWN0RiYgb2xkR2VvbWV0cnkpCiB7CiAgICAgUVNHSXRlbTo6Z2VvbWV0cnlDaGFu Z2VkKG5ld0dlb21ldHJ5LCBvbGRHZW9tZXRyeSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oCmluZGV4IDZlYWNiZDQyMDdkNGIyZTBlMDY3ZDg0 NDY3MTk5OTU5OWMzYTA2MTQuLjIyYzM0ODQ3ZTk2ZjBiNGU0NDE4ZmQyYzk3NzhjYzY1ZGI4NGJm M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmll dy5oCkBAIC0zNiwxOCArMzYsMjQgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVRvdWNoV2ViVmll dyA6IHB1YmxpYyBRU0dJdGVtCiB7CiAgICAgUV9PQkpFQ1QKICAgICBRX1BST1BFUlRZKFFUb3Vj aFdlYlBhZ2UqIHBhZ2UgUkVBRCBwYWdlKQorICAgIFFfUFJPUEVSVFkoaW50IGxvYWRQcm9ncmVz cyBSRUFEIGxvYWRQcm9ncmVzcyBOT1RJRlkgbG9hZFByb2dyZXNzQ2hhbmdlZCkKIAogcHVibGlj OgogICAgIFFUb3VjaFdlYlZpZXcoUVNHSXRlbSogcGFyZW50ID0gMCk7CiAgICAgflFUb3VjaFdl YlZpZXcoKTsKIAogICAgIFFUb3VjaFdlYlBhZ2UgKnBhZ2UoKTsKKyAgICBpbnQgbG9hZFByb2dy ZXNzKCkgY29uc3Q7CisKK1FfU0lHTkFMUzoKKyAgICB2b2lkIGxvYWRQcm9ncmVzc0NoYW5nZWQo aW50IHByb2dyZXNzKTsKIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRyeUNo YW5nZWQoY29uc3QgUVJlY3RGJiwgY29uc3QgUVJlY3RGJik7CiAKIHByaXZhdGU6CiAgICAgZnJp ZW5kIGNsYXNzIFdlYktpdDo6VG91Y2hWaWV3SW50ZXJmYWNlOworICAgIGZyaWVuZCBjbGFzcyBR VG91Y2hXZWJWaWV3UHJpdmF0ZTsKICAgICBRVG91Y2hXZWJWaWV3UHJpdmF0ZSAqZDsKIH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmll d19wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5o CmluZGV4IDg1MGM4YzAzODA1M2U0M2MzM2JhODMyYzVlNzk2NGUyODkwNmJkODkuLjZmZWQ1YjY0 OWEwZDM4MTFjZGQyOTUzYzc4YzIyZTEzYTQ4YWMwZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlld19wLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3X3AuaApAQCAtMzUsNiArMzUsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBzY3JvbGwocXJlYWwgZGVsdGFYLCBxcmVhbCBkZWx0YVkpOwogICAg IHZvaWQgdmlld3BvcnRSZWN0VXBkYXRlZCgpOwogCisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5n ZUxvYWRQcm9ncmVzcyhpbnQpOworCiAgICAgUVRvdWNoV2ViVmlldyogY29uc3QgcTsKICAgICBR U2NvcGVkUG9pbnRlcjxRVG91Y2hXZWJQYWdlPiBwYWdlVmlldzsKICAgICBXZWJLaXQ6OlRvdWNo Vmlld0ludGVyZmFjZSB2aWV3SW50ZXJmYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzBmNWEyYWM4NzA2MmJmMjllMTRiZmYwM2Zl Y2U2MzdlMTc3NDQ1Yi4uOTg1YjllZjkzNTBhNWRiMDY2ODBkMzRhMmFlOWUyNjY2YzU0MzUxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCkBA IC05OSw2ICs5OSw3IEBAIFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eShWaWV3SW50ZXJm YWNlKiB2aWV3SW50ZXJmYWNlLCBRV0tDb250ZXh0KiBjLCBXS1BhCiAgICAgLCBtX2NvbnRleHQo YykKICAgICAsIG1fcHJlZmVyZW5jZXMoMCkKICAgICAsIG1fdW5kb1N0YWNrKGFkb3B0UHRyKG5l dyBRVW5kb1N0YWNrKHRoaXMpKSkKKyAgICAsIG1fbG9hZFByb2dyZXNzKDApCiB7CiAgICAgQVNT RVJUKHZpZXdJbnRlcmZhY2UpOwogICAgIG1lbXNldChtX2FjdGlvbnMsIDAsIHNpemVvZihtX2Fj dGlvbnMpKTsKQEAgLTQyNiw2ICs0MjcsNyBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojpsb2FkRGlk RmFpbChjb25zdCBRV2ViRXJyb3ImIGVycm9yKQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRD aGFuZ2VMb2FkUHJvZ3Jlc3MoaW50IG5ld0xvYWRQcm9ncmVzcykKIHsKKyAgICBtX2xvYWRQcm9n cmVzcyA9IG5ld0xvYWRQcm9ncmVzczsKICAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZENoYW5nZUxv YWRQcm9ncmVzcyhuZXdMb2FkUHJvZ3Jlc3MpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCmluZGV4IDVhNDEwOTlhZjc4MGNiODk0YmU1ZjQ0Mzcw MWVlOGVmYzhmZGUyYmQuLjcwNmM3MzE2Mjc2ODY5MTEzYjY4YTQwMmYzZGNkNzg1MDFiNzZhZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC0x MzQsNiArMTM0LDcgQEAgcHVibGljOgogICAgIHZvaWQgbG9hZERpZFN1Y2NlZWQoKTsKICAgICB2 b2lkIGxvYWREaWRGYWlsKGNvbnN0IFFXZWJFcnJvciYpOwogICAgIHZvaWQgZGlkQ2hhbmdlTG9h ZFByb2dyZXNzKGludCk7CisgICAgaW50IGxvYWRQcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIG1f bG9hZFByb2dyZXNzOyB9CiAKICAgICB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBRUmVj dCk7CiAKQEAgLTE5Nyw2ICsxOTgsNyBAQCBwcml2YXRlOgogICAgIG11dGFibGUgUVdLUHJlZmVy ZW5jZXMqIG1fcHJlZmVyZW5jZXM7CiAKICAgICBPd25QdHI8UVVuZG9TdGFjaz4gbV91bmRvU3Rh Y2s7CisgICAgaW50IG1fbG9hZFByb2dyZXNzOwogfTsKIAogI2VuZGlmIC8qIFF0V2ViUGFnZVBy b3h5X2ggKi8K 102267 2011-07-28 10:08:28 -0700 2011-07-29 13:27:51 -0700 Patch bug-65315-20110728140730.patch text/plain 13439 menard U3VidmVyc2lvbiBSZXZpc2lvbjogOTE5MTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNGMxOTUzYjI3NDc2NDgy NmQzY2RiYzI5ODZlNDU5MjA4NTA1OWFkLi42MjhhOWRlNjc5NmJiODBlNjhkNzIxNTg3MzA0NWZj MWIwM2M5ODU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDctMjggIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBN YWtlIFFEZXNrdG9wV2ViVmlldy9RVG91Y2hXZWJWaWV3IGxvYWRQcm9ncmVzcyBwcm9wZXJ0eSBt b3JlIHVzYWJsZSBpbiBRTUwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEluIG9yZGVyIHRvIHVzZSB0aGUgbG9hZFByb2dyZXNzIHZhbHVlIGluIFFNTCB3 ZSBuZWVkIHRvIG1ha2UgaXQKKyAgICAgICAgYSBRX1BST1BFUlRZLCB0aGVyZWZvcmUgd2UgbmVl ZCBhIGdldHRlciB0byBnZXQgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FkZXNr dG9wd2Vidmlldy5jcHA6CisgICAgICAgIChRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpkaWRDaGFu Z2VMb2FkUHJvZ3Jlc3MpOgorICAgICAgICAoUURlc2t0b3BXZWJWaWV3Ojpsb2FkUHJvZ3Jlc3Mp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFUb3VjaFdl YlBhZ2U6OmxvYWRQcm9ncmVzcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3 ZWJwYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVz dHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHA6CisgICAgICAgICh0c3RfQ29tbW9uVmlld1Rlc3Rz Ojpsb2FkUHJvZ3Jlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9u dmlld3Rlc3RzL3dlYnZpZXdhYnN0cmFjdGlvbi5jcHA6CisgICAgICAgIChXZWJWaWV3QWJzdHJh Y3Rpb246OldlYlZpZXdBYnN0cmFjdGlvbik6CisgICAgICAgIChXZWJWaWV3QWJzdHJhY3Rpb246 OmxvYWRQcm9ncmVzcyk6CisgICAgICAgIChXZWJWaWV3QWJzdHJhY3Rpb246OnRvdWNoVmlld0xv YWRQcm9ncmVzc0NoYW5nZWQpOgorICAgICAgICAoV2ViVmlld0Fic3RyYWN0aW9uOjpkZXNrdG9w Vmlld0xvYWRQcm9ncmVzc0NoYW5nZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVz dHMvY29tbW9udmlld3Rlc3RzL3dlYnZpZXdhYnN0cmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6UXRX ZWJQYWdlUHJveHkpOgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6OmRpZENoYW5nZUxvYWRQcm9n cmVzcyk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5Lmg6CisgICAgICAg IChRdFdlYlBhZ2VQcm94eTo6bG9hZFByb2dyZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv VG91Y2hWaWV3SW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VG91Y2hWaWV3SW50ZXJm YWNlOjpkaWRDaGFuZ2VMb2FkUHJvZ3Jlc3MpOgorCiAyMDExLTA3LTI3ICBNYXJrIEhhaG5lbmJl cmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG9wZXJhdG9yIG5l dyBmcm9tIEpTQ2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZGVza3RvcHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x ZGVza3RvcHdlYnZpZXcuY3BwCmluZGV4IDAzYmE5MzZjMDM0MzkxNWRiOGZlMjgwYzU2OWJlYjBh ZTM4ZjliZDAuLmM0NjA4YTljOTNlMGIxZGQ5ZWNhOWI3MzQ3OTg5MWFmZWFkMGE1YmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5j cHAKQEAgLTEzMiw3ICsxMzIsNyBAQCB2b2lkIFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6OmxvYWRE aWRGYWlsKGNvbnN0IFFXZWJFcnJvciYgZXJyb3IpCiAKIHZvaWQgUURlc2t0b3BXZWJWaWV3UHJp dmF0ZTo6ZGlkQ2hhbmdlTG9hZFByb2dyZXNzKGludCBwZXJjZW50YWdlTG9hZGVkKQogewotICAg IGVtaXQgcS0+bG9hZFByb2dyZXNzKHBlcmNlbnRhZ2VMb2FkZWQpOworICAgIGVtaXQgcS0+bG9h ZFByb2dyZXNzQ2hhbmdlZChwZXJjZW50YWdlTG9hZGVkKTsKIH0KIAogdm9pZCBRRGVza3RvcFdl YlZpZXdQcml2YXRlOjpzaG93Q29udGV4dE1lbnUoUVNoYXJlZFBvaW50ZXI8UU1lbnU+IG1lbnUp CkBAIC0xOTgsNiArMTk4LDExIEBAIFFVcmwgUURlc2t0b3BXZWJWaWV3Ojp1cmwoKSBjb25zdAog ICAgIHJldHVybiBkLT5wYWdlLnVybCgpOwogfQogCitpbnQgUURlc2t0b3BXZWJWaWV3Ojpsb2Fk UHJvZ3Jlc3MoKSBjb25zdAoreworICAgIHJldHVybiBkLT5wYWdlLmxvYWRQcm9ncmVzcygpOwor fQorCiBRU3RyaW5nIFFEZXNrdG9wV2ViVmlldzo6dGl0bGUoKSBjb25zdAogewogICAgIHJldHVy biBkLT5wYWdlLnRpdGxlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FkZXNrdG9wd2Vidmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZGVza3RvcHdlYnZpZXcuaAppbmRleCA2MjM2Yjg1YjhlNWEwNDJkNzY2ZjU4M2VhZjY2MDAz M2JhYmFiOTQ1Li44ZWRkOTIxZDBlNGU5NTdiZDA5OTdhMmQ5NGYxZWIzZTQ3NWU2ODJmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmgK QEAgLTUxLDYgKzUxLDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUURlc2t0b3BXZWJWaWV3IDog cHVibGljIFFTR1BhaW50ZWRJdGVtIHsKICAgICBRX09CSkVDVAogICAgIFFfUFJPUEVSVFkoUVN0 cmluZyB0aXRsZSBSRUFEIHRpdGxlIE5PVElGWSB0aXRsZUNoYW5nZWQpCiAgICAgUV9QUk9QRVJU WShRVXJsIHVybCBSRUFEIHVybCBOT1RJRlkgdXJsQ2hhbmdlZCkKKyAgICBRX1BST1BFUlRZKGlu dCBsb2FkUHJvZ3Jlc3MgUkVBRCBsb2FkUHJvZ3Jlc3MgTk9USUZZIGxvYWRQcm9ncmVzc0NoYW5n ZWQpCiAKICAgICBRX0VOVU1TKE5hdmlnYXRpb25BY3Rpb24pCiAKQEAgLTYwLDYgKzYxLDcgQEAg cHVibGljOgogCiAgICAgUVVybCB1cmwoKSBjb25zdDsKICAgICBRU3RyaW5nIHRpdGxlKCkgY29u c3Q7CisgICAgaW50IGxvYWRQcm9ncmVzcygpIGNvbnN0OwogCiAgICAgUV9JTlZPS0FCTEUgUUFj dGlvbiogbmF2aWdhdGlvbkFjdGlvbihRdFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbiB3aGljaCkg Y29uc3Q7CiAKQEAgLTcyLDcgKzc0LDcgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgbG9hZFN0YXJ0 ZWQoKTsKICAgICB2b2lkIGxvYWRTdWNjZWVkZWQoKTsKICAgICB2b2lkIGxvYWRGYWlsZWQoY29u c3QgUVdlYkVycm9yJik7Ci0gICAgdm9pZCBsb2FkUHJvZ3Jlc3MoaW50IHByb2dyZXNzKTsKKyAg ICB2b2lkIGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50IHByb2dyZXNzKTsKICAgICB2b2lkIHVybENo YW5nZWQoY29uc3QgUVVybCYpOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNwcAppbmRleCA4ODRjMTg1MmMxZDYzZmU1 YTQwMzBjZjhiMWIwMzY2NDg2YjEwNTJiLi44ZmNhYmY2ZjQ1ODRlNWY0NzMwMTgyMjMzYmJjMWEw MmQ1NWE2NjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0 b3VjaHdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRv dWNod2VicGFnZS5jcHAKQEAgLTYwLDYgKzYwLDExIEBAIFFTdHJpbmcgUVRvdWNoV2ViUGFnZTo6 dGl0bGUoKSBjb25zdAogICAgIHJldHVybiBkLT5wYWdlLT50aXRsZSgpOwogfQogCitpbnQgUVRv dWNoV2ViUGFnZTo6bG9hZFByb2dyZXNzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+cGFnZS0+ bG9hZFByb2dyZXNzKCk7Cit9CisKIC8qISBccmVpbXAKICovCiBib29sIFFUb3VjaFdlYlBhZ2U6 OmV2ZW50KFFFdmVudCogZXYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F0b3VjaHdlYnBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXRvdWNod2VicGFnZS5oCmluZGV4IDRhMTRjOTVlYjZmMWZkYjQ4YTgyMjRkMTRlZDZlZWY3M2Yx YjVjOTYuLmQzYTFhYmMxZTZjNDEyNmNmNTgwNzBiN2ExZWU5YjRiY2MzYWYzMzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5oCkBAIC0zOSw2 ICszOSw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFUb3VjaFdlYlBhZ2UgOiBwdWJsaWMgUVNH UGFpbnRlZEl0ZW0gewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRpdGxl IFJFQUQgdGl0bGUgTk9USUZZIHRpdGxlQ2hhbmdlZCkKICAgICBRX1BST1BFUlRZKFFVcmwgdXJs IFJFQUQgdXJsIE5PVElGWSB1cmxDaGFuZ2VkKQorICAgIFFfUFJPUEVSVFkoaW50IGxvYWRQcm9n cmVzcyBSRUFEIGxvYWRQcm9ncmVzcyBOT1RJRlkgbG9hZFByb2dyZXNzQ2hhbmdlZCkKIAogcHVi bGljOgogICAgIFFUb3VjaFdlYlBhZ2UoUVNHSXRlbSogcGFyZW50ID0gMCk7CkBAIC00OSw2ICs1 MCw3IEBAIHB1YmxpYzoKICAgICBRX0lOVk9LQUJMRSBRVXJsIHVybCgpIGNvbnN0OwogCiAgICAg UV9JTlZPS0FCTEUgUVN0cmluZyB0aXRsZSgpIGNvbnN0OworICAgIGludCBsb2FkUHJvZ3Jlc3Mo KSBjb25zdDsKIAogICAgIFFBY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24oUXRXZWJLaXQ6Ok5hdmln YXRpb25BY3Rpb24gd2hpY2gpOwogCkBAIC02MSw3ICs2Myw3IEBAIFFfU0lHTkFMUzoKICAgICB2 b2lkIGxvYWRTdGFydGVkKCk7CiAgICAgdm9pZCBsb2FkU3VjY2VlZGVkKCk7CiAgICAgdm9pZCBs b2FkRmFpbGVkKGNvbnN0IFFXZWJFcnJvciYpOwotICAgIHZvaWQgbG9hZFByb2dyZXNzKGludCBw cm9ncmVzcyk7CisgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVzcyk7CiAK IHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQga2V5UHJlc3NFdmVudChRS2V5RXZlbnQqKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9u dmlld3Rlc3RzL3RzdF9jb21tb252aWV3dGVzdHMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHAK aW5kZXggZjAwY2Y3ZjAxMWM0YTY1Y2FiMWRjODFiZmE2NDcyMDNhYTYzOTliYS4uODUxYTI0NDk0 MzQxMjVkMDJmNzQ0YjNjZTFmNmUzMGIwY2RhOWI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0 ZXN0cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21t b252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHAKQEAgLTM3LDYgKzM3LDcgQEAgcHJp dmF0ZSBzbG90czoKICAgICB2b2lkIGJhY2tBbmRGb3J3YXJkKCk7CiAgICAgdm9pZCByZWxvYWQo KTsKICAgICB2b2lkIHN0b3AoKTsKKyAgICB2b2lkIGxvYWRQcm9ncmVzcygpOwogCiAgICAgdm9p ZCBzaG93KCk7CiBwcml2YXRlOgpAQCAtMTUwLDYgKzE1MSwxOCBAQCB2b2lkIHRzdF9Db21tb25W aWV3VGVzdHM6OnN0b3AoKQogICAgIHZpZXdBYnN0cmFjdGlvbi0+dHJpZ2dlck5hdmlnYXRpb25B Y3Rpb24oUXRXZWJLaXQ6OlN0b3ApOwogfQogCit2b2lkIHRzdF9Db21tb25WaWV3VGVzdHM6Omxv YWRQcm9ncmVzcygpCit7CisgICAgUUNPTVBBUkUodmlld0Fic3RyYWN0aW9uLT5sb2FkUHJvZ3Jl c3MoKSwgMCk7CisKKyAgICB2aWV3QWJzdHJhY3Rpb24tPmxvYWQoUVVybDo6ZnJvbUxvY2FsRmls ZShRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJDRV9ESVIgIi9odG1sL2Jhc2ljX3BhZ2UuaHRtbCIp KSk7CisgICAgUVZFUklGWSh3YWl0Rm9yU2lnbmFsKHZpZXdBYnN0cmFjdGlvbi5kYXRhKCksIFNJ R05BTChsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpKSk7CisKKyAgICBRVkVSSUZZKHdhaXRGb3JT aWduYWwodmlld0Fic3RyYWN0aW9uLmRhdGEoKSwgU0lHTkFMKGxvYWRTdWNjZWVkZWQoKSkpKTsK KworICAgIFFDT01QQVJFKHZpZXdBYnN0cmFjdGlvbi0+bG9hZFByb2dyZXNzKCksIDEwMCk7Cit9 CisKIHZvaWQgdHN0X0NvbW1vblZpZXdUZXN0czo6c2hvdygpCiB7CiAgICAgLy8gVGhpcyBzaG91 bGQgbm90IGNyYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9udmlld3Rlc3RzL3dlYnZpZXdhYnN0 cmFjdGlvbi5jcHAKaW5kZXggZWIwM2RkMWQxODUzNmRhN2MyNTUwMWYyODZlNDRkZDhmNzBiYWVk Yi4uZGQ5ZGE0NjNiOGQ3NmM3MTQ0NmU1ZTMwM2JiMWJjNWFkNGRkOGU2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vi dmlld2Fic3RyYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uY3BwCkBAIC0zNSw2ICsz NSw3IEBAIFdlYlZpZXdBYnN0cmFjdGlvbjo6V2ViVmlld0Fic3RyYWN0aW9uKCkKICAgICBjb25u ZWN0KHRvdWNoV2ViVmlldygpLT5wYWdlKCksIFNJR05BTChsb2FkU3RhcnRlZCgpKSwgdGhpcywg U0xPVCh0b3VjaFZpZXdMb2FkU3RhcnRlZCgpKSk7CiAgICAgY29ubmVjdCh0b3VjaFdlYlZpZXco KS0+cGFnZSgpLCBTSUdOQUwobG9hZFN1Y2NlZWRlZCgpKSwgdGhpcywgU0xPVCh0b3VjaFZpZXdM b2FkU3VjY2VlZGVkKCkpKTsKICAgICBjb25uZWN0KHRvdWNoV2ViVmlldygpLT5wYWdlKCksIFNJ R05BTChsb2FkRmFpbGVkKFFXZWJFcnJvcikpLCB0aGlzLCBTTE9UKHRvdWNoVmlld0xvYWRGYWls ZWQoUVdlYkVycm9yKSkpOworICAgIGNvbm5lY3QodG91Y2hXZWJWaWV3KCktPnBhZ2UoKSwgU0lH TkFMKGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSksIHRoaXMsIFNMT1QodG91Y2hWaWV3TG9hZFBy b2dyZXNzQ2hhbmdlZChpbnQpKSk7CiAKICAgICBzY3JlZW5IYWxmLm1vdmVMZWZ0KHNjcmVlbkhh bGYucmlnaHQoKSk7CiAgICAgbV9kZXNrdG9wV2ViVmlld1dpbmRvdy5zZXRHZW9tZXRyeShzY3Jl ZW5IYWxmKTsKQEAgLTQyLDYgKzQzLDcgQEAgV2ViVmlld0Fic3RyYWN0aW9uOjpXZWJWaWV3QWJz dHJhY3Rpb24oKQogICAgIGNvbm5lY3QoZGVza3RvcFdlYlZpZXcoKSwgU0lHTkFMKGxvYWRTdGFy dGVkKCkpLCB0aGlzLCBTTE9UKGRlc2t0b3BWaWV3TG9hZFN0YXJ0ZWQoKSkpOwogICAgIGNvbm5l Y3QoZGVza3RvcFdlYlZpZXcoKSwgU0lHTkFMKGxvYWRTdWNjZWVkZWQoKSksIHRoaXMsIFNMT1Qo ZGVza3RvcFZpZXdMb2FkU3VjY2VlZGVkKCkpKTsKICAgICBjb25uZWN0KGRlc2t0b3BXZWJWaWV3 KCksIFNJR05BTChsb2FkRmFpbGVkKFFXZWJFcnJvcikpLCB0aGlzLCBTTE9UKGRlc2t0b3BWaWV3 TG9hZEZhaWxlZChRV2ViRXJyb3IpKSk7CisgICAgY29ubmVjdChkZXNrdG9wV2ViVmlldygpLCBT SUdOQUwobG9hZFByb2dyZXNzQ2hhbmdlZChpbnQpKSwgdGhpcywgU0xPVChkZXNrdG9wVmlld0xv YWRQcm9ncmVzc0NoYW5nZWQoaW50KSkpOwogfQogCiB2b2lkIFdlYlZpZXdBYnN0cmFjdGlvbjo6 c2hvdygpCkBAIC03OSw2ICs4MSwyMSBAQCBib29sIFdlYlZpZXdBYnN0cmFjdGlvbjo6dXJsKFFV cmwmIHVybCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAoraW50IFdlYlZpZXdBYnN0cmFj dGlvbjo6bG9hZFByb2dyZXNzKCkgY29uc3QKK3sKKyAgICBpbnQgdG91Y2hWaWV3UHJvZ3Jlc3Mg PSB0b3VjaFdlYlZpZXcoKS0+cGFnZSgpLT5sb2FkUHJvZ3Jlc3MoKTsKKyAgICBpbnQgZGVza3Rv cFZpZXdQcm9ncmVzcyA9IGRlc2t0b3BXZWJWaWV3KCktPmxvYWRQcm9ncmVzcygpOworCisgICAg aWYgKHRvdWNoVmlld1Byb2dyZXNzICE9IGRlc2t0b3BWaWV3UHJvZ3Jlc3MpIHsKKyAgICAgICAg cVdhcm5pbmcoKSA8PCAiV2ViVmlld0Fic3RyYWN0aW9uOjpsb2FkUHJvZ3Jlc3MoKTogdGhlIGxv YWQgcHJvZ3Jlc3MgYXJlIGRpZmZlcmVudC4iOworICAgICAgICBxV2FybmluZygpIDw8ICJRVG91 Y2hWaWV3J3MgbG9hZCBwcm9ncmVzcyA9ICIgPDwgdG91Y2hWaWV3UHJvZ3Jlc3M7CisgICAgICAg IHFXYXJuaW5nKCkgPDwgIlFEZXNrdG9wVmlldydzIGxvYWQgcHJvZ3Jlc3MgPSAiIDw8IGRlc2t0 b3BWaWV3UHJvZ3Jlc3M7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKKyAgICByZXR1cm4g dG91Y2hWaWV3UHJvZ3Jlc3M7Cit9CisKIHZvaWQgV2ViVmlld0Fic3RyYWN0aW9uOjp0cmlnZ2Vy TmF2aWdhdGlvbkFjdGlvbihRdFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbiB3aGljaCkKIHsKICAg ICBRQWN0aW9uKiB0b3VjaEFjdGlvbiA9IHRvdWNoV2ViVmlldygpLT5wYWdlKCktPm5hdmlnYXRp b25BY3Rpb24od2hpY2gpOwpAQCAtMTI5LDYgKzE0NiwyMCBAQCB2b2lkIFdlYlZpZXdBYnN0cmFj dGlvbjo6ZGVza3RvcFZpZXdMb2FkRmFpbGVkKGNvbnN0IFFXZWJFcnJvciYgZXJyb3IpCiAgICAg ICAgIGVtaXQgbG9hZEZhaWxlZChlcnJvcik7CiB9CiAKK3ZvaWQgV2ViVmlld0Fic3RyYWN0aW9u Ojp0b3VjaFZpZXdMb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVzcykKK3sKKyAgICBtX3Rv dWNoVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpXSsr OworICAgIGlmIChtX3RvdWNoVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkUHJvZ3Jlc3ND aGFuZ2VkKGludCkpXSA9PSBtX2Rlc2t0b3BWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRQ cm9ncmVzc0NoYW5nZWQoaW50KSldKQorICAgICAgICBlbWl0IGxvYWRQcm9ncmVzc0NoYW5nZWQo cHJvZ3Jlc3MpOworfQorCit2b2lkIFdlYlZpZXdBYnN0cmFjdGlvbjo6ZGVza3RvcFZpZXdMb2Fk UHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVzcykKK3sKKyAgICBtX2Rlc2t0b3BWaWV3U2lnbmFs c0NvdW50ZXJbU0lHTkFMKGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSldKys7CisgICAgaWYgKG1f dG91Y2hWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSld ID09IG1fZGVza3RvcFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZFByb2dyZXNzQ2hhbmdl ZChpbnQpKV0pCisgICAgICAgIGVtaXQgbG9hZFByb2dyZXNzQ2hhbmdlZChwcm9ncmVzcyk7Cit9 CisKIFFUb3VjaFdlYlZpZXcqIFdlYlZpZXdBYnN0cmFjdGlvbjo6dG91Y2hXZWJWaWV3KCkgY29u c3QKIHsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UVRvdWNoV2ViVmlldyo+KG1fdG91Y2hXZWJW aWV3V2luZG93LndlYlZpZXcuZGF0YSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9udmlld3Rlc3RzL3dlYnZpZXdhYnN0cmFjdGlvbi5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMv d2Vidmlld2Fic3RyYWN0aW9uLmgKaW5kZXggZDEyYWU5NzVlY2Q1ZDc3Zjg0ZTlhZTkwMDc0MmVi NGY0ZTM0MGRiYS4uNTdlMTNhZTA1ZmMwMDJhYTM2M2NmMTZkMTYyNTcyYzNjNDgwN2E2YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3 dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmgKQEAgLTM5 LDYgKzM5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBsb2FkKGNvbnN0IFFVcmwmKTsKICAgICBi b29sIHVybChRVXJsJikgY29uc3Q7CisgICAgaW50IGxvYWRQcm9ncmVzcygpIGNvbnN0OwogCiAg ICAgdm9pZCB0cmlnZ2VyTmF2aWdhdGlvbkFjdGlvbihRdFdlYktpdDo6TmF2aWdhdGlvbkFjdGlv bik7CiAKQEAgLTQ2LDYgKzQ3LDcgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgbG9hZFN0YXJ0ZWQo KTsKICAgICB2b2lkIGxvYWRTdWNjZWVkZWQoKTsKICAgICB2b2lkIGxvYWRGYWlsZWQoY29uc3Qg UVdlYkVycm9yJik7CisgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCk7CiAKIHByaXZh dGUgUV9TTE9UUzoKICAgICB2b2lkIHRvdWNoVmlld0xvYWRTdGFydGVkKCk7CkBAIC01NCw2ICs1 Niw4IEBAIHByaXZhdGUgUV9TTE9UUzoKICAgICB2b2lkIGRlc2t0b3BWaWV3TG9hZFN1Y2NlZWRl ZCgpOwogICAgIHZvaWQgdG91Y2hWaWV3TG9hZEZhaWxlZChjb25zdCBRV2ViRXJyb3ImKTsKICAg ICB2b2lkIGRlc2t0b3BWaWV3TG9hZEZhaWxlZChjb25zdCBRV2ViRXJyb3ImKTsKKyAgICB2b2lk IHRvdWNoVmlld0xvYWRQcm9ncmVzc0NoYW5nZWQoaW50KTsKKyAgICB2b2lkIGRlc2t0b3BWaWV3 TG9hZFByb2dyZXNzQ2hhbmdlZChpbnQpOwogCiBwcml2YXRlOgogICAgIFFUb3VjaFdlYlZpZXcq IHRvdWNoV2ViVmlldygpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFdlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzBmNWEyYWM4NzA2MmJmMjllMTRiZmYwM2ZlY2U2Mzdl MTc3NDQ1Yi4uOTg1YjllZjkzNTBhNWRiMDY2ODBkMzRhMmFlOWUyNjY2YzU0MzUxNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCkBAIC05OSw2 ICs5OSw3IEBAIFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eShWaWV3SW50ZXJmYWNlKiB2 aWV3SW50ZXJmYWNlLCBRV0tDb250ZXh0KiBjLCBXS1BhCiAgICAgLCBtX2NvbnRleHQoYykKICAg ICAsIG1fcHJlZmVyZW5jZXMoMCkKICAgICAsIG1fdW5kb1N0YWNrKGFkb3B0UHRyKG5ldyBRVW5k b1N0YWNrKHRoaXMpKSkKKyAgICAsIG1fbG9hZFByb2dyZXNzKDApCiB7CiAgICAgQVNTRVJUKHZp ZXdJbnRlcmZhY2UpOwogICAgIG1lbXNldChtX2FjdGlvbnMsIDAsIHNpemVvZihtX2FjdGlvbnMp KTsKQEAgLTQyNiw2ICs0MjcsNyBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojpsb2FkRGlkRmFpbChj b25zdCBRV2ViRXJyb3ImIGVycm9yKQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VM b2FkUHJvZ3Jlc3MoaW50IG5ld0xvYWRQcm9ncmVzcykKIHsKKyAgICBtX2xvYWRQcm9ncmVzcyA9 IG5ld0xvYWRQcm9ncmVzczsKICAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZENoYW5nZUxvYWRQcm9n cmVzcyhuZXdMb2FkUHJvZ3Jlc3MpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYlBhZ2VQcm94eS5oCmluZGV4IDVhNDEwOTlhZjc4MGNiODk0YmU1ZjQ0MzcwMWVlOGVm YzhmZGUyYmQuLjcwNmM3MzE2Mjc2ODY5MTEzYjY4YTQwMmYzZGNkNzg1MDFiNzZhZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC0xMzQsNiAr MTM0LDcgQEAgcHVibGljOgogICAgIHZvaWQgbG9hZERpZFN1Y2NlZWQoKTsKICAgICB2b2lkIGxv YWREaWRGYWlsKGNvbnN0IFFXZWJFcnJvciYpOwogICAgIHZvaWQgZGlkQ2hhbmdlTG9hZFByb2dy ZXNzKGludCk7CisgICAgaW50IGxvYWRQcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZFBy b2dyZXNzOyB9CiAKICAgICB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBRUmVjdCk7CiAK QEAgLTE5Nyw2ICsxOTgsNyBAQCBwcml2YXRlOgogICAgIG11dGFibGUgUVdLUHJlZmVyZW5jZXMq IG1fcHJlZmVyZW5jZXM7CiAKICAgICBPd25QdHI8UVVuZG9TdGFjaz4gbV91bmRvU3RhY2s7Cisg ICAgaW50IG1fbG9hZFByb2dyZXNzOwogfTsKIAogI2VuZGlmIC8qIFF0V2ViUGFnZVByb3h5X2gg Ki8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRl cmZhY2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFj ZS5jcHAKaW5kZXggYzQ3Njc0ZGNmM2QxNDM3ODM1NWRiOTdiYjYyYzkwODJlMzI5NjA0Mi4uZmE1 Nzk2NGRiM2FhNGI3OGFhYzViYjAzNzQ5MTJjOTg5NDNjN2Q1NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5jcHAKQEAgLTE3Nyw3ICsx NzcsNyBAQCB2b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6bG9hZERpZEZhaWwoY29uc3QgUVdlYkVy cm9yJiBlcnJvcikKIAogdm9pZCBUb3VjaFZpZXdJbnRlcmZhY2U6OmRpZENoYW5nZUxvYWRQcm9n cmVzcyhpbnQgcGVyY2VudGFnZUxvYWRlZCkKIHsKLSAgICBlbWl0IG1fcGFnZVZpZXctPmxvYWRQ cm9ncmVzcyhwZXJjZW50YWdlTG9hZGVkKTsKKyAgICBlbWl0IG1fcGFnZVZpZXctPmxvYWRQcm9n cmVzc0NoYW5nZWQocGVyY2VudGFnZUxvYWRlZCk7CiB9CiAKIHZvaWQgVG91Y2hWaWV3SW50ZXJm YWNlOjpzaG93Q29udGV4dE1lbnUoUVNoYXJlZFBvaW50ZXI8UU1lbnU+KQo=