97119 2012-09-19 10:40:50 -0700 [BlackBerry] Remove custom painting code for searchCancel 2012-09-19 14:12:04 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis mifenton tonikitoo webkit.review.bot oldest_to_newest 723649 0 rwlbuis 2012-09-19 10:40:50 -0700 We have a hack to paint the 'X' for searchCancel dynamically, however there is no reason to just provide a png like the other ports do. 723654 1 164755 rwlbuis 2012-09-19 10:46:29 -0700 Created attachment 164755 Patch 723817 2 rwlbuis 2012-09-19 14:12:04 -0700 Committed r129041: <http://trac.webkit.org/changeset/129041> 164755 2012-09-19 10:46:29 -0700 2012-09-19 10:50:02 -0700 Patch bug-97119-20120919134904.patch text/plain 2609 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmJhNGU2YjgxYmJlZjgx OGI1MDZkMzBkYzBiMTY2Yzg4YmE1ODNjMy4uMDA5MzJjNWE1ZTk0NDdjZDM4NTMwOGQ4ZmExYjZm N2NiMWY3ZWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTE5ICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbW92ZSBjdXN0 b20gcGFpbnRpbmcgY29kZSBmb3Igc2VhcmNoQ2FuY2VsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzExOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgZHluYW1pYyBwYWludGluZyBjb2Rl IGZvciBzZWFyY2hDYW5jZWwsIHdlIHVzZSBhIHBuZyBmaWxlIG5vdy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSk6CisKIDIwMTItMDktMTkgIEpv bmF0aGFuIERvbmcgIDxqb25hdGhhbi5kb25nQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAg ICBbQmxhY2tCZXJyeV0gQWRkIGZ1bmN0aW9uIHBsYXllcklkKCkgaW4gY2xhc3MgUGFnZUNsaWVu dEJsYWNrQmVycnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvSW1hZ2VCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCbGFja0JlcnJ5LmNwcAppbmRleCA3YTgwZDk4Yzdj MWVlOGIzMzU4NDk1YWFkN2ExYTgyYjhmZDNkMzAxLi44NzkzMjk4ZDExZGYzOWUyOGZjM2VlMTY2 ZTc5Y2JlNTNlMmFkMjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ibGFja2JlcnJ5L0ltYWdlQmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9JbWFnZUJsYWNrQmVycnkuY3BwCkBAIC0yNyw0 MCArMjcsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBQYXNzUmVmUHRyPEltYWdlPiBJbWFn ZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoY29uc3QgY2hhciAqbmFtZSkKIHsKLSAgICBpZiAoIXN0 cmNtcChuYW1lLCAic2VhcmNoQ2FuY2VsIikgfHwgIXN0cmNtcChuYW1lLCAic2VhcmNoQ2FuY2Vs UHJlc3NlZCIpKSB7Ci0gICAgICAgIE93blB0cjxJbWFnZUJ1ZmZlcj4gaW1hZ2VCdWZmZXIgPSBJ bWFnZUJ1ZmZlcjo6Y3JlYXRlKEludFNpemUoMTYsIDE2KSk7Ci0gICAgICAgIGlmICghaW1hZ2VC dWZmZXIpCi0gICAgICAgICAgICByZXR1cm4gMDsKLQotICAgICAgICAvLyBEcmF3IGEgbW9yZSBz dWJ0bGUsIGdyYXkgeC1zaGFwZWQgaWNvbi4KLSAgICAgICAgR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0ID0gaW1hZ2VCdWZmZXItPmNvbnRleHQoKTsKLSAgICAgICAgY29udGV4dC0+c2F2ZSgpOwot Ci0gICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KEZsb2F0UmVjdCgwLCAwLCAxNiwgMTYpLCBDb2xv cjo6d2hpdGUsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotCi0gICAgICAgIGlmICghc3RyY21wKG5h bWUsICJzZWFyY2hDYW5jZWwiKSkKLSAgICAgICAgICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihD b2xvcigxMjgsIDEyOCwgMTI4KSwgQ29sb3JTcGFjZURldmljZVJHQik7Ci0gICAgICAgIGVsc2UK LSAgICAgICAgICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihDb2xvcig2NCwgNjQsIDY0KSwgQ29s b3JTcGFjZURldmljZVJHQik7Ci0KLSAgICAgICAgY29udGV4dC0+dHJhbnNsYXRlKDgsIDgpOwot Ci0gICAgICAgIGNvbnRleHQtPnJvdGF0ZShwaURvdWJsZSAvIDQuMCk7Ci0gICAgICAgIGNvbnRl eHQtPmZpbGxSZWN0KEZsb2F0UmVjdCgtMSwgLTcsIDIsIDE0KSk7Ci0KLSAgICAgICAgY29udGV4 dC0+cm90YXRlKC1waURvdWJsZSAvIDIuMCk7Ci0gICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KEZs b2F0UmVjdCgtMSwgLTcsIDIsIDE0KSk7Ci0KLSAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwot ICAgICAgICByZXR1cm4gaW1hZ2VCdWZmZXItPmNvcHlJbWFnZSgpOwotICAgIH0KLQogICAgIC8v IFJFU09VUkNFX1BBVEggaXMgc2V0IGJ5IENNYWtlIGluIE9wdGlvbnNCbGFja0JlcnJ5LmNtYWtl CiAgICAgU3RyaW5nIGZ1bGxQYXRoKFJFU09VUkNFX1BBVEgpOwogICAgIFN0cmluZyBleHRlbnNp b24oIi5wbmciKTsKIAotICAgIGZ1bGxQYXRoICs9IG5hbWU7Ci0gICAgZnVsbFBhdGggKz0gZXh0 ZW5zaW9uOworICAgIGZ1bGxQYXRoID0gZnVsbFBhdGggKyBuYW1lICsgZXh0ZW5zaW9uOwogCiAg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGVXaXRo Q29udGVudHNPZkZpbGUoZnVsbFBhdGgpOwogICAgIGlmICghYnVmZmVyKQo=