128993 2014-02-18 13:47:10 -0800 Merge notifyComponentsOnChangedSelection into respondToSelectionChange 2014-02-18 14:33:24 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127832 1 rniwa rniwa ap darin enrica mitz oldest_to_newest 982072 0 rniwa 2014-02-18 13:47:10 -0800 notifyComponentsOnChangedSelection was added in a very old WebKit merge in the downstream repository when we added alternative text controller in WebKit to respondToSelectionChange. The person who merged WebKit change probably didn't realize this but things in respondToSelectionChange should really be moved into notifyComponentsOnChangedSelection and vice versa so simply merge them together. 982081 1 224543 rniwa 2014-02-18 13:53:31 -0800 Created attachment 224543 Patch 982101 2 224543 kling 2014-02-18 14:23:20 -0800 Comment on attachment 224543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224543&action=review Seems reasonable. r=me > Source/WebCore/editing/Editor.cpp:3300 > + // FIXME: Merge this to open source https://bugs.webkit.org/show_bug.cgi?id=38830 Is this comment actually relevant? We are *in* open source :) 982117 3 rniwa 2014-02-18 14:33:24 -0800 Committed r164320: <http://trac.webkit.org/changeset/164320> 224543 2014-02-18 13:53:31 -0800 2014-02-18 14:23:20 -0800 Patch bug-128993-20140218135351.patch text/plain 4816 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmM1NWJiMWJhMTNhNDBm YmFjODE0MTE4YWZlMjkyZTIzZTI3ODI5ZS4uZjYwMGRkMTFjZWQ0MzJkZjBmZTU5NjNiMzA1YTlh OTlhYjdkNWExZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAyLTE4ICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCisgICAgICAgIE1lcmdlIG5vdGlmeUNvbXBv bmVudHNPbkNoYW5nZWRTZWxlY3Rpb24gaW50byByZXNwb25kVG9TZWxlY3Rpb25DaGFuZ2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODk5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlZCBub3Rp ZnlDb21wb25lbnRzT25DaGFuZ2VkU2VsZWN0aW9uIGludG8gcmVzcG9uZFRvU2VsZWN0aW9uQ2hh bmdlIHNpbmNlIG5vdGlmeUNvbXBvbmVudHNPbkNoYW5nZWRTZWxlY3Rpb24KKyAgICAgICAgd2Fz IG9ubHkgYWRkZWQgaW4gaU9TIGNvZGViYXNlIGluIHJlc3BvbnNlIHRvIHRoZSBjb2RlIGFkZGVk IGZvciBjb250aW51b3VzIHNwZWxsY2hlY2tpbmcgYW5kIGFsdGVybmF0aXZlIHRleHQgY29udHJv bGxlcgorICAgICAgICBpbiByZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uIGJ1dCB0aGV5IHNob3Vs ZCBoYXZlIGJlZW4gY2FsbGVkIGluc2lkZSBzZXRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlvbkNo YW5nZS4KKworICAgICAgICBTbyBtZXJnZSB0aGVzZSB0d28gZnVuY3Rpb25zIGFuZCBtYWtlIHJl c3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24gYmVoYXZlIGxpa2Ugc2V0SWdub3JlQ29tcG9zaXRpb25T ZWxlY3Rpb25DaGFuZ2UuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpFZGl0b3I6OnNldElnbm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlKToK KyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbik6Cisg ICAgICAgICogZWRpdGluZy9FZGl0b3IuaDoKKworMjAxNC0wMi0xOCAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KKwogICAgICAgICBzZXRTZWxlY3Rpb25SYW5nZSBzaG91bGQgc2V0 IHNlbGVjdGlvbiB3aXRob3V0IHZhbGlkYXRpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODk0OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAK aW5kZXggYWM0YzRlZmUyNzM2ZWYxMWVhMjdiODYzYzE4MWNkNDc3NTZlYzE5MC4uNzQwODUwNWY1 OWM3ZTliMTQyZmUwYjY2OTg2NzA0N2YyNjQ1N2MyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9y LmNwcApAQCAtNzUzLDIzICs3NTMsNiBAQCBib29sIEVkaXRvcjo6c2hvdWxkSW5zZXJ0VGV4dChj b25zdCBTdHJpbmcmIHRleHQsIFJhbmdlKiByYW5nZSwgRWRpdG9ySW5zZXJ0QWN0aQogICAgIHJl dHVybiBjbGllbnQoKSAmJiBjbGllbnQoKS0+c2hvdWxkSW5zZXJ0VGV4dCh0ZXh0LCByYW5nZSwg YWN0aW9uKTsKIH0KIAotdm9pZCBFZGl0b3I6Om5vdGlmeUNvbXBvbmVudHNPbkNoYW5nZWRTZWxl Y3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgb2xkU2VsZWN0aW9uLCBGcmFtZVNlbGVjdGlv bjo6U2V0U2VsZWN0aW9uT3B0aW9ucyBvcHRpb25zKQotewotI2lmIFBMQVRGT1JNKElPUykKLSAg ICAvLyBGSVhNRTogTWVyZ2UgdGhpcyB0byBvcGVuIHNvdXJjZSBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4MzAKLSAgICBpZiAobV9pZ25vcmVDb21wb3NpdGlvblNl bGVjdGlvbkNoYW5nZSkKLSAgICAgICAgcmV0dXJuOwotI2VuZGlmCi0KLSAgICBpZiAoY2xpZW50 KCkpCi0gICAgICAgIGNsaWVudCgpLT5yZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKCZtX2ZyYW1l KTsKLSAgICBzZXRTdGFydE5ld0tpbGxSaW5nU2VxdWVuY2UodHJ1ZSk7Ci0jaWYgRU5BQkxFKERF TEVUSU9OX1VJKQotICAgIG1fZGVsZXRlQnV0dG9uQ29udHJvbGxlci0+cmVzcG9uZFRvQ2hhbmdl ZFNlbGVjdGlvbihvbGRTZWxlY3Rpb24pOwotI2VuZGlmCi0gICAgbV9hbHRlcm5hdGl2ZVRleHRD b250cm9sbGVyLT5yZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKG9sZFNlbGVjdGlvbiwgb3B0aW9u cyk7Ci19Ci0KIHZvaWQgRWRpdG9yOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoY29uc3QgVmlz aWJsZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uKQogewogICAgIGlmIChBWE9iamVjdENhY2hl OjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpKSB7CkBAIC0yODE2LDcgKzI3OTksNyBAQCB2b2lkIEVk aXRvcjo6c2V0SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoYm9vbCBpZ25vcmUpCiAj aWYgUExBVEZPUk0oSU9TKQogICAgIC8vIEZJWE1FOiBNZXJnZSB0aGlzIHRvIG9wZW4gc291cmNl IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODgzMAogICAgIGlmICgh aWdub3JlKQotICAgICAgICBub3RpZnlDb21wb25lbnRzT25DaGFuZ2VkU2VsZWN0aW9uKG1fZnJh bWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIDApOworICAgICAgICByZXNwb25kVG9DaGFuZ2Vk U2VsZWN0aW9uKG1fZnJhbWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIDApOwogI2VuZGlmCiAg ICAgaWYgKCFpZ25vcmUpCiAgICAgICAgIHJldmVhbFNlbGVjdGlvbkFmdGVyRWRpdGluZ09wZXJh dGlvbihTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFJldmVhbEV4dGVudCk7 CkBAIC0zMzEzLDYgKzMyOTYsMTIgQEAgdm9pZCBFZGl0b3I6OnNldE1hcmtlZFRleHRNYXRjaGVz QXJlSGlnaGxpZ2h0ZWQoYm9vbCBmbGFnKQogCiB2b2lkIEVkaXRvcjo6cmVzcG9uZFRvQ2hhbmdl ZFNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24sIEZyYW1lU2Vs ZWN0aW9uOjpTZXRTZWxlY3Rpb25PcHRpb25zIG9wdGlvbnMpCiB7CisjaWYgUExBVEZPUk0oSU9T KQorICAgIC8vIEZJWE1FOiBNZXJnZSB0aGlzIHRvIG9wZW4gc291cmNlIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODgzMAorICAgIGlmIChtX2lnbm9yZUNvbXBvc2l0 aW9uU2VsZWN0aW9uQ2hhbmdlKQorICAgICAgICByZXR1cm47CisjZW5kaWYKKwogICAgIG1fYWx0 ZXJuYXRpdmVUZXh0Q29udHJvbGxlci0+c3RvcFBlbmRpbmdDb3JyZWN0aW9uKG9sZFNlbGVjdGlv bik7CiAKICAgICBib29sIGNsb3NlVHlwaW5nID0gb3B0aW9ucyAmIEZyYW1lU2VsZWN0aW9uOjpD bG9zZVR5cGluZzsKQEAgLTMzNzYsNyArMzM2NSwxMyBAQCB2b2lkIEVkaXRvcjo6cmVzcG9uZFRv Q2hhbmdlZFNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24sIEZy YQogICAgIGlmICghaXNDb250aW51b3VzR3JhbW1hckNoZWNraW5nRW5hYmxlZCkKICAgICAgICAg ZG9jdW1lbnQoKS5tYXJrZXJzKCkucmVtb3ZlTWFya2VycyhEb2N1bWVudE1hcmtlcjo6R3JhbW1h cik7CiAKLSAgICBub3RpZnlDb21wb25lbnRzT25DaGFuZ2VkU2VsZWN0aW9uKG9sZFNlbGVjdGlv biwgb3B0aW9ucyk7CisgICAgaWYgKGNsaWVudCgpKQorICAgICAgICBjbGllbnQoKS0+cmVzcG9u ZFRvQ2hhbmdlZFNlbGVjdGlvbigmbV9mcmFtZSk7CisgICAgc2V0U3RhcnROZXdLaWxsUmluZ1Nl cXVlbmNlKHRydWUpOworI2lmIEVOQUJMRShERUxFVElPTl9VSSkKKyAgICBtX2RlbGV0ZUJ1dHRv bkNvbnRyb2xsZXItPnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24ob2xkU2VsZWN0aW9uKTsKKyNl bmRpZgorICAgIG1fYWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci0+cmVzcG9uZFRvQ2hhbmdlZFNl bGVjdGlvbihvbGRTZWxlY3Rpb24sIG9wdGlvbnMpOwogfQogCiBzdGF0aWMgTm9kZSogZmluZEZp cnN0TWFya2FibGUoTm9kZSogbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCmluZGV4IDA4YWU0 ZmQxNzZiN2I5ZmM5YzFlMTUzMTcwMzRhNDkyZGFhMjY3ODEuLmE3NGZmZTg5ZjM0MzViZDY1NmJj MGMyMWY2YzhkZDAwZjlhNDY0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaApAQCAtNDYzLDcg KzQ2Myw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDb21wb3NpdGlvbihjb25zdCBTdHJpbmcm LCBTZXRDb21wb3NpdGlvbk1vZGUpOwogCiAgICAgdm9pZCBjaGFuZ2VTZWxlY3Rpb25BZnRlckNv bW1hbmQoY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgbmV3U2VsZWN0aW9uLCBGcmFtZVNlbGVjdGlv bjo6U2V0U2VsZWN0aW9uT3B0aW9ucyk7Ci0gICAgdm9pZCBub3RpZnlDb21wb25lbnRzT25DaGFu Z2VkU2VsZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIG9sZFNlbGVjdGlvbiwgRnJhbWVT ZWxlY3Rpb246OlNldFNlbGVjdGlvbk9wdGlvbnMpOwogCiAgICAgTm9kZSogZmluZEV2ZW50VGFy Z2V0RnJvbVNlbGVjdGlvbigpIGNvbnN0OwogCg==