51717 2010-12-29 11:35:37 -0800 REGRESSION (r72887): Mail crashes when doing searches in a message due to method name conflict 2010-12-29 12:02:48 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar, Regression P1 Normal --- 1 mitz mitz oldest_to_newest 327636 0 mitz 2010-12-29 11:35:37 -0800 Mail crashes when doing searches in a message due to method name conflict 327641 1 mitz 2010-12-29 11:40:47 -0800 <rdar://problem/8758191> 327648 2 77635 mitz 2010-12-29 11:48:50 -0800 Created attachment 77635 Rename -findString:options: to -_findString:options: in WebDocumentOptionsSearching 327655 3 mitz 2010-12-29 12:02:48 -0800 Fixed in <http://trac.webkit.org/projects/webkit/changeset/74751>. 77635 2010-12-29 11:48:50 -0800 2010-12-29 11:59:46 -0800 Rename -findString:options: to -_findString:options: in WebDocumentOptionsSearching bug-51717-20101229114849.patch text/plain 4023 mitz SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA3NDc1MCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMTItMjkgIERhbiBCZXJuc3RlaW4gIDxtaXR6 QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODc1ODE5MT4gUkVHUkVTU0lPTiAocjcyODg3KTogTWFpbCBj cmFzaGVzIHdoZW4gZG9pbmcgc2VhcmNoZXMgaW4gYSBtZXNzYWdlIGR1ZSB0byBtZXRob2QgbmFt ZSBjb25mbGljdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTE3MTcKKworICAgICAgICBSZW5hbWVkIC1maW5kU3RyaW5nOm9wdGlvbnM6IHRvIC1fZmlu ZFN0cmluZzpvcHRpb25zOiBpbiB0aGUgV2ViRG9jdW1lbnRPcHRpb25zU2VhcmNoaW5nCisgICAg ICAgIHByb3RvY29sIHRvIGF2b2lkIGNvbmZsaWN0IHdpdGggLVtXZWJIVE1MVmlldyhNYWlsRXh0 cmFzKSBmaW5kU3RyaW5nOm9wdGlvbnM6XSB3aGljaCBNYWlsIGRlZmluZXMuCisKKyAgICAgICAg KiBXZWJWaWV3L1dlYkRvY3VtZW50SW50ZXJuYWwuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhU TUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBzZWFyY2hGb3I6ZGlyZWN0aW9uOmNh c2VTZW5zaXRpdmU6d3JhcDpzdGFydEluU2VsZWN0aW9uOl0pOgorICAgICAgICAoLVtXZWJIVE1M VmlldyBfZmluZFN0cmluZzpvcHRpb25zOl0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5t bToKKyAgICAgICAgKGZpbmRTdHJpbmcpOgorCiAyMDEwLTEyLTI4ICBEYW5pZWwgQmF0ZXMgIDxk YmF0ZXNAcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDog V2ViS2l0L21hYy9XZWJWaWV3L1dlYkRvY3VtZW50SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRG9jdW1lbnRJbnRlcm5hbC5oCShyZXZpc2lvbiA3NDc0OCkK KysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJEb2N1bWVudEludGVybmFsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTY4LDcgKzY4LDggQEAKIEBlbmQKIAogQHByb3RvY29sIFdlYkRvY3VtZW50T3B0aW9u c1NlYXJjaGluZyA8TlNPYmplY3Q+Ci0tIChCT09MKWZpbmRTdHJpbmc6KE5TU3RyaW5nICopc3Ry aW5nIG9wdGlvbnM6KFdlYkZpbmRPcHRpb25zKW9wdGlvbnM7CisvLyBQcmVmaXhlZCB3aXRoIGFu IHVuZGVyc2NvcmUgdG8gYXZvaWQgY29uZmxpY3Qgd2l0aCBNYWlsJ3MgLVtXZWJIVE1MVmlldyhN YWlsRXh0cmFzKSBmaW5kU3RyaW5nOm9wdGlvbnM6XS4KKy0gKEJPT0wpX2ZpbmRTdHJpbmc6KE5T U3RyaW5nICopc3RyaW5nIG9wdGlvbnM6KFdlYkZpbmRPcHRpb25zKW9wdGlvbnM7CiBAZW5kCiAK IC8qIFVzZWQgdG8gc2F2ZSBhbmQgcmVzdG9yZSBzdGF0ZSBpbiB0aGUgdmlldywgdHlwaWNhbGx5 IHdoZW4gZ29pbmcgYmFjay9mb3J3YXJkICovCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi SFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tCShyZXZpc2lvbiA3NDc0OCkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNjI4MSw3ICs2MjgxLDcgQEAgLSAoQk9PTClzdXBwb3J0c1Rl eHRFbmNvZGluZwogCiAtIChCT09MKXNlYXJjaEZvcjooTlNTdHJpbmcgKilzdHJpbmcgZGlyZWN0 aW9uOihCT09MKWZvcndhcmQgY2FzZVNlbnNpdGl2ZTooQk9PTCljYXNlRmxhZyB3cmFwOihCT09M KXdyYXBGbGFnIHN0YXJ0SW5TZWxlY3Rpb246KEJPT0wpc3RhcnRJblNlbGVjdGlvbgogewotICAg IHJldHVybiBbc2VsZiBmaW5kU3RyaW5nOnN0cmluZyBvcHRpb25zOihmb3J3YXJkID8gMCA6IFdl YkZpbmRPcHRpb25zQmFja3dhcmRzKSB8IChjYXNlRmxhZyA/IDAgOiBXZWJGaW5kT3B0aW9uc0Nh c2VJbnNlbnNpdGl2ZSkgfCAoc3RhcnRJblNlbGVjdGlvbiA/IFdlYkZpbmRPcHRpb25zU3RhcnRJ blNlbGVjdGlvbiA6IDApXTsKKyAgICByZXR1cm4gW3NlbGYgX2ZpbmRTdHJpbmc6c3RyaW5nIG9w dGlvbnM6KGZvcndhcmQgPyAwIDogV2ViRmluZE9wdGlvbnNCYWNrd2FyZHMpIHwgKGNhc2VGbGFn ID8gMCA6IFdlYkZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZlKSB8IChzdGFydEluU2VsZWN0aW9u ID8gV2ViRmluZE9wdGlvbnNTdGFydEluU2VsZWN0aW9uIDogMCldOwogfQogCiBAZW5kCkBAIC02 MzUyLDcgKzYzNTIsNyBAQCAtIChOU0FycmF5ICopcmVjdHNGb3JUZXh0TWF0Y2hlcwogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKLS0gKEJPT0wpZmluZFN0cmluZzooTlNTdHJpbmcgKilzdHJpbmcg b3B0aW9uczooV2ViRmluZE9wdGlvbnMpb3B0aW9ucworLSAoQk9PTClfZmluZFN0cmluZzooTlNT dHJpbmcgKilzdHJpbmcgb3B0aW9uczooV2ViRmluZE9wdGlvbnMpb3B0aW9ucwogewogICAgIGlm ICghW3N0cmluZyBsZW5ndGhdKQogICAgICAgICByZXR1cm4gTk87CkluZGV4OiBXZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQkocmV2aXNpb24gNzQ3NDgpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNDI4Niw3ICs0Mjg2LDcgQEAgLSAodm9pZCl1bnNjaGVkdWxl RnJvbVJ1bkxvb3A6KE5TUnVuTG9vcAogc3RhdGljIEJPT0wgZmluZFN0cmluZyhOU1ZpZXcgPFdl YkRvY3VtZW50U2VhcmNoaW5nPiAqc2VhcmNoVmlldywgTlNTdHJpbmcgKnN0cmluZywgV2ViRmlu ZE9wdGlvbnMgb3B0aW9ucykKIHsKICAgICBpZiAoW3NlYXJjaFZpZXcgY29uZm9ybXNUb1Byb3Rv Y29sOkBwcm90b2NvbChXZWJEb2N1bWVudE9wdGlvbnNTZWFyY2hpbmcpXSkKLSAgICAgICAgcmV0 dXJuIFsoTlNWaWV3IDxXZWJEb2N1bWVudE9wdGlvbnNTZWFyY2hpbmc+ICopc2VhcmNoVmlldyBm aW5kU3RyaW5nOnN0cmluZyBvcHRpb25zOm9wdGlvbnNdOworICAgICAgICByZXR1cm4gWyhOU1Zp ZXcgPFdlYkRvY3VtZW50T3B0aW9uc1NlYXJjaGluZz4gKilzZWFyY2hWaWV3IF9maW5kU3RyaW5n OnN0cmluZyBvcHRpb25zOm9wdGlvbnNdOwogICAgIGlmIChbc2VhcmNoVmlldyBjb25mb3Jtc1Rv UHJvdG9jb2w6QHByb3RvY29sKFdlYkRvY3VtZW50SW5jcmVtZW50YWxTZWFyY2hpbmcpXSkKICAg ICAgICAgcmV0dXJuIFsoTlNWaWV3IDxXZWJEb2N1bWVudEluY3JlbWVudGFsU2VhcmNoaW5nPiAq KXNlYXJjaFZpZXcgc2VhcmNoRm9yOnN0cmluZyBkaXJlY3Rpb246IShvcHRpb25zICYgV2ViRmlu ZE9wdGlvbnNCYWNrd2FyZHMpIGNhc2VTZW5zaXRpdmU6IShvcHRpb25zICYgV2ViRmluZE9wdGlv bnNDYXNlSW5zZW5zaXRpdmUpIHdyYXA6ISEob3B0aW9ucyAmIFdlYkZpbmRPcHRpb25zV3JhcEFy b3VuZCkgc3RhcnRJblNlbGVjdGlvbjohIShvcHRpb25zICYgV2ViRmluZE9wdGlvbnNTdGFydElu U2VsZWN0aW9uKV07CiAgICAgcmV0dXJuIFtzZWFyY2hWaWV3IHNlYXJjaEZvcjpzdHJpbmcgZGly ZWN0aW9uOiEob3B0aW9ucyAmIFdlYkZpbmRPcHRpb25zQmFja3dhcmRzKSBjYXNlU2Vuc2l0aXZl OiEob3B0aW9ucyAmIFdlYkZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZlKSB3cmFwOiEhKG9wdGlv bnMgJiBXZWJGaW5kT3B0aW9uc1dyYXBBcm91bmQpXTsK