97126 2012-09-19 12:50:02 -0700 [BlackBerry] Fix vertical positioning problem for 'X' in search field 2012-09-19 13:53:01 -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 723724 0 rwlbuis 2012-09-19 12:50:02 -0700 I noticed our port has the same problem as described here https://bugs.webkit.org/show_bug.cgi?id=30245. 723745 1 164766 rwlbuis 2012-09-19 13:08:01 -0700 Created attachment 164766 Patch 723799 2 rwlbuis 2012-09-19 13:53:01 -0700 Committed r129041: <http://trac.webkit.org/changeset/129041> 164766 2012-09-19 13:08:01 -0700 2012-09-19 13:42:28 -0700 Patch bug-97126-20120919161035.patch text/plain 4851 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjlmYjczNTExMmRhYWUx ZjQ0MmQ0MmMzMzllZjFkMjUwYThhNDk4ZC4uZmZhMzI5MTcyZTJhMmFmNjI2ZTg4MzlkOGNlNDM0 ZDc2MTYyOWUyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTA5LTE5ICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIEZpeCB2ZXJ0aWNh bCBwb3NpdGlvbmluZyBwcm9ibGVtIGZvciAnWCcgaW4gc2VhcmNoIGZpZWxkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzEyNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgdGhlIHNhbWUgcHJv YmxlbSBhcyBkZXNjcmliZWQgaW4gYnVnIDMwMjQ1LCBzbyBpbnRlZ3JhdGUgdGhhdCBjb2RlLgor CisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5Ojpjb252ZXJ0VG9QYWlu dGluZ1JlY3QpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU aGVtZUJsYWNrQmVycnk6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOgorCisyMDEyLTA5 LTE5ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKICAgICAgICAgW0JsYWNrQmVycnldIFJl bW92ZSBjdXN0b20gcGFpbnRpbmcgY29kZSBmb3Igc2VhcmNoQ2FuY2VsCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzExOQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tC ZXJyeS5jcHAKaW5kZXggYjY3M2FmOTA0NjBiYzlkMTY2MTc5ODBjOWZlNGY0M2JiNWQ5OTc3OS4u YTljMDlhMTE5ZmIxMDExZmEyMjc5Y2I0MzYzNTAzNGQ4ZWQ3MmI1ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFj a0JlcnJ5LmNwcApAQCAtMzMyLDI4ICszMzIsNDIgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVy cnk6OnBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW4K ICAgICByZXR1cm4gcGFpbnRUZXh0RmllbGRPclRleHRBcmVhT3JTZWFyY2hGaWVsZChvYmplY3Qs IGluZm8sIHJlY3QpOwogfQogCi1ib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRTZWFy Y2hGaWVsZENhbmNlbEJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCitJbnRSZWN0IFJlbmRlclRoZW1lQmxh Y2tCZXJyeTo6Y29udmVydFRvUGFpbnRpbmdSZWN0KFJlbmRlck9iamVjdCogaW5wdXRSZW5kZXJl ciwgY29uc3QgUmVuZGVyT2JqZWN0KiBwYXJ0UmVuZGVyZXIsIExheW91dFJlY3QgcGFydFJlY3Qs IGNvbnN0IEludFJlY3QmIGxvY2FsT2Zmc2V0KSBjb25zdAogewotICAgIEFTU0VSVChvYmplY3Qt PnBhcmVudCgpKTsKLSAgICBpZiAoIW9iamVjdC0+cGFyZW50KCkgfHwgIW9iamVjdC0+cGFyZW50 KCktPmlzQm94KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAvLyBDb21wdXRlIGFuIG9m ZnNldCBiZXR3ZWVuIHRoZSBwYXJ0IHJlbmRlcmVyIGFuZCB0aGUgaW5wdXQgcmVuZGVyZXIuCisg ICAgTGF5b3V0U2l6ZSBvZmZzZXRGcm9tSW5wdXRSZW5kZXJlciA9IC1wYXJ0UmVuZGVyZXItPm9m ZnNldEZyb21BbmNlc3RvckNvbnRhaW5lcihpbnB1dFJlbmRlcmVyKTsKKyAgICAvLyBNb3ZlIHRo ZSByZWN0IGludG8gcGFydFJlbmRlcmVyJ3MgY29vcmRzLgorICAgIHBhcnRSZWN0Lm1vdmUob2Zm c2V0RnJvbUlucHV0UmVuZGVyZXIpOworICAgIC8vIEFjY291bnQgZm9yIHRoZSBsb2NhbCBkcmF3 aW5nIG9mZnNldC4KKyAgICBwYXJ0UmVjdC5tb3ZlKGxvY2FsT2Zmc2V0LngoKSwgbG9jYWxPZmZz ZXQueSgpKTsKKworICAgIHJldHVybiBwaXhlbFNuYXBwZWRJbnRSZWN0KHBhcnRSZWN0KTsKK30K KwogCi0gICAgUmVuZGVyQm94KiBwYXJlbnRSZW5kZXJCb3ggPSB0b1JlbmRlckJveChvYmplY3Qt PnBhcmVudCgpKTsKK2Jvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludFNlYXJjaEZpZWxk Q2FuY2VsQnV0dG9uKFJlbmRlck9iamVjdCogY2FuY2VsQnV0dG9uT2JqZWN0LCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKK3sKKyAgICBOb2RlKiBpbnB1dCA9 IGNhbmNlbEJ1dHRvbk9iamVjdC0+bm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5vZGUoKTsKKyAgICBp ZiAoIWlucHV0LT5yZW5kZXJlcigpLT5pc0JveCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBJbnRSZWN0IHBhcmVudEJveCA9IHBhcmVudFJlbmRlckJveC0+YWJzb2x1dGVDb250ZW50 Qm94KCk7Ci0gICAgSW50UmVjdCBib3VuZHMgPSByZWN0OwotICAgIC8vIE1ha2Ugc3VyZSB0aGUg c2NhbGVkIGJ1dHRvbiBzdGF5cyBzcXVhcmUgYW5kIGZpdHMgaW4gaXRzIHBhcmVudCdzIGJveC4K LSAgICBib3VuZHMuc2V0SGVpZ2h0KHN0ZDo6bWluKHBhcmVudEJveC53aWR0aCgpLCBzdGQ6Om1p bihwYXJlbnRCb3guaGVpZ2h0KCksIGJvdW5kcy5oZWlnaHQoKSkpKTsKLSAgICBib3VuZHMuc2V0 V2lkdGgoYm91bmRzLmhlaWdodCgpKTsKKyAgICBSZW5kZXJCb3gqIGlucHV0UmVuZGVyQm94ID0g dG9SZW5kZXJCb3goaW5wdXQtPnJlbmRlcmVyKCkpOworICAgIExheW91dFJlY3QgaW5wdXRDb250 ZW50Qm94ID0gaW5wdXRSZW5kZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CiAKLSAgICAvLyBQdXQg dGhlIGJ1dHRvbiBpbiB0aGUgbWlkZGxlIHZlcnRpY2FsbHksIGFuZCByb3VuZCB1cCB0aGUgdmFs dWUuCi0gICAgLy8gU28gaWYgaXQgaGFzIHRvIGJlIG9uZSBwaXhlbCBvZmYtY2VudGVyLCBpdCB3 b3VsZCBiZSBvbmUgcGl4ZWwgY2xvc2VyCi0gICAgLy8gdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmll bGQuIFRoaXMgd291bGQgbG9vayBiZXR0ZXIgd2l0aCB0aGUgdGV4dC4KLSAgICBib3VuZHMuc2V0 WShwYXJlbnRCb3gueSgpICsgKHBhcmVudEJveC5oZWlnaHQoKSAtIGJvdW5kcy5oZWlnaHQoKSAr IDEpIC8gMik7CisgICAgLy8gTWFrZSBzdXJlIHRoZSBzY2FsZWQgYnV0dG9uIHN0YXlzIHNxdWFy ZSBhbmQgd2lsbCBmaXQgaW4gaXRzIHBhcmVudCdzIGJveC4KKyAgICBMYXlvdXRVbml0IGNhbmNl bEJ1dHRvblNpemUgPSBzdGQ6Om1pbihpbnB1dENvbnRlbnRCb3gud2lkdGgoKSwgc3RkOjptaW48 TGF5b3V0VW5pdD4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByLmhlaWdodCgpKSk7CisgICAg Ly8gQ2FsY3VsYXRlIGNhbmNlbCBidXR0b24ncyBjb29yZGluYXRlcyByZWxhdGl2ZSB0byB0aGUg aW5wdXQgZWxlbWVudC4KKyAgICAvLyBDZW50ZXIgdGhlIGJ1dHRvbiB2ZXJ0aWNhbGx5LiBSb3Vu ZCB1cCB0aG91Z2gsIHNvIGlmIGl0IGhhcyB0byBiZSBvbmUgcGl4ZWwgb2ZmLWNlbnRlciwgaXQg d2lsbAorICAgIC8vIGJlIG9uZSBwaXhlbCBjbG9zZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmll bGQuIFRoaXMgdGVuZHMgdG8gbG9vayBiZXR0ZXIgd2l0aCB0aGUgdGV4dC4KKyAgICBMYXlvdXRS ZWN0IGNhbmNlbEJ1dHRvblJlY3QoY2FuY2VsQnV0dG9uT2JqZWN0LT5vZmZzZXRGcm9tQW5jZXN0 b3JDb250YWluZXIoaW5wdXRSZW5kZXJCb3gpLndpZHRoKCksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlucHV0Q29udGVudEJveC55KCkgKyAoaW5wdXRDb250ZW50Qm94LmhlaWdo dCgpIC0gY2FuY2VsQnV0dG9uU2l6ZSArIDEpIC8gMiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2FuY2VsQnV0dG9uU2l6ZSwgY2FuY2VsQnV0dG9uU2l6ZSk7CisgICAgSW50UmVj dCBwYWludGluZ1JlY3QgPSBjb252ZXJ0VG9QYWludGluZ1JlY3QoaW5wdXRSZW5kZXJCb3gsIGNh bmNlbEJ1dHRvbk9iamVjdCwgY2FuY2VsQnV0dG9uUmVjdCwgcik7CiAKICAgICBzdGF0aWMgSW1h Z2UqIGNhbmNlbEltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hDYW5j ZWwiKS5sZWFrUmVmKCk7CiAgICAgc3RhdGljIEltYWdlKiBjYW5jZWxQcmVzc2VkSW1hZ2UgPSBJ bWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaENhbmNlbFByZXNzZWQiKS5sZWFrUmVm KCk7Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQtPmRyYXdJbWFnZShpc1ByZXNzZWQob2JqZWN0KSA/ IGNhbmNlbFByZXNzZWRJbWFnZSA6IGNhbmNlbEltYWdlLCBvYmplY3QtPnN0eWxlKCktPmNvbG9y U3BhY2UoKSwgYm91bmRzKTsKKyAgICBwYWludEluZm8uY29udGV4dC0+ZHJhd0ltYWdlKGlzUHJl c3NlZChjYW5jZWxCdXR0b25PYmplY3QpID8gY2FuY2VsUHJlc3NlZEltYWdlIDogY2FuY2VsSW1h Z2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYW5jZWxCdXR0b25PYmplY3Qt PnN0eWxlKCktPmNvbG9yU3BhY2UoKSwgcGFpbnRpbmdSZWN0KTsKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAK