34376 2010-01-30 08:56:08 -0800 [Qt] Use Windows style on Maemo 5 2010-02-02 03:14:16 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 kling webkit-unassigned commit-queue hausmann kenneth oldest_to_newest 186114 0 kling 2010-01-30 08:56:08 -0800 This is a stopgap measure to stop QtWebKit from looking silly on Maemo. 186115 1 47769 kling 2010-01-30 08:57:26 -0800 Created attachment 47769 Patch 186135 2 47769 kenneth 2010-01-30 15:22:59 -0800 Comment on attachment 47769 Patch > QStyle* RenderThemeQt::qStyle() const > { > +#ifdef Q_WS_MAEMO_5 > + return const_cast<RenderThemeQt*>(this)->fallbackStyle(); > +#else Why not just 'return fallbackStyle();' ? 186138 3 kling 2010-01-30 17:13:01 -0800 Because of: ../../../WebCore/platform/qt/RenderThemeQt.cpp:165: error: passing 'const WebCore::RenderThemeQt' as 'this' argument of 'QStyle* WebCore::RenderThemeQt::fallbackStyle()' discards qualifiers 186191 4 kenneth 2010-01-31 07:09:21 -0800 (In reply to comment #3) > Because of: > ../../../WebCore/platform/qt/RenderThemeQt.cpp:165: error: passing 'const > WebCore::RenderThemeQt' as 'this' argument of 'QStyle* > WebCore::RenderThemeQt::fallbackStyle()' discards qualifiers Yes, but fallbackStyle and qStyle are things of the Qt port. The thing is that fallbackStyle is not really const. So, with you patch you are "lying" that qStyle is :-) You could either change qStyle to not be const anymore, or - if the fallback style doesn't change at runtime - move the fallback construction code to the constructor and make both methods const. I think that I would add m_fallbackStyle = QStyleFactory::create(QLatin1String("windows")); to the constructor. We need that anyway for painting menu list buttons and change fallbackStyle to: // for some widget painting, we need to fallback to Windows style QStyle* RenderThemeQt::fallbackStyle() const { return (m_fallbackStyle) ? m_fallbackStyle : QApplication::style(); } 186249 5 47769 ariya.hidayat 2010-01-31 15:45:12 -0800 Comment on attachment 47769 Patch > + [Qt] Use Windows style on Maemo 5 Better to refer it as "Use the fallback style...". Note that the fallback style could be the application style if the Windows style can't be created (e.g. the style plugin for that is missing or not available). > void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const > { > +#ifdef Q_WS_MAEMO_5 > + static QPalette lightGrayPalette(Qt::lightGray); > + palette = lightGrayPalette; > +#else > // If the webview has a custom palette, use it > if (!m_page) > return; > @@ -786,6 +795,7 @@ void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const > if (!pageClient) > return; > palette = pageClient->palette(); > +#endif Why don't we have a quick return like in qStyle() patch above? That way, the alternative code path is easier to spot. r- for these minor issues, otherwise LGTM. 186374 6 47831 kling 2010-02-01 05:41:12 -0800 Created attachment 47831 New patch, raised issues addressed. 186377 7 47831 kenneth 2010-02-01 05:46:49 -0800 Comment on attachment 47831 New patch, raised issues addressed. Please remove the #endif and change the #else to become #endif, both places. 186378 8 47832 kling 2010-02-01 05:55:01 -0800 Created attachment 47832 Same patch, less cruft 186711 9 47832 commit-queue 2010-02-01 17:16:56 -0800 Comment on attachment 47832 Same patch, less cruft Clearing flags on attachment: 47832 Committed r54180: <http://trac.webkit.org/changeset/54180> 186712 10 commit-queue 2010-02-01 17:17:03 -0800 All reviewed patches have been landed. Closing bug. 186887 11 hausmann 2010-02-02 03:14:16 -0800 (In reply to comment #9) > (From update of attachment 47832 [details]) > Clearing flags on attachment: 47832 > > Committed r54180: <http://trac.webkit.org/changeset/54180> Manually cherry-picked with commit 69dd29fbeb12d076741dce70ac6bc155101ccd6f into qtwebkit-4.6 47769 2010-01-30 08:57:26 -0800 2010-02-01 05:41:12 -0800 Patch bug-34376.diff text/plain 1959 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmJlMDU2MC4uYjQzYzAwOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMS0zMCAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gVXNlIFdpbmRvd3Mgc3R5bGUgb24gTWFlbW8gNQor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDM3Ngor CisgICAgICAgICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZVF0OjpxU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVRdDo6c2V0UGFsZXR0ZUZyb21QYWdlQ2xpZW50SWZFeGlzdHMpOgorCiAyMDEwLTAxLTI5ICBN YXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBjb3B5aW5nIGFuIElE TCBmaWxlIGluIHRvIHRoZSBmcmFtZXdvcmsgd3JhcHBlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRl clRoZW1lUXQuY3BwCmluZGV4IDgzZTM3NDYuLmRhYzhlZjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9S ZW5kZXJUaGVtZVF0LmNwcApAQCAtMTYwLDYgKzE2MCwxMCBAQCBRU3R5bGUqIFJlbmRlclRoZW1l UXQ6OmZhbGxiYWNrU3R5bGUoKQogCiBRU3R5bGUqIFJlbmRlclRoZW1lUXQ6OnFTdHlsZSgpIGNv bnN0CiB7CisjaWZkZWYgUV9XU19NQUVNT181CisgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8UmVuZGVy VGhlbWVRdCo+KHRoaXMpLT5mYWxsYmFja1N0eWxlKCk7CisjZWxzZQorCiAgICAgaWYgKG1fcGFn ZSkgewogICAgICAgICBRV2ViUGFnZUNsaWVudCogcGFnZUNsaWVudCA9IG1fcGFnZS0+Y2hyb21l KCktPmNsaWVudCgpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKTsKIApAQCAtMTY4LDYgKzE3Miw3IEBA IFFTdHlsZSogUmVuZGVyVGhlbWVRdDo6cVN0eWxlKCkgY29uc3QKICAgICB9CiAKICAgICByZXR1 cm4gUUFwcGxpY2F0aW9uOjpzdHlsZSgpOworI2VuZGlmCiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVR dDo6c3VwcG9ydHNIb3Zlcihjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0CkBAIC03NzMsNiArNzc4 LDEwIEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6c3VwcG9ydHNGb2N1cyhDb250cm9sUGFydCBhcHBl YXJhbmNlKSBjb25zdAogCiB2b2lkIFJlbmRlclRoZW1lUXQ6OnNldFBhbGV0dGVGcm9tUGFnZUNs aWVudElmRXhpc3RzKFFQYWxldHRlJiBwYWxldHRlKSBjb25zdAogeworI2lmZGVmIFFfV1NfTUFF TU9fNQorICAgIHN0YXRpYyBRUGFsZXR0ZSBsaWdodEdyYXlQYWxldHRlKFF0OjpsaWdodEdyYXkp OworICAgIHBhbGV0dGUgPSBsaWdodEdyYXlQYWxldHRlOworI2Vsc2UKICAgICAvLyBJZiB0aGUg d2VidmlldyBoYXMgYSBjdXN0b20gcGFsZXR0ZSwgdXNlIGl0CiAgICAgaWYgKCFtX3BhZ2UpCiAg ICAgICAgIHJldHVybjsKQEAgLTc4Niw2ICs3OTUsNyBAQCB2b2lkIFJlbmRlclRoZW1lUXQ6OnNl dFBhbGV0dGVGcm9tUGFnZUNsaWVudElmRXhpc3RzKFFQYWxldHRlJiBwYWxldHRlKSBjb25zdAog ICAgIGlmICghcGFnZUNsaWVudCkKICAgICAgICAgcmV0dXJuOwogICAgIHBhbGV0dGUgPSBwYWdl Q2xpZW50LT5wYWxldHRlKCk7CisjZW5kaWYKIH0KIAogQ29udHJvbFBhcnQgUmVuZGVyVGhlbWVR dDo6aW5pdGlhbGl6ZUNvbW1vblFTdHlsZU9wdGlvbnMoUVN0eWxlT3B0aW9uJiBvcHRpb24sIFJl bmRlck9iamVjdCogbykgY29uc3QK 47831 2010-02-01 05:41:12 -0800 2010-02-01 05:55:01 -0800 New patch, raised issues addressed. bug-34376.diff text/plain 3514 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTQyNTE0MC4uZmQxN2YxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMi0wMSAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gVXNlIHRoZSBmYWxsYmFjayBzdHlsZSBvbiBNYWVt byA1CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0 Mzc2CisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OlJlbmRlclRoZW1lUXQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVRdDo6ZmFsbGJhY2tTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZVF0OjpxU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRdDo6c2V0 UGFsZXR0ZUZyb21QYWdlQ2xpZW50SWZFeGlzdHMpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1Jl bmRlclRoZW1lUXQuaDoKKwogMjAxMC0wMi0wMSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQXJpeWEgSGlkYXlhdC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCmluZGV4IDgzZTM3NDYuLmY4OGZiNmIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcApAQCAtMTI5LDcgKzEyOSw2IEBAIFBhc3NSZWZQ dHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoUGFnZSogcGFnZSkKIFJl bmRlclRoZW1lUXQ6OlJlbmRlclRoZW1lUXQoUGFnZSogcGFnZSkKICAgICA6IFJlbmRlclRoZW1l KCkKICAgICAsIG1fcGFnZShwYWdlKQotICAgICwgbV9mYWxsYmFja1N0eWxlKDApCiB7CiAgICAg UVB1c2hCdXR0b24gYnV0dG9uOwogICAgIGJ1dHRvbi5zZXRBdHRyaWJ1dGUoUXQ6OldBX01hY1Nt YWxsU2l6ZSk7CkBAIC0xMzksNiArMTM4LDEyIEBAIFJlbmRlclRoZW1lUXQ6OlJlbmRlclRoZW1l UXQoUGFnZSogcGFnZSkKICNpZmRlZiBRX1dTX01BQwogICAgIG1fYnV0dG9uRm9udFBpeGVsU2l6 ZSA9IGZvbnRJbmZvLnBpeGVsU2l6ZSgpOwogI2VuZGlmCisKKyAgICAvLyBmb3Igc29tZSB3aWRn ZXQgcGFpbnRpbmcsIHdlIG5lZWQgdG8gZmFsbGJhY2sgdG8gV2luZG93cyBzdHlsZQorICAgIG1f ZmFsbGJhY2tTdHlsZSA9IFFTdHlsZUZhY3Rvcnk6OmNyZWF0ZShRTGF0aW4xU3RyaW5nKCJ3aW5k b3dzIikpOworCisgICAgaWYgKCFtX2ZhbGxiYWNrU3R5bGUpCisgICAgICAgIG1fZmFsbGJhY2tT dHlsZSA9IFFBcHBsaWNhdGlvbjo6c3R5bGUoKTsKIH0KIAogUmVuZGVyVGhlbWVRdDo6flJlbmRl clRoZW1lUXQoKQpAQCAtMTQ2LDIwICsxNTEsMTcgQEAgUmVuZGVyVGhlbWVRdDo6flJlbmRlclRo ZW1lUXQoKQogICAgIGRlbGV0ZSBtX2ZhbGxiYWNrU3R5bGU7CiB9CiAKLS8vIGZvciBzb21lIHdp ZGdldCBwYWludGluZywgd2UgbmVlZCB0byBmYWxsYmFjayB0byBXaW5kb3dzIHN0eWxlCi1RU3R5 bGUqIFJlbmRlclRoZW1lUXQ6OmZhbGxiYWNrU3R5bGUoKQorUVN0eWxlKiBSZW5kZXJUaGVtZVF0 OjpmYWxsYmFja1N0eWxlKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fZmFsbGJhY2tTdHlsZSkKLSAg ICAgICAgbV9mYWxsYmFja1N0eWxlID0gUVN0eWxlRmFjdG9yeTo6Y3JlYXRlKFFMYXRpbjFTdHJp bmcoIndpbmRvd3MiKSk7Ci0KLSAgICBpZiAoIW1fZmFsbGJhY2tTdHlsZSkKLSAgICAgICAgbV9m YWxsYmFja1N0eWxlID0gUUFwcGxpY2F0aW9uOjpzdHlsZSgpOwotCiAgICAgcmV0dXJuIG1fZmFs bGJhY2tTdHlsZTsKIH0KIAogUVN0eWxlKiBSZW5kZXJUaGVtZVF0OjpxU3R5bGUoKSBjb25zdAog eworI2lmZGVmIFFfV1NfTUFFTU9fNQorICAgIHJldHVybiBmYWxsYmFja1N0eWxlKCk7CisjZWxz ZQorCiAgICAgaWYgKG1fcGFnZSkgewogICAgICAgICBRV2ViUGFnZUNsaWVudCogcGFnZUNsaWVu dCA9IG1fcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKTsKIApA QCAtMTY4LDYgKzE3MCw3IEBAIFFTdHlsZSogUmVuZGVyVGhlbWVRdDo6cVN0eWxlKCkgY29uc3QK ICAgICB9CiAKICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpzdHlsZSgpOworI2VuZGlmCiB9CiAK IGJvb2wgUmVuZGVyVGhlbWVRdDo6c3VwcG9ydHNIb3Zlcihjb25zdCBSZW5kZXJTdHlsZSopIGNv bnN0CkBAIC03NzMsNiArNzc2LDExIEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6c3VwcG9ydHNGb2N1 cyhDb250cm9sUGFydCBhcHBlYXJhbmNlKSBjb25zdAogCiB2b2lkIFJlbmRlclRoZW1lUXQ6OnNl dFBhbGV0dGVGcm9tUGFnZUNsaWVudElmRXhpc3RzKFFQYWxldHRlJiBwYWxldHRlKSBjb25zdAog eworI2lmZGVmIFFfV1NfTUFFTU9fNQorICAgIHN0YXRpYyBRUGFsZXR0ZSBsaWdodEdyYXlQYWxl dHRlKFF0OjpsaWdodEdyYXkpOworICAgIHBhbGV0dGUgPSBsaWdodEdyYXlQYWxldHRlOworICAg IHJldHVybjsKKyNlbHNlCiAgICAgLy8gSWYgdGhlIHdlYnZpZXcgaGFzIGEgY3VzdG9tIHBhbGV0 dGUsIHVzZSBpdAogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm47CkBAIC03ODYsNiAr Nzk0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZVF0OjpzZXRQYWxldHRlRnJvbVBhZ2VDbGllbnRJZkV4 aXN0cyhRUGFsZXR0ZSYgcGFsZXR0ZSkgY29uc3QKICAgICBpZiAoIXBhZ2VDbGllbnQpCiAgICAg ICAgIHJldHVybjsKICAgICBwYWxldHRlID0gcGFnZUNsaWVudC0+cGFsZXR0ZSgpOworI2VuZGlm CiB9CiAKIENvbnRyb2xQYXJ0IFJlbmRlclRoZW1lUXQ6OmluaXRpYWxpemVDb21tb25RU3R5bGVP cHRpb25zKFFTdHlsZU9wdGlvbiYgb3B0aW9uLCBSZW5kZXJPYmplY3QqIG8pIGNvbnN0CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuaCBiL1dlYkNvcmUvcGxh dGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5oCmluZGV4IGU2YmFiN2UuLjUzODU4ODEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5oCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5oCkBAIC0xNDUsNyArMTQ1LDcgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgc2V0UGFsZXR0ZUZyb21QYWdlQ2xpZW50SWZFeGlzdHMoUVBhbGV0dGUmKSBjb25z dDsKIAotICAgIFFTdHlsZSogZmFsbGJhY2tTdHlsZSgpOworICAgIFFTdHlsZSogZmFsbGJhY2tT dHlsZSgpIGNvbnN0OwogCiAgICAgUGFnZSogbV9wYWdlOwogCg== 47832 2010-02-01 05:55:01 -0800 2010-02-01 17:16:55 -0800 Same patch, less cruft bug-34376-2.diff text/plain 2942 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTQyNTE0MC4uZmQxN2YxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMi0wMSAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gVXNlIHRoZSBmYWxsYmFjayBzdHlsZSBvbiBNYWVt byA1CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0 Mzc2CisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OlJlbmRlclRoZW1lUXQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVRdDo6ZmFsbGJhY2tTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZVF0OjpxU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRdDo6c2V0 UGFsZXR0ZUZyb21QYWdlQ2xpZW50SWZFeGlzdHMpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1Jl bmRlclRoZW1lUXQuaDoKKwogMjAxMC0wMi0wMSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQXJpeWEgSGlkYXlhdC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCmluZGV4IDgzZTM3NDYuLjI3MWMxMWEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcApAQCAtMTI5LDcgKzEyOSw2IEBAIFBhc3NSZWZQ dHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoUGFnZSogcGFnZSkKIFJl bmRlclRoZW1lUXQ6OlJlbmRlclRoZW1lUXQoUGFnZSogcGFnZSkKICAgICA6IFJlbmRlclRoZW1l KCkKICAgICAsIG1fcGFnZShwYWdlKQotICAgICwgbV9mYWxsYmFja1N0eWxlKDApCiB7CiAgICAg UVB1c2hCdXR0b24gYnV0dG9uOwogICAgIGJ1dHRvbi5zZXRBdHRyaWJ1dGUoUXQ6OldBX01hY1Nt YWxsU2l6ZSk7CkBAIC0xMzksNiArMTM4LDggQEAgUmVuZGVyVGhlbWVRdDo6UmVuZGVyVGhlbWVR dChQYWdlKiBwYWdlKQogI2lmZGVmIFFfV1NfTUFDCiAgICAgbV9idXR0b25Gb250UGl4ZWxTaXpl ID0gZm9udEluZm8ucGl4ZWxTaXplKCk7CiAjZW5kaWYKKworICAgIG1fZmFsbGJhY2tTdHlsZSA9 IFFTdHlsZUZhY3Rvcnk6OmNyZWF0ZShRTGF0aW4xU3RyaW5nKCJ3aW5kb3dzIikpOwogfQogCiBS ZW5kZXJUaGVtZVF0Ojp+UmVuZGVyVGhlbWVRdCgpCkBAIC0xNDcsMTkgKzE0OCwxNyBAQCBSZW5k ZXJUaGVtZVF0Ojp+UmVuZGVyVGhlbWVRdCgpCiB9CiAKIC8vIGZvciBzb21lIHdpZGdldCBwYWlu dGluZywgd2UgbmVlZCB0byBmYWxsYmFjayB0byBXaW5kb3dzIHN0eWxlCi1RU3R5bGUqIFJlbmRl clRoZW1lUXQ6OmZhbGxiYWNrU3R5bGUoKQorUVN0eWxlKiBSZW5kZXJUaGVtZVF0OjpmYWxsYmFj a1N0eWxlKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fZmFsbGJhY2tTdHlsZSkKLSAgICAgICAgbV9m YWxsYmFja1N0eWxlID0gUVN0eWxlRmFjdG9yeTo6Y3JlYXRlKFFMYXRpbjFTdHJpbmcoIndpbmRv d3MiKSk7Ci0KLSAgICBpZiAoIW1fZmFsbGJhY2tTdHlsZSkKLSAgICAgICAgbV9mYWxsYmFja1N0 eWxlID0gUUFwcGxpY2F0aW9uOjpzdHlsZSgpOwotCi0gICAgcmV0dXJuIG1fZmFsbGJhY2tTdHls ZTsKKyAgICByZXR1cm4gKG1fZmFsbGJhY2tTdHlsZSkgPyBtX2ZhbGxiYWNrU3R5bGUgOiBRQXBw bGljYXRpb246OnN0eWxlKCk7CiB9CiAKIFFTdHlsZSogUmVuZGVyVGhlbWVRdDo6cVN0eWxlKCkg Y29uc3QKIHsKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyAgICByZXR1cm4gZmFsbGJhY2tTdHlsZSgp OworI2VuZGlmCisKICAgICBpZiAobV9wYWdlKSB7CiAgICAgICAgIFFXZWJQYWdlQ2xpZW50KiBw YWdlQ2xpZW50ID0gbV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPnBsYXRmb3JtUGFnZUNsaWVu dCgpOwogCkBAIC03NzMsNiArNzcyLDExIEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6c3VwcG9ydHNG b2N1cyhDb250cm9sUGFydCBhcHBlYXJhbmNlKSBjb25zdAogCiB2b2lkIFJlbmRlclRoZW1lUXQ6 OnNldFBhbGV0dGVGcm9tUGFnZUNsaWVudElmRXhpc3RzKFFQYWxldHRlJiBwYWxldHRlKSBjb25z dAogeworI2lmZGVmIFFfV1NfTUFFTU9fNQorICAgIHN0YXRpYyBRUGFsZXR0ZSBsaWdodEdyYXlQ YWxldHRlKFF0OjpsaWdodEdyYXkpOworICAgIHBhbGV0dGUgPSBsaWdodEdyYXlQYWxldHRlOwor ICAgIHJldHVybjsKKyNlbmRpZgogICAgIC8vIElmIHRoZSB3ZWJ2aWV3IGhhcyBhIGN1c3RvbSBw YWxldHRlLCB1c2UgaXQKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmggYi9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuaAppbmRleCBlNmJhYjdlLi41Mzg1ODgxIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuaAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuaApAQCAtMTQ1LDcgKzE0NSw3IEBAIHByaXZhdGU6CiAKICAg ICB2b2lkIHNldFBhbGV0dGVGcm9tUGFnZUNsaWVudElmRXhpc3RzKFFQYWxldHRlJikgY29uc3Q7 CiAKLSAgICBRU3R5bGUqIGZhbGxiYWNrU3R5bGUoKTsKKyAgICBRU3R5bGUqIGZhbGxiYWNrU3R5 bGUoKSBjb25zdDsKIAogICAgIFBhZ2UqIG1fcGFnZTsKIAo=