58569 2011-04-14 14:17:31 -0700 Remove calls to deprecatedOffset and deprecatedNode in TypingCommand 2011-04-19 18:18:10 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 52099 1 rniwa webkit-unassigned darin enrica eric leviw ojan rniwa tkent tony oldest_to_newest 386027 0 rniwa 2011-04-14 14:17:31 -0700 This is a cleanup 386028 1 89644 rniwa 2011-04-14 14:22:43 -0700 Created attachment 89644 cleanup 388585 2 rniwa 2011-04-19 10:41:12 -0700 Any reviewers interested in reviewing this patch? 388595 3 89644 eric 2011-04-19 10:50:48 -0700 Comment on attachment 89644 cleanup LGTM. 388597 4 rniwa 2011-04-19 10:51:19 -0700 (In reply to comment #3) > (From update of attachment 89644 [details]) > LGTM. Yay! Thanks for the review. 388979 5 89644 rniwa 2011-04-19 18:18:06 -0700 Comment on attachment 89644 cleanup Clearing flags on attachment: 89644 Committed r84326: <http://trac.webkit.org/changeset/84326> 388980 6 rniwa 2011-04-19 18:18:10 -0700 All reviewed patches have been landed. Closing bug. 89644 2011-04-14 14:22:43 -0700 2011-04-19 18:18:06 -0700 cleanup bug-58569-20110414142242.patch text/plain 6562 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzODk0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTQgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGNhbGxzIHRvIGRlcHJlY2F0ZWRPZmZzZXQgYW5kIGRl cHJlY2F0ZWROb2RlIGluIFR5cGluZ0NvbW1hbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU4NTY5CisKKyAgICAgICAgUmVtb3ZlZCBhbGwgY2FsbHMg dG8gZGVwcmVjYXRlZE9mZnNldCBhbmQgZGVwcmVjYXRlZE5vZGUuCisKKyAgICAgICAgKiBlZGl0 aW5nL1R5cGluZ0NvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VHlwaW5nQ29tbWFuZDo6 aW5zZXJ0VGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpUeXBpbmdDb21tYW5kOjpkZWxldGVLZXlQ cmVzc2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlR5cGluZ0NvbW1hbmQ6OmZvcndhcmREZWxldGVL ZXlQcmVzc2VkKToKKwogMjAxMS0wNC0xNCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogU291cmNl L1dlYkNvcmUvZWRpdGluZy9UeXBpbmdDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1R5cGluZ0NvbW1hbmQuY3BwCShyZXZpc2lvbiA4MzgwNykKKysrIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvVHlwaW5nQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE3MiwxNCArMTcyLDE0IEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6aW5zZXJ0VGV4dChEb2N1bWVu dCoKICAgICBWaXNpYmxlU2VsZWN0aW9uIGN1cnJlbnRTZWxlY3Rpb24gPSBmcmFtZS0+c2VsZWN0 aW9uKCktPnNlbGVjdGlvbigpOwogICAgIGJvb2wgY2hhbmdlU2VsZWN0aW9uID0gY3VycmVudFNl bGVjdGlvbiAhPSBzZWxlY3Rpb25Gb3JJbnNlcnRpb247CiAgICAgU3RyaW5nIG5ld1RleHQgPSB0 ZXh0OwotICAgIE5vZGUqIHN0YXJ0Tm9kZSA9IHNlbGVjdGlvbkZvckluc2VydGlvbi5zdGFydCgp LmRlcHJlY2F0ZWROb2RlKCk7Ci0gICAgCi0gICAgaWYgKHN0YXJ0Tm9kZSAmJiBzdGFydE5vZGUt PnJvb3RFZGl0YWJsZUVsZW1lbnQoKSAmJiBjb21wb3NpdGlvblR5cGUgIT0gVGV4dENvbXBvc2l0 aW9uVXBkYXRlKSB7Ci0gICAgICAgIC8vIFNlbmQgQmVmb3JlVGV4dEluc2VydGVkRXZlbnQuIFRo ZSBldmVudCBoYW5kbGVyIHdpbGwgdXBkYXRlIHRleHQgaWYgbmVjZXNzYXJ5LgotICAgICAgICBF eGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICAgICAgUmVmUHRyPEJlZm9yZVRleHRJbnNlcnRlZEV2 ZW50PiBldnQgPSBCZWZvcmVUZXh0SW5zZXJ0ZWRFdmVudDo6Y3JlYXRlKHRleHQpOwotICAgICAg ICBzdGFydE5vZGUtPnJvb3RFZGl0YWJsZUVsZW1lbnQoKS0+ZGlzcGF0Y2hFdmVudChldnQsIGVj KTsKLSAgICAgICAgbmV3VGV4dCA9IGV2dC0+dGV4dCgpOworICAgIGlmIChOb2RlKiBzdGFydE5v ZGUgPSBzZWxlY3Rpb25Gb3JJbnNlcnRpb24uc3RhcnQoKS5jb250YWluZXJOb2RlKCkpIHsKKyAg ICAgICAgaWYgKHN0YXJ0Tm9kZS0+cm9vdEVkaXRhYmxlRWxlbWVudCgpICYmIGNvbXBvc2l0aW9u VHlwZSAhPSBUZXh0Q29tcG9zaXRpb25VcGRhdGUpIHsKKyAgICAgICAgICAgIC8vIFNlbmQgQmVm b3JlVGV4dEluc2VydGVkRXZlbnQuIFRoZSBldmVudCBoYW5kbGVyIHdpbGwgdXBkYXRlIHRleHQg aWYgbmVjZXNzYXJ5LgorICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CisgICAgICAg ICAgICBSZWZQdHI8QmVmb3JlVGV4dEluc2VydGVkRXZlbnQ+IGV2dCA9IEJlZm9yZVRleHRJbnNl cnRlZEV2ZW50OjpjcmVhdGUodGV4dCk7CisgICAgICAgICAgICBzdGFydE5vZGUtPnJvb3RFZGl0 YWJsZUVsZW1lbnQoKS0+ZGlzcGF0Y2hFdmVudChldnQsIGVjKTsKKyAgICAgICAgICAgIG5ld1Rl eHQgPSBldnQtPnRleHQoKTsKKyAgICAgICAgfQogICAgIH0KICAgICAKICAgICBpZiAobmV3VGV4 dC5pc0VtcHR5KCkpCkBAIC01MDYsNyArNTA2LDcgQEAgdm9pZCBUeXBpbmdDb21tYW5kOjpkZWxl dGVLZXlQcmVzc2VkKFRleAogCiAgICAgICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlU3RhcnQo ZW5kaW5nU2VsZWN0aW9uKCkudmlzaWJsZVN0YXJ0KCkpOwogICAgICAgICAvLyBJZiB3ZSBoYXZl IGEgY2FyZXQgc2VsZWN0aW9uIG9uIGFuIGVtcHR5IGNlbGwsIHdlIGhhdmUgbm90aGluZyB0byBk by4KLSAgICAgICAgaWYgKGlzRW1wdHlUYWJsZUNlbGwodmlzaWJsZVN0YXJ0LmRlZXBFcXVpdmFs ZW50KCkuZGVwcmVjYXRlZE5vZGUoKSkpCisgICAgICAgIGlmIChpc0VtcHR5VGFibGVDZWxsKHZp c2libGVTdGFydC5kZWVwRXF1aXZhbGVudCgpLmNvbnRhaW5lck5vZGUoKSkpCiAgICAgICAgICAg ICByZXR1cm47CiAKICAgICAgICAgLy8gSWYgdGhlIGNhcmV0IGlzIGF0IHRoZSBzdGFydCBvZiBh IHBhcmFncmFwaCBhZnRlciBhIHRhYmxlLCBtb3ZlIGNvbnRlbnQgaW50byB0aGUgbGFzdCB0YWJs ZSBjZWxsLgpAQCAtNTI1LDcgKzUyNSw4IEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6ZGVsZXRlS2V5 UHJlc3NlZChUZXgKIAogICAgICAgICBzZWxlY3Rpb25Ub0RlbGV0ZSA9IHNlbGVjdGlvbi5zZWxl Y3Rpb24oKTsKIAotICAgICAgICBpZiAoZ3JhbnVsYXJpdHkgPT0gQ2hhcmFjdGVyR3JhbnVsYXJp dHkgJiYgc2VsZWN0aW9uVG9EZWxldGUuZW5kKCkuZGVwcmVjYXRlZE5vZGUoKSA9PSBzZWxlY3Rp b25Ub0RlbGV0ZS5zdGFydCgpLmRlcHJlY2F0ZWROb2RlKCkgJiYgc2VsZWN0aW9uVG9EZWxldGUu ZW5kKCkuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSAtIHNlbGVjdGlvblRvRGVsZXRlLnN0YXJ0 KCkuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSA+IDEpIHsKKyAgICAgICAgaWYgKGdyYW51bGFy aXR5ID09IENoYXJhY3RlckdyYW51bGFyaXR5ICYmIHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmNv bnRhaW5lck5vZGUoKSA9PSBzZWxlY3Rpb25Ub0RlbGV0ZS5zdGFydCgpLmNvbnRhaW5lck5vZGUo KQorICAgICAgICAgICAgJiYgc2VsZWN0aW9uVG9EZWxldGUuZW5kKCkuY29tcHV0ZU9mZnNldElu Q29udGFpbmVyTm9kZSgpIC0gc2VsZWN0aW9uVG9EZWxldGUuc3RhcnQoKS5jb21wdXRlT2Zmc2V0 SW5Db250YWluZXJOb2RlKCkgPiAxKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGVyZSBhcmUgbXVs dGlwbGUgVW5pY29kZSBjb2RlIHBvaW50cyB0byBiZSBkZWxldGVkLCBhZGp1c3QgdGhlIHJhbmdl IHRvIG1hdGNoIHBsYXRmb3JtIGNvbnZlbnRpb25zLgogICAgICAgICAgICAgc2VsZWN0aW9uVG9E ZWxldGUuc2V0V2l0aG91dFZhbGlkYXRpb24oc2VsZWN0aW9uVG9EZWxldGUuZW5kKCksIHNlbGVj dGlvblRvRGVsZXRlLmVuZCgpLnByZXZpb3VzKEJhY2t3YXJkRGVsZXRpb24pKTsKICAgICAgICAg fQpAQCAtNTkyLDggKzU5Myw5IEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6Zm9yd2FyZERlbGV0ZUtl eVByZXMKICAgICAgICAgaWYgKHZpc2libGVFbmQgPT0gZW5kT2ZQYXJhZ3JhcGgodmlzaWJsZUVu ZCkpCiAgICAgICAgICAgICBkb3duc3RyZWFtRW5kID0gdmlzaWJsZUVuZC5uZXh0KENhbm5vdENy b3NzRWRpdGluZ0JvdW5kYXJ5KS5kZWVwRXF1aXZhbGVudCgpLmRvd25zdHJlYW0oKTsKICAgICAg ICAgLy8gV2hlbiBkZWxldGluZyB0YWJsZXM6IFNlbGVjdCB0aGUgdGFibGUgZmlyc3QsIHRoZW4g cGVyZm9ybSB0aGUgZGVsZXRpb24KLSAgICAgICAgaWYgKGRvd25zdHJlYW1FbmQuZGVwcmVjYXRl ZE5vZGUoKSAmJiBkb3duc3RyZWFtRW5kLmRlcHJlY2F0ZWROb2RlKCktPnJlbmRlcmVyKCkgJiYg ZG93bnN0cmVhbUVuZC5kZXByZWNhdGVkTm9kZSgpLT5yZW5kZXJlcigpLT5pc1RhYmxlKCkgJiYg IWRvd25zdHJlYW1FbmQuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSkgewotICAgICAgICAgICAg c2V0RW5kaW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24oZW5kaW5nU2VsZWN0aW9uKCkuZW5k KCksIHBvc2l0aW9uQWZ0ZXJOb2RlKGRvd25zdHJlYW1FbmQuZGVwcmVjYXRlZE5vZGUoKSksIERP V05TVFJFQU0pKTsKKyAgICAgICAgaWYgKGRvd25zdHJlYW1FbmQuY29udGFpbmVyTm9kZSgpICYm IGRvd25zdHJlYW1FbmQuY29udGFpbmVyTm9kZSgpLT5yZW5kZXJlcigpICYmIGRvd25zdHJlYW1F bmQuY29udGFpbmVyTm9kZSgpLT5yZW5kZXJlcigpLT5pc1RhYmxlKCkKKyAgICAgICAgICAgICYm IGRvd25zdHJlYW1FbmQuY29tcHV0ZU9mZnNldEluQ29udGFpbmVyTm9kZSgpIDw9IGNhcmV0TWlu T2Zmc2V0KGRvd25zdHJlYW1FbmQuY29udGFpbmVyTm9kZSgpKSkgeworICAgICAgICAgICAgc2V0 RW5kaW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24oZW5kaW5nU2VsZWN0aW9uKCkuZW5kKCks IHBvc2l0aW9uQWZ0ZXJOb2RlKGRvd25zdHJlYW1FbmQuY29udGFpbmVyTm9kZSgpKSwgRE9XTlNU UkVBTSkpOwogICAgICAgICAgICAgdHlwaW5nQWRkZWRUb09wZW5Db21tYW5kKEZvcndhcmREZWxl dGVLZXkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC02MTAsMTUgKzYxMiwx NSBAQCB2b2lkIFR5cGluZ0NvbW1hbmQ6OmZvcndhcmREZWxldGVLZXlQcmVzCiAgICAgICAgICAg ICAvLyBXZSBjYW4ndCBsZXQgdGhlIFZpc2libGVTZWxlY3Rpb24gY2xhc3MncyB2YWxpZGF0aW9u IGtpY2sgaW4gb3IgaXQnbGwgYWRqdXN0IGZvciB1cyBiYXNlZCBvbgogICAgICAgICAgICAgLy8g dGhlIGN1cnJlbnQgc3RhdGUgb2YgdGhlIGRvY3VtZW50IGFuZCB3ZSdsbCBnZXQgdGhlIHdyb25n IHJlc3VsdC4KICAgICAgICAgICAgIFBvc2l0aW9uIGV4dGVudCA9IHN0YXJ0aW5nU2VsZWN0aW9u KCkuZW5kKCk7Ci0gICAgICAgICAgICBpZiAoZXh0ZW50LmRlcHJlY2F0ZWROb2RlKCkgIT0gc2Vs ZWN0aW9uVG9EZWxldGUuZW5kKCkuZGVwcmVjYXRlZE5vZGUoKSkKKyAgICAgICAgICAgIGlmIChl eHRlbnQuY29udGFpbmVyTm9kZSgpICE9IHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmNvbnRhaW5l ck5vZGUoKSkKICAgICAgICAgICAgICAgICBleHRlbnQgPSBzZWxlY3Rpb25Ub0RlbGV0ZS5leHRl bnQoKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIGludCBleHRyYUNoYXJh Y3RlcnM7Ci0gICAgICAgICAgICAgICAgaWYgKHNlbGVjdGlvblRvRGVsZXRlLnN0YXJ0KCkuZGVw cmVjYXRlZE5vZGUoKSA9PSBzZWxlY3Rpb25Ub0RlbGV0ZS5lbmQoKS5kZXByZWNhdGVkTm9kZSgp KQotICAgICAgICAgICAgICAgICAgICBleHRyYUNoYXJhY3RlcnMgPSBzZWxlY3Rpb25Ub0RlbGV0 ZS5lbmQoKS5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpIC0gc2VsZWN0aW9uVG9EZWxldGUuc3Rh cnQoKS5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpOworICAgICAgICAgICAgICAgIGlmIChzZWxl Y3Rpb25Ub0RlbGV0ZS5zdGFydCgpLmNvbnRhaW5lck5vZGUoKSA9PSBzZWxlY3Rpb25Ub0RlbGV0 ZS5lbmQoKS5jb250YWluZXJOb2RlKCkpCisgICAgICAgICAgICAgICAgICAgIGV4dHJhQ2hhcmFj dGVycyA9IHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5v ZGUoKSAtIHNlbGVjdGlvblRvRGVsZXRlLnN0YXJ0KCkuY29tcHV0ZU9mZnNldEluQ29udGFpbmVy Tm9kZSgpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgZXh0cmFD aGFyYWN0ZXJzID0gc2VsZWN0aW9uVG9EZWxldGUuZW5kKCkuZGVwcmVjYXRlZEVkaXRpbmdPZmZz ZXQoKTsKLSAgICAgICAgICAgICAgICBleHRlbnQgPSBQb3NpdGlvbihleHRlbnQuZGVwcmVjYXRl ZE5vZGUoKSwgZXh0ZW50LmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgKyBleHRyYUNoYXJhY3Rl cnMsIFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpOworICAgICAgICAgICAgICAg ICAgICBleHRyYUNoYXJhY3RlcnMgPSBzZWxlY3Rpb25Ub0RlbGV0ZS5lbmQoKS5jb21wdXRlT2Zm c2V0SW5Db250YWluZXJOb2RlKCk7CisgICAgICAgICAgICAgICAgZXh0ZW50ID0gUG9zaXRpb24o ZXh0ZW50LmNvbnRhaW5lck5vZGUoKSwgZXh0ZW50LmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5v ZGUoKSArIGV4dHJhQ2hhcmFjdGVycywgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hv cik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzZWxlY3Rpb25BZnRlclVuZG8uc2V0V2l0 aG91dFZhbGlkYXRpb24oc3RhcnRpbmdTZWxlY3Rpb24oKS5zdGFydCgpLCBleHRlbnQpOwogICAg ICAgICB9Cg==