55731 2011-03-03 17:18:51 -0800 Those checking in Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited() should be done with VisiblePosition::isNull(). 2011-03-04 21:20:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P2 Normal --- 1 jiapu.mail webkit-unassigned commit-queue oldest_to_newest 362109 0 jiapu.mail 2011-03-03 17:18:51 -0800 Those wordy if statement really should use VisiblePosition::isNull(). 362622 1 84780 jiapu.mail 2011-03-04 10:46:29 -0800 Created attachment 84780 Proposed patch (v1) 362864 2 84780 commit-queue 2011-03-04 21:20:39 -0800 Comment on attachment 84780 Proposed patch (v1) Clearing flags on attachment: 84780 Committed r80405: <http://trac.webkit.org/changeset/80405> 362865 3 commit-queue 2011-03-04 21:20:44 -0800 All reviewed patches have been landed. Closing bug. 84780 2011-03-04 10:46:29 -0800 2011-03-04 21:20:39 -0800 Proposed patch (v1) bug-55731-20110304104628.patch text/plain 3839 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogODAyNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMjMxZDU5MGQ2N2ZkMTAx ODVhNjI3ZmJlYzMxZGI2MGNjZjM3N2ExLi5iOTlmYTRjM2E1YTY5N2ZkMmI4OWVjMjdhMDA4ZGEw MjY0MDdmYTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDQgIEppYSBQ dSAgPGpwdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhvc2UgY2hlY2tpbmcgaW4gRWRpdG9yOjpyZW1vdmVTcGVsbEFuZENvcnJl Y3Rpb25NYXJrZXJzRnJvbVdvcmRzVG9CZUVkaXRlZCgpIHNob3VsZCBiZSBkb25lIHdpdGggVmlz aWJsZVBvc2l0aW9uOjppc051bGwoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU1NzMxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGVyZSdzIG5v IGJlaGF2aW9yYWwgY2hhbmdlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW1wcm92ZWQgY2xhcml0 eSBhbmQgcmVhZGFiaWxpdHkgb2YgRWRpdG9yOjpyZW1vdmVTcGVsbEFuZENvcnJlY3Rpb25NYXJr ZXJzRnJvbVdvcmRzVG9CZUVkaXRlZCgpLgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZW1vdmVTcGVsbEFuZENvcnJlY3Rpb25NYXJr ZXJzRnJvbVdvcmRzVG9CZUVkaXRlZCk6CisKIDIwMTEtMDMtMDMgIE1hcnRpbiBSb2JpbnNvbiAg PG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFhIVE1MTVAgYnVpbGQgYnJva2VuIGFm dGVyIHI3ODM0MgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3Bw IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCmluZGV4IDMyODcyMzFkNzMwMTkx NTVlOTc5NTFjMThkMWFjYzkwNTY3Y2M0MzAuLmRkOTNhMjdiMGUyZjM5MDJiNDUwODUyYzI3MDIz NDg3NjBlMTA1M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKQEAgLTI2OTAsMjAgKzI2 OTAsMjIgQEAgdm9pZCBFZGl0b3I6OnJlbW92ZVNwZWxsQW5kQ29ycmVjdGlvbk1hcmtlcnNGcm9t V29yZHNUb0JlRWRpdGVkKGJvb2wgZG9Ob3RSZW1vdmUKICAgICBWaXNpYmxlUG9zaXRpb24gc3Rh cnRPZkxhc3RXb3JkID0gc3RhcnRPZldvcmQoZW5kT2ZTZWxlY3Rpb24sIFJpZ2h0V29yZElmT25C b3VuZGFyeSk7CiAgICAgVmlzaWJsZVBvc2l0aW9uIGVuZE9mTGFzdFdvcmQgPSBlbmRPZldvcmQo ZW5kT2ZTZWxlY3Rpb24sIFJpZ2h0V29yZElmT25Cb3VuZGFyeSk7CiAKLSAgICAvLyBUaGlzIGNh biBiZSB0aGUgY2FzZSBpZiB0aGUgZW5kIG9mIHNlbGVjdGlvbiBpcyBhdCB0aGUgZW5kIG9mIGRv Y3VtZW50LgotICAgIGlmIChlbmRPZkxhc3RXb3JkLmRlZXBFcXVpdmFsZW50KCkuYW5jaG9yVHlw ZSgpICE9IFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpIHsKLSAgICAgICAgc3Rh cnRPZkxhc3RXb3JkID0gc3RhcnRPZldvcmQoZnJhbWUoKS0+c2VsZWN0aW9uKCktPnNlbGVjdGlv bigpLnN0YXJ0KCksIExlZnRXb3JkSWZPbkJvdW5kYXJ5KTsKLSAgICAgICAgZW5kT2ZMYXN0V29y ZCA9IGVuZE9mV29yZChmcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCkuc3RhcnQoKSwg TGVmdFdvcmRJZk9uQm91bmRhcnkpOworICAgIGlmIChzdGFydE9mRmlyc3RXb3JkLmlzTnVsbCgp KSB7CisgICAgICAgIHN0YXJ0T2ZGaXJzdFdvcmQgPSBzdGFydE9mV29yZChzdGFydE9mU2VsZWN0 aW9uLCBSaWdodFdvcmRJZk9uQm91bmRhcnkpOworICAgICAgICBlbmRPZkZpcnN0V29yZCA9IGVu ZE9mV29yZChzdGFydE9mU2VsZWN0aW9uLCBSaWdodFdvcmRJZk9uQm91bmRhcnkpOworICAgIH0K KyAgICAKKyAgICBpZiAoZW5kT2ZMYXN0V29yZC5pc051bGwoKSkgeworICAgICAgICBzdGFydE9m TGFzdFdvcmQgPSBzdGFydE9mV29yZChlbmRPZlNlbGVjdGlvbiwgTGVmdFdvcmRJZk9uQm91bmRh cnkpOworICAgICAgICBlbmRPZkxhc3RXb3JkID0gZW5kT2ZXb3JkKGVuZE9mU2VsZWN0aW9uLCBM ZWZ0V29yZElmT25Cb3VuZGFyeSk7CiAgICAgfQogCiAgICAgLy8gSWYgZG9Ob3RSZW1vdmVJZlNl bGVjdGlvbkF0V29yZEJvdW5kYXJ5IGlzIHRydWUsIGFuZCBmaXJzdCB3b3JkIGVuZHMgYXQgdGhl IHN0YXJ0IG9mIHNlbGVjdGlvbiwKICAgICAvLyB3ZSBjaG9vc2UgbmV4dCB3b3JkIGFzIHRoZSBm aXJzdCB3b3JkLgogICAgIGlmIChkb05vdFJlbW92ZUlmU2VsZWN0aW9uQXRXb3JkQm91bmRhcnkg JiYgZW5kT2ZGaXJzdFdvcmQgPT0gc3RhcnRPZlNlbGVjdGlvbikgewogICAgICAgICBzdGFydE9m Rmlyc3RXb3JkID0gbmV4dFdvcmRQb3NpdGlvbihzdGFydE9mRmlyc3RXb3JkKTsKLSAgICAgICAg aWYgKHN0YXJ0T2ZGaXJzdFdvcmQuaXNOdWxsKCkgfHwgc3RhcnRPZkZpcnN0V29yZCA9PSBlbmRP ZlNlbGVjdGlvbikKLSAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgZW5kT2ZGaXJzdFdvcmQg PSBlbmRPZldvcmQoc3RhcnRPZkZpcnN0V29yZCwgUmlnaHRXb3JkSWZPbkJvdW5kYXJ5KTsKLSAg ICAgICAgaWYgKGVuZE9mRmlyc3RXb3JkLmRlZXBFcXVpdmFsZW50KCkuYW5jaG9yVHlwZSgpICE9 IFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpCisgICAgICAgIGlmIChzdGFydE9m Rmlyc3RXb3JkID09IGVuZE9mU2VsZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0K IApAQCAtMjcxMiwxMCArMjcxNCwxMyBAQCB2b2lkIEVkaXRvcjo6cmVtb3ZlU3BlbGxBbmRDb3Jy ZWN0aW9uTWFya2Vyc0Zyb21Xb3Jkc1RvQmVFZGl0ZWQoYm9vbCBkb05vdFJlbW92ZQogICAgIGlm IChkb05vdFJlbW92ZUlmU2VsZWN0aW9uQXRXb3JkQm91bmRhcnkgJiYgc3RhcnRPZkxhc3RXb3Jk ID09IGVuZE9mU2VsZWN0aW9uKSB7CiAgICAgICAgIHN0YXJ0T2ZMYXN0V29yZCA9IHByZXZpb3Vz V29yZFBvc2l0aW9uKHN0YXJ0T2ZMYXN0V29yZCk7CiAgICAgICAgIGVuZE9mTGFzdFdvcmQgPSBl bmRPZldvcmQoc3RhcnRPZkxhc3RXb3JkLCBSaWdodFdvcmRJZk9uQm91bmRhcnkpOwotICAgICAg ICBpZiAoZW5kT2ZMYXN0V29yZCA9PSBzdGFydE9mRmlyc3RXb3JkKQorICAgICAgICBpZiAoZW5k T2ZMYXN0V29yZCA9PSBzdGFydE9mU2VsZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorICAgIGlmIChzdGFydE9mRmlyc3RXb3JkLmlzTnVsbCgpIHx8IGVuZE9mRmlyc3RXb3Jk LmlzTnVsbCgpIHx8IHN0YXJ0T2ZMYXN0V29yZC5pc051bGwoKSB8fCBlbmRPZkxhc3RXb3JkLmlz TnVsbCgpKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBOb3cgd2UgcmVtb3ZlIG1hcmtlcnMg b24gZXZlcnl0aGluZyBiZXR3ZWVuIHN0YXJ0T2ZGaXJzdFdvcmQgYW5kIGVuZE9mTGFzdFdvcmQu CiAgICAgLy8gSG93ZXZlciwgaWYgYW4gYXV0b2NvcnJlY3Rpb24gY2hhbmdlIGEgc2luZ2xlIHdv cmQgdG8gbXVsdGlwbGUgd29yZHMsIHdlIHdhbnQgdG8gcmVtb3ZlIGNvcnJlY3Rpb24gbWFyayBm cm9tIGFsbCB0aGUKICAgICAvLyByZXN1bHRlZCB3b3JkcyBldmVuIHdlIG9ubHkgZWRpdCBvbmUg b2YgdGhlbS4gRm9yIGV4YW1wbGUsIGFzc3VtaW5nIGF1dG9jb3JyZWN0aW9uIGNoYW5nZXMgImF2 YW50Z2FyZGUiIHRvICJhdmFudAo=