114383 2013-04-10 14:21:55 -0700 Cleanup local variables in Editor::markAndReplaceFor 2013-04-10 18:25:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114337 1 rniwa rniwa commit-queue enrica jiapu.mail mifenton oldest_to_newest 873241 0 rniwa 2013-04-10 14:21:55 -0700 Cleanup local variables in Editor::markAndReplaceFor 873243 1 197406 rniwa 2013-04-10 14:24:59 -0700 Created attachment 197406 Cleanup 873396 2 197406 enrica 2013-04-10 17:47:33 -0700 Comment on attachment 197406 Cleanup I don't think you can remove the #if USE_AUTOCORRECTION_PANEL, because it is compiled out for iOS. Could you please verify? 873397 3 197406 enrica 2013-04-10 17:50:19 -0700 Comment on attachment 197406 Cleanup Looks good. 873414 4 rniwa 2013-04-10 18:25:53 -0700 Committed r148163: <http://trac.webkit.org/changeset/148163> 197406 2013-04-10 14:24:59 -0700 2013-04-10 17:50:19 -0700 Cleanup bug-114383-20130410142440.patch text/plain 7429 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODEzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA0LTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFudXAgbG9jYWwgdmFyaWFi bGVzIGluIEVkaXRvcjo6bWFya0FuZFJlcGxhY2VGb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDM4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHJlc3VsdEVuZExvY2F0aW9uLCB3aGljaCBp cyB0aGUgc3VtIG9mIHJlc3VsdExvY2F0aW9uIGFuZCByZXN1bHRMZW5ndGguCisKKyAgICAgICAg QWxzbyByZXBsYWNlZCBhbWJpZ3VvdXNCb3VuZGFyeU9mZnNldCBieSB1c2VBbWJpZ3VvdXNCb3Vu ZGFyeU9mZnNldCBzaW5jZSB0aGUgYW1iaWd1b3VzIG9mZnNldCBpcyBhbHdheXMKKyAgICAgICAg c2VsZWN0aW9uT2Zmc2V0IC0xIHRvIGF2b2lkIHRoZSBleHRyYSBob3VzZSBrZWVwaW5nIGFuZCBv Ym5veGlvdXMgLTEgY2hlY2suCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKToKKwogMjAxMy0wNC0xMCAg SGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1c2lv bnNdIFpvb20gY2F1c2VzIHNoYXBlLWluc2lkZSB0byBmYWlsIHdoZW4gc2hhcGUtcGFkZGluZyBp cyBzcGVjaWZpZWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDE0 ODEyNCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjE4MywxMCArMjE4MywxMyBAQCB2b2lkIEVkaXRvcjo6bWFya0FuZFJlcGxhY2VGb3Io UGFzc1JlZlB0CiAgICAgY29uc3QgYm9vbCBzaG91bGRQZXJmb3JtUmVwbGFjZW1lbnQgPSB0ZXh0 Q2hlY2tpbmdPcHRpb25zICYgVGV4dENoZWNraW5nVHlwZVJlcGxhY2VtZW50OwogICAgIGNvbnN0 IGJvb2wgc2hvdWxkU2hvd0NvcnJlY3Rpb25QYW5lbCA9IHRleHRDaGVja2luZ09wdGlvbnMgJiBU ZXh0Q2hlY2tpbmdUeXBlU2hvd0NvcnJlY3Rpb25QYW5lbDsKICAgICBjb25zdCBib29sIHNob3Vs ZENoZWNrRm9yQ29ycmVjdGlvbiA9IHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwgfHwgKHRleHRD aGVja2luZ09wdGlvbnMgJiBUZXh0Q2hlY2tpbmdUeXBlQ29ycmVjdGlvbik7CisjaWYgIVVTRShB VVRPQ09SUkVDVElPTl9QQU5FTCkKKyAgICBBU1NFUlQoIXNob3VsZFNob3dDb3JyZWN0aW9uUGFu ZWwpOworI2VuZGlmCiAKICAgICAvLyBFeHBhbmQgdGhlIHJhbmdlIHRvIGVuY29tcGFzcyBlbnRp cmUgcGFyYWdyYXBocywgc2luY2UgdGV4dCBjaGVja2luZyBuZWVkcyB0aGF0IG11Y2ggY29udGV4 dC4KICAgICBpbnQgc2VsZWN0aW9uT2Zmc2V0ID0gMDsKLSAgICBpbnQgYW1iaWd1b3VzQm91bmRh cnlPZmZzZXQgPSAtMTsKKyAgICBib29sIHVzZUFtYmlndW91c0JvdW5kYXJ5T2Zmc2V0ID0gZmFs c2U7CiAgICAgYm9vbCBzZWxlY3Rpb25DaGFuZ2VkID0gZmFsc2U7CiAgICAgYm9vbCByZXN0b3Jl U2VsZWN0aW9uQWZ0ZXJDaGFuZ2UgPSBmYWxzZTsKICAgICBib29sIGFkanVzdFNlbGVjdGlvbkZv clBhcmFncmFwaEJvdW5kYXJpZXMgPSBmYWxzZTsKQEAgLTIyMDAsNyArMjIwMyw3IEBAIHZvaWQg RWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihQYXNzUmVmUHQKICAgICAgICAgICAgIGlmIChzZWxl Y3Rpb25PZmZzZXQgPiAwICYmIChzZWxlY3Rpb25PZmZzZXQgPiBwYXJhZ3JhcGgudGV4dExlbmd0 aCgpIHx8IHBhcmFncmFwaC50ZXh0Q2hhckF0KHNlbGVjdGlvbk9mZnNldCAtIDEpID09IG5ld2xp bmVDaGFyYWN0ZXIpKQogICAgICAgICAgICAgICAgIGFkanVzdFNlbGVjdGlvbkZvclBhcmFncmFw aEJvdW5kYXJpZXMgPSB0cnVlOwogICAgICAgICAgICAgaWYgKHNlbGVjdGlvbk9mZnNldCA+IDAg JiYgc2VsZWN0aW9uT2Zmc2V0IDw9IHBhcmFncmFwaC50ZXh0TGVuZ3RoKCkgJiYgaXNBbWJpZ3Vv dXNCb3VuZGFyeUNoYXJhY3RlcihwYXJhZ3JhcGgudGV4dENoYXJBdChzZWxlY3Rpb25PZmZzZXQg LSAxKSkpCi0gICAgICAgICAgICAgICAgYW1iaWd1b3VzQm91bmRhcnlPZmZzZXQgPSBzZWxlY3Rp b25PZmZzZXQgLSAxOworICAgICAgICAgICAgICAgIHVzZUFtYmlndW91c0JvdW5kYXJ5T2Zmc2V0 ID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjIxMSw4ICsyMjE0LDkgQEAgdm9pZCBF ZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKFBhc3NSZWZQdAogICAgICAgICBjb25zdCBUZXh0Q2hl Y2tpbmdUeXBlIHJlc3VsdFR5cGUgPSByZXN1bHRzW2ldLnR5cGU7CiAgICAgICAgIGNvbnN0IGlu dCByZXN1bHRMb2NhdGlvbiA9IHJlc3VsdHNbaV0ubG9jYXRpb24gKyBvZmZzZXREdWVUb1JlcGxh Y2VtZW50OwogICAgICAgICBjb25zdCBpbnQgcmVzdWx0TGVuZ3RoID0gcmVzdWx0c1tpXS5sZW5n dGg7CisgICAgICAgIGNvbnN0IGludCByZXN1bHRFbmRMb2NhdGlvbiA9IHJlc3VsdExvY2F0aW9u ICsgcmVzdWx0TGVuZ3RoOwogICAgICAgICBjb25zdCBTdHJpbmcmIHJlcGxhY2VtZW50ID0gcmVz dWx0c1tpXS5yZXBsYWNlbWVudDsKLSAgICAgICAgY29uc3QgYm9vbCByZXN1bHRFbmRzQXRBbWJp Z3VvdXNCb3VuZGFyeSA9IGFtYmlndW91c0JvdW5kYXJ5T2Zmc2V0ID49IDAgJiYgcmVzdWx0TG9j YXRpb24gKyByZXN1bHRMZW5ndGggPT0gYW1iaWd1b3VzQm91bmRhcnlPZmZzZXQ7CisgICAgICAg IGNvbnN0IGJvb2wgcmVzdWx0RW5kc0F0QW1iaWd1b3VzQm91bmRhcnkgPSB1c2VBbWJpZ3VvdXNC b3VuZGFyeU9mZnNldCAmJiByZXN1bHRFbmRMb2NhdGlvbiA9PSBzZWxlY3Rpb25PZmZzZXQgLSAx OwogCiAgICAgICAgIC8vIE9ubHkgbWFyayBtaXNzcGVsbGluZyBpZjoKICAgICAgICAgLy8gMS4g Q3VycmVudCB0ZXh0IGNoZWNraW5nIGlzbid0IGRvbmUgZm9yIGF1dG9jb3JyZWN0aW9uLCBpbiB3 aGljaCBjYXNlIHNob3VsZE1hcmtTcGVsbGluZyBpcyBmYWxzZS4KQEAgLTIyMjAsNyArMjIyNCw3 IEBAIHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihQYXNzUmVmUHQKICAgICAgICAgLy8g My4gVGhlIHdvcmQgaW4gcXVlc3Rpb24gZG9lc24ndCBlbmQgYXQgYW4gYW1iaWd1b3VzIGJvdW5k YXJ5LiBGb3IgaW5zdGFuY2UsIHdlIHdvdWxkIG5vdCBtYXJrCiAgICAgICAgIC8vICAgICJ3b3Vs ZG4nIiBhcyBtaXNzcGVsbGVkIHJpZ2h0IGFmdGVyIGFwb3N0cm9waGUgaXMgdHlwZWQuCiAgICAg ICAgIGlmIChzaG91bGRNYXJrU3BlbGxpbmcgJiYgIXNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwg JiYgcmVzdWx0VHlwZSA9PSBUZXh0Q2hlY2tpbmdUeXBlU3BlbGxpbmcKLSAgICAgICAgICAgICYm IHJlc3VsdExvY2F0aW9uID49IHBhcmFncmFwaC5jaGVja2luZ1N0YXJ0KCkgJiYgcmVzdWx0TG9j YXRpb24gKyByZXN1bHRMZW5ndGggPD0gc3BlbGxpbmdSYW5nZUVuZE9mZnNldCAmJiAhcmVzdWx0 RW5kc0F0QW1iaWd1b3VzQm91bmRhcnkpIHsKKyAgICAgICAgICAgICYmIHJlc3VsdExvY2F0aW9u ID49IHBhcmFncmFwaC5jaGVja2luZ1N0YXJ0KCkgJiYgcmVzdWx0RW5kTG9jYXRpb24gPD0gc3Bl bGxpbmdSYW5nZUVuZE9mZnNldCAmJiAhcmVzdWx0RW5kc0F0QW1iaWd1b3VzQm91bmRhcnkpIHsK ICAgICAgICAgICAgIEFTU0VSVChyZXN1bHRMZW5ndGggPiAwICYmIHJlc3VsdExvY2F0aW9uID49 IDApOwogICAgICAgICAgICAgUmVmUHRyPFJhbmdlPiBtaXNzcGVsbGluZ1JhbmdlID0gcGFyYWdy YXBoLnN1YnJhbmdlKHJlc3VsdExvY2F0aW9uLCByZXN1bHRMZW5ndGgpOwogICAgICAgICAgICAg aWYgKCFtX2FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXItPmlzU3BlbGxpbmdNYXJrZXJBbGxvd2Vk KG1pc3NwZWxsaW5nUmFuZ2UpKQpAQCAtMjIzNywxMiArMjI0MSwxMiBAQCB2b2lkIEVkaXRvcjo6 bWFya0FuZFJlcGxhY2VGb3IoUGFzc1JlZlB0CiAgICAgICAgICAgICAgICAgICAgIGJhZEdyYW1t YXJSYW5nZS0+c3RhcnRDb250YWluZXIoKS0+ZG9jdW1lbnQoKS0+bWFya2VycygpLT5hZGRNYXJr ZXIoYmFkR3JhbW1hclJhbmdlLmdldCgpLCBEb2N1bWVudE1hcmtlcjo6R3JhbW1hciwgZGV0YWls LnVzZXJEZXNjcmlwdGlvbik7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAg ICAgICB9IGVsc2UgaWYgKHJlc3VsdExvY2F0aW9uICsgcmVzdWx0TGVuZ3RoIDw9IHNwZWxsaW5n UmFuZ2VFbmRPZmZzZXQgJiYgcmVzdWx0TG9jYXRpb24gKyByZXN1bHRMZW5ndGggPj0gcGFyYWdy YXBoLmNoZWNraW5nU3RhcnQoKQorICAgICAgICB9IGVsc2UgaWYgKHJlc3VsdEVuZExvY2F0aW9u IDw9IHNwZWxsaW5nUmFuZ2VFbmRPZmZzZXQgJiYgcmVzdWx0RW5kTG9jYXRpb24gPj0gcGFyYWdy YXBoLmNoZWNraW5nU3RhcnQoKQogICAgICAgICAgICAgJiYgaXNBdXRvbWF0aWNUZXh0UmVwbGFj ZW1lbnRUeXBlKHJlc3VsdFR5cGUpKSB7CiAgICAgICAgICAgICAvLyBJbiB0aGlzIGNhc2UgdGhl IHJlc3VsdCByYW5nZSBqdXN0IGhhcyB0byB0b3VjaCB0aGUgc3BlbGxpbmcgcmFuZ2UsIHNvIHdl IGNhbiBoYW5kbGUgcmVwbGFjaW5nIG5vbi13b3JkIHRleHQgc3VjaCBhcyBwdW5jdHVhdGlvbi4K ICAgICAgICAgICAgIEFTU0VSVChyZXN1bHRMZW5ndGggPiAwICYmIHJlc3VsdExvY2F0aW9uID49 IDApOwogCi0gICAgICAgICAgICBpZiAoc2hvdWxkU2hvd0NvcnJlY3Rpb25QYW5lbCAmJiAocmVz dWx0TG9jYXRpb24gKyByZXN1bHRMZW5ndGggPCBzcGVsbGluZ1JhbmdlRW5kT2Zmc2V0IHx8IHJl c3VsdFR5cGUgIT0gVGV4dENoZWNraW5nVHlwZUNvcnJlY3Rpb24pKQorICAgICAgICAgICAgaWYg KHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwgJiYgKHJlc3VsdEVuZExvY2F0aW9uIDwgc3BlbGxp bmdSYW5nZUVuZE9mZnNldCB8fCByZXN1bHRUeXBlICE9IFRleHRDaGVja2luZ1R5cGVDb3JyZWN0 aW9uKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgLy8gQXBwbHkg cmVwbGFjZW1lbnQgaWY6CkBAIC0yMjUzLDkgKzIyNTcsNyBAQCB2b2lkIEVkaXRvcjo6bWFya0Fu ZFJlcGxhY2VGb3IoUGFzc1JlZlB0CiAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlVG9S ZXBsYWNlID0gcGFyYWdyYXBoLnN1YnJhbmdlKHJlc3VsdExvY2F0aW9uLCByZXN1bHRMZW5ndGgp OwogCiAgICAgICAgICAgICAvLyBhZGRpbmcgbGlua3Mgc2hvdWxkIGJlIGRvbmUgb25seSBpbW1l ZGlhdGVseSBhZnRlciB0aGV5IGFyZSB0eXBlZAotICAgICAgICAgICAgaW50IHJlc3VsdEVuZCA9 IHJlc3VsdExvY2F0aW9uICsgcmVzdWx0TGVuZ3RoOwotICAgICAgICAgICAgaWYgKHJlc3VsdFR5 cGUgPT0gVGV4dENoZWNraW5nVHlwZUxpbmsKLSAgICAgICAgICAgICAgICAmJiAoc2VsZWN0aW9u T2Zmc2V0ID4gcmVzdWx0RW5kICsgMSB8fCBzZWxlY3Rpb25PZmZzZXQgPD0gcmVzdWx0TG9jYXRp b24pKQorICAgICAgICAgICAgaWYgKHJlc3VsdFR5cGUgPT0gVGV4dENoZWNraW5nVHlwZUxpbmsg JiYgKHNlbGVjdGlvbk9mZnNldCA+IHJlc3VsdEVuZExvY2F0aW9uICsgMSB8fCBzZWxlY3Rpb25P ZmZzZXQgPD0gcmVzdWx0TG9jYXRpb24pKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAg ICAgICAgICAgICBpZiAoIShzaG91bGRQZXJmb3JtUmVwbGFjZW1lbnQgfHwgc2hvdWxkQ2hlY2tG b3JDb3JyZWN0aW9uIHx8IHNob3VsZE1hcmtMaW5rKSB8fCAhZG9SZXBsYWNlbWVudCkKQEAgLTIy NjcsMTEgKzIyNjksNyBAQCB2b2lkIEVkaXRvcjo6bWFya0FuZFJlcGxhY2VGb3IoUGFzc1JlZlB0 CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIGlmIChzaG91bGRTaG93 Q29ycmVjdGlvblBhbmVsKSB7Ci0jaWYgIVVTRShBVVRPQ09SUkVDVElPTl9QQU5FTCkKLSAgICAg ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSNlbmRpZgotICAgICAgICAgICAgICAg IC8vIHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwgY2FuIGJlIHRydWUgb25seSB3aGVuIHRoZSBw YW5lbCBpcyBhdmFpbGFibGUuCi0gICAgICAgICAgICAgICAgaWYgKHJlc3VsdExvY2F0aW9uICsg cmVzdWx0TGVuZ3RoID09IHNwZWxsaW5nUmFuZ2VFbmRPZmZzZXQpIHsKKyAgICAgICAgICAgICAg ICBpZiAocmVzdWx0RW5kTG9jYXRpb24gPT0gc3BlbGxpbmdSYW5nZUVuZE9mZnNldCkgewogICAg ICAgICAgICAgICAgICAgICAvLyBXZSBvbmx5IHNob3cgdGhlIGNvcnJlY3Rpb24gcGFuZWwgb24g dGhlIGxhc3Qgd29yZC4KICAgICAgICAgICAgICAgICAgICAgbV9hbHRlcm5hdGl2ZVRleHRDb250 cm9sbGVyLT5zaG93KHJhbmdlVG9SZXBsYWNlLCByZXBsYWNlbWVudCk7CiAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwpAQCAtMjMwMiwxMSArMjMwMCw4IEBAIHZvaWQgRWRpdG9yOjptYXJrQW5k UmVwbGFjZUZvcihQYXNzUmVmUHQKIAogICAgICAgICAgICAgICAgIHNlbGVjdGlvbkNoYW5nZWQg PSB0cnVlOwogICAgICAgICAgICAgICAgIG9mZnNldER1ZVRvUmVwbGFjZW1lbnQgKz0gcmVwbGFj ZW1lbnQubGVuZ3RoKCkgLSByZXN1bHRMZW5ndGg7Ci0gICAgICAgICAgICAgICAgaWYgKHJlc3Vs dExvY2F0aW9uIDwgc2VsZWN0aW9uT2Zmc2V0KSB7CisgICAgICAgICAgICAgICAgaWYgKHJlc3Vs dExvY2F0aW9uIDwgc2VsZWN0aW9uT2Zmc2V0KQogICAgICAgICAgICAgICAgICAgICBzZWxlY3Rp b25PZmZzZXQgKz0gcmVwbGFjZW1lbnQubGVuZ3RoKCkgLSByZXN1bHRMZW5ndGg7Ci0gICAgICAg ICAgICAgICAgICAgIGlmIChhbWJpZ3VvdXNCb3VuZGFyeU9mZnNldCA+PSAwKQotICAgICAgICAg ICAgICAgICAgICAgICAgYW1iaWd1b3VzQm91bmRhcnlPZmZzZXQgPSBzZWxlY3Rpb25PZmZzZXQg LSAxOwotICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIC8vIEFkZCBhIG1hcmtl ciBzbyB0aGF0IGNvcnJlY3Rpb25zIGNhbiBlYXNpbHkgYmUgdW5kb25lIGFuZCB3b24ndCBiZSBy ZS1jb3JyZWN0ZWQuCiAgICAgICAgICAgICAgICAgaWYgKHJlc3VsdFR5cGUgPT0gVGV4dENoZWNr aW5nVHlwZUNvcnJlY3Rpb24pCg==