130146 2014-03-12 11:34:51 -0700 Spelling is hard 2014-03-12 11:53:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 989753 0 simon.fraser 2014-03-12 11:34:51 -0700 Spelling is hard 989757 1 226539 simon.fraser 2014-03-12 11:35:50 -0700 Created attachment 226539 Patch 989778 2 simon.fraser 2014-03-12 11:53:16 -0700 https://trac.webkit.org/r165491 226539 2014-03-12 11:35:50 -0700 2014-03-12 11:36:40 -0700 Patch bug-130146-20140312113526.patch text/plain 7110 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ2ODM2MzllNmJmMzY1 ODhkNmE2ZjlhNjU4YzU2MjdlN2JhNTBjYy4uMzM2Mzg5ZDdmY2I0ZDk4YmZkMzI3MDNhODBiNzcz OGYwNjZmNTA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0LTAzLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFNwZWxsaW5nIGlz IGhhcmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eCBzcGVsbGluZyAoY29uc3RhaW5lZCAtPiBjb25zdHJhaW5lZCkuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllck1vZGVsT2JqZWN0OjpzdHlsZURpZENoYW5nZSk6CisKKzIwMTQtMDMtMTIgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgQ2hhbmdlIHNjcm9s bE9mZnNldEZvckZpeGVkUG9zaXRpb24oKSB0byBkbyBMYXlvdXRVbml0IG1hdGgKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTk4MQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2lvcy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2lvcy9DaGFu Z2VMb2cKaW5kZXggMGYyYmFhOGFmOTkwYjUwMDI4MDRlNmM2YWQxMWM4Y2E3ZDhjZDBmNC4uMTFm NjljZjA3MDE3N2E4MDYzOGMwZmMzZDQ0NGYzZDkxOWU1ZDBjMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9pb3MvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvaW9zL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDE0LTAzLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgorCisgICAgICAgIFNwZWxsaW5nIGlzIGhhcmQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDE0NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgRml4IHNwZWxsaW5nIChjb25z dGFpbmVkIC0+IGNvbnN0cmFpbmVkKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZp eGVkUG9zaXRpb25Db250ZW50Lm1tOgorICAgICAgICAoLVtXZWJGaXhlZFBvc2l0aW9uQ29udGVu dCBzY3JvbGxPclpvb21DaGFuZ2VkOl0pOgorICAgICAgICAoLVtXZWJGaXhlZFBvc2l0aW9uQ29u dGVudCBvdmVyZmxvd1Njcm9sbFBvc2l0aW9uRm9yTGF5ZXI6Y2hhbmdlZFRvOl0pOgorICAgICAg ICAoLVtXZWJGaXhlZFBvc2l0aW9uQ29udGVudCBzZXRWaWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJz OldURjo6V2ViQ29yZTo6c3RpY2t5Q29udGFpbmVyTWFwOldURjo6XSk6CisgICAgICAgICgtW1dl YkZpeGVkUG9zaXRpb25Db250ZW50IGhhc0ZpeGVkT3JTdGlja3lQb3NpdGlvbkxheWVyc10pOgor ICAgICAgICAoLVtXZWJGaXhlZFBvc2l0aW9uQ29udGVudCBtaW5pbXVtT2Zmc2V0RnJvbUZpeGVk UG9zaXRpb25MYXllcnNUb0FuY2hvckVkZ2U6b2ZSZWN0OmluTGF5ZXI6XSk6CisKIDIwMTQtMDIt MTcgIFNlcmdpbyBDb3JyZWlhICA8c2VyZ2lvLmNvcnJlaWFAb3BlbmJvc3NhLm9yZz4KIAogICAg ICAgICBSZXBsYWNlIHVzZXMgb2YgUGFzc093blB0ci9Pd25QdHIgd2l0aCBzdGQ6OnVuaXF1ZV9w dHIgaW4gV2ViQ29yZS9pbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcAppbmRleCBiYTUyOGM2N2U0ZWQ1ZTIyMTIzMWE4 OGE3ODMyMmVhZmNmNmY5NWVjLi5lYjhmMmU5Zjk0MTc4OWZjN2Y5MjczODkzNzg4ZWU1YzcwZTBh MmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2Rl bE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9k ZWxPYmplY3QuY3BwCkBAIC0xNjYsMTAgKzE2NiwxMCBAQCB2b2lkIFJlbmRlckxheWVyTW9kZWxP YmplY3Q6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJT dAogICAgICAgICAgICAgc2V0Q2hpbGROZWVkc0xheW91dCgpOwogICAgIH0KIAotICAgIGJvb2wg bmV3U3R5bGVJc1ZpZXdwb3J0Q29uc3RhaW5lZCA9IHN0eWxlKCkuaGFzVmlld3BvcnRDb25zdHJh aW5lZFBvc2l0aW9uKCk7CisgICAgYm9vbCBuZXdTdHlsZUlzVmlld3BvcnRDb25zdHJhaW5lZCA9 IHN0eWxlKCkuaGFzVmlld3BvcnRDb25zdHJhaW5lZFBvc2l0aW9uKCk7CiAgICAgYm9vbCBvbGRT dHlsZUlzVmlld3BvcnRDb25zdHJhaW5lZCA9IG9sZFN0eWxlICYmIG9sZFN0eWxlLT5oYXNWaWV3 cG9ydENvbnN0cmFpbmVkUG9zaXRpb24oKTsKLSAgICBpZiAobmV3U3R5bGVJc1ZpZXdwb3J0Q29u c3RhaW5lZCAhPSBvbGRTdHlsZUlzVmlld3BvcnRDb25zdHJhaW5lZCkgewotICAgICAgICBpZiAo bmV3U3R5bGVJc1ZpZXdwb3J0Q29uc3RhaW5lZCAmJiBsYXllcigpKQorICAgIGlmIChuZXdTdHls ZUlzVmlld3BvcnRDb25zdHJhaW5lZCAhPSBvbGRTdHlsZUlzVmlld3BvcnRDb25zdHJhaW5lZCkg eworICAgICAgICBpZiAobmV3U3R5bGVJc1ZpZXdwb3J0Q29uc3RyYWluZWQgJiYgbGF5ZXIoKSkK ICAgICAgICAgICAgIHZpZXcoKS5mcmFtZVZpZXcoKS5hZGRWaWV3cG9ydENvbnN0cmFpbmVkT2Jq ZWN0KHRoaXMpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2aWV3KCkuZnJhbWVWaWV3KCku cmVtb3ZlVmlld3BvcnRDb25zdHJhaW5lZE9iamVjdCh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvaW9zL1dlYkNvcmVTdXBwb3J0L1dlYkZpeGVkUG9zaXRpb25Db250ZW50Lm1tIGIv U291cmNlL1dlYktpdC9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViRml4ZWRQb3NpdGlvbkNvbnRlbnQu bW0KaW5kZXggODA3NDMzZWZkY2ZkMzgwZDZiYTQwNTIxYjVmOTJkODg0N2RmNGRiZS4uYzI0MjE3 NmFkNjUzZmQwNTkzZTE2ZTAxN2Q3MGVkN2NiZDM4MzQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViRml4ZWRQb3NpdGlvbkNvbnRlbnQubW0KKysrIGIv U291cmNlL1dlYktpdC9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViRml4ZWRQb3NpdGlvbkNvbnRlbnQu bW0KQEAgLTcwLDcgKzcwLDcgQEAgcHVibGljOgogICAgIH5XZWJGaXhlZFBvc2l0aW9uQ29udGVu dERhdGEoKTsKICAgICAKICAgICBXZWJWaWV3ICptX3dlYlZpZXc7Ci0gICAgTGF5ZXJJbmZvTWFw IG1fdmlld3BvcnRDb25zdGFpbmVkTGF5ZXJzOworICAgIExheWVySW5mb01hcCBtX3ZpZXdwb3J0 Q29uc3RyYWluZWRMYXllcnM7CiB9OwogCiAKQEAgLTEwMyw4ICsxMDMsOCBAQCBXZWJGaXhlZFBv c2l0aW9uQ29udGVudERhdGE6On5XZWJGaXhlZFBvc2l0aW9uQ29udGVudERhdGEoKQogewogICAg IE11dGV4TG9ja2VyIGxvY2soV2ViRml4ZWRQb3NpdGlvbkNvbnRlbnREYXRhTG9jaygpKTsKIAot ICAgIExheWVySW5mb01hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gX3ByaXZhdGUtPm1fdmlld3Bv cnRDb25zdGFpbmVkTGF5ZXJzLmVuZCgpOwotICAgIGZvciAoTGF5ZXJJbmZvTWFwOjpjb25zdF9p dGVyYXRvciBpdCA9IF9wcml2YXRlLT5tX3ZpZXdwb3J0Q29uc3RhaW5lZExheWVycy5iZWdpbigp OyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICBMYXllckluZm9NYXA6OmNvbnN0X2l0ZXJhdG9yIGVu ZCA9IF9wcml2YXRlLT5tX3ZpZXdwb3J0Q29uc3RyYWluZWRMYXllcnMuZW5kKCk7CisgICAgZm9y IChMYXllckluZm9NYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gX3ByaXZhdGUtPm1fdmlld3BvcnRD b25zdHJhaW5lZExheWVycy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgQ0FM YXllciAqbGF5ZXIgPSBpdC0+a2V5LmdldCgpOwogICAgICAgICBWaWV3cG9ydENvbnN0cmFpbmVk TGF5ZXJEYXRhKiBjb25zdHJhaW50RGF0YSA9IGl0LT52YWx1ZS5nZXQoKTsKICAgICAgICAgY29u c3QgVmlld3BvcnRDb25zdHJhaW50cyYgY29uc3RyYWludHMgPSAqKGNvbnN0cmFpbnREYXRhLT5t X3ZpZXdwb3J0Q29uc3RyYWludHMuZ2V0KCkpOwpAQCAtMTQyLDggKzE0Miw4IEBAIFdlYkZpeGVk UG9zaXRpb25Db250ZW50RGF0YTo6fldlYkZpeGVkUG9zaXRpb25Db250ZW50RGF0YSgpCiB7CiAg ICAgTXV0ZXhMb2NrZXIgbG9jayhXZWJGaXhlZFBvc2l0aW9uQ29udGVudERhdGFMb2NrKCkpOwog Ci0gICAgTGF5ZXJJbmZvTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBfcHJpdmF0ZS0+bV92aWV3 cG9ydENvbnN0YWluZWRMYXllcnMuZW5kKCk7Ci0gICAgZm9yIChMYXllckluZm9NYXA6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gX3ByaXZhdGUtPm1fdmlld3BvcnRDb25zdGFpbmVkTGF5ZXJzLmJlZ2lu KCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgIExheWVySW5mb01hcDo6Y29uc3RfaXRlcmF0b3Ig ZW5kID0gX3ByaXZhdGUtPm1fdmlld3BvcnRDb25zdHJhaW5lZExheWVycy5lbmQoKTsKKyAgICBm b3IgKExheWVySW5mb01hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBfcHJpdmF0ZS0+bV92aWV3cG9y dENvbnN0cmFpbmVkTGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBD QUxheWVyICpsYXllciA9IGl0LT5rZXkuZ2V0KCk7CiAgICAgICAgIFZpZXdwb3J0Q29uc3RyYWlu ZWRMYXllckRhdGEqIGNvbnN0cmFpbnREYXRhID0gaXQtPnZhbHVlLmdldCgpOwogICAgICAgICAK QEAgLTE3NSw3ICsxNzUsNyBAQCBXZWJGaXhlZFBvc2l0aW9uQ29udGVudERhdGE6On5XZWJGaXhl ZFBvc2l0aW9uQ29udGVudERhdGEoKQogewogICAgIE11dGV4TG9ja2VyIGxvY2soV2ViRml4ZWRQ b3NpdGlvbkNvbnRlbnREYXRhTG9jaygpKTsKIAotICAgIF9wcml2YXRlLT5tX3ZpZXdwb3J0Q29u c3RhaW5lZExheWVycy5jbGVhcigpOworICAgIF9wcml2YXRlLT5tX3ZpZXdwb3J0Q29uc3RyYWlu ZWRMYXllcnMuY2xlYXIoKTsKIAogICAgIEhhc2hNYXA8Q0FMYXllciAqLCBPd25QdHI8Vmlld3Bv cnRDb25zdHJhaW50cz4gPjo6aXRlcmF0b3IgZW5kID0gbGF5ZXJNYXAuZW5kKCk7CiAgICAgZm9y IChIYXNoTWFwPENBTGF5ZXIgKiwgT3duUHRyPFZpZXdwb3J0Q29uc3RyYWludHM+ID46Oml0ZXJh dG9yIGl0ID0gbGF5ZXJNYXAuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CkBAIC0xODUsMTQg KzE4NSwxNCBAQCBXZWJGaXhlZFBvc2l0aW9uQ29udGVudERhdGE6On5XZWJGaXhlZFBvc2l0aW9u Q29udGVudERhdGEoKQogICAgICAgICBsYXllckRhdGEtPm1fZW5jbG9zaW5nQWNjZWxlcmF0ZWRT Y3JvbGxMYXllciA9IHN0aWNreUNvbnRhaW5lcnMuZ2V0KGxheWVyKTsKICAgICAgICAgbGF5ZXJE YXRhLT5tX3ZpZXdwb3J0Q29uc3RyYWludHMgPSBpdC0+dmFsdWUucmVsZWFzZSgpOwogCi0gICAg ICAgIF9wcml2YXRlLT5tX3ZpZXdwb3J0Q29uc3RhaW5lZExheWVycy5zZXQobGF5ZXIsIGxheWVy RGF0YS5yZWxlYXNlKCkpOworICAgICAgICBfcHJpdmF0ZS0+bV92aWV3cG9ydENvbnN0cmFpbmVk TGF5ZXJzLnNldChsYXllciwgbGF5ZXJEYXRhLnJlbGVhc2UoKSk7CiAgICAgfQogfQogCiAtIChC T09MKWhhc0ZpeGVkT3JTdGlja3lQb3NpdGlvbkxheWVycwogewogICAgIE11dGV4TG9ja2VyIGxv Y2soV2ViRml4ZWRQb3NpdGlvbkNvbnRlbnREYXRhTG9jaygpKTsKLSAgICByZXR1cm4gIV9wcml2 YXRlLT5tX3ZpZXdwb3J0Q29uc3RhaW5lZExheWVycy5pc0VtcHR5KCk7CisgICAgcmV0dXJuICFf cHJpdmF0ZS0+bV92aWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJzLmlzRW1wdHkoKTsKIH0KIAogc3Rh dGljIFZpZXdwb3J0Q29uc3RyYWludHM6OkFuY2hvckVkZ2VGbGFncyBhbmNob3JFZGdlRmxhZ3NG b3JBbmNob3JFZGdlKFdlYkZpeGVkUG9zaXRpb25BbmNob3JFZGdlIGVkZ2UpCkBAIC0yMTQsOCAr MjE0LDggQEAgc3RhdGljIFZpZXdwb3J0Q29uc3RyYWludHM6OkFuY2hvckVkZ2VGbGFncyBhbmNo b3JFZGdlRmxhZ3NGb3JBbmNob3JFZGdlKFdlYkZpeGUKICAgICBNdXRleExvY2tlciBsb2NrKFdl YkZpeGVkUG9zaXRpb25Db250ZW50RGF0YUxvY2soKSk7CiAgICAgVmlld3BvcnRDb25zdHJhaW50 czo6QW5jaG9yRWRnZUZsYWdzIGFuY2hvckVkZ2VGbGFncyA9IGFuY2hvckVkZ2VGbGFnc0ZvckFu Y2hvckVkZ2UoYW5jaG9yRWRnZSk7CiAgICAgQ0dGbG9hdCBtaW5pbXVtT2Zmc2V0ID0gQ0dGTE9B VF9NQVg7Ci0gICAgTGF5ZXJJbmZvTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBfcHJpdmF0ZS0+ bV92aWV3cG9ydENvbnN0YWluZWRMYXllcnMuZW5kKCk7Ci0gICAgZm9yIChMYXllckluZm9NYXA6 OmNvbnN0X2l0ZXJhdG9yIGl0ID0gX3ByaXZhdGUtPm1fdmlld3BvcnRDb25zdGFpbmVkTGF5ZXJz LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgIExheWVySW5mb01hcDo6Y29uc3RfaXRl cmF0b3IgZW5kID0gX3ByaXZhdGUtPm1fdmlld3BvcnRDb25zdHJhaW5lZExheWVycy5lbmQoKTsK KyAgICBmb3IgKExheWVySW5mb01hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBfcHJpdmF0ZS0+bV92 aWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAg ICAgICBDQUxheWVyICpmaXhlZExheWVyID0gaXQtPmtleS5nZXQoKTsKICAgICAgICAgVmlld3Bv cnRDb25zdHJhaW5lZExheWVyRGF0YSogY29uc3RyYWludERhdGEgPSBpdC0+dmFsdWUuZ2V0KCk7 CiAgICAgICAgIGNvbnN0IFZpZXdwb3J0Q29uc3RyYWludHMmIGNvbnN0cmFpbnRzID0gKihjb25z dHJhaW50RGF0YS0+bV92aWV3cG9ydENvbnN0cmFpbnRzLmdldCgpKTsK