58458 2011-04-13 11:00:41 -0700 constructLine should take bidiRuns as a parameter 2011-04-13 22:36:37 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned commit-queue eric oldest_to_newest 385011 0 yael 2011-04-13 11:00:41 -0700 Currently, constructLine takes 7 parameters, most of which are members of bidiRuns. We could just pass bidiRuns instead. 385012 1 89406 yael 2011-04-13 11:04:22 -0700 Created attachment 89406 Patch. 385030 2 89406 eric 2011-04-13 11:21:26 -0700 Comment on attachment 89406 Patch. Yay! 385522 3 89406 commit-queue 2011-04-13 22:36:30 -0700 Comment on attachment 89406 Patch. Clearing flags on attachment: 89406 Committed r83813: <http://trac.webkit.org/changeset/83813> 385523 4 commit-queue 2011-04-13 22:36:37 -0700 All reviewed patches have been landed. Closing bug. 89406 2011-04-13 11:04:22 -0700 2011-04-13 22:36:30 -0700 Patch. 58458.patch text/plain 6781 yael SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzQ5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMTMgIFlhZWwgQWhh cm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGNvbnN0cnVjdExpbmUgc2hvdWxkIHRha2UgYmlkaVJ1bnMg YXMgYSBwYXJhbWV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU4NDU4CisKKyAgICAgICAgUGFzcyBiaWRpUnVucyB0byBjb25zdHJ1Y3RMaW5lIGFu ZCBtb3ZlIHJlYWNoZWRFbmRPZlRleHRSZW5kZXJlciBzbyB0aGF0IGl0IGlzCisgICAgICAgIGRl Y2xhcmVkIGJlZm9yZSBjb25zdHJ1Y3RMaW5lLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0 aGlzIGlzIHJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnJlYWNoZWRFbmRPZlRleHRSZW5kZXJlcik6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCbG9jazo6Y29uc3RydWN0TGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9jazo6bGF5b3V0SW5saW5lQ2hpbGRyZW4pOgorCiAyMDExLTA0LTEyICBQYXZlbCBQb2Rp dmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBh dmVsIEZlbGRtYW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAko cmV2aXNpb24gODM3NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAkod29ya2luZyBjb3B5KQpAQCAtNTAxLDcgKzUwMSw3IEBAIHByaXZhdGU6CiAgICAgdHlwZWRl ZiBzdGQ6OnBhaXI8UmVuZGVyVGV4dCosIExhenlMaW5lQnJlYWtJdGVyYXRvcj4gTGluZUJyZWFr SXRlcmF0b3JJbmZvOwogICAgIElubGluZUl0ZXJhdG9yIGZpbmROZXh0TGluZUJyZWFrKElubGlu ZUJpZGlSZXNvbHZlciYsIGJvb2wgZmlyc3RMaW5lLCBib29sJiBpc0xpbmVFbXB0eSwgTGluZUJy ZWFrSXRlcmF0b3JJbmZvJiwgYm9vbCYgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5LCBib29sJiBo eXBoZW5hdGVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVDbGVhcios IEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBWZWN0b3I8UmVuZGVy Qm94Kj4mIHBvc2l0aW9uZWRPYmplY3RzKTsKLSAgICBSb290SW5saW5lQm94KiBjb25zdHJ1Y3RM aW5lKHVuc2lnbmVkIHJ1bkNvdW50LCBCaWRpUnVuKiBmaXJzdFJ1biwgQmlkaVJ1biogbGFzdFJ1 biwgYm9vbCBmaXJzdExpbmUsIGJvb2wgbGFzdExpbmUsIGJvb2wgaXNMb2dpY2FsbHlMYXN0UnVu V3JhcHBlZCwgUmVuZGVyT2JqZWN0KiBsb2dpY2FsbHlMYXN0UnVuUmVuZGVyZXIpOworICAgIFJv b3RJbmxpbmVCb3gqIGNvbnN0cnVjdExpbmUoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mLCBib29sIGZp cnN0TGluZSwgYm9vbCBsYXN0TGluZSk7CiAgICAgSW5saW5lRmxvd0JveCogY3JlYXRlTGluZUJv eGVzKFJlbmRlck9iamVjdCosIGJvb2wgZmlyc3RMaW5lLCBJbmxpbmVCb3gqIGNoaWxkQm94KTsK IAogICAgIHZvaWQgY29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUoUm9vdElu bGluZUJveCosIGJvb2wgZmlyc3RMaW5lLCBCaWRpUnVuKiBmaXJzdFJ1biwgQmlkaVJ1biogdHJh aWxpbmdTcGFjZVJ1biwgYm9vbCByZWFjaGVkRW5kLCBHbHlwaE92ZXJmbG93QW5kRmFsbGJhY2tG b250c01hcCYsIFZlcnRpY2FsUG9zaXRpb25DYWNoZSYpOwpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHJldmlzaW9uIDgz NzQ4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NiwxNyArMjY2LDM4IEBAIElubGluZUZsb3dCb3gqIFJl bmRlckJsb2NrOjpjcmVhdGVMaW5lQm8KICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1Sb290SW5s aW5lQm94KiBSZW5kZXJCbG9jazo6Y29uc3RydWN0TGluZSh1bnNpZ25lZCBydW5Db3VudCwgQmlk aVJ1biogZmlyc3RSdW4sIEJpZGlSdW4qIGxhc3RSdW4sIGJvb2wgZmlyc3RMaW5lLCBib29sIGxh c3RMaW5lLCBib29sIGlzTG9naWNhbGx5TGFzdFJ1bldyYXBwZWQsIFJlbmRlck9iamVjdCogbG9n aWNhbGx5TGFzdFJ1blJlbmRlcmVyKQorc3RhdGljIGJvb2wgcmVhY2hlZEVuZE9mVGV4dFJlbmRl cmVyKGNvbnN0IEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBiaWRpUnVucykKK3sKKyAgICBCaWRpUnVu KiBydW4gPSBiaWRpUnVucy5sb2dpY2FsbHlMYXN0UnVuKCk7CisgICAgaWYgKCFydW4pCisgICAg ICAgIHJldHVybiB0cnVlOworICAgIHVuc2lnbmVkIGludCBwb3MgPSBydW4tPnN0b3AoKTsKKyAg ICBSZW5kZXJPYmplY3QqIHIgPSBydW4tPm1fb2JqZWN0OworICAgIGlmICghci0+aXNUZXh0KCkg fHwgci0+aXNCUigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgUmVuZGVyVGV4dCogcmVu ZGVyVGV4dCA9IHRvUmVuZGVyVGV4dChyKTsKKyAgICBpZiAocG9zID49IHJlbmRlclRleHQtPnRl eHRMZW5ndGgoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICB3aGlsZSAoaXNBU0NJSVNw YWNlKHJlbmRlclRleHQtPmNoYXJhY3RlcnMoKVtwb3NdKSkgeworICAgICAgICBwb3MrKzsKKyAg ICAgICAgaWYgKHBvcyA+PSByZW5kZXJUZXh0LT50ZXh0TGVuZ3RoKCkpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCitSb290SW5saW5lQm94 KiBSZW5kZXJCbG9jazo6Y29uc3RydWN0TGluZShCaWRpUnVuTGlzdDxCaWRpUnVuPiYgYmlkaVJ1 bnMsIGJvb2wgZmlyc3RMaW5lLCBib29sIGxhc3RMaW5lKQogewotICAgIEFTU0VSVChmaXJzdFJ1 bik7CisgICAgQVNTRVJUKGJpZGlSdW5zLmZpcnN0UnVuKCkpOwogCiAgICAgYm9vbCByb290SGFz U2VsZWN0ZWRDaGlsZHJlbiA9IGZhbHNlOwogICAgIElubGluZUZsb3dCb3gqIHBhcmVudEJveCA9 IDA7Ci0gICAgZm9yIChCaWRpUnVuKiByID0gZmlyc3RSdW47IHI7IHIgPSByLT5uZXh0KCkpIHsK KyAgICBmb3IgKEJpZGlSdW4qIHIgPSBiaWRpUnVucy5maXJzdFJ1bigpOyByOyByID0gci0+bmV4 dCgpKSB7CiAgICAgICAgIC8vIENyZWF0ZSBhIGJveCBmb3Igb3VyIG9iamVjdC4KLSAgICAgICAg Ym9vbCBpc09ubHlSdW4gPSAocnVuQ291bnQgPT0gMSk7Ci0gICAgICAgIGlmIChydW5Db3VudCA9 PSAyICYmICFyLT5tX29iamVjdC0+aXNMaXN0TWFya2VyKCkpCi0gICAgICAgICAgICBpc09ubHlS dW4gPSAoIXN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGxhc3RSdW4gOiBmaXJz dFJ1biktPm1fb2JqZWN0LT5pc0xpc3RNYXJrZXIoKTsKKyAgICAgICAgYm9vbCBpc09ubHlSdW4g PSAoYmlkaVJ1bnMucnVuQ291bnQoKSA9PSAxKTsKKyAgICAgICAgaWYgKGJpZGlSdW5zLnJ1bkNv dW50KCkgPT0gMiAmJiAhci0+bV9vYmplY3QtPmlzTGlzdE1hcmtlcigpKQorICAgICAgICAgICAg aXNPbmx5UnVuID0gKCFzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBiaWRpUnVu cy5sYXN0UnVuKCkgOiBiaWRpUnVucy5maXJzdFJ1bigpKS0+bV9vYmplY3QtPmlzTGlzdE1hcmtl cigpOwogCiAgICAgICAgIElubGluZUJveCogYm94ID0gY3JlYXRlSW5saW5lQm94Rm9yUmVuZGVy ZXIoci0+bV9vYmplY3QsIGZhbHNlLCBpc09ubHlSdW4pOwogICAgICAgICByLT5tX2JveCA9IGJv eDsKQEAgLTMyNSw3ICszNDYsOCBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6Y29uc3Ry dWN0TGluCiAgICAgLy8gcGFpbnQgYm9yZGVycy9tYXJnaW5zL3BhZGRpbmcuICBUaGlzIGtub3ds ZWRnZSB3aWxsIHVsdGltYXRlbHkgYmUgdXNlZCB3aGVuCiAgICAgLy8gd2UgZGV0ZXJtaW5lIHRo ZSBob3Jpem9udGFsIHBvc2l0aW9ucyBhbmQgd2lkdGhzIG9mIGFsbCB0aGUgaW5saW5lIGJveGVz IG9uCiAgICAgLy8gdGhlIGxpbmUuCi0gICAgbGFzdExpbmVCb3goKS0+ZGV0ZXJtaW5lU3BhY2lu Z0ZvckZsb3dCb3hlcyhsYXN0TGluZSwgaXNMb2dpY2FsbHlMYXN0UnVuV3JhcHBlZCwgbG9naWNh bGx5TGFzdFJ1blJlbmRlcmVyKTsKKyAgICBib29sIGlzTG9naWNhbGx5TGFzdFJ1bldyYXBwZWQg PSBiaWRpUnVucy5sb2dpY2FsbHlMYXN0UnVuKCktPm1fb2JqZWN0ICYmIGJpZGlSdW5zLmxvZ2lj YWxseUxhc3RSdW4oKS0+bV9vYmplY3QtPmlzVGV4dCgpID8gIXJlYWNoZWRFbmRPZlRleHRSZW5k ZXJlcihiaWRpUnVucykgOiB0cnVlOworICAgIGxhc3RMaW5lQm94KCktPmRldGVybWluZVNwYWNp bmdGb3JGbG93Qm94ZXMobGFzdExpbmUsIGlzTG9naWNhbGx5TGFzdFJ1bldyYXBwZWQsIGJpZGlS dW5zLmxvZ2ljYWxseUxhc3RSdW4oKS0+bV9vYmplY3QpOwogCiAgICAgLy8gTm93IG1hcmsgdGhl IGxpbmUgYm94ZXMgYXMgYmVpbmcgY29uc3RydWN0ZWQuCiAgICAgbGFzdExpbmVCb3goKS0+c2V0 Q29uc3RydWN0ZWQoKTsKQEAgLTYzOSwyNyArNjYxLDYgQEAgc3RhdGljIHZvaWQgc2V0U3RhdGlj UG9zaXRpb25zKFJlbmRlckJsbwogICAgIGNoaWxkLT5sYXllcigpLT5zZXRTdGF0aWNCbG9ja1Bv c2l0aW9uKGJsb2NrSGVpZ2h0KTsKIH0KIAotc3RhdGljIGJvb2wgcmVhY2hlZEVuZE9mVGV4dFJl bmRlcmVyKGNvbnN0IEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBiaWRpUnVucykKLXsKLSAgICBCaWRp UnVuKiBydW4gPSBiaWRpUnVucy5sb2dpY2FsbHlMYXN0UnVuKCk7Ci0gICAgaWYgKCFydW4pCi0g ICAgICAgIHJldHVybiB0cnVlOwotICAgIHVuc2lnbmVkIGludCBwb3MgPSBydW4tPnN0b3AoKTsK LSAgICBSZW5kZXJPYmplY3QqIHIgPSBydW4tPm1fb2JqZWN0OwotICAgIGlmICghci0+aXNUZXh0 KCkgfHwgci0+aXNCUigpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgUmVuZGVyVGV4dCog cmVuZGVyVGV4dCA9IHRvUmVuZGVyVGV4dChyKTsKLSAgICBpZiAocG9zID49IHJlbmRlclRleHQt PnRleHRMZW5ndGgoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICB3aGlsZSAoaXNBU0NJ SVNwYWNlKHJlbmRlclRleHQtPmNoYXJhY3RlcnMoKVtwb3NdKSkgewotICAgICAgICBwb3MrKzsK LSAgICAgICAgaWYgKHBvcyA+PSByZW5kZXJUZXh0LT50ZXh0TGVuZ3RoKCkpCi0gICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotICAgIAogaW5saW5l IEJpZGlSdW4qIFJlbmRlckJsb2NrOjpoYW5kbGVUcmFpbGluZ1NwYWNlcyhCaWRpUnVuTGlzdDxC aWRpUnVuPiYgYmlkaVJ1bnMsIEJpZGlDb250ZXh0KiBjdXJyZW50Q29udGV4dCkKIHsKICAgICBp ZiAoIWJpZGlSdW5zLnJ1bkNvdW50KCkKQEAgLTkwMiw5ICs5MDMsNyBAQCB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRJbmxpbmVDaGlsZHJlbihiCiAgICAgICAgICAgICAgICAgaWYgKGJpZGlSdW5z LnJ1bkNvdW50KCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKGh5cGhlbmF0ZWQpCiAgICAg ICAgICAgICAgICAgICAgICAgICBiaWRpUnVucy5sb2dpY2FsbHlMYXN0UnVuKCktPm1faGFzSHlw aGVuID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgYm9vbCBpc0xvZ2ljYWxseUxhc3RSdW5X cmFwcGVkID0gYmlkaVJ1bnMubG9naWNhbGx5TGFzdFJ1bigpLT5tX29iamVjdCAmJiBiaWRpUnVu cy5sb2dpY2FsbHlMYXN0UnVuKCktPm1fb2JqZWN0LT5pc1RleHQoKSA/ICFyZWFjaGVkRW5kT2ZU ZXh0UmVuZGVyZXIoYmlkaVJ1bnMpIDogdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgLy8gRklY TUU6IENsZWFybHkgY29uc3RydWN0TGluZSBzaG91bGQganVzdCB0YWtlIGEgYmlkaVJ1bnMgb2Jq ZWN0LgotICAgICAgICAgICAgICAgICAgICBsaW5lQm94ID0gY29uc3RydWN0TGluZShiaWRpUnVu cy5ydW5Db3VudCgpLCBiaWRpUnVucy5maXJzdFJ1bigpLCBiaWRpUnVucy5sYXN0UnVuKCksIGZp cnN0TGluZSwgIWVuZC5tX29iaiwgaXNMb2dpY2FsbHlMYXN0UnVuV3JhcHBlZCwgYmlkaVJ1bnMu bG9naWNhbGx5TGFzdFJ1bigpLT5tX29iamVjdCk7CisgICAgICAgICAgICAgICAgICAgIGxpbmVC b3ggPSBjb25zdHJ1Y3RMaW5lKGJpZGlSdW5zLCBmaXJzdExpbmUsICFlbmQubV9vYmopOwogICAg ICAgICAgICAgICAgICAgICBpZiAobGluZUJveCkgewogICAgICAgICAgICAgICAgICAgICAgICAg bGluZUJveC0+c2V0RW5kc1dpdGhCcmVhayhwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkpOwogCg==