36119 2010-03-15 08:22:34 -0700 Method name and parameter name mistakes from recent SPI addition 2010-03-15 08:41:51 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 sullivan sullivan oldest_to_newest 199664 0 sullivan 2010-03-15 08:22:34 -0700 A method named "setAllowScrollersToOverlapContent:" was recently added as Mac-only SPI in WebFrame and WebDynamicScrollBarsView. This name should be "setAllows…" to match other usage. Also, parameters for -[WebDynamicScrollBarsView setAlwaysHideHorizontalScroller:] and -setAlwaysHideVerticalScroller: (which were added together with -setAllowScrollersToOverlapContent:) have reversed boolean-style names in the implementation, which is confusing. 199668 1 50710 sullivan 2010-03-15 08:35:23 -0700 Created attachment 50710 Patch to rename recently-added methods, instance variable, and parameters. These methods are used only on Safari at this point. I will also update Safari for these renamings. 199671 2 sullivan 2010-03-15 08:41:51 -0700 Committed in 55997. 50710 2010-03-15 08:35:23 -0700 2010-03-15 08:39:38 -0700 Patch to rename recently-added methods, instance variable, and parameters. WebKitRenaming_patch.txt text/plain 7337 sullivan SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTk5NSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTAtMDMtMTUgIEpvaG4gU3VsbGl2YW4gIDxzdWxs aXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWV0aG9kIG5hbWUgYW5kIHBhcmFtZXRlciBuYW1l IG1pc3Rha2VzIGZyb20gcmVjZW50IFNQSSBhZGRpdGlvbgorICAgICAgICA8aHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTE5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFy c1ZpZXcuaDoKKyAgICAgICAgUmVuYW1lZCBpbnN0YW5jZSB2YXJpYWJsZSBhbmQgbWV0aG9kIG5h bWUgZnJvbSAic2V0QWxsb3dYWFgiIHRvICJzZXRBbGxvd3NYWFgiLgorICAgICAgICAKKyAgICAg ICAgKiBXZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbToKKyAgICAgICAgKC1bV2Vi RHluYW1pY1Njcm9sbEJhcnNWaWV3IHNldEFsbG93c1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6 XSk6CisgICAgICAgIFVwZGF0ZWQgZm9yIHJlbmFtZWQgaW5zdGFuY2UgdmFyaWFibGUgYW5kIG1l dGhvZC4KKyAgICAgICAgKC1bV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IHNldEFsd2F5c0hpZGVI b3Jpem9udGFsU2Nyb2xsZXI6XSk6CisgICAgICAgIENoYW5nZWQgcGFyYW1ldGVyIG5hbWUgZnJv bSBzaG91bGRCZVZpc2libGUgdG8gc2hvdWxkQmVIaWRkZW4uCisgICAgICAgICgtW1dlYkR5bmFt aWNTY3JvbGxCYXJzVmlldyBzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjpdKToKKyAgICAg ICAgRGl0dG8uCisgICAgICAgICgtW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBjb250ZW50Vmll d0ZyYW1lXSk6CisgICAgICAgIFVwZGF0ZWQgZm9yIHJlbmFtZWQgaW5zdGFuY2UgdmFyaWFibGUu CisgICAgICAgICgtW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyB0aWxlXSk6CisgICAgICAgIERp dHRvLgorICAgICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgcmVmbGVjdFNjcm9sbGVk Q2xpcFZpZXc6XSk6CisgICAgICAgIERpdHRvLgorCisgICAgICAgICogV2ViVmlldy9XZWJGcmFt ZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUgc2V0QWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFwQ29u dGVudDpdKToKKyAgICAgICAgUmVuYW1lZCBtZXRob2QgZnJvbSBzZXRBbGxvd1hYWCwgYW5kIHVw ZGF0ZWQgZm9yIHNhbWUgY2hhbmdlIGluIFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmg6CisgICAgICAgIFJlbmFtZWQgbWV0aG9k IG5hbWUgZnJvbSAic2V0QWxsb3dYWFgiIHRvICJzZXRBbGxvd3NYWFgiLgorCiAyMDEwLTAzLTE0 ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YXJrIFJvd2UuCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNW aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxC YXJzVmlldy5oCShyZXZpc2lvbiA1NTk3NCkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5h bWljU2Nyb2xsQmFyc1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQCBAaW50 ZXJmYWNlIFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyA6IE5TCiAgICAgQk9PTCBob3Jpem9udGFs bHlQaW5uZWRCeVByZXZpb3VzV2hlZWxFdmVudDsKICAgICB1bnNpZ25lZCBpblVwZGF0ZVNjcm9s bGVyc0xheW91dFBhc3M7CiAKLSAgICBCT09MIGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVu dDsKKyAgICBCT09MIGFsbG93c1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ7CiAgICAgQk9PTCBo aWRlSG9yaXpvbnRhbFNjcm9sbGVyOwogICAgIEJPT0wgaGlkZVZlcnRpY2FsU2Nyb2xsZXI7CiB9 CkBAIC01Myw3ICs1Myw3IEBAIEBpbnRlcmZhY2UgV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IDog TlMKIC8vIFBlcmhhcHMgaXQgY2FuIGJlIHJlbW92ZWQuCiAtICh2b2lkKXNldEFsbG93c0hvcml6 b250YWxTY3JvbGxpbmc6KEJPT0wpZmxhZzsKIAotLSAodm9pZClzZXRBbGxvd1Njcm9sbGVyc1Rv T3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZzsKKy0gKHZvaWQpc2V0QWxsb3dzU2Nyb2xsZXJzVG9P dmVybGFwQ29udGVudDooQk9PTClmbGFnOwogLSAodm9pZClzZXRBbHdheXNIaWRlSG9yaXpvbnRh bFNjcm9sbGVyOihCT09MKWZsYWc7CiAtICh2b2lkKXNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9s bGVyOihCT09MKWZsYWc7CiBAZW5kCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1p Y1Njcm9sbEJhcnNWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJE eW5hbWljU2Nyb2xsQmFyc1ZpZXcubW0JKHJldmlzaW9uIDU1OTc0KQorKysgV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTQs MzMgKzU0LDMzIEBAIC0gKHZvaWQpc2V0QWxsb3dzSG9yaXpvbnRhbFNjcm9sbGluZzooQk8KICAg ICBbc2VsZiB1cGRhdGVTY3JvbGxlcnNdOwogfQogCi0tICh2b2lkKXNldEFsbG93U2Nyb2xsZXJz VG9PdmVybGFwQ29udGVudDooQk9PTClmbGFnCistICh2b2lkKXNldEFsbG93c1Njcm9sbGVyc1Rv T3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZwogewotICAgIGlmIChhbGxvd1Njcm9sbGVyc1RvT3Zl cmxhcENvbnRlbnQgPT0gZmxhZykKKyAgICBpZiAoYWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFwQ29u dGVudCA9PSBmbGFnKQogICAgICAgICByZXR1cm47CiAgICAgICAgIAotICAgIGFsbG93U2Nyb2xs ZXJzVG9PdmVybGFwQ29udGVudCA9IGZsYWc7CisgICAgYWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFw Q29udGVudCA9IGZsYWc7CiAgICAgCiAgICAgW1tzZWxmIGNvbnRlbnRWaWV3XSBzZXRGcmFtZTpb c2VsZiBjb250ZW50Vmlld0ZyYW1lXV07CiAgICAgW1tzZWxmIGRvY3VtZW50Vmlld10gc2V0TmVl ZHNMYXlvdXQ6WUVTXTsKICAgICBbW3NlbGYgZG9jdW1lbnRWaWV3XSBsYXlvdXRdOwogfQogCi0t ICh2b2lkKXNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6KEJPT0wpc2hvdWxkQmVWaXNp YmxlCistICh2b2lkKXNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6KEJPT0wpc2hvdWxk QmVIaWRkZW4KIHsKLSAgICBpZiAoaGlkZUhvcml6b250YWxTY3JvbGxlciA9PSBzaG91bGRCZVZp c2libGUpCisgICAgaWYgKGhpZGVIb3Jpem9udGFsU2Nyb2xsZXIgPT0gc2hvdWxkQmVIaWRkZW4p CiAgICAgICAgIHJldHVybjsKIAotICAgIGhpZGVIb3Jpem9udGFsU2Nyb2xsZXIgPSBzaG91bGRC ZVZpc2libGU7CisgICAgaGlkZUhvcml6b250YWxTY3JvbGxlciA9IHNob3VsZEJlSGlkZGVuOwog ICAgIFtzZWxmIHVwZGF0ZVNjcm9sbGVyc107CiB9CiAKLS0gKHZvaWQpc2V0QWx3YXlzSGlkZVZl cnRpY2FsU2Nyb2xsZXI6KEJPT0wpc2hvdWxkQmVWaXNpYmxlCistICh2b2lkKXNldEFsd2F5c0hp ZGVWZXJ0aWNhbFNjcm9sbGVyOihCT09MKXNob3VsZEJlSGlkZGVuCiB7Ci0gICAgaWYgKGhpZGVW ZXJ0aWNhbFNjcm9sbGVyID09IHNob3VsZEJlVmlzaWJsZSkKKyAgICBpZiAoaGlkZVZlcnRpY2Fs U2Nyb2xsZXIgPT0gc2hvdWxkQmVIaWRkZW4pCiAgICAgICAgIHJldHVybjsKICAgICAgICAgCi0g ICAgaGlkZVZlcnRpY2FsU2Nyb2xsZXIgPSBzaG91bGRCZVZpc2libGU7CisgICAgaGlkZVZlcnRp Y2FsU2Nyb2xsZXIgPSBzaG91bGRCZUhpZGRlbjsKICAgICBbc2VsZiB1cGRhdGVTY3JvbGxlcnNd OwogfQogCkBAIC05Myw5ICs5Myw5IEBAIC0gKE5TUmVjdCljb250ZW50Vmlld0ZyYW1lCiAgICAg TlNSZWN0IGZyYW1lID0gW1tzZWxmIGNvbnRlbnRWaWV3XSBmcmFtZV07CiAgICAgCiAgICAgaWYg KFtzZWxmIGhhc0hvcml6b250YWxTY3JvbGxlcl0pCi0gICAgICAgIGZyYW1lLnNpemUuaGVpZ2h0 ID0gKGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudCA/IE5TTWF4WShbW3NlbGYgaG9yaXpv bnRhbFNjcm9sbGVyXSBmcmFtZV0pIDogTlNNaW5ZKFtbc2VsZiBob3Jpem9udGFsU2Nyb2xsZXJd IGZyYW1lXSkpOworICAgICAgICBmcmFtZS5zaXplLmhlaWdodCA9IChhbGxvd3NTY3JvbGxlcnNU b092ZXJsYXBDb250ZW50ID8gTlNNYXhZKFtbc2VsZiBob3Jpem9udGFsU2Nyb2xsZXJdIGZyYW1l XSkgOiBOU01pblkoW1tzZWxmIGhvcml6b250YWxTY3JvbGxlcl0gZnJhbWVdKSk7CiAgICAgaWYg KFtzZWxmIGhhc1ZlcnRpY2FsU2Nyb2xsZXJdKQotICAgICAgICBmcmFtZS5zaXplLndpZHRoID0g KGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudCA/IE5TTWF4WChbW3NlbGYgdmVydGljYWxT Y3JvbGxlcl0gZnJhbWVdKSA6IE5TTWluWChbW3NlbGYgdmVydGljYWxTY3JvbGxlcl0gZnJhbWVd KSk7CisgICAgICAgIGZyYW1lLnNpemUud2lkdGggPSAoYWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFw Q29udGVudCA/IE5TTWF4WChbW3NlbGYgdmVydGljYWxTY3JvbGxlcl0gZnJhbWVdKSA6IE5TTWlu WChbW3NlbGYgdmVydGljYWxTY3JvbGxlcl0gZnJhbWVdKSk7CiAgICAgcmV0dXJuIGZyYW1lOwog fQogCkBAIC0xMDUsNyArMTA1LDcgQEAgLSAodm9pZCl0aWxlCiAKICAgICAvLyBbc3VwZXIgdGls ZV0gc2V0cyB0aGUgY29udGVudFZpZXcgc2l6ZSBzbyB0aGF0IGl0IGRvZXMgbm90IG92ZXJsYXAg d2l0aCB0aGUgc2Nyb2xsZXJzLAogICAgIC8vIHdlIHdhbnQgdG8gcmUtc2V0IHRoZSBjb250ZW50 VmlldyB0byBvdmVybGFwIHNjcm9sbGVycyBiZWZvcmUgZGlzcGxheWluZy4KLSAgICBpZiAoYWxs b3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50KQorICAgIGlmIChhbGxvd3NTY3JvbGxlcnNUb092 ZXJsYXBDb250ZW50KQogICAgICAgICBbW3NlbGYgY29udGVudFZpZXddIHNldEZyYW1lOltzZWxm IGNvbnRlbnRWaWV3RnJhbWVdXTsKIH0KIApAQCAtMjUwLDcgKzI1MCw3IEBAIC0gKHZvaWQpcmVm bGVjdFNjcm9sbGVkQ2xpcFZpZXc6KE5TQ2xpcFYKIHsKICAgICBpZiAoY2xpcFZpZXcgPT0gW3Nl bGYgY29udGVudFZpZXddKSB7CiAgICAgICAgIC8vIFByZXZlbnQgYXBwZWFyYW5jZSBvZiB0cmFp bHMgYmVjYXVzZSBvZiBvdmVybGFwcGluZyB2aWV3cwotICAgICAgICBpZiAoYWxsb3dTY3JvbGxl cnNUb092ZXJsYXBDb250ZW50KQorICAgICAgICBpZiAoYWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFw Q29udGVudCkKICAgICAgICAgICAgIFtzZWxmIHNldERyYXdzQmFja2dyb3VuZDpOT107CiAgICAg CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGhhY2sgaGVyZSBwcmV2ZW50cyBpbmZpbml0ZSByZWN1 cnNpb24gdGhhdCB0YWtlcyBwbGFjZSB3aGVuIHdlCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcv V2ViRnJhbWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1t CShyZXZpc2lvbiA1NTk3NCkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkod29y a2luZyBjb3B5KQpAQCAtMTI4MiwxMCArMTI4MiwxMCBAQCAtIChKU0dsb2JhbENvbnRleHRSZWYp X2dsb2JhbENvbnRleHRGb3JTCiAgICAgcmV0dXJuIHRvR2xvYmFsUmVmKGNvcmVGcmFtZS0+c2Ny aXB0KCktPmdsb2JhbE9iamVjdChjb3JlV29ybGQpLT5nbG9iYWxFeGVjKCkpOwogfQogCi0tICh2 b2lkKXNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDooQk9PTClmbGFnCistICh2b2lk KXNldEFsbG93c1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZwogewogICAgIEFT U0VSVChbW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIGlzS2luZE9mQ2xhc3M6W1dlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldyBjbGFzc11dKTsKLSAgICBbKFdlYkR5bmFtaWNTY3JvbGxCYXJz VmlldyAqKVtbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBzZXRBbGxvd1Njcm9sbGVyc1Rv T3ZlcmxhcENvbnRlbnQ6ZmxhZ107CisgICAgWyhXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgKilb W3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gc2V0QWxsb3dzU2Nyb2xsZXJzVG9PdmVybGFw Q29udGVudDpmbGFnXTsKIH0KIAogLSAodm9pZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9s bGVyOihCT09MKWZsYWcKSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVByaXZhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmgJKHJl dmlzaW9uIDU1OTc0KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjQsNyArMTI0LDcgQEAgQGludGVyZmFjZSBXZWJGcmFtZSAoV2Vi UHJpdmF0ZSkKIC8vIFNldHMgd2hldGhlciB0aGUgc2Nyb2xsYmFycywgaWYgYW55LCBzaG91bGQg YmUgc2hvd24gaW5zaWRlIHRoZSBkb2N1bWVudCdzIGJvcmRlciAKIC8vICh0aHVzIG92ZXJsYXBw aW5nIHNvbWUgY29udGVudCkgb3Igb3V0c2lkZSB0aGUgd2ViVmlldydzIGJvcmRlciAoZGVmYXVs dCBiZWhhdmlvcikuIAogLy8gQ2hhbmdpbmcgdGhpcyBmbGFnIGNoYW5nZXMgdGhlIHNpemUgb2Yg dGhlIGNvbnRlbnRWaWV3IGFuZCBtYWludGFpbnMgdGhlIHNpemUgb2YgdGhlIGZyYW1lVmlldy4K LS0gKHZvaWQpc2V0QWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50OihCT09MKWZsYWc7Cist ICh2b2lkKXNldEFsbG93c1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZzsKIAog Ly8gU2V0cyBpZiB0aGUgc2Nyb2xsYmFyIGlzIGFsd2F5cyBoaWRkZW4sIHJlZ2FyZGxlc3Mgb2Yg b3RoZXIgc2Nyb2xsYmFyIHZpc2liaWxpdHkgc2V0dGluZ3MuIAogLy8gVGhpcyBkb2VzIG5vdCBh ZmZlY3QgdGhlIHNjcm9sbGFiaWxpdHkgb2YgdGhlIGRvY3VtZW50Lgo=