39764 2010-05-26 13:28:10 -0700 [Qt] ScrollbarThemeQt.cpp has coding-style errors 2010-06-04 23:07:23 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 agbakken webkit-unassigned commit-queue levin peojala11 oldest_to_newest 230843 0 agbakken 2010-05-26 13:28:10 -0700 WebCore/platform/qt/ScrollbarThemeQt.cpp:35: Alphabetical sorting problem. [build/include_order] [4] WebCore/platform/qt/ScrollbarThemeQt.cpp:42: Alphabetical sorting problem. [build/include_order] [4] WebCore/platform/qt/ScrollbarThemeQt.cpp:59: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebCore/platform/qt/ScrollbarThemeQt.cpp:81: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebCore/platform/qt/ScrollbarThemeQt.cpp:125: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] WebCore/platform/qt/ScrollbarThemeQt.cpp:126: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 6 in 1 files 230907 1 57144 agbakken 2010-05-26 14:35:28 -0700 Created attachment 57144 Patch that fixes the coding style issues 231080 2 peojala11 2010-05-26 21:43:31 -0700 QtTriaged 231395 3 57144 levin 2010-05-27 11:20:09 -0700 Comment on attachment 57144 Patch that fixes the coding style issues > No new tests. (OOPS!) Ditto. 234467 4 57939 agbakken 2010-06-04 18:44:34 -0700 Created attachment 57939 Patch 234515 5 57939 eric 2010-06-04 22:01:35 -0700 Comment on attachment 57939 Patch LGTM. 234547 6 57939 commit-queue 2010-06-04 23:07:17 -0700 Comment on attachment 57939 Patch Clearing flags on attachment: 57939 Committed r60737: <http://trac.webkit.org/changeset/60737> 234548 7 commit-queue 2010-06-04 23:07:23 -0700 All reviewed patches have been landed. Closing bug. 57144 2010-05-26 14:35:28 -0700 2010-06-04 18:44:30 -0700 Patch that fixes the coding style issues patch.39764 text/plain 4661 agbakken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDI1MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjYgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2Nyb2xsYmFyVGhlbWVRdC5jcHAgaGFzIGNvZGluZy1zdHlsZSBlcnJvcnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NzY0CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVt ZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpz Y3JvbGxiYXJQYXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OnN0eWxlT3B0aW9uU2xpZGVyKToKKwog MjAxMC0wNS0yNiAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvU2Nyb2xsYmFyVGhlbWVR dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0 LmNwcAkocmV2aXNpb24gNjAyNDcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRo ZW1lUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw3ICsyMiw3IEBACiAgKiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ CiAgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKICAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKiBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKQEAgLTMxLDE1ICszMSwxNSBAQAogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgog I2luY2x1ZGUgIlJlbmRlclRoZW1lUXQuaCIKLSNpbmNsdWRlICJTY3JvbGxiYXIuaCIKICNpbmNs dWRlICJTY3JvbGxWaWV3LmgiCisjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAKICNpbmNsdWRlIDxR QXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlYnVnPgorI2luY2x1ZGUgPFFNZW51PgogI2luY2x1 ZGUgPFFQYWludGVyPgogI2luY2x1ZGUgPFFTdHlsZT4KICNpbmNsdWRlIDxRU3R5bGVPcHRpb25T bGlkZXI+Ci0jaW5jbHVkZSA8UU1lbnU+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNTYs MjAgKzU2LDIwIEBAIFNjcm9sbGJhclRoZW1lUXQ6On5TY3JvbGxiYXJUaGVtZVF0KCkKIHN0YXRp YyBRU3R5bGU6OlN1YkNvbnRyb2wgc2NQYXJ0KGNvbnN0IFNjcm9sbGJhclBhcnQmIHBhcnQpCiB7 CiAgICAgc3dpdGNoIChwYXJ0KSB7Ci0gICAgICAgIGNhc2UgTm9QYXJ0OgotICAgICAgICAgICAg cmV0dXJuIFFTdHlsZTo6U0NfTm9uZTsKLSAgICAgICAgY2FzZSBCYWNrQnV0dG9uU3RhcnRQYXJ0 OgotICAgICAgICBjYXNlIEJhY2tCdXR0b25FbmRQYXJ0OgotICAgICAgICAgICAgcmV0dXJuIFFT dHlsZTo6U0NfU2Nyb2xsQmFyU3ViTGluZTsKLSAgICAgICAgY2FzZSBCYWNrVHJhY2tQYXJ0Ogot ICAgICAgICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3ViUGFnZTsKLSAgICAgICAg Y2FzZSBUaHVtYlBhcnQ6Ci0gICAgICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJT bGlkZXI7Ci0gICAgICAgIGNhc2UgRm9yd2FyZFRyYWNrUGFydDoKLSAgICAgICAgICAgIHJldHVy biBRU3R5bGU6OlNDX1Njcm9sbEJhckFkZFBhZ2U7Ci0gICAgICAgIGNhc2UgRm9yd2FyZEJ1dHRv blN0YXJ0UGFydDoKLSAgICAgICAgY2FzZSBGb3J3YXJkQnV0dG9uRW5kUGFydDoKLSAgICAgICAg ICAgIHJldHVybiBRU3R5bGU6OlNDX1Njcm9sbEJhckFkZExpbmU7CisgICAgY2FzZSBOb1BhcnQ6 CisgICAgICAgIHJldHVybiBRU3R5bGU6OlNDX05vbmU7CisgICAgY2FzZSBCYWNrQnV0dG9uU3Rh cnRQYXJ0OgorICAgIGNhc2UgQmFja0J1dHRvbkVuZFBhcnQ6CisgICAgICAgIHJldHVybiBRU3R5 bGU6OlNDX1Njcm9sbEJhclN1YkxpbmU7CisgICAgY2FzZSBCYWNrVHJhY2tQYXJ0OgorICAgICAg ICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJTdWJQYWdlOworICAgIGNhc2UgVGh1bWJQYXJ0 OgorICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJTbGlkZXI7CisgICAgY2FzZSBG b3J3YXJkVHJhY2tQYXJ0OgorICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJBZGRQ YWdlOworICAgIGNhc2UgRm9yd2FyZEJ1dHRvblN0YXJ0UGFydDoKKyAgICBjYXNlIEZvcndhcmRC dXR0b25FbmRQYXJ0OgorICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJBZGRMaW5l OwogICAgIH0KIAogICAgIHJldHVybiBRU3R5bGU6OlNDX05vbmU7CkBAIC03OCwxOCArNzgsMTgg QEAgc3RhdGljIFFTdHlsZTo6U3ViQ29udHJvbCBzY1BhcnQoY29uc3QgUwogc3RhdGljIFNjcm9s bGJhclBhcnQgc2Nyb2xsYmFyUGFydChjb25zdCBRU3R5bGU6OlN1YkNvbnRyb2wmIHNjKQogewog ICAgIHN3aXRjaCAoc2MpIHsKLSAgICAgICAgY2FzZSBRU3R5bGU6OlNDX05vbmU6Ci0gICAgICAg ICAgICByZXR1cm4gTm9QYXJ0OwotICAgICAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3Vi TGluZToKLSAgICAgICAgICAgIHJldHVybiBCYWNrQnV0dG9uU3RhcnRQYXJ0OwotICAgICAgICBj YXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3ViUGFnZToKLSAgICAgICAgICAgIHJldHVybiBCYWNr VHJhY2tQYXJ0OwotICAgICAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU2xpZGVyOgotICAg ICAgICAgICAgcmV0dXJuIFRodW1iUGFydDsKLSAgICAgICAgY2FzZSBRU3R5bGU6OlNDX1Njcm9s bEJhckFkZFBhZ2U6Ci0gICAgICAgICAgICByZXR1cm4gRm9yd2FyZFRyYWNrUGFydDsKLSAgICAg ICAgY2FzZSBRU3R5bGU6OlNDX1Njcm9sbEJhckFkZExpbmU6Ci0gICAgICAgICAgICByZXR1cm4g Rm9yd2FyZEJ1dHRvblN0YXJ0UGFydDsKKyAgICBjYXNlIFFTdHlsZTo6U0NfTm9uZToKKyAgICAg ICAgcmV0dXJuIE5vUGFydDsKKyAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3ViTGluZToK KyAgICAgICAgcmV0dXJuIEJhY2tCdXR0b25TdGFydFBhcnQ7CisgICAgY2FzZSBRU3R5bGU6OlND X1Njcm9sbEJhclN1YlBhZ2U6CisgICAgICAgIHJldHVybiBCYWNrVHJhY2tQYXJ0OworICAgIGNh c2UgUVN0eWxlOjpTQ19TY3JvbGxCYXJTbGlkZXI6CisgICAgICAgIHJldHVybiBUaHVtYlBhcnQ7 CisgICAgY2FzZSBRU3R5bGU6OlNDX1Njcm9sbEJhckFkZFBhZ2U6CisgICAgICAgIHJldHVybiBG b3J3YXJkVHJhY2tQYXJ0OworICAgIGNhc2UgUVN0eWxlOjpTQ19TY3JvbGxCYXJBZGRMaW5lOgor ICAgICAgICByZXR1cm4gRm9yd2FyZEJ1dHRvblN0YXJ0UGFydDsKICAgICB9CiAgICAgcmV0dXJu IE5vUGFydDsKIH0KQEAgLTEyMiw5ICsxMjIsOSBAQCBzdGF0aWMgUVN0eWxlT3B0aW9uU2xpZGVy KiBzdHlsZU9wdGlvblNsCiAgICAgU2Nyb2xsYmFyUGFydCBob3ZlcmVkUGFydCA9IHNjcm9sbGJh ci0+aG92ZXJlZFBhcnQoKTsKICAgICBpZiAocHJlc3NlZFBhcnQgIT0gTm9QYXJ0KSB7CiAgICAg ICAgIG9wdC5hY3RpdmVTdWJDb250cm9scyA9IHNjUGFydChzY3JvbGxiYXItPnByZXNzZWRQYXJ0 KCkpOwotICAgICAgICBpZiAocHJlc3NlZFBhcnQgPT0gQmFja0J1dHRvblN0YXJ0UGFydCB8fCBw cmVzc2VkUGFydCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0IHx8Ci0gICAgICAgICAgICBwcmVz c2VkUGFydCA9PSBCYWNrQnV0dG9uRW5kUGFydCB8fCBwcmVzc2VkUGFydCA9PSBGb3J3YXJkQnV0 dG9uRW5kUGFydCB8fAotICAgICAgICAgICAgcHJlc3NlZFBhcnQgPT0gVGh1bWJQYXJ0KQorICAg ICAgICBpZiAocHJlc3NlZFBhcnQgPT0gQmFja0J1dHRvblN0YXJ0UGFydCB8fCBwcmVzc2VkUGFy dCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0CisgICAgICAgICAgICB8fCBwcmVzc2VkUGFydCA9 PSBCYWNrQnV0dG9uRW5kUGFydCB8fCBwcmVzc2VkUGFydCA9PSBGb3J3YXJkQnV0dG9uRW5kUGFy dAorICAgICAgICAgICAgfHwgcHJlc3NlZFBhcnQgPT0gVGh1bWJQYXJ0KQogICAgICAgICAgICAg b3B0LnN0YXRlIHw9IFFTdHlsZTo6U3RhdGVfU3Vua2VuOwogICAgIH0gZWxzZQogICAgICAgICBv cHQuYWN0aXZlU3ViQ29udHJvbHMgPSBzY1BhcnQoaG92ZXJlZFBhcnQpOwo= 57939 2010-06-04 18:44:34 -0700 2010-06-04 23:07:17 -0700 Patch bug-39764-20100604184433.patch text/plain 4781 agbakken ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWZiN2VkMmU2ZTdjZGYwNjc1MTQxY2M5ZTA3MjU4YjQzNTVkYTljYy4uZTExZDZlYzQwMWQ3ZTAw NDI3NDRhODc2YTA1ZjAwNmI5OWNkMmIzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNi0wNCAgQW5k ZXJzIEJha2tlbiAgPGFnYmFra2VuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFNjcm9sbGJhclRoZW1lUXQuY3BwIGhhcyBj b2Rpbmctc3R5bGUgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zOTc2NAorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2Nyb2xsYmFyVGhlbWVR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY1BhcnQpOgorICAgICAgICAoV2ViQ29yZTo6c2Ny b2xsYmFyUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpzdHlsZU9wdGlvblNsaWRlcik6CisKIDIw MTAtMDYtMDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v cXQvU2Nyb2xsYmFyVGhlbWVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRo ZW1lUXQuY3BwCmluZGV4IGViMmQ5MzQ4OWQ0MzZiYzNiNjExM2Y2NDQ0NzM4ZWRjYzdlYTYwZGEu LjY3MjI2YjBkZWZlMWFhZDNhNWRiZDE3NWM1OThjMDFlN2E2NTJjYWYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vcXQvU2Nyb2xsYmFyVGhlbWVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcApAQCAtMjIsNyArMjIsNyBAQAogICogUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWQogICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCiAgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICogT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCkBAIC0zMSwxNSArMzEsMTUgQEAKICNp bmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQu aCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZVF0LmgiCi0jaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAj aW5jbHVkZSAiU2Nyb2xsVmlldy5oIgorI2luY2x1ZGUgIlNjcm9sbGJhci5oIgogCiAjaW5jbHVk ZSA8UUFwcGxpY2F0aW9uPgogI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRlIDxRTWVudT4KICNp bmNsdWRlIDxRUGFpbnRlcj4KICNpbmNsdWRlIDxRU3R5bGU+CiAjaW5jbHVkZSA8UVN0eWxlT3B0 aW9uU2xpZGVyPgotI2luY2x1ZGUgPFFNZW51PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAg LTU2LDIwICs1NiwyMCBAQCBTY3JvbGxiYXJUaGVtZVF0Ojp+U2Nyb2xsYmFyVGhlbWVRdCgpCiBz dGF0aWMgUVN0eWxlOjpTdWJDb250cm9sIHNjUGFydChjb25zdCBTY3JvbGxiYXJQYXJ0JiBwYXJ0 KQogewogICAgIHN3aXRjaCAocGFydCkgewotICAgICAgICBjYXNlIE5vUGFydDoKLSAgICAgICAg ICAgIHJldHVybiBRU3R5bGU6OlNDX05vbmU7Ci0gICAgICAgIGNhc2UgQmFja0J1dHRvblN0YXJ0 UGFydDoKLSAgICAgICAgY2FzZSBCYWNrQnV0dG9uRW5kUGFydDoKLSAgICAgICAgICAgIHJldHVy biBRU3R5bGU6OlNDX1Njcm9sbEJhclN1YkxpbmU7Ci0gICAgICAgIGNhc2UgQmFja1RyYWNrUGFy dDoKLSAgICAgICAgICAgIHJldHVybiBRU3R5bGU6OlNDX1Njcm9sbEJhclN1YlBhZ2U7Ci0gICAg ICAgIGNhc2UgVGh1bWJQYXJ0OgotICAgICAgICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xs QmFyU2xpZGVyOwotICAgICAgICBjYXNlIEZvcndhcmRUcmFja1BhcnQ6Ci0gICAgICAgICAgICBy ZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJBZGRQYWdlOwotICAgICAgICBjYXNlIEZvcndhcmRC dXR0b25TdGFydFBhcnQ6Ci0gICAgICAgIGNhc2UgRm9yd2FyZEJ1dHRvbkVuZFBhcnQ6Ci0gICAg ICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19TY3JvbGxCYXJBZGRMaW5lOworICAgIGNhc2UgTm9Q YXJ0OgorICAgICAgICByZXR1cm4gUVN0eWxlOjpTQ19Ob25lOworICAgIGNhc2UgQmFja0J1dHRv blN0YXJ0UGFydDoKKyAgICBjYXNlIEJhY2tCdXR0b25FbmRQYXJ0OgorICAgICAgICByZXR1cm4g UVN0eWxlOjpTQ19TY3JvbGxCYXJTdWJMaW5lOworICAgIGNhc2UgQmFja1RyYWNrUGFydDoKKyAg ICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3ViUGFnZTsKKyAgICBjYXNlIFRodW1i UGFydDoKKyAgICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU2xpZGVyOworICAgIGNh c2UgRm9yd2FyZFRyYWNrUGFydDoKKyAgICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xsQmFy QWRkUGFnZTsKKyAgICBjYXNlIEZvcndhcmRCdXR0b25TdGFydFBhcnQ6CisgICAgY2FzZSBGb3J3 YXJkQnV0dG9uRW5kUGFydDoKKyAgICAgICAgcmV0dXJuIFFTdHlsZTo6U0NfU2Nyb2xsQmFyQWRk TGluZTsKICAgICB9CiAKICAgICByZXR1cm4gUVN0eWxlOjpTQ19Ob25lOwpAQCAtNzgsMTggKzc4 LDE4IEBAIHN0YXRpYyBRU3R5bGU6OlN1YkNvbnRyb2wgc2NQYXJ0KGNvbnN0IFNjcm9sbGJhclBh cnQmIHBhcnQpCiBzdGF0aWMgU2Nyb2xsYmFyUGFydCBzY3JvbGxiYXJQYXJ0KGNvbnN0IFFTdHls ZTo6U3ViQ29udHJvbCYgc2MpCiB7CiAgICAgc3dpdGNoIChzYykgewotICAgICAgICBjYXNlIFFT dHlsZTo6U0NfTm9uZToKLSAgICAgICAgICAgIHJldHVybiBOb1BhcnQ7Ci0gICAgICAgIGNhc2Ug UVN0eWxlOjpTQ19TY3JvbGxCYXJTdWJMaW5lOgotICAgICAgICAgICAgcmV0dXJuIEJhY2tCdXR0 b25TdGFydFBhcnQ7Ci0gICAgICAgIGNhc2UgUVN0eWxlOjpTQ19TY3JvbGxCYXJTdWJQYWdlOgot ICAgICAgICAgICAgcmV0dXJuIEJhY2tUcmFja1BhcnQ7Ci0gICAgICAgIGNhc2UgUVN0eWxlOjpT Q19TY3JvbGxCYXJTbGlkZXI6Ci0gICAgICAgICAgICByZXR1cm4gVGh1bWJQYXJ0OwotICAgICAg ICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyQWRkUGFnZToKLSAgICAgICAgICAgIHJldHVybiBG b3J3YXJkVHJhY2tQYXJ0OwotICAgICAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyQWRkTGlu ZToKLSAgICAgICAgICAgIHJldHVybiBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0OworICAgIGNhc2Ug UVN0eWxlOjpTQ19Ob25lOgorICAgICAgICByZXR1cm4gTm9QYXJ0OworICAgIGNhc2UgUVN0eWxl OjpTQ19TY3JvbGxCYXJTdWJMaW5lOgorICAgICAgICByZXR1cm4gQmFja0J1dHRvblN0YXJ0UGFy dDsKKyAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyU3ViUGFnZToKKyAgICAgICAgcmV0dXJu IEJhY2tUcmFja1BhcnQ7CisgICAgY2FzZSBRU3R5bGU6OlNDX1Njcm9sbEJhclNsaWRlcjoKKyAg ICAgICAgcmV0dXJuIFRodW1iUGFydDsKKyAgICBjYXNlIFFTdHlsZTo6U0NfU2Nyb2xsQmFyQWRk UGFnZToKKyAgICAgICAgcmV0dXJuIEZvcndhcmRUcmFja1BhcnQ7CisgICAgY2FzZSBRU3R5bGU6 OlNDX1Njcm9sbEJhckFkZExpbmU6CisgICAgICAgIHJldHVybiBGb3J3YXJkQnV0dG9uU3RhcnRQ YXJ0OwogICAgIH0KICAgICByZXR1cm4gTm9QYXJ0OwogfQpAQCAtMTIyLDkgKzEyMiw5IEBAIHN0 YXRpYyBRU3R5bGVPcHRpb25TbGlkZXIqIHN0eWxlT3B0aW9uU2xpZGVyKFNjcm9sbGJhciogc2Ny b2xsYmFyLCBRV2lkZ2V0KiB3aWRnCiAgICAgU2Nyb2xsYmFyUGFydCBob3ZlcmVkUGFydCA9IHNj cm9sbGJhci0+aG92ZXJlZFBhcnQoKTsKICAgICBpZiAocHJlc3NlZFBhcnQgIT0gTm9QYXJ0KSB7 CiAgICAgICAgIG9wdC5hY3RpdmVTdWJDb250cm9scyA9IHNjUGFydChzY3JvbGxiYXItPnByZXNz ZWRQYXJ0KCkpOwotICAgICAgICBpZiAocHJlc3NlZFBhcnQgPT0gQmFja0J1dHRvblN0YXJ0UGFy dCB8fCBwcmVzc2VkUGFydCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0IHx8Ci0gICAgICAgICAg ICBwcmVzc2VkUGFydCA9PSBCYWNrQnV0dG9uRW5kUGFydCB8fCBwcmVzc2VkUGFydCA9PSBGb3J3 YXJkQnV0dG9uRW5kUGFydCB8fAotICAgICAgICAgICAgcHJlc3NlZFBhcnQgPT0gVGh1bWJQYXJ0 KQorICAgICAgICBpZiAocHJlc3NlZFBhcnQgPT0gQmFja0J1dHRvblN0YXJ0UGFydCB8fCBwcmVz c2VkUGFydCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0CisgICAgICAgICAgICB8fCBwcmVzc2Vk UGFydCA9PSBCYWNrQnV0dG9uRW5kUGFydCB8fCBwcmVzc2VkUGFydCA9PSBGb3J3YXJkQnV0dG9u RW5kUGFydAorICAgICAgICAgICAgfHwgcHJlc3NlZFBhcnQgPT0gVGh1bWJQYXJ0KQogICAgICAg ICAgICAgb3B0LnN0YXRlIHw9IFFTdHlsZTo6U3RhdGVfU3Vua2VuOwogICAgIH0gZWxzZQogICAg ICAgICBvcHQuYWN0aXZlU3ViQ29udHJvbHMgPSBzY1BhcnQoaG92ZXJlZFBhcnQpOwo=