128439 2014-02-07 20:53:02 -0800 Merge updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance 2014-02-07 21:22:18 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127832 1 rniwa rniwa benjamin darin enrica kling koivisto oldest_to_newest 978271 0 rniwa 2014-02-07 20:53:02 -0800 FrameSelection::selectAll() has superfluous call to updateSelectionCachesIfSelectionIsInsideTextFormControl and selectFrameElementInParentIfFullySelected because it doesn't call setSelection with UserTriggered set. Do that and merge updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance 978272 1 223544 rniwa 2014-02-07 20:59:52 -0800 Created attachment 223544 Cleanup 978276 2 rniwa 2014-02-07 21:22:18 -0800 Committed r163692: <http://trac.webkit.org/changeset/163692> 223544 2014-02-07 20:59:52 -0800 2014-02-07 21:01:44 -0800 Cleanup bug-128439-20140207205952.patch text/plain 7545 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTA3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1lcmdlIHVwZGF0ZVNlbGVjdGlv bkNhY2hlc0lmU2VsZWN0aW9uSXNJbnNpZGVUZXh0Rm9ybUNvbnRyb2wgaW50byBzZXRTZWxlY3Rp b25XaXRob3V0VXBkYXRpbmdBcHBlYXJhbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGcmFtZVNlbGVjdGlvbjo6c2VsZWN0QWxsIGhhZCBhIHN1cGVy Zmx1b3VzIGNhbGwgdG8gdXBkYXRlU2VsZWN0aW9uQ2FjaGVzSWZTZWxlY3Rpb25Jc0luc2lkZVRl eHRGb3JtQ29udHJvbAorICAgICAgICBiZWNhdXNlIGl0IHdhc24ndCBzZXR0aW5nIFVzZXJUcmln Z2VyZWQgb3B0aW9uIHRvIGF2b2lkIHJldmVhbGluZyBzZWxlY3Rpb24uCisKKyAgICAgICAgQ2Fs bCBzZXRTZWxlY3Rpb24gd2l0aCBVc2VyVHJpZ2dlcmVkIGFuZCByZWNlbnRseSBhZGRlZCBEb05v dFJldmVhbFNlbGVjdGlvbiBvcHRpb24gYW5kIG1lcmdlCisgICAgICAgIHVwZGF0ZVNlbGVjdGlv bkNhY2hlc0lmU2VsZWN0aW9uSXNJbnNpZGVUZXh0Rm9ybUNvbnRyb2wgaW50byBzZXRTZWxlY3Rp b25XaXRob3V0VXBkYXRpbmdBcHBlYXJhbmNlLgorCisgICAgICAgIEFsc28gcmVuYW1lIGxvY2Fs IHZhcmlhYmxlcyBpbiBzZXRTZWxlY3Rpb25XaXRob3V0VXBkYXRpbmdBcHBlYXJhbmNlLCBuZXdT ZWxlY3Rpb24gdG8KKyAgICAgICAgbmV3U2VsZWN0aW9uUG9zc2libHlXaXRob3V0RGlyZWN0aW9u IGFuZCBzIHRvIG5ld1NlbGVjdGlvbiBzbyB0aGF0IHRoZXkncmUgc2VsZiBleHBsYW5hdG9yeS4K KworICAgICAgICBJbiBhZGRpdGlvbiwgd2Ugbm93IHVwZGF0ZSB0aGUgaW5wdXQgZWxlbWVudCdz IHNlbGVjdGlvbiBjYWNoZXMgYmVmb3JlIGNhbGxpbmcKKyAgICAgICAgc2VsZWN0RnJhbWVFbGVt ZW50SW5QYXJlbnRJZkZ1bGx5U2VsZWN0ZWQgYnV0IHRoaXMgc2hvdWxkIGJlIGZpbmUgYmVjYXVz ZSBzZWxlY3Rpb24gY2Fubm90IHNpbXVsdGFuZW91c2x5CisgICAgICAgIHNlbGVjdCB0aGUgZW50 aXJlIGRvY3VtZW50IGFuZCBiZSBpbnNpZGUgYSB0ZXh0IGZvcm0gY29udHJvbC4KKworICAgICAg ICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVT ZWxlY3Rpb246OnNldFNlbGVjdGlvbldpdGhvdXRVcGRhdGluZ0FwcGVhcmFuY2UpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OnNlbGVjdEFsbCk6CisKIDIwMTQtMDItMDcgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRUZMIGJ1aWxkIGZpeCBh dHRlbXB0IGFmdGVyIHIxNjM2NjIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcAkocmV2aXNpb24gMTYzNjkwKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9GcmFtZVNlbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MCwzMyArMjUwLDMzIEBA IHZvaWQgRnJhbWVTZWxlY3Rpb246OnNldFNlbGVjdGlvbkJ5TW91c2UKICAgICBzZXRTZWxlY3Rp b24obmV3U2VsZWN0aW9uLCBVc2VyVHJpZ2dlcmVkIHwgRG9Ob3RSZXZlYWxTZWxlY3Rpb24gfCBD bG9zZVR5cGluZyB8IENsZWFyVHlwaW5nU3R5bGUsIEFsaWduQ3Vyc29yT25TY3JvbGxJZk5lZWRl ZCwgZ3JhbnVsYXJpdHkpOwogfQogCi1ib29sIEZyYW1lU2VsZWN0aW9uOjpzZXRTZWxlY3Rpb25X aXRob3V0VXBkYXRpbmdBcHBlYXJhbmNlKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIG5ld1NlbGVj dGlvbiwgU2V0U2VsZWN0aW9uT3B0aW9ucyBvcHRpb25zLCBDdXJzb3JBbGlnbk9uU2Nyb2xsIGFs aWduLCBUZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHksIEVVc2VyVHJpZ2dlcmVkIHVzZXJUcmln Z2VyZWQpCitib29sIEZyYW1lU2VsZWN0aW9uOjpzZXRTZWxlY3Rpb25XaXRob3V0VXBkYXRpbmdB cHBlYXJhbmNlKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIG5ld1NlbGVjdGlvblBvc3NpYmx5V2l0 aG91dERpcmVjdGlvbiwgU2V0U2VsZWN0aW9uT3B0aW9ucyBvcHRpb25zLCBDdXJzb3JBbGlnbk9u U2Nyb2xsIGFsaWduLCBUZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHksIEVVc2VyVHJpZ2dlcmVk IHVzZXJUcmlnZ2VyZWQpCiB7CiAgICAgYm9vbCBjbG9zZVR5cGluZyA9IG9wdGlvbnMgJiBDbG9z ZVR5cGluZzsKICAgICBib29sIHNob3VsZENsZWFyVHlwaW5nU3R5bGUgPSBvcHRpb25zICYgQ2xl YXJUeXBpbmdTdHlsZTsKIAotICAgIFZpc2libGVTZWxlY3Rpb24gcyA9IG5ld1NlbGVjdGlvbjsK KyAgICBWaXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbiA9IG5ld1NlbGVjdGlvblBvc3NpYmx5 V2l0aG91dERpcmVjdGlvbjsKICAgICBpZiAoc2hvdWxkQWx3YXlzVXNlRGlyZWN0aW9uYWxTZWxl Y3Rpb24obV9mcmFtZSkpCi0gICAgICAgIHMuc2V0SXNEaXJlY3Rpb25hbCh0cnVlKTsKKyAgICAg ICAgbmV3U2VsZWN0aW9uLnNldElzRGlyZWN0aW9uYWwodHJ1ZSk7CiAKICAgICBpZiAoIW1fZnJh bWUpIHsKLSAgICAgICAgbV9zZWxlY3Rpb24gPSBzOworICAgICAgICBtX3NlbGVjdGlvbiA9IG5l d1NlbGVjdGlvbjsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8vIDxodHRw Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ2ND46IEluZmluaXRlIHJlY3Vy c2lvbiBhdCBGcmFtZVNlbGVjdGlvbjo6c2V0U2VsZWN0aW9uCiAgICAgLy8gaWYgZG9jdW1lbnQt PmZyYW1lKCkgPT0gbV9mcmFtZSB3ZSBjYW4gZ2V0IGludG8gYW4gaW5maW5pdGUgbG9vcAotICAg IGlmIChzLmJhc2UoKS5hbmNob3JOb2RlKCkpIHsKLSAgICAgICAgRG9jdW1lbnQmIGRvY3VtZW50 ID0gcy5iYXNlKCkuYW5jaG9yTm9kZSgpLT5kb2N1bWVudCgpOwotICAgICAgICBpZiAoZG9jdW1l bnQuZnJhbWUoKSAmJiBkb2N1bWVudC5mcmFtZSgpICE9IG1fZnJhbWUgJiYgJmRvY3VtZW50ICE9 IG1fZnJhbWUtPmRvY3VtZW50KCkpIHsKLSAgICAgICAgICAgIFJlZlB0cjxGcmFtZT4gZ3VhcmQg PSBkb2N1bWVudC5mcmFtZSgpOwotICAgICAgICAgICAgZG9jdW1lbnQuZnJhbWUoKS0+c2VsZWN0 aW9uKCkuc2V0U2VsZWN0aW9uKHMsIG9wdGlvbnMsIGFsaWduLCBncmFudWxhcml0eSk7Ci0gICAg ICAgICAgICAvLyBJdCdzIHBvc3NpYmxlIHRoYXQgZHVyaW5nIHRoZSBhYm92ZSBzZXQgc2VsZWN0 aW9uLCB0aGlzIEZyYW1lU2VsZWN0aW9uIGhhcyBiZWVuIG1vZGlmaWVkIGJ5Ci0gICAgICAgICAg ICAvLyBzZWxlY3RGcmFtZUVsZW1lbnRJblBhcmVudElmRnVsbHlTZWxlY3RlZCwgYnV0IHRoYXQg dGhlIHNlbGVjdGlvbiBpcyBubyBsb25nZXIgdmFsaWQgc2luY2UKLSAgICAgICAgICAgIC8vIHRo ZSBmcmFtZSBpcyBhYm91dCB0byBiZSBkZXN0cm95ZWQuIElmIHRoaXMgaXMgdGhlIGNhc2UsIGNs ZWFyIG91ciBzZWxlY3Rpb24uCi0gICAgICAgICAgICBpZiAoZ3VhcmQtPmhhc09uZVJlZigpICYm ICFtX3NlbGVjdGlvbi5pc05vbk9ycGhhbmVkQ2FyZXRPclJhbmdlKCkpCi0gICAgICAgICAgICAg ICAgY2xlYXIoKTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoRG9jdW1lbnQq IG5ld1NlbGVjdGlvbkRvY3VtZW50ID0gbmV3U2VsZWN0aW9uLmJhc2UoKS5kb2N1bWVudCgpKSB7 CisgICAgICAgIGlmIChSZWZQdHI8RnJhbWU+IG5ld1NlbGVjdGlvbkZyYW1lID0gbmV3U2VsZWN0 aW9uRG9jdW1lbnQtPmZyYW1lKCkpIHsKKyAgICAgICAgICAgIGlmIChuZXdTZWxlY3Rpb25GcmFt ZSAhPSBtX2ZyYW1lICYmIG5ld1NlbGVjdGlvbkRvY3VtZW50ICE9IG1fZnJhbWUtPmRvY3VtZW50 KCkpIHsKKyAgICAgICAgICAgICAgICBuZXdTZWxlY3Rpb25GcmFtZS0+c2VsZWN0aW9uKCkuc2V0 U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgb3B0aW9ucywgYWxpZ24sIGdyYW51bGFyaXR5KTsKKyAg ICAgICAgICAgICAgICAvLyBJdCdzIHBvc3NpYmxlIHRoYXQgZHVyaW5nIHRoZSBhYm92ZSBzZXQg c2VsZWN0aW9uLCB0aGlzIEZyYW1lU2VsZWN0aW9uIGhhcyBiZWVuIG1vZGlmaWVkIGJ5CisgICAg ICAgICAgICAgICAgLy8gc2VsZWN0RnJhbWVFbGVtZW50SW5QYXJlbnRJZkZ1bGx5U2VsZWN0ZWQs IGJ1dCB0aGF0IHRoZSBzZWxlY3Rpb24gaXMgbm8gbG9uZ2VyIHZhbGlkIHNpbmNlCisgICAgICAg ICAgICAgICAgLy8gdGhlIGZyYW1lIGlzIGFib3V0IHRvIGJlIGRlc3Ryb3llZC4gSWYgdGhpcyBp cyB0aGUgY2FzZSwgY2xlYXIgb3VyIHNlbGVjdGlvbi4KKyAgICAgICAgICAgICAgICBpZiAobmV3 U2VsZWN0aW9uRnJhbWUtPmhhc09uZVJlZigpICYmICFtX3NlbGVjdGlvbi5pc05vbk9ycGhhbmVk Q2FyZXRPclJhbmdlKCkpCisgICAgICAgICAgICAgICAgICAgIGNsZWFyKCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogCkBA IC0yOTIsMjUgKzI5MiwyNSBAQCBib29sIEZyYW1lU2VsZWN0aW9uOjpzZXRTZWxlY3Rpb25XaXRo b3V0CiAgICAgaWYgKHNob3VsZENsZWFyVHlwaW5nU3R5bGUpCiAgICAgICAgIGNsZWFyVHlwaW5n U3R5bGUoKTsKIAotICAgIGlmIChtX3NlbGVjdGlvbiA9PSBzKSB7Ci0gICAgICAgIC8vIEV2ZW4g aWYgc2VsZWN0aW9uIHdhcyBub3QgY2hhbmdlZCwgc2VsZWN0aW9uIG9mZnNldHMgbWF5IGhhdmUg YmVlbiBjaGFuZ2VkLgotICAgICAgICB1cGRhdGVTZWxlY3Rpb25DYWNoZXNJZlNlbGVjdGlvbklz SW5zaWRlVGV4dEZvcm1Db250cm9sKHVzZXJUcmlnZ2VyZWQpOwotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgfQotCiAgICAgVmlzaWJsZVNlbGVjdGlvbiBvbGRTZWxlY3Rpb24gPSBtX3NlbGVj dGlvbjsKKyAgICBtX3NlbGVjdGlvbiA9IG5ld1NlbGVjdGlvbjsKKworICAgIC8vIFNlbGVjdGlv biBvZmZzZXRzIHNob3VsZCBpbmNyZWFzZSB3aGVuIExGIGlzIGluc2VydGVkIGJlZm9yZSB0aGUg Y2FyZXQgaW4gSW5zZXJ0TGluZUJyZWFrQ29tbWFuZC4gU2VlIDxodHRwczovL3dlYmtpdC5vcmcv Yi81NjA2MT4uCisgICAgaWYgKEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0ZXh0Q29udHJv bCA9IGVuY2xvc2luZ1RleHRGb3JtQ29udHJvbChuZXdTZWxlY3Rpb24uc3RhcnQoKSkpCisgICAg ICAgIHRleHRDb250cm9sLT5zZWxlY3Rpb25DaGFuZ2VkKHVzZXJUcmlnZ2VyZWQgPT0gVXNlclRy aWdnZXJlZCk7CisKKyAgICBpZiAob2xkU2VsZWN0aW9uID09IG5ld1NlbGVjdGlvbikKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgbV9zZWxlY3Rpb24gPSBzOwogICAgIHNldENhcmV0UmVj dE5lZWRzVXBkYXRlKCk7Ci0gICAgCi0gICAgaWYgKCFzLmlzTm9uZSgpICYmICEob3B0aW9ucyAm IERvTm90U2V0Rm9jdXMpKQorCisgICAgaWYgKCFuZXdTZWxlY3Rpb24uaXNOb25lKCkgJiYgIShv cHRpb25zICYgRG9Ob3RTZXRGb2N1cykpCiAgICAgICAgIHNldEZvY3VzZWRFbGVtZW50SWZOZWVk ZWQoKTsKIAogICAgIC8vIEFsd2F5cyBjbGVhciB0aGUgeCBwb3NpdGlvbiB1c2VkIGZvciB2ZXJ0 aWNhbCBhcnJvdyBuYXZpZ2F0aW9uLgogICAgIC8vIEl0IHdpbGwgYmUgcmVzdG9yZWQgYnkgdGhl IHZlcnRpY2FsIGFycm93IG5hdmlnYXRpb24gY29kZSBpZiBuZWNlc3NhcnkuCiAgICAgbV94UG9z Rm9yVmVydGljYWxBcnJvd05hdmlnYXRpb24gPSBOb1hQb3NGb3JWZXJ0aWNhbEFycm93TmF2aWdh dGlvbigpOwogICAgIHNlbGVjdEZyYW1lRWxlbWVudEluUGFyZW50SWZGdWxseVNlbGVjdGVkKCk7 Ci0gICAgdXBkYXRlU2VsZWN0aW9uQ2FjaGVzSWZTZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29u dHJvbCh1c2VyVHJpZ2dlcmVkKTsKICAgICBtX2ZyYW1lLT5lZGl0b3IoKS5yZXNwb25kVG9DaGFu Z2VkU2VsZWN0aW9uKG9sZFNlbGVjdGlvbiwgb3B0aW9ucyk7CiAgICAgbV9mcmFtZS0+ZG9jdW1l bnQoKS0+ZW5xdWV1ZURvY3VtZW50RXZlbnQoRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuc2Vs ZWN0aW9uY2hhbmdlRXZlbnQsIGZhbHNlLCBmYWxzZSkpOwogCkBAIC0xNzA2LDEwICsxNzA2LDcg QEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6c2VsZWN0QWxsKCkKICAgICBWaXNpYmxlU2VsZWN0aW9u IG5ld1NlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uOjpzZWxlY3Rpb25Gcm9tQ29udGVudHNPZk5v ZGUocm9vdC5nZXQoKSkpOwogCiAgICAgaWYgKHNob3VsZENoYW5nZVNlbGVjdGlvbihuZXdTZWxl Y3Rpb24pKQotICAgICAgICBzZXRTZWxlY3Rpb24obmV3U2VsZWN0aW9uKTsKLQotICAgIHNlbGVj dEZyYW1lRWxlbWVudEluUGFyZW50SWZGdWxseVNlbGVjdGVkKCk7Ci0gICAgdXBkYXRlU2VsZWN0 aW9uQ2FjaGVzSWZTZWxlY3Rpb25Jc0luc2lkZVRleHRGb3JtQ29udHJvbChVc2VyVHJpZ2dlcmVk KTsKKyAgICAgICAgc2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgVXNlclRyaWdnZXJlZCB8IENs b3NlVHlwaW5nIHwgQ2xlYXJUeXBpbmdTdHlsZSB8IERvTm90UmV2ZWFsU2VsZWN0aW9uKTsKIH0K IAogYm9vbCBGcmFtZVNlbGVjdGlvbjo6c2V0U2VsZWN0ZWRSYW5nZShSYW5nZSogcmFuZ2UsIEVB ZmZpbml0eSBhZmZpbml0eSwgYm9vbCBjbG9zZVR5cGluZykKQEAgLTE5MTIsMTIgKzE5MDksNiBA QCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpjYXJldEJsaW5rVGltZXJGaXJlCiAjZW5kaWYKIH0KIAot dm9pZCBGcmFtZVNlbGVjdGlvbjo6dXBkYXRlU2VsZWN0aW9uQ2FjaGVzSWZTZWxlY3Rpb25Jc0lu c2lkZVRleHRGb3JtQ29udHJvbChFVXNlclRyaWdnZXJlZCB1c2VyVHJpZ2dlcmVkKQotewotICAg IGlmIChIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudCogdGV4dENvbnRyb2wgPSBlbmNsb3NpbmdU ZXh0Rm9ybUNvbnRyb2wobV9zZWxlY3Rpb24uc3RhcnQoKSkpCi0gICAgICAgIHRleHRDb250cm9s LT5zZWxlY3Rpb25DaGFuZ2VkKHVzZXJUcmlnZ2VyZWQgPT0gVXNlclRyaWdnZXJlZCk7Ci19Ci0K IC8vIEhlbHBlciBmdW5jdGlvbiB0aGF0IHRlbGxzIHdoZXRoZXIgYSBwYXJ0aWN1bGFyIG5vZGUg aXMgYW4gZWxlbWVudCB0aGF0IGhhcyBhbiBlbnRpcmUKIC8vIEZyYW1lIGFuZCBGcmFtZVZpZXcs IGEgPGZyYW1lPiwgPGlmcmFtZT4sIG9yIDxvYmplY3Q+Lgogc3RhdGljIGJvb2wgaXNGcmFtZUVs ZW1lbnQoY29uc3QgTm9kZSogbikK