68357 2011-09-19 06:53:23 -0700 [Qt][WK2] Make loading errors API easier to use. 2011-09-19 14:09:06 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 menard menard ademar hausmann kling noam vestbo webkit.review.bot oldest_to_newest 469368 0 menard 2011-09-19 06:53:23 -0700 [Qt][WK2] Make loading errors API more easier to use. 469370 1 ademar 2011-09-19 06:57:46 -0700 s/more easier/easier/ 469371 2 107848 menard 2011-09-19 06:58:49 -0700 Created attachment 107848 Patch 469372 3 webkit.review.bot 2011-09-19 07:00:24 -0700 Attachment 107848 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 4 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 469373 4 107849 menard 2011-09-19 07:01:28 -0700 Created attachment 107849 Patch 469374 5 webkit.review.bot 2011-09-19 07:03:31 -0700 Attachment 107849 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 4 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 469420 6 menard 2011-09-19 08:42:24 -0700 (In reply to comment #5) > Attachment 107849 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > > Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] > Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h:72: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] > Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "errorType" adds no information, so it should be removed. [readability/parameter_name] [5] > Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:88: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] > Total errors found: 4 in 12 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Added a patch in https://bugs.webkit.org/show_bug.cgi?id=68359 which fixes those warnings. 469537 7 107849 webkit.review.bot 2011-09-19 11:03:19 -0700 Comment on attachment 107849 Patch Rejecting attachment 107849 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: cripts/webkitpy/common/system/executive.py", line 420, in run_command close_fds=self._should_close_fds()) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/system/executive.py", line 476, in popen return subprocess.Popen(*args, **kwargs) File "/usr/lib/python2.6/subprocess.py", line 623, in __init__ errread, errwrite) File "/usr/lib/python2.6/subprocess.py", line 1141, in _execute_child raise child_exception TypeError: execv() arg 2 must contain only strings Full output: http://queues.webkit.org/results/9739798 469645 8 107849 menard 2011-09-19 13:32:11 -0700 Comment on attachment 107849 Patch Let's try the cq again. 469647 9 107849 webkit.review.bot 2011-09-19 13:35:43 -0700 Comment on attachment 107849 Patch Rejecting attachment 107849 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: cripts/webkitpy/common/system/executive.py", line 420, in run_command close_fds=self._should_close_fds()) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/system/executive.py", line 476, in popen return subprocess.Popen(*args, **kwargs) File "/usr/lib/python2.6/subprocess.py", line 623, in __init__ errread, errwrite) File "/usr/lib/python2.6/subprocess.py", line 1141, in _execute_child raise child_exception TypeError: execv() arg 2 must contain only strings Full output: http://queues.webkit.org/results/9737938 469676 10 menard 2011-09-19 14:09:06 -0700 Committed r95472: <http://trac.webkit.org/changeset/95472> 107848 2011-09-19 06:58:49 -0700 2011-09-19 07:01:21 -0700 Patch bug-68357-20110919105836.patch text/plain 14438 menard SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDExKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDktMTkgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IE1ha2UgbG9hZGluZyBlcnJvcnMgQVBJIG1vcmUgZWFzaWVyIHRvIHVzZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzU3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgQVBJIHRvIGdldCBs b2FkaW5nIGVycm9ycyBlYXNpZXIgdG8gdXNlLiA5NTE5NyBpbnRyb2R1Y2VkCisgICAgICAgIGEg UUpTVmFsdWUgQVBJIHRoYXQgaXMgYSBiaXQgb3BhcXVlIGZvciB0aGUgY2xpZW50IGNvZGUuIFJh dGhlciB0aGFuCisgICAgICAgIHVzaW5nIGEgZGVkaWNhdGVkIG9iamVjdCwgd2UgY2FuIGp1c3Qg cGFzcyB0aGUgbmVlZGVkIGluZm9ybWF0aW9uIGFzCisgICAgICAgIHBhcmFtZXRlcnMgb2YgdGhl IHNsb3QuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5jcHA6 CisgICAgICAgIChRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpsb2FkRGlkRmFpbCk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlld19wLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9x dC9xdG91Y2h3ZWJwYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21t b252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHA6CisgICAgICAgICh0c3RfQ29tbW9u Vmlld1Rlc3RzOjpsb2FkTm9uZXhpc3RlbnRGaWxlVXJsKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uY3BwOgorICAg ICAgICAoV2ViVmlld0Fic3RyYWN0aW9uOjpXZWJWaWV3QWJzdHJhY3Rpb24pOgorICAgICAgICAo V2ViVmlld0Fic3RyYWN0aW9uOjp0b3VjaFZpZXdMb2FkRmFpbGVkKToKKyAgICAgICAgKFdlYlZp ZXdBYnN0cmFjdGlvbjo6ZGVza3RvcFZpZXdMb2FkRmFpbGVkKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoUXRXZWJQ YWdlUHJveHk6OmxvYWREaWRGYWlsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvVG91Y2hWaWV3 SW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VG91Y2hWaWV3SW50ZXJmYWNlOjpsb2Fk RGlkRmFpbCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9xdC9WaWV3SW50ZXJmYWNlLmg6CisKIDIwMTEtMDktMTkgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IEZpeCBkaXN0Y2hlY2sgYnVpbGQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcWRlc2t0b3B3ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5jcHAJKHJldmlzaW9uIDk1MTk3KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi cWRlc2t0b3B3ZWJ2aWV3LmgiCiAjaW5jbHVkZSAicWRlc2t0b3B3ZWJ2aWV3X3AuaCIKKyNpbmNs dWRlICJxd2ViZXJyb3IuaCIKIAogI2luY2x1ZGUgPFFHcmFwaGljc1NjZW5lUmVzaXplRXZlbnQ+ CiAjaW5jbHVkZSA8UVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtPgpAQCAtMTQ0LDkgKzE0NSw5IEBA IHZvaWQgUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6bG9hZERpZFN1Y2MKICAgICBlbWl0IHEtPmxv YWRTdWNjZWVkZWQoKTsKIH0KIAotdm9pZCBRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpsb2FkRGlk RmFpbChjb25zdCBRSlNWYWx1ZSYgZXJyb3IpCit2b2lkIFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6 OmxvYWREaWRGYWlsKGNvbnN0IFFXZWJFcnJvciYgZXJyb3IpCiB7Ci0gICAgZW1pdCBxLT5sb2Fk RmFpbGVkKGVycm9yKTsKKyAgICBlbWl0IHEtPmxvYWRGYWlsZWQoc3RhdGljX2Nhc3Q8UURlc2t0 b3BXZWJWaWV3OjpFcnJvclR5cGU+KGVycm9yLnR5cGUoKSksIGVycm9yLmVycm9yQ29kZSgpLCBl cnJvci51cmwoKSk7CiB9CiAKIHZvaWQgUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6ZGlkQ2hhbmdl TG9hZFByb2dyZXNzKGludCBwZXJjZW50YWdlTG9hZGVkKQpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5oCShyZXZpc2lvbiA5NTE5 NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmgJ KHdvcmtpbmcgY29weSkKQEAgLTU0LDcgKzU0LDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUURl c2t0b3BXZWJWaWV3IDogcAogICAgIFFfUFJPUEVSVFkoaW50IGxvYWRQcm9ncmVzcyBSRUFEIGxv YWRQcm9ncmVzcyBOT1RJRlkgbG9hZFByb2dyZXNzQ2hhbmdlZCkKICAgICBRX1BST1BFUlRZKFFX ZWJOYXZpZ2F0aW9uQ29udHJvbGxlciogbmF2aWdhdGlvbiBSRUFEIG5hdmlnYXRpb25Db250cm9s bGVyIENPTlNUQU5UKQogICAgIFFfRU5VTVMoTmF2aWdhdGlvblBvbGljeSkKLQorICAgIFFfRU5V TVMoRXJyb3JUeXBlKQogcHVibGljOgogICAgIGVudW0gTmF2aWdhdGlvblBvbGljeSB7CiAgICAg ICAgIFVzZVBvbGljeSwKQEAgLTYyLDYgKzYyLDEyIEBAIHB1YmxpYzoKICAgICAgICAgSWdub3Jl UG9saWN5CiAgICAgfTsKIAorICAgIGVudW0gRXJyb3JUeXBlIHsKKyAgICAgICAgRW5naW5lRXJy b3IsCisgICAgICAgIE5ldHdvcmtFcnJvciwKKyAgICAgICAgSHR0cEVycm9yLAorICAgIH07CisK ICAgICBRRGVza3RvcFdlYlZpZXcoUVNHSXRlbSogcGFyZW50ID0gMCk7CiAgICAgdmlydHVhbCB+ UURlc2t0b3BXZWJWaWV3KCk7CiAKQEAgLTc5LDggKzg1LDcgQEAgUV9TSUdOQUxTOgogICAgIHZv aWQgc3RhdHVzQmFyTWVzc2FnZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpOwogICAgIHZvaWQgbG9h ZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRTdWNjZWVkZWQoKTsKLSAgICAvLyBUaGUgcGFyYW1l dGVyIG5lZWRzIHRvIGJlIGV4cGxpY2l0bHkgbmFtZWQgdG8gd29yayBpbiBRTUwuCi0gICAgdm9p ZCBsb2FkRmFpbGVkKGNvbnN0IFFKU1ZhbHVlJiBlcnJvcik7CisgICAgdm9pZCBsb2FkRmFpbGVk KFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBlIGVycm9yVHlwZSwgaW50IGVycm9yQ29kZSwgY29u c3QgUVVybCYgdXJsKTsKICAgICB2b2lkIGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50IHByb2dyZXNz KTsKICAgICB2b2lkIHVybENoYW5nZWQoY29uc3QgUVVybCYpOwogCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlld19wLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oCShyZXZp c2lvbiA5NTE5NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3 ZWJ2aWV3X3AuaAkod29ya2luZyBjb3B5KQpAQCAtNzEsNyArNzEsNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBsb2FkRGlkQmVnaW4oKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZENv bW1pdCgpOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkU3VjY2VlZCgpOwotICAgIHZpcnR1YWwg dm9pZCBsb2FkRGlkRmFpbChjb25zdCBRSlNWYWx1ZSYpOworICAgIHZpcnR1YWwgdm9pZCBsb2Fk RGlkRmFpbChjb25zdCBRV2ViRXJyb3ImKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlTG9h ZFByb2dyZXNzKGludCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KFFTaGFy ZWRQb2ludGVyPFFNZW51Pik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F0b3VjaHdlYnBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F0b3VjaHdlYnBhZ2UuaAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDEs OCArNDEsMTQgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVRvdWNoV2ViUGFnZSA6IHB1YgogICAg IFFfUFJPUEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgTk9USUZZIHVybENoYW5nZWQpCiAgICAgUV9Q Uk9QRVJUWShpbnQgbG9hZFByb2dyZXNzIFJFQUQgbG9hZFByb2dyZXNzIE5PVElGWSBsb2FkUHJv Z3Jlc3NDaGFuZ2VkKQogICAgIFFfUFJPUEVSVFkoUVdlYk5hdmlnYXRpb25Db250cm9sbGVyKiBu YXZpZ2F0aW9uIFJFQUQgbmF2aWdhdGlvbkNvbnRyb2xsZXIgQ09OU1RBTlQpCi0KKyAgICBRX0VO VU1TKEVycm9yVHlwZSkKIHB1YmxpYzoKKyAgICBlbnVtIEVycm9yVHlwZSB7CisgICAgICAgIEVu Z2luZUVycm9yLAorICAgICAgICBOZXR3b3JrRXJyb3IsCisgICAgICAgIEh0dHBFcnJvciwKKyAg ICB9OworCiAgICAgUVRvdWNoV2ViUGFnZShRU0dJdGVtKiBwYXJlbnQgPSAwKTsKIAogICAgIHZp cnR1YWwgflFUb3VjaFdlYlBhZ2UoKTsKQEAgLTYzLDggKzY5LDcgQEAgUV9TSUdOQUxTOgogICAg IHZvaWQgdGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKTsKICAgICB2b2lkIGxvYWRTdGFydGVk KCk7CiAgICAgdm9pZCBsb2FkU3VjY2VlZGVkKCk7Ci0gICAgLy8gVGhlIHBhcmFtZXRlciBuZWVk cyB0byBiZSBleHBsaWNpdGx5IG5hbWVkIHRvIHdvcmsgaW4gUU1MLgotICAgIHZvaWQgbG9hZEZh aWxlZChjb25zdCBRSlNWYWx1ZSYgZXJyb3IpOworICAgIHZvaWQgbG9hZEZhaWxlZChRVG91Y2hX ZWJQYWdlOjpFcnJvclR5cGUgZXJyb3JUeXBlLCBpbnQgZXJyb3JDb2RlLCBjb25zdCBRVXJsJiB1 cmwpOwogICAgIHZvaWQgbG9hZFByb2dyZXNzQ2hhbmdlZChpbnQgcHJvZ3Jlc3MpOwogCiBwcm90 ZWN0ZWQ6CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2NvbW1v bnZpZXd0ZXN0cy90c3RfY29tbW9udmlld3Rlc3RzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy90c3RfY29tbW9u dmlld3Rlc3RzLmNwcAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy90c3RfY29tbW9udmlld3Rlc3RzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtOTcsNyArOTcsNyBAQCB2b2lkIHRzdF9Db21tb25WaWV3VGVzdHM6 OmxvYWROb25leGlzdGVuCiAgICAgUVNpZ25hbFNweSBsb2FkRmFpbGVkU3B5KHZpZXdBYnN0cmFj dGlvbi5kYXRhKCksIFNJR05BTChsb2FkU3RhcnRlZCgpKSk7CiAKICAgICB2aWV3QWJzdHJhY3Rp b24tPmxvYWQoUVVybDo6ZnJvbUxvY2FsRmlsZShRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJDRV9E SVIgIi9odG1sL2ZpbGVfdGhhdF9kb2VzX25vdF9leGlzdC5odG1sIikpKTsKLSAgICBRVkVSSUZZ KHdhaXRGb3JTaWduYWwodmlld0Fic3RyYWN0aW9uLmRhdGEoKSwgU0lHTkFMKGxvYWRGYWlsZWQo UUpTVmFsdWUpKSkpOworICAgIFFWRVJJRlkod2FpdEZvclNpZ25hbCh2aWV3QWJzdHJhY3Rpb24u ZGF0YSgpLCBTSUdOQUwobG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVycm9yVHlwZSwgaW50 LCBRVXJsKSkpKTsKIAogICAgIFFDT01QQVJFKGxvYWRGYWlsZWRTcHkuc2l6ZSgpLCAxKTsKIH0K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9udmlld3Rl c3RzL3dlYnZpZXdhYnN0cmFjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9u LmNwcAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNSw3ICszNSw3IEBAIFdlYlZpZXdBYnN0cmFjdGlvbjo6V2ViVmlld0Fic3RyYWN0 aW9uKCkKICAgICBtX3RvdWNoV2ViVmlld1dpbmRvdy5zZXRXaW5kb3dUaXRsZShRTGF0aW4xU3Ry aW5nKCJUb3VjaFdlYlZpZXciKSk7CiAgICAgY29ubmVjdCh0b3VjaFdlYlZpZXcoKS0+cGFnZSgp LCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSksIHRoaXMsIFNMT1QodG91Y2hWaWV3TG9hZFN0YXJ0ZWQo KSkpOwogICAgIGNvbm5lY3QodG91Y2hXZWJWaWV3KCktPnBhZ2UoKSwgU0lHTkFMKGxvYWRTdWNj ZWVkZWQoKSksIHRoaXMsIFNMT1QodG91Y2hWaWV3TG9hZFN1Y2NlZWRlZCgpKSk7Ci0gICAgY29u bmVjdCh0b3VjaFdlYlZpZXcoKS0+cGFnZSgpLCBTSUdOQUwobG9hZEZhaWxlZChRSlNWYWx1ZSkp LCB0aGlzLCBTTE9UKHRvdWNoVmlld0xvYWRGYWlsZWQoUUpTVmFsdWUpKSk7CisgICAgY29ubmVj dCh0b3VjaFdlYlZpZXcoKS0+cGFnZSgpLCBTSUdOQUwobG9hZEZhaWxlZChRVG91Y2hXZWJQYWdl OjpFcnJvclR5cGUsIGludCwgY29uc3QgUVVybCYpKSwgdGhpcywgU0xPVCh0b3VjaFZpZXdMb2Fk RmFpbGVkKFFUb3VjaFdlYlBhZ2U6OkVycm9yVHlwZSwgaW50LCBjb25zdCBRVXJsJikpKTsKICAg ICBjb25uZWN0KHRvdWNoV2ViVmlldygpLT5wYWdlKCksIFNJR05BTChsb2FkUHJvZ3Jlc3NDaGFu Z2VkKGludCkpLCB0aGlzLCBTTE9UKHRvdWNoVmlld0xvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSkp OwogCiAgICAgc2NyZWVuSGFsZi5tb3ZlTGVmdChzY3JlZW5IYWxmLnJpZ2h0KCkpOwpAQCAtNDMs NyArNDMsNyBAQCBXZWJWaWV3QWJzdHJhY3Rpb246OldlYlZpZXdBYnN0cmFjdGlvbigpCiAgICAg bV9kZXNrdG9wV2ViVmlld1dpbmRvdy5zZXRXaW5kb3dUaXRsZShRTGF0aW4xU3RyaW5nKCJEZXNr dG9wV2ViVmlldyIpKTsKICAgICBjb25uZWN0KGRlc2t0b3BXZWJWaWV3KCksIFNJR05BTChsb2Fk U3RhcnRlZCgpKSwgdGhpcywgU0xPVChkZXNrdG9wVmlld0xvYWRTdGFydGVkKCkpKTsKICAgICBj b25uZWN0KGRlc2t0b3BXZWJWaWV3KCksIFNJR05BTChsb2FkU3VjY2VlZGVkKCkpLCB0aGlzLCBT TE9UKGRlc2t0b3BWaWV3TG9hZFN1Y2NlZWRlZCgpKSk7Ci0gICAgY29ubmVjdChkZXNrdG9wV2Vi VmlldygpLCBTSUdOQUwobG9hZEZhaWxlZChRSlNWYWx1ZSkpLCB0aGlzLCBTTE9UKGRlc2t0b3BW aWV3TG9hZEZhaWxlZChRSlNWYWx1ZSkpKTsKKyAgICBjb25uZWN0KGRlc2t0b3BXZWJWaWV3KCks IFNJR05BTChsb2FkRmFpbGVkKFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBlLCBpbnQsIGNvbnN0 IFFVcmwmKSksIHRoaXMsIFNMT1QoZGVza3RvcFZpZXdMb2FkRmFpbGVkKFFEZXNrdG9wV2ViVmll dzo6RXJyb3JUeXBlLCBpbnQsIGNvbnN0IFFVcmwmKSkpOwogICAgIGNvbm5lY3QoZGVza3RvcFdl YlZpZXcoKSwgU0lHTkFMKGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSksIHRoaXMsIFNMT1QoZGVz a3RvcFZpZXdMb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpKTsKIH0KIApAQCAtMTMzLDE4ICsxMzMs MTggQEAgdm9pZCBXZWJWaWV3QWJzdHJhY3Rpb246OmRlc2t0b3BWaWV3TG9hZAogICAgICAgICBl bWl0IGxvYWRTdWNjZWVkZWQoKTsKIH0KIAotdm9pZCBXZWJWaWV3QWJzdHJhY3Rpb246OnRvdWNo Vmlld0xvYWRGYWlsZWQoY29uc3QgUUpTVmFsdWUmIGVycm9yKQordm9pZCBXZWJWaWV3QWJzdHJh Y3Rpb246OnRvdWNoVmlld0xvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlIGVycm9y VHlwZSwgaW50IGVycm9yQ29kZSwgY29uc3QgUVVybCYgdXJsKQogewotICAgIG1fdG91Y2hWaWV3 U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUpKV0rKzsKLSAgICBpZiAo bV90b3VjaFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRSlNWYWx1ZSkpXSA9 PSBtX2Rlc2t0b3BWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUp KV0pCi0gICAgICAgIGVtaXQgbG9hZEZhaWxlZChlcnJvcik7CisgICAgbV90b3VjaFZpZXdTaWdu YWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRVG91Y2hXZWJQYWdlOjpFcnJvclR5cGUsIGlu dCwgY29uc3QgUVVybCYpKV0rKzsKKyAgICBpZiAobV90b3VjaFZpZXdTaWduYWxzQ291bnRlcltT SUdOQUwobG9hZEZhaWxlZChRVG91Y2hXZWJQYWdlOjpFcnJvclR5cGUsIGludCwgY29uc3QgUVVy bCYpKV0gPT0gbV9kZXNrdG9wVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkRmFpbGVkKFFU b3VjaFdlYlBhZ2U6OkVycm9yVHlwZSwgaW50LCBRVXJsKSldKQorICAgICAgICBlbWl0IGxvYWRG YWlsZWQoc3RhdGljX2Nhc3Q8UURlc2t0b3BXZWJWaWV3OjpFcnJvclR5cGU+KGVycm9yVHlwZSks IGVycm9yQ29kZSwgdXJsKTsKIH0KIAotdm9pZCBXZWJWaWV3QWJzdHJhY3Rpb246OmRlc2t0b3BW aWV3TG9hZEZhaWxlZChjb25zdCBRSlNWYWx1ZSYgZXJyb3IpCit2b2lkIFdlYlZpZXdBYnN0cmFj dGlvbjo6ZGVza3RvcFZpZXdMb2FkRmFpbGVkKFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBlIGVy cm9yVHlwZSwgaW50IGVycm9yQ29kZSwgY29uc3QgUVVybCYgdXJsKQogewotICAgIG1fZGVza3Rv cFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRSlNWYWx1ZSkpXSsrOwotICAg IGlmIChtX3RvdWNoVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkRmFpbGVkKFFKU1ZhbHVl KSldID09IG1fZGVza3RvcFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRSlNW YWx1ZSkpXSkKLSAgICAgICAgZW1pdCBsb2FkRmFpbGVkKGVycm9yKTsKKyAgICBtX2Rlc2t0b3BW aWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJv clR5cGUsIGludCwgY29uc3QgUVVybCYpKV0rKzsKKyAgICBpZiAobV90b3VjaFZpZXdTaWduYWxz Q291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVycm9yVHlwZSwgaW50 LCBjb25zdCBRVXJsJikpXSA9PSBtX2Rlc2t0b3BWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxv YWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJvclR5cGUsIGludCwgUVVybCkpXSkKKyAgICAg ICAgZW1pdCBsb2FkRmFpbGVkKGVycm9yVHlwZSwgZXJyb3JDb2RlLCB1cmwpOwogfQogCiB2b2lk IFdlYlZpZXdBYnN0cmFjdGlvbjo6dG91Y2hWaWV3TG9hZFByb2dyZXNzQ2hhbmdlZChpbnQgcHJv Z3Jlc3MpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2NvbW1v bnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJh Y3Rpb24uaAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93ZWJ2aWV3YWJzdHJhY3Rpb24uaAkod29ya2luZyBj b3B5KQpAQCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiBRX1NJR05BTFM6CiAgICAgdm9pZCBsb2Fk U3RhcnRlZCgpOwogICAgIHZvaWQgbG9hZFN1Y2NlZWRlZCgpOwotICAgIHZvaWQgbG9hZEZhaWxl ZChjb25zdCBRSlNWYWx1ZSYpOworICAgIHZvaWQgbG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6 OkVycm9yVHlwZSwgaW50LCBjb25zdCBRVXJsJik7CiAgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFu Z2VkKGludCk7CiAKIHByaXZhdGUgUV9TTE9UUzoKQEAgLTU0LDggKzU0LDggQEAgcHJpdmF0ZSBR X1NMT1RTOgogICAgIHZvaWQgZGVza3RvcFZpZXdMb2FkU3RhcnRlZCgpOwogICAgIHZvaWQgdG91 Y2hWaWV3TG9hZFN1Y2NlZWRlZCgpOwogICAgIHZvaWQgZGVza3RvcFZpZXdMb2FkU3VjY2VlZGVk KCk7Ci0gICAgdm9pZCB0b3VjaFZpZXdMb2FkRmFpbGVkKGNvbnN0IFFKU1ZhbHVlJik7Ci0gICAg dm9pZCBkZXNrdG9wVmlld0xvYWRGYWlsZWQoY29uc3QgUUpTVmFsdWUmKTsKKyAgICB2b2lkIHRv dWNoVmlld0xvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlLCBpbnQsIGNvbnN0IFFV cmwmKTsKKyAgICB2b2lkIGRlc2t0b3BWaWV3TG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVy cm9yVHlwZSwgaW50LCBjb25zdCBRVXJsJik7CiAgICAgdm9pZCB0b3VjaFZpZXdMb2FkUHJvZ3Jl c3NDaGFuZ2VkKGludCk7CiAgICAgdm9pZCBkZXNrdG9wVmlld0xvYWRQcm9ncmVzc0NoYW5nZWQo aW50KTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdl UHJveHkuY3BwCShyZXZpc2lvbiA5NTE5NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwNywxNSArNDA3LDcgQEAg dm9pZCBRdFdlYlBhZ2VQcm94eTo6bG9hZERpZFN1Y2NlZWQoKQogCiB2b2lkIFF0V2ViUGFnZVBy b3h5Ojpsb2FkRGlkRmFpbChjb25zdCBRV2ViRXJyb3ImIGVycm9yKQogewotICAgIFFKU0VuZ2lu ZSogZW5naW5lID0gbV92aWV3SW50ZXJmYWNlLT5lbmdpbmUoKTsKLSAgICBRSlNWYWx1ZSB2YWx1 ZTsKLSAgICBpZiAoZW5naW5lKSB7Ci0gICAgICAgIHZhbHVlID0gZW5naW5lLT5uZXdPYmplY3Qo KTsKLSAgICAgICAgdmFsdWUuc2V0UHJvcGVydHkoUUxhdGluMVN0cmluZygiZXJyb3JDb2RlIiks IGVycm9yLmVycm9yQ29kZSgpKTsKLSAgICAgICAgdmFsdWUuc2V0UHJvcGVydHkoUUxhdGluMVN0 cmluZygidXJsIiksIGVycm9yLnVybCgpLnRvU3RyaW5nKCkpOwotICAgICAgICB2YWx1ZS5zZXRQ cm9wZXJ0eShRTGF0aW4xU3RyaW5nKCJ0eXBlIiksIGVycm9yLnR5cGUoKSk7Ci0gICAgfQotICAg IG1fdmlld0ludGVyZmFjZS0+bG9hZERpZEZhaWwodmFsdWUpOworICAgIG1fdmlld0ludGVyZmFj ZS0+bG9hZERpZEZhaWwoZXJyb3IpOwogfQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRDaGFu Z2VMb2FkUHJvZ3Jlc3MoaW50IG5ld0xvYWRQcm9ncmVzcykKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwCShyZXZpc2lvbiA5 NTE5NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAjaW5jbHVkZSAicXRvdWNod2Vi cGFnZV9wLmgiCiAjaW5jbHVkZSAicXRvdWNod2Vidmlldy5oIgogI2luY2x1ZGUgInF0b3VjaHdl YnZpZXdfcC5oIgorI2luY2x1ZGUgInF3ZWJlcnJvci5oIgogCiAjaW5jbHVkZSA8UURlY2xhcmF0 aXZlRW5naW5lPgogI2luY2x1ZGUgPFFTR1ZpZXc+CkBAIC0xMzEsOSArMTMyLDkgQEAgdm9pZCBU b3VjaFZpZXdJbnRlcmZhY2U6OmxvYWREaWRTdWNjZWVkKAogICAgIGVtaXQgbV9wYWdlVmlldy0+ bG9hZFN1Y2NlZWRlZCgpOwogfQogCi12b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6bG9hZERpZEZh aWwoY29uc3QgUUpTVmFsdWUmIGVycm9yKQordm9pZCBUb3VjaFZpZXdJbnRlcmZhY2U6OmxvYWRE aWRGYWlsKGNvbnN0IFFXZWJFcnJvciYgZXJyb3IpCiB7Ci0gICAgZW1pdCBtX3BhZ2VWaWV3LT5s b2FkRmFpbGVkKGVycm9yKTsKKyAgICBlbWl0IG1fcGFnZVZpZXctPmxvYWRGYWlsZWQoc3RhdGlj X2Nhc3Q8UVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlPihlcnJvci50eXBlKCkpLCBlcnJvci5lcnJv ckNvZGUoKSwgZXJyb3IudXJsKCkpOwogfQogCiB2b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6ZGlk Q2hhbmdlTG9hZFByb2dyZXNzKGludCBwZXJjZW50YWdlTG9hZGVkKQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuaAkocmV2aXNpb24g OTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNl LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDcgKzY2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IHZvaWQgbG9hZERpZEJlZ2luKCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREaWRDb21taXQoKTsK ICAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZFN1Y2NlZWQoKTsKLSAgICB2aXJ0dWFsIHZvaWQgbG9h ZERpZEZhaWwoY29uc3QgUUpTVmFsdWUmKTsKKyAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZEZhaWwo Y29uc3QgUVdlYkVycm9yJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUxvYWRQcm9ncmVz cyhpbnQpOwogCiAgICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudShRU2hhcmVkUG9pbnRl cjxRTWVudT4pOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdJbnRlcmZh Y2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVmlld0ludGVy ZmFjZS5oCShyZXZpc2lvbiA5NTE5NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9W aWV3SW50ZXJmYWNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDEyICsyNiwxMyBAQAogI2luY2x1 ZGUgPFF0R3VpL1FNZW51PgogI2luY2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAKK2NsYXNzIFFX ZWJFcnJvcjsKKwogUVRfQkVHSU5fTkFNRVNQQUNFCiBjbGFzcyBRQ3Vyc29yOwogY2xhc3MgUUdy YXBoaWNzV2lkZ2V0OwogY2xhc3MgUUltYWdlOwogY2xhc3MgUUpTRW5naW5lOwotY2xhc3MgUUpT VmFsdWU7CiBjbGFzcyBRTWltZURhdGE7CiBjbGFzcyBRUG9pbnQ7CiBjbGFzcyBRUmVjdDsKQEAg LTc1LDcgKzc2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkQmVnaW4oKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREaWRDb21taXQoKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIGxvYWREaWRTdWNjZWVkKCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkRmFpbChj b25zdCBRSlNWYWx1ZSYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZEZhaWwoY29uc3Qg UVdlYkVycm9yJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VMb2FkUHJvZ3Jlc3Mo aW50KSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KFFTaGFyZWRQb2lu dGVyPFFNZW51PikgPSAwOwo= 107849 2011-09-19 07:01:28 -0700 2011-09-19 13:35:43 -0700 Patch bug-68357-20110919110114.patch text/plain 14433 menard SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDExKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDktMTkgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IE1ha2UgbG9hZGluZyBlcnJvcnMgQVBJIGVhc2llciB0byB1c2UuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM1NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgdGhlIEFQSSB0byBnZXQgbG9hZGlu ZyBlcnJvcnMgZWFzaWVyIHRvIHVzZS4gOTUxOTcgaW50cm9kdWNlZAorICAgICAgICBhIFFKU1Zh bHVlIEFQSSB0aGF0IGlzIGEgYml0IG9wYXF1ZSBmb3IgdGhlIGNsaWVudCBjb2RlLiBSYXRoZXIg dGhhbgorICAgICAgICB1c2luZyBhIGRlZGljYXRlZCBvYmplY3QsIHdlIGNhbiBqdXN0IHBhc3Mg dGhlIG5lZWRlZCBpbmZvcm1hdGlvbiBhcworICAgICAgICBwYXJhbWV0ZXJzIG9mIHRoZSBzbG90 LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuY3BwOgorICAg ICAgICAoUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6bG9hZERpZEZhaWwpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRv dWNod2VicGFnZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9udmll d3Rlc3RzL3RzdF9jb21tb252aWV3dGVzdHMuY3BwOgorICAgICAgICAodHN0X0NvbW1vblZpZXdU ZXN0czo6bG9hZE5vbmV4aXN0ZW50RmlsZVVybCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9x dC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmNwcDoKKyAgICAgICAg KFdlYlZpZXdBYnN0cmFjdGlvbjo6V2ViVmlld0Fic3RyYWN0aW9uKToKKyAgICAgICAgKFdlYlZp ZXdBYnN0cmFjdGlvbjo6dG91Y2hWaWV3TG9hZEZhaWxlZCk6CisgICAgICAgIChXZWJWaWV3QWJz dHJhY3Rpb246OmRlc2t0b3BWaWV3TG9hZEZhaWxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmg6CisgICAgICAg ICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVBy b3h5Ojpsb2FkRGlkRmFpbCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVy ZmFjZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRvdWNoVmlld0ludGVyZmFjZTo6bG9hZERpZEZh aWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvVmlld0ludGVyZmFjZS5oOgorCiAyMDExLTA5LTE5ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBGaXgg ZGlzdGNoZWNrIGJ1aWxkCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fk ZXNrdG9wd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuY3BwCShyZXZpc2lvbiA5NTE5NykKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgInFkZXNr dG9wd2Vidmlldy5oIgogI2luY2x1ZGUgInFkZXNrdG9wd2Vidmlld19wLmgiCisjaW5jbHVkZSAi cXdlYmVycm9yLmgiCiAKICNpbmNsdWRlIDxRR3JhcGhpY3NTY2VuZVJlc2l6ZUV2ZW50PgogI2lu Y2x1ZGUgPFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbT4KQEAgLTE0NCw5ICsxNDUsOSBAQCB2b2lk IFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6OmxvYWREaWRTdWNjCiAgICAgZW1pdCBxLT5sb2FkU3Vj Y2VlZGVkKCk7CiB9CiAKLXZvaWQgUURlc2t0b3BXZWJWaWV3UHJpdmF0ZTo6bG9hZERpZEZhaWwo Y29uc3QgUUpTVmFsdWUmIGVycm9yKQordm9pZCBRRGVza3RvcFdlYlZpZXdQcml2YXRlOjpsb2Fk RGlkRmFpbChjb25zdCBRV2ViRXJyb3ImIGVycm9yKQogewotICAgIGVtaXQgcS0+bG9hZEZhaWxl ZChlcnJvcik7CisgICAgZW1pdCBxLT5sb2FkRmFpbGVkKHN0YXRpY19jYXN0PFFEZXNrdG9wV2Vi Vmlldzo6RXJyb3JUeXBlPihlcnJvci50eXBlKCkpLCBlcnJvci5lcnJvckNvZGUoKSwgZXJyb3Iu dXJsKCkpOwogfQogCiB2b2lkIFFEZXNrdG9wV2ViVmlld1ByaXZhdGU6OmRpZENoYW5nZUxvYWRQ cm9ncmVzcyhpbnQgcGVyY2VudGFnZUxvYWRlZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaAkocmV2aXNpb24gOTUxOTcpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFEZXNrdG9w V2ViVmlldyA6IHAKICAgICBRX1BST1BFUlRZKGludCBsb2FkUHJvZ3Jlc3MgUkVBRCBsb2FkUHJv Z3Jlc3MgTk9USUZZIGxvYWRQcm9ncmVzc0NoYW5nZWQpCiAgICAgUV9QUk9QRVJUWShRV2ViTmF2 aWdhdGlvbkNvbnRyb2xsZXIqIG5hdmlnYXRpb24gUkVBRCBuYXZpZ2F0aW9uQ29udHJvbGxlciBD T05TVEFOVCkKICAgICBRX0VOVU1TKE5hdmlnYXRpb25Qb2xpY3kpCi0KKyAgICBRX0VOVU1TKEVy cm9yVHlwZSkKIHB1YmxpYzoKICAgICBlbnVtIE5hdmlnYXRpb25Qb2xpY3kgewogICAgICAgICBV c2VQb2xpY3ksCkBAIC02Miw2ICs2MiwxMiBAQCBwdWJsaWM6CiAgICAgICAgIElnbm9yZVBvbGlj eQogICAgIH07CiAKKyAgICBlbnVtIEVycm9yVHlwZSB7CisgICAgICAgIEVuZ2luZUVycm9yLAor ICAgICAgICBOZXR3b3JrRXJyb3IsCisgICAgICAgIEh0dHBFcnJvciwKKyAgICB9OworCiAgICAg UURlc2t0b3BXZWJWaWV3KFFTR0l0ZW0qIHBhcmVudCA9IDApOwogICAgIHZpcnR1YWwgflFEZXNr dG9wV2ViVmlldygpOwogCkBAIC03OSw4ICs4NSw3IEBAIFFfU0lHTkFMUzoKICAgICB2b2lkIHN0 YXR1c0Jhck1lc3NhZ2VDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKTsKICAgICB2b2lkIGxvYWRTdGFy dGVkKCk7CiAgICAgdm9pZCBsb2FkU3VjY2VlZGVkKCk7Ci0gICAgLy8gVGhlIHBhcmFtZXRlciBu ZWVkcyB0byBiZSBleHBsaWNpdGx5IG5hbWVkIHRvIHdvcmsgaW4gUU1MLgotICAgIHZvaWQgbG9h ZEZhaWxlZChjb25zdCBRSlNWYWx1ZSYgZXJyb3IpOworICAgIHZvaWQgbG9hZEZhaWxlZChRRGVz a3RvcFdlYlZpZXc6OkVycm9yVHlwZSBlcnJvclR5cGUsIGludCBlcnJvckNvZGUsIGNvbnN0IFFV cmwmIHVybCk7CiAgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVzcyk7CiAg ICAgdm9pZCB1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKTsKIApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3X3AuaAkocmV2aXNpb24g OTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmll d19wLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDcgKzcxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0 dWFsIHZvaWQgbG9hZERpZEJlZ2luKCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREaWRDb21taXQo KTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZFN1Y2NlZWQoKTsKLSAgICB2aXJ0dWFsIHZvaWQg bG9hZERpZEZhaWwoY29uc3QgUUpTVmFsdWUmKTsKKyAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZEZh aWwoY29uc3QgUVdlYkVycm9yJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUxvYWRQcm9n cmVzcyhpbnQpOwogCiAgICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudShRU2hhcmVkUG9p bnRlcjxRTWVudT4pOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91 Y2h3ZWJwYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xdG91Y2h3ZWJwYWdlLmgJKHJldmlzaW9uIDk1MTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDggKzQx LDE0IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFUb3VjaFdlYlBhZ2UgOiBwdWIKICAgICBRX1BS T1BFUlRZKFFVcmwgdXJsIFJFQUQgdXJsIE5PVElGWSB1cmxDaGFuZ2VkKQogICAgIFFfUFJPUEVS VFkoaW50IGxvYWRQcm9ncmVzcyBSRUFEIGxvYWRQcm9ncmVzcyBOT1RJRlkgbG9hZFByb2dyZXNz Q2hhbmdlZCkKICAgICBRX1BST1BFUlRZKFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlciogbmF2aWdh dGlvbiBSRUFEIG5hdmlnYXRpb25Db250cm9sbGVyIENPTlNUQU5UKQotCisgICAgUV9FTlVNUyhF cnJvclR5cGUpCiBwdWJsaWM6CisgICAgZW51bSBFcnJvclR5cGUgeworICAgICAgICBFbmdpbmVF cnJvciwKKyAgICAgICAgTmV0d29ya0Vycm9yLAorICAgICAgICBIdHRwRXJyb3IsCisgICAgfTsK KwogICAgIFFUb3VjaFdlYlBhZ2UoUVNHSXRlbSogcGFyZW50ID0gMCk7CiAKICAgICB2aXJ0dWFs IH5RVG91Y2hXZWJQYWdlKCk7CkBAIC02Myw4ICs2OSw3IEBAIFFfU0lHTkFMUzoKICAgICB2b2lk IHRpdGxlQ2hhbmdlZChjb25zdCBRU3RyaW5nJik7CiAgICAgdm9pZCBsb2FkU3RhcnRlZCgpOwog ICAgIHZvaWQgbG9hZFN1Y2NlZWRlZCgpOwotICAgIC8vIFRoZSBwYXJhbWV0ZXIgbmVlZHMgdG8g YmUgZXhwbGljaXRseSBuYW1lZCB0byB3b3JrIGluIFFNTC4KLSAgICB2b2lkIGxvYWRGYWlsZWQo Y29uc3QgUUpTVmFsdWUmIGVycm9yKTsKKyAgICB2b2lkIGxvYWRGYWlsZWQoUVRvdWNoV2ViUGFn ZTo6RXJyb3JUeXBlIGVycm9yVHlwZSwgaW50IGVycm9yQ29kZSwgY29uc3QgUVVybCYgdXJsKTsK ICAgICB2b2lkIGxvYWRQcm9ncmVzc0NoYW5nZWQoaW50IHByb2dyZXNzKTsKIAogcHJvdGVjdGVk OgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3 dGVzdHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0 ZXN0cy5jcHAJKHJldmlzaW9uIDk1MTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvdHN0X2NvbW1vbnZpZXd0ZXN0cy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCB0c3RfQ29tbW9uVmlld1Rlc3RzOjpsb2Fk Tm9uZXhpc3RlbgogICAgIFFTaWduYWxTcHkgbG9hZEZhaWxlZFNweSh2aWV3QWJzdHJhY3Rpb24u ZGF0YSgpLCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSkpOwogCiAgICAgdmlld0Fic3RyYWN0aW9uLT5s b2FkKFFVcmw6OmZyb21Mb2NhbEZpbGUoUUxhdGluMVN0cmluZyhURVNUU19TT1VSQ0VfRElSICIv aHRtbC9maWxlX3RoYXRfZG9lc19ub3RfZXhpc3QuaHRtbCIpKSk7Ci0gICAgUVZFUklGWSh3YWl0 Rm9yU2lnbmFsKHZpZXdBYnN0cmFjdGlvbi5kYXRhKCksIFNJR05BTChsb2FkRmFpbGVkKFFKU1Zh bHVlKSkpKTsKKyAgICBRVkVSSUZZKHdhaXRGb3JTaWduYWwodmlld0Fic3RyYWN0aW9uLmRhdGEo KSwgU0lHTkFMKGxvYWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJvclR5cGUsIGludCwgUVVy bCkpKSk7CiAKICAgICBRQ09NUEFSRShsb2FkRmFpbGVkU3B5LnNpemUoKSwgMSk7CiB9CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2NvbW1vbnZpZXd0ZXN0cy93 ZWJ2aWV3YWJzdHJhY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvdGVzdHMvY29tbW9udmlld3Rlc3RzL3dlYnZpZXdhYnN0cmFjdGlvbi5jcHAJ KHJldmlzaW9uIDk1MTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0 cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzUsNyArMzUsNyBAQCBXZWJWaWV3QWJzdHJhY3Rpb246OldlYlZpZXdBYnN0cmFjdGlvbigp CiAgICAgbV90b3VjaFdlYlZpZXdXaW5kb3cuc2V0V2luZG93VGl0bGUoUUxhdGluMVN0cmluZygi VG91Y2hXZWJWaWV3IikpOwogICAgIGNvbm5lY3QodG91Y2hXZWJWaWV3KCktPnBhZ2UoKSwgU0lH TkFMKGxvYWRTdGFydGVkKCkpLCB0aGlzLCBTTE9UKHRvdWNoVmlld0xvYWRTdGFydGVkKCkpKTsK ICAgICBjb25uZWN0KHRvdWNoV2ViVmlldygpLT5wYWdlKCksIFNJR05BTChsb2FkU3VjY2VlZGVk KCkpLCB0aGlzLCBTTE9UKHRvdWNoVmlld0xvYWRTdWNjZWVkZWQoKSkpOwotICAgIGNvbm5lY3Qo dG91Y2hXZWJWaWV3KCktPnBhZ2UoKSwgU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUpKSwgdGhp cywgU0xPVCh0b3VjaFZpZXdMb2FkRmFpbGVkKFFKU1ZhbHVlKSkpOworICAgIGNvbm5lY3QodG91 Y2hXZWJWaWV3KCktPnBhZ2UoKSwgU0lHTkFMKGxvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJy b3JUeXBlLCBpbnQsIGNvbnN0IFFVcmwmKSksIHRoaXMsIFNMT1QodG91Y2hWaWV3TG9hZEZhaWxl ZChRVG91Y2hXZWJQYWdlOjpFcnJvclR5cGUsIGludCwgY29uc3QgUVVybCYpKSk7CiAgICAgY29u bmVjdCh0b3VjaFdlYlZpZXcoKS0+cGFnZSgpLCBTSUdOQUwobG9hZFByb2dyZXNzQ2hhbmdlZChp bnQpKSwgdGhpcywgU0xPVCh0b3VjaFZpZXdMb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpKTsKIAog ICAgIHNjcmVlbkhhbGYubW92ZUxlZnQoc2NyZWVuSGFsZi5yaWdodCgpKTsKQEAgLTQzLDcgKzQz LDcgQEAgV2ViVmlld0Fic3RyYWN0aW9uOjpXZWJWaWV3QWJzdHJhY3Rpb24oKQogICAgIG1fZGVz a3RvcFdlYlZpZXdXaW5kb3cuc2V0V2luZG93VGl0bGUoUUxhdGluMVN0cmluZygiRGVza3RvcFdl YlZpZXciKSk7CiAgICAgY29ubmVjdChkZXNrdG9wV2ViVmlldygpLCBTSUdOQUwobG9hZFN0YXJ0 ZWQoKSksIHRoaXMsIFNMT1QoZGVza3RvcFZpZXdMb2FkU3RhcnRlZCgpKSk7CiAgICAgY29ubmVj dChkZXNrdG9wV2ViVmlldygpLCBTSUdOQUwobG9hZFN1Y2NlZWRlZCgpKSwgdGhpcywgU0xPVChk ZXNrdG9wVmlld0xvYWRTdWNjZWVkZWQoKSkpOwotICAgIGNvbm5lY3QoZGVza3RvcFdlYlZpZXco KSwgU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUpKSwgdGhpcywgU0xPVChkZXNrdG9wVmlld0xv YWRGYWlsZWQoUUpTVmFsdWUpKSk7CisgICAgY29ubmVjdChkZXNrdG9wV2ViVmlldygpLCBTSUdO QUwobG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVycm9yVHlwZSwgaW50LCBjb25zdCBRVXJs JikpLCB0aGlzLCBTTE9UKGRlc2t0b3BWaWV3TG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVy cm9yVHlwZSwgaW50LCBjb25zdCBRVXJsJikpKTsKICAgICBjb25uZWN0KGRlc2t0b3BXZWJWaWV3 KCksIFNJR05BTChsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpLCB0aGlzLCBTTE9UKGRlc2t0b3BW aWV3TG9hZFByb2dyZXNzQ2hhbmdlZChpbnQpKSk7CiB9CiAKQEAgLTEzMywxOCArMTMzLDE4IEBA IHZvaWQgV2ViVmlld0Fic3RyYWN0aW9uOjpkZXNrdG9wVmlld0xvYWQKICAgICAgICAgZW1pdCBs b2FkU3VjY2VlZGVkKCk7CiB9CiAKLXZvaWQgV2ViVmlld0Fic3RyYWN0aW9uOjp0b3VjaFZpZXdM b2FkRmFpbGVkKGNvbnN0IFFKU1ZhbHVlJiBlcnJvcikKK3ZvaWQgV2ViVmlld0Fic3RyYWN0aW9u Ojp0b3VjaFZpZXdMb2FkRmFpbGVkKFFUb3VjaFdlYlBhZ2U6OkVycm9yVHlwZSBlcnJvclR5cGUs IGludCBlcnJvckNvZGUsIGNvbnN0IFFVcmwmIHVybCkKIHsKLSAgICBtX3RvdWNoVmlld1NpZ25h bHNDb3VudGVyW1NJR05BTChsb2FkRmFpbGVkKFFKU1ZhbHVlKSldKys7Ci0gICAgaWYgKG1fdG91 Y2hWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUpKV0gPT0gbV9k ZXNrdG9wVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkRmFpbGVkKFFKU1ZhbHVlKSldKQot ICAgICAgICBlbWl0IGxvYWRGYWlsZWQoZXJyb3IpOworICAgIG1fdG91Y2hWaWV3U2lnbmFsc0Nv dW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlLCBpbnQsIGNv bnN0IFFVcmwmKSldKys7CisgICAgaWYgKG1fdG91Y2hWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFM KGxvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlLCBpbnQsIGNvbnN0IFFVcmwmKSld ID09IG1fZGVza3RvcFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRVG91Y2hX ZWJQYWdlOjpFcnJvclR5cGUsIGludCwgUVVybCkpXSkKKyAgICAgICAgZW1pdCBsb2FkRmFpbGVk KHN0YXRpY19jYXN0PFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBlPihlcnJvclR5cGUpLCBlcnJv ckNvZGUsIHVybCk7CiB9CiAKLXZvaWQgV2ViVmlld0Fic3RyYWN0aW9uOjpkZXNrdG9wVmlld0xv YWRGYWlsZWQoY29uc3QgUUpTVmFsdWUmIGVycm9yKQordm9pZCBXZWJWaWV3QWJzdHJhY3Rpb246 OmRlc2t0b3BWaWV3TG9hZEZhaWxlZChRRGVza3RvcFdlYlZpZXc6OkVycm9yVHlwZSBlcnJvclR5 cGUsIGludCBlcnJvckNvZGUsIGNvbnN0IFFVcmwmIHVybCkKIHsKLSAgICBtX2Rlc2t0b3BWaWV3 U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUpKV0rKzsKLSAgICBpZiAo bV90b3VjaFZpZXdTaWduYWxzQ291bnRlcltTSUdOQUwobG9hZEZhaWxlZChRSlNWYWx1ZSkpXSA9 PSBtX2Rlc2t0b3BWaWV3U2lnbmFsc0NvdW50ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUUpTVmFsdWUp KV0pCi0gICAgICAgIGVtaXQgbG9hZEZhaWxlZChlcnJvcik7CisgICAgbV9kZXNrdG9wVmlld1Np Z25hbHNDb3VudGVyW1NJR05BTChsb2FkRmFpbGVkKFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBl LCBpbnQsIGNvbnN0IFFVcmwmKSldKys7CisgICAgaWYgKG1fdG91Y2hWaWV3U2lnbmFsc0NvdW50 ZXJbU0lHTkFMKGxvYWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJvclR5cGUsIGludCwgY29u c3QgUVVybCYpKV0gPT0gbV9kZXNrdG9wVmlld1NpZ25hbHNDb3VudGVyW1NJR05BTChsb2FkRmFp bGVkKFFEZXNrdG9wV2ViVmlldzo6RXJyb3JUeXBlLCBpbnQsIFFVcmwpKV0pCisgICAgICAgIGVt aXQgbG9hZEZhaWxlZChlcnJvclR5cGUsIGVycm9yQ29kZSwgdXJsKTsKIH0KIAogdm9pZCBXZWJW aWV3QWJzdHJhY3Rpb246OnRvdWNoVmlld0xvYWRQcm9ncmVzc0NoYW5nZWQoaW50IHByb2dyZXNz KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3 dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9u LmgJKHJldmlzaW9uIDk1MTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90 ZXN0cy9jb21tb252aWV3dGVzdHMvd2Vidmlld2Fic3RyYWN0aW9uLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogUV9TSUdOQUxTOgogICAgIHZvaWQgbG9hZFN0YXJ0 ZWQoKTsKICAgICB2b2lkIGxvYWRTdWNjZWVkZWQoKTsKLSAgICB2b2lkIGxvYWRGYWlsZWQoY29u c3QgUUpTVmFsdWUmKTsKKyAgICB2b2lkIGxvYWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJv clR5cGUsIGludCwgY29uc3QgUVVybCYpOwogICAgIHZvaWQgbG9hZFByb2dyZXNzQ2hhbmdlZChp bnQpOwogCiBwcml2YXRlIFFfU0xPVFM6CkBAIC01NCw4ICs1NCw4IEBAIHByaXZhdGUgUV9TTE9U UzoKICAgICB2b2lkIGRlc2t0b3BWaWV3TG9hZFN0YXJ0ZWQoKTsKICAgICB2b2lkIHRvdWNoVmll d0xvYWRTdWNjZWVkZWQoKTsKICAgICB2b2lkIGRlc2t0b3BWaWV3TG9hZFN1Y2NlZWRlZCgpOwot ICAgIHZvaWQgdG91Y2hWaWV3TG9hZEZhaWxlZChjb25zdCBRSlNWYWx1ZSYpOwotICAgIHZvaWQg ZGVza3RvcFZpZXdMb2FkRmFpbGVkKGNvbnN0IFFKU1ZhbHVlJik7CisgICAgdm9pZCB0b3VjaFZp ZXdMb2FkRmFpbGVkKFFUb3VjaFdlYlBhZ2U6OkVycm9yVHlwZSwgaW50LCBjb25zdCBRVXJsJik7 CisgICAgdm9pZCBkZXNrdG9wVmlld0xvYWRGYWlsZWQoUURlc2t0b3BXZWJWaWV3OjpFcnJvclR5 cGUsIGludCwgY29uc3QgUVVybCYpOwogICAgIHZvaWQgdG91Y2hWaWV3TG9hZFByb2dyZXNzQ2hh bmdlZChpbnQpOwogICAgIHZvaWQgZGVza3RvcFZpZXdMb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCk7 CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5 LmNwcAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRX ZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDcsMTUgKzQwNyw3IEBAIHZvaWQg UXRXZWJQYWdlUHJveHk6OmxvYWREaWRTdWNjZWVkKCkKIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6 bG9hZERpZEZhaWwoY29uc3QgUVdlYkVycm9yJiBlcnJvcikKIHsKLSAgICBRSlNFbmdpbmUqIGVu Z2luZSA9IG1fdmlld0ludGVyZmFjZS0+ZW5naW5lKCk7Ci0gICAgUUpTVmFsdWUgdmFsdWU7Ci0g ICAgaWYgKGVuZ2luZSkgewotICAgICAgICB2YWx1ZSA9IGVuZ2luZS0+bmV3T2JqZWN0KCk7Ci0g ICAgICAgIHZhbHVlLnNldFByb3BlcnR5KFFMYXRpbjFTdHJpbmcoImVycm9yQ29kZSIpLCBlcnJv ci5lcnJvckNvZGUoKSk7Ci0gICAgICAgIHZhbHVlLnNldFByb3BlcnR5KFFMYXRpbjFTdHJpbmco InVybCIpLCBlcnJvci51cmwoKS50b1N0cmluZygpKTsKLSAgICAgICAgdmFsdWUuc2V0UHJvcGVy dHkoUUxhdGluMVN0cmluZygidHlwZSIpLCBlcnJvci50eXBlKCkpOwotICAgIH0KLSAgICBtX3Zp ZXdJbnRlcmZhY2UtPmxvYWREaWRGYWlsKHZhbHVlKTsKKyAgICBtX3ZpZXdJbnRlcmZhY2UtPmxv YWREaWRGYWlsKGVycm9yKTsKIH0KIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlTG9h ZFByb2dyZXNzKGludCBuZXdMb2FkUHJvZ3Jlc3MpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcAkocmV2aXNpb24gOTUxOTcp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNyBAQAogI2luY2x1ZGUgInF0b3VjaHdlYnBhZ2Vf cC5oIgogI2luY2x1ZGUgInF0b3VjaHdlYnZpZXcuaCIKICNpbmNsdWRlICJxdG91Y2h3ZWJ2aWV3 X3AuaCIKKyNpbmNsdWRlICJxd2ViZXJyb3IuaCIKIAogI2luY2x1ZGUgPFFEZWNsYXJhdGl2ZUVu Z2luZT4KICNpbmNsdWRlIDxRU0dWaWV3PgpAQCAtMTMxLDkgKzEzMiw5IEBAIHZvaWQgVG91Y2hW aWV3SW50ZXJmYWNlOjpsb2FkRGlkU3VjY2VlZCgKICAgICBlbWl0IG1fcGFnZVZpZXctPmxvYWRT dWNjZWVkZWQoKTsKIH0KIAotdm9pZCBUb3VjaFZpZXdJbnRlcmZhY2U6OmxvYWREaWRGYWlsKGNv bnN0IFFKU1ZhbHVlJiBlcnJvcikKK3ZvaWQgVG91Y2hWaWV3SW50ZXJmYWNlOjpsb2FkRGlkRmFp bChjb25zdCBRV2ViRXJyb3ImIGVycm9yKQogewotICAgIGVtaXQgbV9wYWdlVmlldy0+bG9hZEZh aWxlZChlcnJvcik7CisgICAgZW1pdCBtX3BhZ2VWaWV3LT5sb2FkRmFpbGVkKHN0YXRpY19jYXN0 PFFUb3VjaFdlYlBhZ2U6OkVycm9yVHlwZT4oZXJyb3IudHlwZSgpKSwgZXJyb3IuZXJyb3JDb2Rl KCksIGVycm9yLnVybCgpKTsKIH0KIAogdm9pZCBUb3VjaFZpZXdJbnRlcmZhY2U6OmRpZENoYW5n ZUxvYWRQcm9ncmVzcyhpbnQgcGVyY2VudGFnZUxvYWRlZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmgJKHJldmlzaW9uIDk1MTk3 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC02Niw3ICs2Niw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IGxvYWREaWRCZWdpbigpOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkQ29tbWl0KCk7CiAgICAg dmlydHVhbCB2b2lkIGxvYWREaWRTdWNjZWVkKCk7Ci0gICAgdmlydHVhbCB2b2lkIGxvYWREaWRG YWlsKGNvbnN0IFFKU1ZhbHVlJik7CisgICAgdmlydHVhbCB2b2lkIGxvYWREaWRGYWlsKGNvbnN0 IFFXZWJFcnJvciYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VMb2FkUHJvZ3Jlc3MoaW50 KTsKIAogICAgIHZpcnR1YWwgdm9pZCBzaG93Q29udGV4dE1lbnUoUVNoYXJlZFBvaW50ZXI8UU1l bnU+KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9WaWV3SW50ZXJmYWNlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdJbnRlcmZhY2Uu aAkocmV2aXNpb24gOTUxOTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVmlld0lu dGVyZmFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiwxMiArMjYsMTMgQEAKICNpbmNsdWRlIDxR dEd1aS9RTWVudT4KICNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgogCitjbGFzcyBRV2ViRXJy b3I7CisKIFFUX0JFR0lOX05BTUVTUEFDRQogY2xhc3MgUUN1cnNvcjsKIGNsYXNzIFFHcmFwaGlj c1dpZGdldDsKIGNsYXNzIFFJbWFnZTsKIGNsYXNzIFFKU0VuZ2luZTsKLWNsYXNzIFFKU1ZhbHVl OwogY2xhc3MgUU1pbWVEYXRhOwogY2xhc3MgUVBvaW50OwogY2xhc3MgUVJlY3Q7CkBAIC03NSw3 ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZEJlZ2luKCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkQ29tbWl0KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBs b2FkRGlkU3VjY2VlZCgpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgbG9hZERpZEZhaWwoY29uc3Qg UUpTVmFsdWUmKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGxvYWREaWRGYWlsKGNvbnN0IFFXZWJF cnJvciYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlTG9hZFByb2dyZXNzKGludCkg PSAwOwogCiAgICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudShRU2hhcmVkUG9pbnRlcjxR TWVudT4pID0gMDsK