143568 2015-04-09 11:40:04 -0700 Revert part of 182516: it broke tests 2015-04-09 12:04:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue mmaxfield simon.fraser oldest_to_newest 1084007 0 simon.fraser 2015-04-09 11:40:04 -0700 Revert part of 182516: it broke tests 1084008 1 250450 simon.fraser 2015-04-09 11:41:22 -0700 Created attachment 250450 Patch 1084016 2 simon.fraser 2015-04-09 12:04:55 -0700 https://trac.webkit.org/r182605 250450 2015-04-09 11:41:22 -0700 2015-04-09 11:52:35 -0700 Patch bug-143568-20150409114031.patch text/plain 3483 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY1MzYwODRlZTg3Y2Fj ZjU4YWQzMTQzOWViMGJkNjkyYzNlZDMzYS4uN2UyZjQ4NzU4ZTdjNjM5ZDA4NjYyNzU0NWFkZDk5 MmI1MTJjMDRmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA0LTA5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmVydCBwYXJ0 IG9mIDE4MjUxNjogaXQgYnJva2UgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzU2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJldmVydCB0aGUgRm9udENhc2NhZGVDb2NvYSBwYXJ0cyBvZiBy MTgyNTE2LCBzaW5jZSBpdCBicm9rZSBzb21lIENTUyBzaGFwZXMgdGVzdHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdHbHlwaHMpOgorICAgICAgICAoV2ViQ29yZTo6ZGls YXRpb25TaXplRm9yVGV4dENvbG9yKTogRGVsZXRlZC4KKwogMjAxNS0wNC0wOCAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEJsb2NrIHBvcHVw cyBmcm9tIGNvbnRlbnQgZXh0ZW5zaW9ucy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCmluZGV4IDRlMDJh MGU4NzVjODM5ZmU2MTc3NzU4Y2I1MDRhZDBmM2IzNWVmYjUuLmVkZDNlNDNkNzhlZjc0ZGI0ZDQy YmU5NzA2NWZmM2VhZmQwNWM5ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQpAQCAtMjAzLDI2ICsy MDMsNiBAQCBzdGF0aWMgdm9pZCBzZXRDR0ZvbnRSZW5kZXJpbmdNb2RlKENHQ29udGV4dFJlZiBj Z0NvbnRleHQsIE5TRm9udFJlbmRlcmluZ01vZGUgcgogfQogI2VuZGlmCiAKLSNpZiBQTEFURk9S TShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwCi1zdGF0 aWMgQ0dTaXplIGRpbGF0aW9uU2l6ZUZvclRleHRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCi17 Ci0gICAgZG91YmxlIGh1ZTsKLSAgICBkb3VibGUgc2F0dXJhdGlvbjsKLSAgICBkb3VibGUgbGln aHRuZXNzOwotICAgIGNvbG9yLmdldEhTTChodWUsIHNhdHVyYXRpb24sIGxpZ2h0bmVzcyk7Ci0g ICAgCi0gICAgLy8gVGhlc2UgdmFsdWVzIHdlcmUgZGVyaXZlZCBlbXBpcmljYWxseSwgYW5kIGFy ZSBvbmx5IGV4cGVyaW1lbnRhbC4KLSAgICBpZiAobGlnaHRuZXNzIDwgMC4zMzMzKSAvLyBEYXJr Ci0gICAgICAgIHJldHVybiBDR1NpemVNYWtlKDAuMDA3LCAwLjAxOSk7Ci0KLSAgICBpZiAobGln aHRuZXNzIDwgMC42NjY3KSAvLyBNZWRpdW0KLSAgICAgICAgcmV0dXJuIENHU2l6ZU1ha2UoMC4w MzIsIDAuMDMyKTsKLQotICAgIC8vIExpZ2h0Ci0gICAgcmV0dXJuIENHU2l6ZU1ha2UoMC4wNDc1 LCAwLjAzOSk7Ci19Ci0jZW5kaWYKLQogdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0dseXBocyhHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZvbnQqIGZvbnQsIGNvbnN0IEdseXBoQnVmZmVy JiBnbHlwaEJ1ZmZlciwgaW50IGZyb20sIGludCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQm IGFuY2hvclBvaW50KSBjb25zdAogewogICAgIGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRm b3JtRGF0YSA9IGZvbnQtPnBsYXRmb3JtRGF0YSgpOwpAQCAtMjc3LDE3ICsyNTcsNiBAQCB2b2lk IEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg Rm9udCogZm9udCwgY29uc3QgRwogICAgICAgICBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhp bmcgPSBDR0NvbnRleHRHZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQpOwogICAgICAgICBD R0NvbnRleHRTZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQsIHNob3VsZFNtb290aEZvbnRz KTsKICAgICB9Ci0gICAgCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDExMDAKLSAgICBDR0ZvbnRBbnRpYWxpYXNpbmdTdHlsZSBvbGRBbnRpYWxpYXNpbmdTdHlsZTsK LSAgICBib29sIHJlc2V0QW50aWFsaWFzaW5nU3R5bGUgPSBmYWxzZTsKLSAgICBpZiAoYW50aWFs aWFzZWRGb250RGlsYXRpb25FbmFibGVkKCkgJiYgIUNHQ29udGV4dEdldFNob3VsZFNtb290aEZv bnRzKGNnQ29udGV4dCkgJiYgbWF0Y2hBbnRpYWxpYXNlZEFuZFNtb290aGVkRm9udHMpIHsKLSAg ICAgICAgcmVzZXRBbnRpYWxpYXNpbmdTdHlsZSA9IHRydWU7Ci0gICAgICAgIG9sZEFudGlhbGlh c2luZ1N0eWxlID0gQ0dDb250ZXh0R2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKGNnQ29udGV4dCk7 Ci0gICAgICAgIENHQ29udGV4dFNldEZvbnRBbnRpYWxpYXNpbmdTdHlsZShjZ0NvbnRleHQsIGtD R0ZvbnRBbnRpYWxpYXNpbmdTdHlsZVVuZmlsdGVyZWRDdXN0b21EaWxhdGlvbik7Ci0gICAgICAg IENHQ29udGV4dFNldEZvbnREaWxhdGlvbihjZ0NvbnRleHQsIGRpbGF0aW9uU2l6ZUZvclRleHRD b2xvcihjb250ZXh0LT5maWxsQ29sb3IoKSkpOwotICAgIH0KLSNlbmRpZgogI2VuZGlmCiAKICNp ZiAhUExBVEZPUk0oSU9TKQpAQCAtNDA1LDExICszNzQsNiBAQCB2b2lkIEZvbnRDYXNjYWRlOjpk cmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRm9udCogZm9udCwgY29u c3QgRwogICAgICAgICBjb250ZXh0LT5zZXRTaGFkb3coc2hhZG93T2Zmc2V0LCBzaGFkb3dCbHVy LCBzaGFkb3dDb2xvciwgc2hhZG93Q29sb3JTcGFjZSk7CiAKICNpZiAhUExBVEZPUk0oSU9TKQot I2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwCi0gICAgaWYgKHJl c2V0QW50aWFsaWFzaW5nU3R5bGUpCi0gICAgICAgIENHQ29udGV4dFNldEZvbnRBbnRpYWxpYXNp bmdTdHlsZShjZ0NvbnRleHQsIG9sZEFudGlhbGlhc2luZ1N0eWxlKTsKLSNlbmRpZgotICAgIAog ICAgIGlmIChjaGFuZ2VGb250U21vb3RoaW5nKQogICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRT bW9vdGhGb250cyhjZ0NvbnRleHQsIG9yaWdpbmFsU2hvdWxkVXNlRm9udFNtb290aGluZyk7CiAj ZW5kaWYK