151534 2015-11-21 14:01:11 -0800 Tiny cleanup in ComplexTextController::collectComplexTextRuns() 2015-11-21 15:06:53 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield oldest_to_newest 1143963 0 mmaxfield 2015-11-21 14:01:11 -0800 Tiny cleanup in ComplexTextController::collectComplexTextRuns() 1143964 1 266032 mmaxfield 2015-11-21 14:02:43 -0800 Created attachment 266032 Patch 1143965 2 266032 zalan 2015-11-21 14:18:48 -0800 Comment on attachment 266032 Patch rs=me 1143966 3 mmaxfield 2015-11-21 15:06:53 -0800 Committed r192726: <http://trac.webkit.org/changeset/192726> 266032 2015-11-21 14:02:43 -0800 2015-11-21 14:18:48 -0800 Patch bug-151534-20151121140229.patch text/plain 3714 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I5OWY0ODgxOTFjYTIz MDYxZWQyMGQ3OGU4NzEzMzFkNDUxZTQ2MC4uMDY0NTE5YzY1NDhiNGM0NjBkN2MyN2JiOTRhNGM0 MjFhNWJiNGM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSArMSwxNiBAQAorMjAxNS0xMS0yMSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFRpbnkgY2xlYW51 cCBpbiBDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnMoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNTM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzTWlzc2lu Z0dseXBoIGJvb2xlYW4gaXMgY29tcGxldGVseSB1bm5lY2Vzc2FyeS4gSXRzIGVudGlyZQorICAg ICAgICByZXNwb25zaWJsaXR5IGlzIGR1cGxpY2F0ZWQgYnkgdGhlICJmb250IiBwb2ludGVyLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0 Q29tcGxleFRleHRSdW5zKToKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIwMTUtMTEt MjEgPT0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9D b21wbGV4VGV4dENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAKaW5kZXggNmM5OGYwZmMwOGVlYmYwOGQ1 OTYxYzcwNDZkZTFlNDhkMzBhZWVlNS4uYTM2MmEzMDEyMjRhNDYwNjNmZmYzMDgwMzA2ODEzYzYy NzlhNDdlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L0NvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAKQEAgLTMxMyw5ICszMTMsNyBA QCB2b2lkIENvbXBsZXhUZXh0Q29udHJvbGxlcjo6Y29sbGVjdENvbXBsZXhUZXh0UnVucygpCiAg ICAgY29uc3QgVUNoYXIqIGVuZCA9IGNwICsgbV9lbmQ7CiAKICAgICBjb25zdCBGb250KiBmb250 OwotICAgIGJvb2wgaXNNaXNzaW5nR2x5cGg7CiAgICAgY29uc3QgRm9udCogbmV4dEZvbnQ7Ci0g ICAgYm9vbCBuZXh0SXNNaXNzaW5nR2x5cGg7CiAKICAgICB1bnNpZ25lZCBtYXJrQ291bnQ7CiAg ICAgY29uc3QgVUNoYXIqIHNlcXVlbmNlU3RhcnQgPSBjdXJyOwpAQCAtMzM1LDE0ICszMzMsMTAg QEAgdm9pZCBDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnMoKQog ICAgICAgICAgICAgbV9zbWFsbENhcHNCdWZmZXJbc2VxdWVuY2VTdGFydCAtIGNwICsgaSArIDFd ID0gc2VxdWVuY2VTdGFydFtpICsgMV07CiAgICAgfQogCi0gICAgbmV4dElzTWlzc2luZ0dseXBo ID0gZmFsc2U7CiAgICAgbmV4dEZvbnQgPSBtX2ZvbnQuZm9udEZvckNvbWJpbmluZ0NoYXJhY3Rl clNlcXVlbmNlKHNlcXVlbmNlU3RhcnQsIGN1cnIgLSBzZXF1ZW5jZVN0YXJ0LCBuZXh0SXNTbWFs bENhcHMgPyBTbWFsbENhcHNWYXJpYW50IDogTm9ybWFsVmFyaWFudCk7Ci0gICAgaWYgKCFuZXh0 Rm9udCkKLSAgICAgICAgbmV4dElzTWlzc2luZ0dseXBoID0gdHJ1ZTsKIAogICAgIHdoaWxlIChj dXJyIDwgZW5kKSB7CiAgICAgICAgIGZvbnQgPSBuZXh0Rm9udDsKLSAgICAgICAgaXNNaXNzaW5n R2x5cGggPSBuZXh0SXNNaXNzaW5nR2x5cGg7CiAgICAgICAgIGlzU21hbGxDYXBzID0gbmV4dElz U21hbGxDYXBzOwogICAgICAgICBpbnQgaW5kZXggPSBjdXJyIC0gY3A7CiAKQEAgLTM2MCwxOSAr MzU0LDE1IEBAIHZvaWQgQ29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRleHRS dW5zKCkKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIG5leHRJc01pc3NpbmdH bHlwaCA9IGZhbHNlOwogICAgICAgICBpZiAoYmFzZUNoYXJhY3RlciA9PSB6ZXJvV2lkdGhKb2lu ZXIpCiAgICAgICAgICAgICBuZXh0Rm9udCA9IGZvbnQ7Ci0gICAgICAgIGVsc2UgeworICAgICAg ICBlbHNlCiAgICAgICAgICAgICBuZXh0Rm9udCA9IG1fZm9udC5mb250Rm9yQ29tYmluaW5nQ2hh cmFjdGVyU2VxdWVuY2UoY3AgKyBpbmRleCwgY3VyciAtIGNwIC0gaW5kZXgsIG5leHRJc1NtYWxs Q2FwcyA/IFNtYWxsQ2Fwc1ZhcmlhbnQgOiBOb3JtYWxWYXJpYW50KTsKLSAgICAgICAgICAgIGlm ICghbmV4dEZvbnQpCi0gICAgICAgICAgICAgICAgbmV4dElzTWlzc2luZ0dseXBoID0gdHJ1ZTsK LSAgICAgICAgfQogCi0gICAgICAgIGlmIChuZXh0Rm9udCAhPSBmb250IHx8IG5leHRJc01pc3Np bmdHbHlwaCAhPSBpc01pc3NpbmdHbHlwaCkgeworICAgICAgICBpZiAobmV4dEZvbnQgIT0gZm9u dCkgewogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IHN0YXRpY19jYXN0PGludD4oaW5kZXhP ZkZvbnRUcmFuc2l0aW9uKTsKICAgICAgICAgICAgIGludCBpdGVtTGVuZ3RoID0gaW5kZXggLSBp bmRleE9mRm9udFRyYW5zaXRpb247Ci0gICAgICAgICAgICBjb2xsZWN0Q29tcGxleFRleHRSdW5z Rm9yQ2hhcmFjdGVycygoaXNTbWFsbENhcHMgPyBtX3NtYWxsQ2Fwc0J1ZmZlci5kYXRhKCkgOiBj cCkgKyBpdGVtU3RhcnQsIGl0ZW1MZW5ndGgsIGl0ZW1TdGFydCwgIWlzTWlzc2luZ0dseXBoID8g Zm9udCA6IDApOworICAgICAgICAgICAgY29sbGVjdENvbXBsZXhUZXh0UnVuc0ZvckNoYXJhY3Rl cnMoKGlzU21hbGxDYXBzID8gbV9zbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0 YXJ0LCBpdGVtTGVuZ3RoLCBpdGVtU3RhcnQsIGZvbnQpOwogICAgICAgICAgICAgaW5kZXhPZkZv bnRUcmFuc2l0aW9uID0gaW5kZXg7CiAgICAgICAgIH0KICAgICB9CkBAIC0zODAsNyArMzcwLDcg QEAgdm9pZCBDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnMoKQog ICAgIGludCBpdGVtTGVuZ3RoID0gbV9lbmQgLSBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAg aWYgKGl0ZW1MZW5ndGgpIHsKICAgICAgICAgaW50IGl0ZW1TdGFydCA9IGluZGV4T2ZGb250VHJh bnNpdGlvbjsKLSAgICAgICAgY29sbGVjdENvbXBsZXhUZXh0UnVuc0ZvckNoYXJhY3RlcnMoKG5l eHRJc1NtYWxsQ2FwcyA/IG1fc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFy dCwgaXRlbUxlbmd0aCwgaXRlbVN0YXJ0LCAhbmV4dElzTWlzc2luZ0dseXBoID8gbmV4dEZvbnQg OiAwKTsKKyAgICAgICAgY29sbGVjdENvbXBsZXhUZXh0UnVuc0ZvckNoYXJhY3RlcnMoKG5leHRJ c1NtYWxsQ2FwcyA/IG1fc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFydCwg aXRlbUxlbmd0aCwgaXRlbVN0YXJ0LCBuZXh0Rm9udCk7CiAgICAgfQogCiAgICAgaWYgKCFtX3J1 bi5sdHIoKSkK