70243 2011-10-17 08:29:58 -0700 AX: children() method should be consolidated in AccessibilityObject 2011-10-17 10:00:49 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70241 1 cfleizach cfleizach webkit.review.bot oldest_to_newest 485172 0 cfleizach 2011-10-17 08:29:58 -0700 Right now there are four or five nearly identical implementations of children(). Those can be consolidate into one method in AccessibilityObject 485189 1 111270 cfleizach 2011-10-17 09:04:55 -0700 Created attachment 111270 patch 485193 2 webkit.review.bot 2011-10-17 09:07:26 -0700 Attachment 111270 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit', '--chromium']" exit_code: 2 Updating OpenSource Current branch master is up to date. Updating chromium port dependencies using gclient... Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Error: 'depot_tools/gclient sync' failed 3 tries and returned 256 at Tools/Scripts/update-webkit-chromium line 107. Re-trying 'depot_tools/gclient sync' No such file or directory at Tools/Scripts/update-webkit line 104. If any of these errors are false positives, please file a bug against check-webkit-style. 485198 3 111270 darin 2011-10-17 09:13:32 -0700 Comment on attachment 111270 patch View in context: https://bugs.webkit.org/attachment.cgi?id=111270&action=review > Source/WebCore/accessibility/AccessibilityTableColumn.cpp:75 > + Stray blank space on what should just be an empty line. 485233 4 cfleizach 2011-10-17 10:00:49 -0700 http://trac.webkit.org/changeset/97629 111270 2011-10-17 09:04:55 -0700 2011-10-17 09:13:32 -0700 patch patch.txt text/plain 9880 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NjIzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMTAtMTcgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogY2hpbGRyZW4oKSBt ZXRob2Qgc2hvdWxkIGJlIGNvbnNvbGlkYXRlZCBpbiBBY2Nlc3NpYmlsaXR5T2JqZWN0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDI0MworCisgICAg ICAgIENvZGUgY2xlYW51cCwgbm8gbmV3IHRlc3RzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNoaWxkcmVu KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dXBkYXRlQ2hpbGRyZW5JZk5l Y2Vzc2FyeSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6dXBkYXRlQ2hp bGRyZW5JZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5U2Nyb2xs Vmlldzo6dXBkYXRlU2Nyb2xsYmFycyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5 U2Nyb2xsVmlldzo6YWRkQ2hpbGRyZW4pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVNjcm9sbFZpZXcuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlTbGlkZXIuY3BwOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRl ci5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1uLmNw cDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNvbHVtbi5oOgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVy LmNwcDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNv bnRhaW5lci5oOgorCiAyMDExLTEwLTEyICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZpeCBoYW5kbGluZyBvZiBzb3Vy Y2UgbWFwcGluZyBlbnRyaWVzIHdpdGggbm8gbWFwcGluZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCShyZXZpc2lvbiA5 NzA5MikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw2IEBACiAgICAgdmlydHVhbCBib29sIGlz U2xpZGVyKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0lucHV0 U2xpZGVyKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIAotICAgIHZpcnR1YWwgY29uc3Qg QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9p ZCBhZGRDaGlsZHJlbigpOwogICAgIAogICAgIHZpcnR1YWwgYm9vbCBjYW5TZXRWYWx1ZUF0dHJp YnV0ZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmgJKHJldmlzaW9u IDk3MDkyKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw4ICs1Myw4IEBACiAgICAgdmlydHVhbCBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uKSBj b25zdDsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRyZW4oKTsKICAgICB2aXJ0dWFsIEFjY2Vz c2liaWxpdHlPYmplY3QqIGFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IExheW91dFBvaW50Jikg Y29uc3Q7Ci0gICAgdmlydHVhbCBjb25zdCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGNo aWxkcmVuKCk7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKTsK KyAgICB2b2lkIHVwZGF0ZVNjcm9sbGJhcnMoKTsKICAgICAKICAgICB2aXJ0dWFsIEZyYW1lVmll dyogZG9jdW1lbnRGcmFtZVZpZXcoKSBjb25zdDsKICAgICB2aXJ0dWFsIExheW91dFJlY3QgZWxl bWVudFJlY3QoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5j cHAJKHJldmlzaW9uIDk3MDkyKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5VGFibGVIZWFkZXJDb250YWluZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OSwx MyArNDksNiBAQAogICAgIHJldHVybiBhZG9wdFJlZihuZXcgQWNjZXNzaWJpbGl0eVRhYmxlSGVh ZGVyQ29udGFpbmVyKCkpOwogfQogICAgIAotY29uc3QgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBBY2Nlc3NpYmlsaXR5VGFibGVIZWFkZXJDb250YWlu ZXI6OmNoaWxkcmVuKCkKLXsKLSAgICBpZiAoIW1faGF2ZUNoaWxkcmVuKQotICAgICAgICBhZGRD aGlsZHJlbigpOwotICAgIHJldHVybiBtX2NoaWxkcmVuOwotfQotCiBMYXlvdXRSZWN0IEFjY2Vz c2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lcjo6ZWxlbWVudFJlY3QoKSBjb25zdAogewogICAg IC8vIHRoaXMgd2lsbCBiZSBmaWxsZWQgaW4gd2hlbiBhZGRDaGlsZHJlbiBpcyBjYWxsZWQKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlUYWJsZUNvbHVtbi5jcHAJKHJldmlzaW9uIDk3MDkyKQorKysgU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDb2x1bW4uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03MiwxNCArNzIsNyBAQAogewogICAgIHJldHVybiBlbGVtZW50UmVjdCgpLnNpemUoKTsK IH0KLSAgCi1jb25zdCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5W ZWN0b3ImIEFjY2Vzc2liaWxpdHlUYWJsZUNvbHVtbjo6Y2hpbGRyZW4oKQotewotICAgIGlmICgh bV9oYXZlQ2hpbGRyZW4pCi0gICAgICAgIGFkZENoaWxkcmVuKCk7Ci0gICAgcmV0dXJuIG1fY2hp bGRyZW47Ci19Ci0gICAgCisgCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5VGFi bGVDb2x1bW46OmhlYWRlck9iamVjdCgpCiB7CiAgICAgaWYgKCFtX3BhcmVudCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5o CShyZXZpc2lvbiA5NzA5MikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NTIsNyArNTUyLDcgQEAKIAogICAg IHZpcnR1YWwgdm9pZCBjaGlsZHJlbkNoYW5nZWQoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgY29u dGVudENoYW5nZWQoKSB7IH0KLSAgICB2aXJ0dWFsIGNvbnN0IEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgY2hpbGRyZW4oKSB7IHJldHVybiBtX2NoaWxkcmVuOyB9CisgICAgY29uc3QgQWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9pZCBh ZGRDaGlsZHJlbigpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBjYW5IYXZlQ2hpbGRyZW4oKSBjb25z dCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIGhhc0NoaWxkcmVuKCkgY29uc3Qg eyByZXR1cm4gbV9oYXZlQ2hpbGRyZW47IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCShyZXZpc2lv biA5NzA5MikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMDEsNyArMjAxLDYgQEAKICAgICB2aXJ0 dWFsIEZyYW1lVmlldyogZG9jdW1lbnRGcmFtZVZpZXcoKSBjb25zdDsKICAgICB2aXJ0dWFsIHVu c2lnbmVkIGhpZXJhcmNoaWNhbExldmVsKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIGNvbnN0IEFj Y2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgY2hpbGRyZW4oKTsKICAgICB2aXJ0dWFsIHZvaWQg Y2xlYXJDaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDaGlsZHJlbklmTmVjZXNz YXJ5KCk7CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlTbGlkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVNsaWRlci5jcHAJKHJldmlzaW9uIDk3MDkyKQorKysgU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTAsMTMgKzUwLDYgQEAKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEFjY2Vzc2liaWxp dHlTbGlkZXIocmVuZGVyZXIpKTsKIH0KIAotY29uc3QgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBBY2Nlc3NpYmlsaXR5U2xpZGVyOjpjaGlsZHJlbigp Ci17Ci0gICAgaWYgKCFtX2hhdmVDaGlsZHJlbikKLSAgICAgICAgYWRkQ2hpbGRyZW4oKTsKLSAg ICByZXR1cm4gbV9jaGlsZHJlbjsKLX0KLQogQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uIEFjY2Vz c2liaWxpdHlTbGlkZXI6Om9yaWVudGF0aW9uKCkgY29uc3QKIHsKICAgICAvLyBEZWZhdWx0IHRv IGhvcml6b250YWwgaW4gdGhlIHVua25vd24gY2FzZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCShy ZXZpc2lvbiA5NzA5MikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVNjcm9sbFZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSwxMyArNTksNiBAQAogICAg IHJldHVybiAwOwogfQogCi1jb25zdCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3ImIEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3OjpjaGlsZHJlbigpCi17Ci0g ICAgaWYgKCFtX2hhdmVDaGlsZHJlbikKLSAgICAgICAgYWRkQ2hpbGRyZW4oKTsKLSAgICByZXR1 cm4gbV9jaGlsZHJlbjsKLX0KLQogLy8gSWYgdGhpcyBpcyBXZWJLaXQxIHRoZW4gdGhlIG5hdGl2 ZSBzY3JvbGwgdmlldyBuZWVkcyB0byByZXR1cm4gdGhlCiAvLyBBWCBpbmZvcm1hdGlvbiAoYmVj YXVzZSB0aGVyZSBhcmUgbm8gc2Nyb2xsIGJhciBjaGlsZHJlbiBpbiB0aGUgU2Nyb2xsVmlldyBv YmplY3QgaW4gV0sxKS4KIC8vIEluIFdlYktpdDIsIHRoZSBTY3JvbGxWaWV3IG9iamVjdCB3aWxs IHJldHVybiB0aGUgQVggaW5mb3JtYXRpb24gKGJlY2F1c2UgdGhlcmUgYXJlIG5vIHBsYXRmb3Jt IHdpZGdldHMpLgpAQCAtODEsNiArNzQsMTQgQEAKICAgICAKIHZvaWQgQWNjZXNzaWJpbGl0eVNj cm9sbFZpZXc6OnVwZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKQogeworICAgIGlmICghbV9oYXZl Q2hpbGRyZW4pCisgICAgICAgIGFkZENoaWxkcmVuKCk7CisgICAgCisgICAgdXBkYXRlU2Nyb2xs YmFycygpOworfQorCit2b2lkIEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxi YXJzKCkKK3sKICAgICBpZiAobV9zY3JvbGxWaWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCkgJiYg IW1faG9yaXpvbnRhbFNjcm9sbGJhcikKICAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyID0g YWRkQ2hpbGRTY3JvbGxiYXIobV9zY3JvbGxWaWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCkpOwog ICAgIGVsc2UgaWYgKCFtX3Njcm9sbFZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKSAmJiBtX2hv cml6b250YWxTY3JvbGxiYXIpIHsKQEAgLTEyMyw3ICsxMjQsNyBAQAogICAgIGlmICh3ZWJBcmVh KQogICAgICAgICBtX2NoaWxkcmVuLmFwcGVuZCh3ZWJBcmVhKTsKICAgICAKLSAgICB1cGRhdGVD aGlsZHJlbklmTmVjZXNzYXJ5KCk7CisgICAgdXBkYXRlU2Nyb2xsYmFycygpOwogfQogCiBBY2Nl c3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6d2ViQXJlYU9iamVjdCgp IGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDk3MDkyKQorKysgU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzQ4MiwxMyArMzQ4Miw2IEBACiAgICAgCiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdDo6dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOwogfQotICAgIAotY29uc3Qg QWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjpjaGlsZHJlbigpCi17Ci0gICAgdXBkYXRlQ2hpbGRyZW5JZk5l Y2Vzc2FyeSgpOwotICAgIAotICAgIHJldHVybiBtX2NoaWxkcmVuOwotfQogCiB2b2lkIEFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OmFkZENoaWxkcmVuKCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkocmV2 aXNpb24gOTcwOTIpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDExLDcgKzEwMTEsMTQgQEAKIAogICAg IHJldHVybiBvYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CiB9CisKK2NvbnN0IEFjY2Vzc2li aWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgQWNjZXNzaWJpbGl0eU9i amVjdDo6Y2hpbGRyZW4oKQoreworICAgIHVwZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKTsKICAg ICAKKyAgICByZXR1cm4gbV9jaGlsZHJlbjsKK30KKyAgICAKIHZvaWQgQWNjZXNzaWJpbGl0eU9i amVjdDo6dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpCiB7CiAgICAgaWYgKCFoYXNDaGlsZHJl bigpKQpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFi bGVIZWFkZXJDb250YWluZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5oCShyZXZpc2lvbiA5NzA5 MikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlSGVh ZGVyQ29udGFpbmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1LDYgQEAKICAgICAKICAg ICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIFRh YmxlSGVhZGVyQ29udGFpbmVyUm9sZTsgfQogICAgIAotICAgIHZpcnR1YWwgY29uc3QgQWNjZXNz aWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9pZCBhZGRD aGlsZHJlbigpOwogICAgIAogICAgIHZpcnR1YWwgTGF5b3V0U2l6ZSBzaXplKCkgY29uc3Q7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNvbHVt bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVRhYmxlQ29sdW1uLmgJKHJldmlzaW9uIDk3MDkyKQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDb2x1bW4uaAkod29ya2luZyBjb3B5KQpAQCAt NTQsNyArNTQsNiBAQAogICAgIHZvaWQgc2V0Q29sdW1uSW5kZXgoaW50IGNvbHVtbkluZGV4KSB7 IG1fY29sdW1uSW5kZXggPSBjb2x1bW5JbmRleDsgfQogICAgIGludCBjb2x1bW5JbmRleCgpIGNv bnN0IHsgcmV0dXJuIG1fY29sdW1uSW5kZXg7IH0gICAgCiAgICAgCi0gICAgdmlydHVhbCBjb25z dCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGNoaWxkcmVuKCk7CiAgICAgdmlydHVhbCB2 b2lkIGFkZENoaWxkcmVuKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhcmVudChBY2Nlc3NpYmls aXR5T2JqZWN0Kik7CiAgICAgCg==