85007 2012-04-26 14:41:31 -0700 [BlackBerry] Improve log output in InputHandler.cpp 2012-04-27 09:10:13 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nima.ghanavatian nima.ghanavatian tonikitoo webkit.review.bot oldest_to_newest 610997 0 nima.ghanavatian 2012-04-26 14:41:31 -0700 The log output, specifically in setText was very lacking. This meant manually adding output at the right places (before early returns) and with more information. 611001 1 139073 nima.ghanavatian 2012-04-26 14:46:38 -0700 Created attachment 139073 Patch 611560 2 139073 webkit.review.bot 2012-04-27 09:10:09 -0700 Comment on attachment 139073 Patch Clearing flags on attachment: 139073 Committed r115437: <http://trac.webkit.org/changeset/115437> 611562 3 webkit.review.bot 2012-04-27 09:10:13 -0700 All reviewed patches have been landed. Closing bug. 139073 2012-04-26 14:46:38 -0700 2012-04-27 09:10:08 -0700 Patch bug-85007-20120426174317.patch text/plain 7106 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2MDRlMThkODYyMjcxMWFjYTIwNzM4ZGNkNzI3NmIzMDQ1ZDQ3ZjJhLi4xMGQzYmE5YzA2 MjM4NzMyNTdiMDkxYjIwZDI5MWZjMDAxNTJjMWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wNC0yNiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBJbXByb3ZlIGxvZyBv dXRwdXQgaW4gSW5wdXRIYW5kbGVyLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUwMDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBQUiAxMzgyOTIKKyAgICAgICAgSW1wcm92aW5nIGxvZ2dpbmcgaW4g SW5wdXRIYW5kbGVyLgorICAgICAgICBJbiBzZXRUZXh0IHdlIGhhZCBhbiBlYXJseSByZXR1cm4g d2hpY2ggd2Fzbid0IGJlaW5nIGNhcHR1cmVkLgorICAgICAgICBBbHNvLCBjbGVhbmluZyB1cCB0 aGUgb3V0cHV0IHRvIG1ha2UgaXQgbW9yZSBjbGVhciBhbmQgZGVzY3JpcHRpdmUuCisKKyAgICAg ICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBNaWtlIEZlbnRvbi4KKworICAgICAgICAqIFdlYktp dFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 SW5wdXRIYW5kbGVyOjpsZWFyblRleHQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ bnB1dEhhbmRsZXI6OmVuYWJsZUlucHV0TW9kZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OklucHV0SGFuZGxlcjo6c2V0VGV4dCk6CisKIDIwMTItMDQtMjYgIFlvbmcgTGkgIDx5b2xp QHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEEgcXVpY2sgZml4IHRvIHRoZSBwcmV2 aW91cyBwYXRjaCByMTE1MjQ1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKaW5kZXggYzk4YjFlM2IxY2QxNjEzZGVk MDUwMTFmY2Y3NDU5ZTU0MDljNmQ3My4uNTI2ZGNmM2NmM2VhMjM0NTNlNTkxOTUxZjEzMDM2YmM1 M2I0YTE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCkBAIC0zOTgsNyArMzk4LDcgQEAgdm9pZCBJbnB1dEhh bmRsZXI6OmxlYXJuVGV4dCgpCiAgICAgaWYgKHRleHRJbkZpZWxkLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjps ZWFyblRleHQgJXMiLCB0ZXh0SW5GaWVsZC5sYXRpbjEoKS5kYXRhKCkpOworICAgIElucHV0TG9n KExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6bGVhcm5UZXh0ICclcyciLCB0ZXh0SW5GaWVs ZC5sYXRpbjEoKS5kYXRhKCkpOwogICAgIHNlbmRMZWFyblRleHREZXRhaWxzKHRleHRJbkZpZWxk KTsKIH0KIApAQCAtNDMyLDkgKzQzMiw5IEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50 VW5mb2N1c2VkKGJvb2wgcmVmb2N1c09jY3VyaW5nKQogCiB2b2lkIElucHV0SGFuZGxlcjo6ZW5h YmxlSW5wdXRNb2RlKGJvb2wgaW5wdXRNb2RlQWxsb3dlZCkKIHsKLSAgICBGb2N1c0xvZyhMb2dM ZXZlbEluZm8sICJJbnB1dEhhbmRsZXI6OmVuYWJsZUlucHV0TW9kZSAlcywgb3ZlcnJpZGUgaXMg JXMiCisgICAgRm9jdXNMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjplbmFibGVJbnB1 dE1vZGUgJyVzJywgb3ZlcnJpZGUgaXMgJyVzJyIKICAgICAgICAgICAgICAsIGlucHV0TW9kZUFs bG93ZWQgPyAidHJ1ZSIgOiAiZmFsc2UiCi0gICAgICAgICAgICAsIG1fd2ViUGFnZS0+bV9kdW1w UmVuZGVyVHJlZSB8fCBQbGF0Zm9ybTo6U2V0dGluZ3M6OmdldCgpLT5hbHdheXNTaG93S2V5Ym9h cmRPbkZvY3VzKCkgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKKyAgICAgICAgICAgICAsIG1fd2ViUGFn ZS0+bV9kdW1wUmVuZGVyVHJlZSB8fCBQbGF0Zm9ybTo6U2V0dGluZ3M6OmdldCgpLT5hbHdheXNT aG93S2V5Ym9hcmRPbkZvY3VzKCkgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKIAogICAgIG1faW5wdXRN b2RlRW5hYmxlZCA9IGlucHV0TW9kZUFsbG93ZWQ7CiAKQEAgLTE1MzcsNiArMTUzNyw4IEBAIGJv b2wgSW5wdXRIYW5kbGVyOjpzZXRUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCogc3Bhbm5hYmxlU3Ry aW5nKQogICAgIFN0cmluZyB0ZXh0VG9JbnNlcnQgPSBjb252ZXJ0U3Bhbm5hYmxlU3RyaW5nVG9T dHJpbmcoc3Bhbm5hYmxlU3RyaW5nKTsKICAgICBpbnQgdGV4dExlbmd0aCA9IHRleHRUb0luc2Vy dC5sZW5ndGgoKTsKIAorICAgIElucHV0TG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6 c2V0VGV4dCBzcGFubmFibGVTdHJpbmcgaXMgJyVzJywgb2YgbGVuZ3RoICVkIFxuIiwgdGV4dFRv SW5zZXJ0LmxhdGluMSgpLmRhdGEoKSwgdGV4dExlbmd0aCk7CisKICAgICBzcGFuX3QqIGNoYW5n ZWRTcGFuID0gZmlyc3RTcGFuSW5TdHJpbmcoc3Bhbm5hYmxlU3RyaW5nLCBDSEFOR0VEX0FUVFJJ Qik7CiAgICAgaW50IGNvbXBvc2luZ1RleHRTdGFydCA9IG1fY29tcG9zaW5nVGV4dFN0YXJ0Owog ICAgIGludCBjb21wb3NpbmdUZXh0RW5kID0gbV9jb21wb3NpbmdUZXh0RW5kOwpAQCAtMTU0NSwx OSArMTU0NywyNiBAQCBib29sIElucHV0SGFuZGxlcjo6c2V0VGV4dChzcGFubmFibGVfc3RyaW5n X3QqIHNwYW5uYWJsZVN0cmluZykKIAogICAgIGlmIChpc1RyYWlsaW5nU2luZ2xlQ2hhcmFjdGVy KGNoYW5nZWRTcGFuLCB0ZXh0TGVuZ3RoLCBjb21wb3NpbmdUZXh0TGVuZ3RoKSkgewogICAgICAg ICAvLyBIYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGV4dCBpcyBiZWluZyBjb21wb3NlZC4KLSAgICAg ICAgaWYgKGZpcnN0U3BhbkluU3RyaW5nKHNwYW5uYWJsZVN0cmluZywgQ09NUE9TRURfVEVYVF9B VFRSSUIpKQorICAgICAgICBpZiAoZmlyc3RTcGFuSW5TdHJpbmcoc3Bhbm5hYmxlU3RyaW5nLCBD T01QT1NFRF9URVhUX0FUVFJJQikpIHsKKyAgICAgICAgICAgIElucHV0TG9nKExvZ0xldmVsSW5m bywgIklucHV0SGFuZGxlcjo6c2V0VGV4dCBTaW5nbGUgdHJhaWxpbmcgY2hhcmFjdGVyIGRldGVj dGVkLiAgVGV4dCBpcyBiZWluZyBjb21wb3NlZC4gXG4iKTsKICAgICAgICAgICAgIHJldHVybiBl ZGl0b3ItPmNvbW1hbmQoIkluc2VydFRleHQiKS5leGVjdXRlKHRleHRUb0luc2VydC5yaWdodCgx KSk7CisgICAgICAgIH0KKyAgICAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5k bGVyOjpzZXRUZXh0IFNpbmdsZSB0cmFpbGluZyBjaGFyYWN0ZXIgZGV0ZWN0ZWQuIFRleHQgaXMg bm90IGJlaW5nIGNvbXBvc2VkLiBcbiIpOwogICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJ bnB1dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNlcnRbdGV4dExlbmd0aCAtIDFd LCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5Q2hhciwgMCksIGZhbHNlIC8qIGNoYW5nZUlz UGFydE9mQ29tcG9zaXRpb24gKi8pOwogICAgIH0KIAogICAgIC8vIElmIG5vIHNwYW5zIGhhdmUg Y2hhbmdlZCwgdHJlYXQgaXQgYXMgYSBkZWxldGUgb3BlcmF0aW9uLgogICAgIGlmICghY2hhbmdl ZFNwYW4pIHsKICAgICAgICAgLy8gSWYgdGhlIGNvbXBvc2l0aW9uIGxlbmd0aCBpcyB0aGUgc2Ft ZSBhcyBvdXIgc3RyaW5nIGxlbmd0aCwgdGhlbiB3ZSBkb24ndCBuZWVkIHRvIGRvIGFueXRoaW5n LgotICAgICAgICBpZiAoY29tcG9zaW5nVGV4dExlbmd0aCA9PSB0ZXh0TGVuZ3RoKQorICAgICAg ICBpZiAoY29tcG9zaW5nVGV4dExlbmd0aCA9PSB0ZXh0TGVuZ3RoKSB7CisgICAgICAgICAgICBJ bnB1dExvZyhMb2dMZXZlbEluZm8sICJJbnB1dEhhbmRsZXI6OnNldFRleHQgTm8gc3BhbnMgaGF2 ZSBjaGFuZ2VkLiBOZXcgdGV4dCBpcyB0aGUgc2FtZSBsZW5ndGggYXMgdGhlIG9sZC4gTm90aGlu ZyB0byBkby4gXG4iKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAKLSAg ICAgICAgaWYgKGNvbXBvc2luZ1RleHRMZW5ndGggLSB0ZXh0TGVuZ3RoID09IDEpCisgICAgICAg IGlmIChjb21wb3NpbmdUZXh0TGVuZ3RoIC0gdGV4dExlbmd0aCA9PSAxKSB7CisgICAgICAgICAg ICBJbnB1dExvZyhMb2dMZXZlbEluZm8sICJJbnB1dEhhbmRsZXI6OnNldFRleHQgTm8gc3BhbnMg aGF2ZSBjaGFuZ2VkLiBOZXcgdGV4dCBpcyBvbmUgY2hhcmFjdGVyIHNob3J0ZXIgdGhhbiB0aGUg b2xkLiBUcmVhdGluZyBhcyAnZGVsZXRlJy4gXG4iKTsKICAgICAgICAgICAgIHJldHVybiBlZGl0 b3ItPmNvbW1hbmQoIkRlbGV0ZUJhY2t3YXJkIikuZXhlY3V0ZSgpOworICAgICAgICB9CiAgICAg fQogCiAgICAgaWYgKGNvbXBvc2luZ1RleHRMZW5ndGggJiYgIXNldFNlbGVjdGlvbihjb21wb3Np bmdUZXh0U3RhcnQsIGNvbXBvc2luZ1RleHRFbmQsIHRydWUgLyogY2hhbmdlSXNQYXJ0T2ZDb21w b3NpdGlvbiAqLykpCkBAIC0xNTcyLDggKzE1ODEsNiBAQCBib29sIElucHV0SGFuZGxlcjo6c2V0 VGV4dChzcGFubmFibGVfc3RyaW5nX3QqIHNwYW5uYWJsZVN0cmluZykKICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQogCi0gICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAic2V0VGV4dCBzcGFu bmFibGVTdHJpbmcgaXMgJXMsICVkIFxuIiwgdGV4dFRvSW5zZXJ0LmxhdGluMSgpLmRhdGEoKSwg dGV4dExlbmd0aCk7Ci0KICAgICAvLyBUcmlnZ2VyaW5nIGFuIGluc2VydCBvZiB0aGUgdGV4dCB3 aXRoIGEgc3BhY2UgY2hhcmFjdGVyIHRyYWlsaW5nCiAgICAgLy8gY2F1c2VzIG5ldyB0ZXh0IHRv IGFkb3B0IHRoZSBwcmV2aW91cyB0ZXh0IHN0eWxlLgogICAgIC8vIFJlbW92ZSBpdCBhbmQgYXBw bHkgaXQgYXMgYSBrZXlwcmVzcyBsYXRlci4KQEAgLTE1ODUsMjcgKzE1OTIsMjUgQEAgYm9vbCBJ bnB1dEhhbmRsZXI6OnNldFRleHQoc3Bhbm5hYmxlX3N0cmluZ190KiBzcGFubmFibGVTdHJpbmcp CiAgICAgICAgIHRleHRUb0luc2VydC5yZW1vdmUodGV4dExlbmd0aCwgMSk7CiAgICAgfQogCi0g ICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRUZXh0IFJlcXVlc3Qg YmVpbmcgcHJvY2Vzc2VkIFRleHQgYmVmb3JlICVzIiwgZWxlbWVudFRleHQoKS5sYXRpbjEoKS5k YXRhKCkpOworICAgIElucHV0TG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c2V0VGV4 dCBSZXF1ZXN0IGJlaW5nIHByb2Nlc3NlZC4gVGV4dCBiZWZvcmUgcHJvY2Vzc2luZzogJyVzJyIs IGVsZW1lbnRUZXh0KCkubGF0aW4xKCkuZGF0YSgpKTsKIAogICAgIGlmICh0ZXh0TGVuZ3RoID09 IDEgJiYgIXNwYW5uYWJsZVN0cmluZy0+c3BhbnNfY291bnQpIHsKICAgICAgICAgLy8gSGFuZGxl IHNpbmdsZSBrZXkgbm9uLWF0dHJpYnV0ZWQgZW50cnkgYXMga2V5IHByZXNzIHJhdGhlciB0aGFu IGluc2VydCB0byBhbGxvdwogICAgICAgICAvLyB0cmlnZ2VyaW5nIG9mIGphdmFzY3JpcHQgZXZl bnRzLgotCisgICAgICAgIElucHV0TG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c2V0 VGV4dCBTaW5nbGUgY2hhcmFjdGVyIGVudHJ5IHRyZWF0ZWQgYXMga2V5LXByZXNzIGluIHRoZSBh YnNlbnNlIG9mIHNwYW5zLiBcbiIpOwogICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1 dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNlcnRbMF0sIFBsYXRmb3JtOjpLZXli b2FyZEV2ZW50OjpLZXlDaGFyLCAwKSwgdHJ1ZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9u ICovKTsKICAgICB9CiAKICAgICAvLyBQZXJmb3JtIHRoZSB0ZXh0IGNoYW5nZSBhcyBhIHNpbmds ZSBjb21tYW5kIGlmIHRoZXJlIGlzIG9uZS4KICAgICBpZiAoIXRleHRUb0luc2VydC5pc0VtcHR5 KCkgJiYgIWVkaXRvci0+Y29tbWFuZCgiSW5zZXJ0VGV4dCIpLmV4ZWN1dGUodGV4dFRvSW5zZXJ0 KSkgewotICAgICAgICBJbnB1dExvZyhMb2dMZXZlbFdhcm4sICJJbnB1dEhhbmRsZXI6OnNldFRl eHQgRmFpbGVkIHRvIGluc2VydCB0ZXh0ICVzIiwgdGV4dFRvSW5zZXJ0LmxhdGluMSgpLmRhdGEo KSk7CisgICAgICAgIElucHV0TG9nKExvZ0xldmVsV2FybiwgIklucHV0SGFuZGxlcjo6c2V0VGV4 dCBGYWlsZWQgdG8gaW5zZXJ0IHRleHQgJyVzJyIsIHRleHRUb0luc2VydC5sYXRpbjEoKS5kYXRh KCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgSW5wdXRMb2coTG9nTGV2 ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRUZXh0IFJlcXVlc3QgYmVpbmcgcHJvY2Vzc2VkIFRl eHQgYWZ0ZXIgaW5zZXJ0ICVzIiwgZWxlbWVudFRleHQoKS5sYXRpbjEoKS5kYXRhKCkpOwotCiAg ICAgaWYgKHJlcXVpcmVzU3BhY2VLZXlQcmVzcykKICAgICAgICAgaGFuZGxlS2V5Ym9hcmRJbnB1 dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCgzMiAvKiBzcGFjZSAqLywgUGxhdGZvcm06OktleWJv YXJkRXZlbnQ6OktleUNoYXIsIDApLCB0cnVlIC8qIGNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24g Ki8pOwogCi0gICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRUZXh0 IFRleHQgYWZ0ZXIgJXMiLCBlbGVtZW50VGV4dCgpLmxhdGluMSgpLmRhdGEoKSk7CisgICAgSW5w dXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRUZXh0IFJlcXVlc3QgYmVpbmcg cHJvY2Vzc2VkLiBUZXh0IGFmdGVyIHByb2Nlc3NpbmcgJyVzJyIsIGVsZW1lbnRUZXh0KCkubGF0 aW4xKCkuZGF0YSgpKTsKIAogICAgIHJldHVybiB0cnVlOwogfQo=