153015 2016-01-12 08:55:22 -0800 [GTK] Fix return value of some paint methods in RenderThemeGtk 2016-01-12 22:47:31 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1154704 0 cgarcia 2016-01-12 08:55:22 -0800 It's a bit confusing, but the bool value returned by paint methods in RenderTheme means whether the appearance is supported or not, so we should return true when not supported (so we didn't paint anything) and false when supported (so we actually painted the theme part). 1154705 1 268772 cgarcia 2016-01-12 08:57:13 -0800 Created attachment 268772 Patch 1154786 2 268772 mcatanzaro 2016-01-12 11:22:50 -0800 Comment on attachment 268772 Patch Watch the bots.... 1155034 3 cgarcia 2016-01-12 22:47:31 -0800 Committed r194955: <http://trac.webkit.org/changeset/194955> 268772 2016-01-12 08:57:13 -0800 2016-01-12 11:22:50 -0800 Patch wcore-render-theme-paint-returns.diff text/plain 6432 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMzdiMTc5Li4wMjkzYjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTYtMDEtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEZpeCByZXR1cm4gdmFsdWUgb2Ygc29tZSBwYWludCBtZXRob2Rz IGluIFJlbmRlclRoZW1lR3RrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTMwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGUgYm9vbCB2YWx1ZSByZXR1cm5lZCBieSBwYWludCBtZXRob2RzIGluIFJl bmRlclRoZW1lIG1lYW5zCisgICAgICAgIHdoZXRoZXIgdGhlIGFwcGVhcmFuY2UgaXMgc3VwcG9y dGVkIG9yIG5vdCwgc28gd2Ugc2hvdWxkIHJldHVybgorICAgICAgICB0cnVlIHdoZW4gbm90IHN1 cHBvcnRlZCAoc28gd2UgZGlkbid0IHBhaW50IGFueXRoaW5nKSBhbmQgZmFsc2UKKyAgICAgICAg d2hlbiBzdXBwb3J0ZWQgKHNvIHdlIGFjdHVhbGx5IHBhaW50ZWQgdGhlIHRoZW1lIHBhcnQpLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lR3RrOjpwYWludFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpwYWludFNlYXJjaEZpZWxkQ2Fu Y2VsQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlh QnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhTXV0 ZUJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRNZWRpYVBs YXlCdXR0b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OnBhaW50TWVkaWFT bGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRNZWRp YVZvbHVtZVNsaWRlckNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRoZW1lR3RrLmg6CisKKzIwMTYtMDEtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBpc1JlY29yZGluZyBj b25kaXRpb24gbG9naWMgaW4gR3JhcGhpY3NDb250ZXh0Ojpyb3VuZFRvRGV2aWNlUGl4ZWxzIGFm dGVyIHIxOTQ4MTYuCiAKICAgICAgICAgVGhpcyBsb29rcyBsaWtlIGEgdHlwbyBpbnRyb2R1Y2Vk IGluIHIxOTQ4MTYsIHdlIHdhbnQgdG8gcmV0dXJuIGVhcmx5IGxvZ2dpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IDBiMzlhOTIuLjhiYjhjYjUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtMTAw Nyw5ICsxMDA3LDkgQEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRTZWFyY2hGaWVsZFJlc3Vs dHNEZWNvcmF0aW9uUGFydChjb25zdCBSZW5kZXJCb3gmIHJlbmQKIHsKICAgICBJbnRSZWN0IGlj b25SZWN0ID0gY2VudGVyUmVjdFZlcnRpY2FsbHlJblBhcmVudElucHV0RWxlbWVudChyZW5kZXJP YmplY3QsIHJlY3QpOwogICAgIGlmIChpY29uUmVjdC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICByZXR1cm4gcGFpbnRFbnRyeUlj b24oRW50cnlJY29uTGVmdCwgImVkaXQtZmluZC1zeW1ib2xpYyIsIHBhaW50SW5mby5jb250ZXh0 KCksIGljb25SZWN0LCBndGtUZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC5zdHlsZSgpLmRpcmVj dGlvbigpKSwKKyAgICByZXR1cm4gIXBhaW50RW50cnlJY29uKEVudHJ5SWNvbkxlZnQsICJlZGl0 LWZpbmQtc3ltYm9saWMiLCBwYWludEluZm8uY29udGV4dCgpLCBpY29uUmVjdCwgZ3RrVGV4dERp cmVjdGlvbihyZW5kZXJPYmplY3Quc3R5bGUoKS5kaXJlY3Rpb24oKSksCiAgICAgICAgIGd0a0lj b25TdGF0ZUZsYWdzKHRoaXMsIHJlbmRlck9iamVjdCkpOwogfQogCkBAIC0xMDIyLDkgKzEwMjIs OSBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKGNv bnN0IFJlbmRlckJveCYgcmVuZGVyT2JqZWN0LAogewogICAgIEludFJlY3QgaWNvblJlY3QgPSBj ZW50ZXJSZWN0VmVydGljYWxseUluUGFyZW50SW5wdXRFbGVtZW50KHJlbmRlck9iamVjdCwgcmVj dCk7CiAgICAgaWYgKGljb25SZWN0LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJldHVybiBwYWludEVudHJ5SWNvbihFbnRyeUlj b25SaWdodCwgImVkaXQtY2xlYXItc3ltYm9saWMiLCBwYWludEluZm8uY29udGV4dCgpLCBpY29u UmVjdCwgZ3RrVGV4dERpcmVjdGlvbihyZW5kZXJPYmplY3Quc3R5bGUoKS5kaXJlY3Rpb24oKSks CisgICAgcmV0dXJuICFwYWludEVudHJ5SWNvbihFbnRyeUljb25SaWdodCwgImVkaXQtY2xlYXIt c3ltYm9saWMiLCBwYWludEluZm8uY29udGV4dCgpLCBpY29uUmVjdCwgZ3RrVGV4dERpcmVjdGlv bihyZW5kZXJPYmplY3Quc3R5bGUoKS5kaXJlY3Rpb24oKSksCiAgICAgICAgIGd0a0ljb25TdGF0 ZUZsYWdzKHRoaXMsIHJlbmRlck9iamVjdCkpOwogfQogCkBAIC0xMzgyLDcgKzEzODIsNyBAQCBi b29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYg cmVuZGVyT2JqZWN0LCBHcmFwaGljcwogICAgIGd0a19zdHlsZV9jb250ZXh0X3NldF9zdGF0ZShj b250ZXh0LmdldCgpLCBndGtJY29uU3RhdGVGbGFncyh0aGlzLCByZW5kZXJPYmplY3QpKTsKICAg ICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbWVkaWFJY29uU2l6ZSA9IDE2OwogICAgIEludFJlY3Qg aWNvblJlY3QocmVjdC54KCkgKyAocmVjdC53aWR0aCgpIC0gbWVkaWFJY29uU2l6ZSkgLyAyLCBy ZWN0LnkoKSArIChyZWN0LmhlaWdodCgpIC0gbWVkaWFJY29uU2l6ZSkgLyAyLCBtZWRpYUljb25T aXplLCBtZWRpYUljb25TaXplKTsKLSAgICByZXR1cm4gcGFpbnRJY29uKGNvbnRleHQuZ2V0KCks IGdyYXBoaWNzQ29udGV4dCwgaWNvblJlY3QsIGljb25OYW1lKTsKKyAgICByZXR1cm4gIXBhaW50 SWNvbihjb250ZXh0LmdldCgpLCBncmFwaGljc0NvbnRleHQsIGljb25SZWN0LCBpY29uTmFtZSk7 CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVHdGs6Omhhc093bkRpc2FibGVkU3RhdGVIYW5kbGluZ0Zv cihDb250cm9sUGFydCBwYXJ0KSBjb25zdApAQCAtMTM5OSwxMCArMTM5OSwxMCBAQCBib29sIFJl bmRlclRoZW1lR3RrOjpwYWludE1lZGlhTXV0ZUJ1dHRvbihjb25zdCBSZW5kZXJPYmplY3QmIHJl bmRlck9iamVjdCwgY29ucwogewogICAgIE5vZGUqIG5vZGUgPSByZW5kZXJPYmplY3Qubm9kZSgp OwogICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICBOb2RlKiBtZWRpYU5vZGUgPSBub2RlLT5zaGFkb3dIb3N0KCk7CiAgICAgaWYg KCFpczxIVE1MTWVkaWFFbGVtZW50PihtZWRpYU5vZGUpKQotICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVt ZW50ID0gZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4obWVkaWFOb2RlKTsKICAgICByZXR1cm4g cGFpbnRNZWRpYUJ1dHRvbihyZW5kZXJPYmplY3QsIHBhaW50SW5mby5jb250ZXh0KCksIHJlY3Qs IG1lZGlhRWxlbWVudC0+bXV0ZWQoKSA/ICJhdWRpby12b2x1bWUtbXV0ZWQtc3ltYm9saWMiIDog ImF1ZGlvLXZvbHVtZS1oaWdoLXN5bWJvbGljIik7CkBAIC0xNDEyLDEwICsxNDEyLDkgQEAgYm9v bCBSZW5kZXJUaGVtZUd0azo6cGFpbnRNZWRpYVBsYXlCdXR0b24oY29uc3QgUmVuZGVyT2JqZWN0 JiByZW5kZXJPYmplY3QsIGNvbnMKIHsKICAgICBOb2RlKiBub2RlID0gcmVuZGVyT2JqZWN0Lm5v ZGUoKTsKICAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQorICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICBpZiAoIW5vZGVIYXNQc2V1ZG8obm9kZSwgIi13ZWJraXQtbWVkaWEt Y29udHJvbHMtcGxheS1idXR0b24iKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBwYWludE1lZGlhQnV0dG9uKHJlbmRlck9iamVjdCwg cGFpbnRJbmZvLmNvbnRleHQoKSwgcmVjdCwgbm9kZUhhc0NsYXNzKG5vZGUsICJwYXVzZWQiKSA/ ICJtZWRpYS1wbGF5YmFjay1zdGFydC1zeW1ib2xpYyIgOiAibWVkaWEtcGxheWJhY2stcGF1c2Ut c3ltYm9saWMiKTsKIH0KQEAgLTE0NTAsNyArMTQ0OSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6 OnBhaW50TWVkaWFTbGlkZXJUcmFjayhjb25zdCBSZW5kZXJPYmplY3QmIG8sIGNvbnN0IFBhaW50 SW5mCiB7CiAgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFF bGVtZW50KG8pOwogICAgIGlmICghbWVkaWFFbGVtZW50KQotICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0ID0g cGFpbnRJbmZvLmNvbnRleHQoKTsKICAgICBjb250ZXh0LnNhdmUoKTsKQEAgLTE0ODYsMTEgKzE0 ODUsNiBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhU2xpZGVyVGh1bWIoY29uc3Qg UmVuZGVyT2JqZWN0JiBvLCBjb25zdCBQYWludEluZgogICAgIHJldHVybiBmYWxzZTsKIH0KIAot Ym9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcihjb25z dCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0JikKLXsKLSAg ICByZXR1cm4gdHJ1ZTsKLX0KLQogYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRNZWRpYVZvbHVt ZVNsaWRlclRyYWNrKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBIVE1MTWVkaWFF bGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQocmVuZGVyT2JqZWN0KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmgKaW5kZXggOGRmNjJhZi4u YWQzM2I4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l R3RrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmgKQEAg LTE2Miw3ICsxNjIsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhU2Vl a0ZvcndhcmRCdXR0b24oY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29u c3QgSW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhU2xpZGVy VHJhY2soY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVj dCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhU2xpZGVyVGh1bWIoY29u c3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpIG92ZXJy aWRlOwotICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyKGNv bnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYVZvbHVtZVNsaWRlclRyYWNrKGNvbnN0 IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYVZvbHVtZVNsaWRlclRodW1iKGNvbnN0IFJl bmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYUN1cnJlbnRUaW1lKGNvbnN0IFJlbmRlck9iamVj dCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsK