41032 2010-06-22 20:09:41 -0700 Removing document dependencies from CanvasRenderingContext::setFont for use in workers 2010-06-22 20:12:43 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED INVALID P2 Normal --- 34909 0 sswigart webkit-unassigned oldest_to_newest 241618 0 59469 sswigart 2010-06-22 20:09:41 -0700 Created attachment 59469 setFont refactoring See summary. 241619 1 sswigart 2010-06-22 20:12:43 -0700 Not doing canvas on workers for now. This is put up in case of reference for future. 59469 2010-06-22 20:09:41 -0700 2010-06-22 20:12:07 -0700 setFont refactoring setFont.diff text/plain 6403 sswigart ZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAgYi9XZWJDb3JlL2Nz cy9DU1NGb250U2VsZWN0b3IuY3BwCmluZGV4IDU2ZWUyNjEuLmY4YjZlZWMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTRm9u dFNlbGVjdG9yLmNwcApAQCAtNjcsNiArNjcsMTIgQEAgQ1NTRm9udFNlbGVjdG9yOjpDU1NGb250 U2VsZWN0b3IoRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIGZvbnRDYWNoZSgpLT5hZGRDbGllbnQo dGhpcyk7CiB9CiAKK0NTU0ZvbnRTZWxlY3Rvcjo6Q1NTRm9udFNlbGVjdG9yKCkKKyAgICA6IG1f ZG9jdW1lbnQoMCkKK3sKKyAgICBmb250Q2FjaGUoKS0+YWRkQ2xpZW50KHRoaXMpOworfQorCiBD U1NGb250U2VsZWN0b3I6On5DU1NGb250U2VsZWN0b3IoKQogewogICAgIGZvbnRDYWNoZSgpLT5y ZW1vdmVDbGllbnQodGhpcyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0 b3IuaCBiL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4IGFmNDU0YmQuLjIxZGFm MTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCisrKyBiL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCkBAIC02NSw2ICs2NSw3IEBAIHB1YmxpYzoKIAogcHJp dmF0ZToKICAgICBDU1NGb250U2VsZWN0b3IoRG9jdW1lbnQqKTsKKyAgICBDU1NGb250U2VsZWN0 b3IoKTsKIAogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwogICAgIEhhc2hNYXA8U3RyaW5nLCBW ZWN0b3I8UmVmUHRyPENTU0ZvbnRGYWNlPiA+KiwgQ2FzZUZvbGRpbmdIYXNoPiBtX2ZvbnRGYWNl czsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvV2ViQ29y ZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggZWJkMzY3NC4uMWZkY2EzMSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAKQEAgLTQ3Niw2ICs0NzYsMTUgQEAgQ1NTU3R5bGVTZWxlY3Rv cjo6Q1NTU3R5bGVTZWxlY3RvcihEb2N1bWVudCogZG9jLCBTdHlsZVNoZWV0TGlzdCogc3R5bGVT aGVldHMsIEMKICAgICAgICAgZG9jLT5yZW5kZXJlcigpLT5zdHlsZSgpLT5mb250KCkudXBkYXRl KGZvbnRTZWxlY3RvcigpKTsKIH0KIAorQ1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVTZWxlY3Rv cigpCisgICAgOiBtX2F1dGhvclN0eWxlKG5ldyBDU1NSdWxlU2V0KCkpCisgICAgLCBtX3VzZXJT dHlsZSgwKQorICAgICwgbV9iYWNrZ3JvdW5kRGF0YShCYWNrZ3JvdW5kRmlsbExheWVyKQorICAg ICwgbV9tYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMoZmFsc2UpCit7CisgICAgaW5pdCgpOworfQor CiAvLyBUaGlzIGlzIGEgc2ltcGxpZmllZCBzdHlsZSBzZXR0aW5nIGZ1bmN0aW9uIGZvciBrZXlm cmFtZSBzdHlsZXMKIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRkS2V5ZnJhbWVTdHlsZShQYXNz UmVmUHRyPFdlYktpdENTU0tleWZyYW1lc1J1bGU+IHJ1bGUpCiB7CkBAIC04MjIsOSArODMxLDEy IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6aW5pdEZvclN0eWxlUmVzb2x2ZShFbGVtZW50KiBl LCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsCiAgICAgZWxzZQogICAgICAgICBtX3BhcmVudFN0 eWxlID0gbV9wYXJlbnROb2RlID8gbV9wYXJlbnROb2RlLT5yZW5kZXJTdHlsZSgpIDogMDsKIAot ICAgIE5vZGUqIGRvY0VsZW1lbnQgPSBlID8gZS0+ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50 KCkgOiAwOwotICAgIFJlbmRlclN0eWxlKiBkb2NTdHlsZSA9IG1fY2hlY2tlci5tX2RvY3VtZW50 LT5yZW5kZXJTdHlsZSgpOwotICAgIG1fcm9vdEVsZW1lbnRTdHlsZSA9IGRvY0VsZW1lbnQgJiYg ZSAhPSBkb2NFbGVtZW50ID8gZG9jRWxlbWVudC0+cmVuZGVyU3R5bGUoKSA6IGRvY1N0eWxlOwor ICAgIGlmIChtX2NoZWNrZXIubV9kb2N1bWVudCkgeworICAgICAgICBOb2RlKiBkb2NFbGVtZW50 ID0gZSA/IGUtPmRvY3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgpIDogMDsKKyAgICAgICAgUmVu ZGVyU3R5bGUqIGRvY1N0eWxlID0gbV9jaGVja2VyLm1fZG9jdW1lbnQtPnJlbmRlclN0eWxlKCk7 CisgICAgICAgIG1fcm9vdEVsZW1lbnRTdHlsZSA9IGRvY0VsZW1lbnQgJiYgZSAhPSBkb2NFbGVt ZW50ID8gZG9jRWxlbWVudC0+cmVuZGVyU3R5bGUoKSA6IGRvY1N0eWxlOworICAgIH0gZWxzZQor ICAgICAgICBtX3Jvb3RFbGVtZW50U3R5bGUgPSAwOwogCiAgICAgbV9zdHlsZSA9IDA7CiAKQEAg LTg3NCw2ICs4ODYsMTYgQEAgQ1NTU3R5bGVTZWxlY3Rvcjo6U2VsZWN0b3JDaGVja2VyOjpTZWxl Y3RvckNoZWNrZXIoRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIHN0cmkKIHsKIH0KIAorQ1NTU3R5 bGVTZWxlY3Rvcjo6U2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNrZXIoKQorICAgIDogbV9k b2N1bWVudCgwKQorICAgICwgbV9zdHJpY3RQYXJzaW5nKGZhbHNlKQorICAgICwgbV9jb2xsZWN0 UnVsZXNPbmx5KGZhbHNlKQorICAgICwgbV9wc2V1ZG9TdHlsZShOT1BTRVVETykKKyAgICAsIG1f ZG9jdW1lbnRJc0hUTUwoZmFsc2UpCisgICAgLCBtX21hdGNoVmlzaXRlZFBzZXVkb0NsYXNzKGZh bHNlKQoreworfQorCiBFSW5zaWRlTGluayBDU1NTdHlsZVNlbGVjdG9yOjpTZWxlY3RvckNoZWNr ZXI6OmRldGVybWluZUxpbmtTdGF0ZShFbGVtZW50KiBlbGVtZW50KSBjb25zdAogewogICAgIGlm ICghZWxlbWVudC0+aXNMaW5rKCkpCkBAIC00MjQ5LDE0ICs0MjcxLDE4IEBAIHZvaWQgQ1NTU3R5 bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQgaWQsIENTU1ZhbHVlICp2YWx1ZSkKICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiB2YWwg PSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KGl0ZW0pOwogICAgICAgICAgICAgQXRv bWljU3RyaW5nIGZhY2U7Ci0gICAgICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX2NoZWNr ZXIubV9kb2N1bWVudC0+c2V0dGluZ3MoKTsKICAgICAgICAgICAgIGlmICh2YWwtPnByaW1pdGl2 ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORykKICAgICAgICAgICAgICAg ICBmYWNlID0gc3RhdGljX2Nhc3Q8Rm9udEZhbWlseVZhbHVlKj4odmFsKS0+ZmFtaWx5TmFtZSgp OwotICAgICAgICAgICAgZWxzZSBpZiAodmFsLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19JREVOVCAmJiBzZXR0aW5ncykgeworICAgICAgICAgICAgZWxzZSBpZiAo dmFsLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19JREVOVCkgewor ICAgICAgICAgICAgICAgIC8vIE5vdyBhc3N1bWluZyB0aGF0IGlmIGlkZW50ICE9IENTU1ZhbHVl V2Via2l0Qm9keSwgc2V0dGluZ3MgaXMgbm90IHJlcXVpcmVkIHRvIGV4aXN0CiAgICAgICAgICAg ICAgICAgc3dpdGNoICh2YWwtPmdldElkZW50KCkpIHsKICAgICAgICAgICAgICAgICAgICAgY2Fz ZSBDU1NWYWx1ZVdlYmtpdEJvZHk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBmYWNlID0gc2V0 dGluZ3MtPnN0YW5kYXJkRm9udEZhbWlseSgpOworICAgICAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSAgbV9jaGVja2VyLm1fZG9j dW1lbnQgPyBtX2NoZWNrZXIubV9kb2N1bWVudC0+c2V0dGluZ3MoKSA6IDA7CisgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoc2V0dGluZ3MpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZmFjZSA9IHNldHRpbmdzLT5zdGFuZGFyZEZvbnRGYW1pbHkoKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg IGNhc2UgQ1NTVmFsdWVTZXJpZjoKICAgICAgICAgICAgICAgICAgICAgICAgIGZhY2UgPSAiLXdl YmtpdC1zZXJpZiI7CiAgICAgICAgICAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0 R2VuZXJpY0ZhbWlseShGb250RGVzY3JpcHRpb246OlNlcmlmRmFtaWx5KTsKQEAgLTU5MjAsNiAr NTk0Niw4IEBAIGZsb2F0IENTU1N0eWxlU2VsZWN0b3I6OmdldENvbXB1dGVkU2l6ZUZyb21TcGVj aWZpZWRTaXplKERvY3VtZW50KiBkb2N1bWVudCwgUmVuCiAgICAgZmxvYXQgem9vbUZhY3RvciA9 IDEuMGY7CiAgICAgaWYgKCF1c2VTVkdab29tUnVsZXMpIHsKICAgICAgICAgem9vbUZhY3RvciA9 IHN0eWxlLT5lZmZlY3RpdmVab29tKCk7CisgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAg ICAgICByZXR1cm4gc3BlY2lmaWVkU2l6ZSAqIHpvb21GYWN0b3I7CiAgICAgICAgIGlmIChkb2N1 bWVudC0+ZnJhbWUoKSAmJiBkb2N1bWVudC0+ZnJhbWUoKS0+c2hvdWxkQXBwbHlUZXh0Wm9vbSgp KQogICAgICAgICAgICAgem9vbUZhY3RvciAqPSBkb2N1bWVudC0+ZnJhbWUoKS0+dGV4dFpvb21G YWN0b3IoKTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmggYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggODBhMTg2Yi4uMGJjNDNj OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCisrKyBiL1dlYkNv cmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaApAQCAtODMsNiArODMsNyBAQCBwdWJsaWM6CiAgICAg ICAgIENTU1N0eWxlU2VsZWN0b3IoRG9jdW1lbnQqLCBTdHlsZVNoZWV0TGlzdCogYXV0aG9yU2hl ZXRzLCBDU1NTdHlsZVNoZWV0KiBtYXBwZWRFbGVtZW50U2hlZXQsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgQ1NTU3R5bGVTaGVldCogcGFnZVVzZXJTaGVldCwgY29uc3QgVmVjdG9yPFJlZlB0 cjxDU1NTdHlsZVNoZWV0PiA+KiBwYWdlR3JvdXBVc2VyU2hlZXRzLAogICAgICAgICAgICAgICAg ICAgICAgICAgIGJvb2wgc3RyaWN0UGFyc2luZywgYm9vbCBtYXRjaEF1dGhvckFuZFVzZXJTdHls ZXMpOworICAgICAgICBDU1NTdHlsZVNlbGVjdG9yKCk7CiAgICAgICAgIH5DU1NTdHlsZVNlbGVj dG9yKCk7CiAKICAgICAgICAgdm9pZCBpbml0RWxlbWVudChFbGVtZW50Kik7CkBAIC0xOTQsNiAr MTk1LDcgQEAgcHVibGljOgogICAgICAgICBjbGFzcyBTZWxlY3RvckNoZWNrZXIgOiBwdWJsaWMg Tm9uY29weWFibGUgewogICAgICAgICBwdWJsaWM6CiAgICAgICAgICAgICBTZWxlY3RvckNoZWNr ZXIoRG9jdW1lbnQqLCBib29sIHN0cmljdFBhcnNpbmcpOworICAgICAgICAgICAgU2VsZWN0b3JD aGVja2VyKCk7CiAKICAgICAgICAgICAgIGJvb2wgY2hlY2tTZWxlY3RvcihDU1NTZWxlY3Rvcios IEVsZW1lbnQqKSBjb25zdDsKICAgICAgICAgICAgIFNlbGVjdG9yTWF0Y2ggY2hlY2tTZWxlY3Rv cihDU1NTZWxlY3RvciosIEVsZW1lbnQqLCBIYXNoU2V0PEF0b21pY1N0cmluZ0ltcGwqPiogc2Vs ZWN0b3JBdHRycywgUHNldWRvSWQmIGR5bmFtaWNQc2V1ZG8sIGJvb2wgaXNTdWJTZWxlY3Rvciwg Ym9vbCBlbmNvdW50ZXJlZExpbmssIFJlbmRlclN0eWxlKiA9IDAsIFJlbmRlclN0eWxlKiBlbGVt ZW50UGFyZW50U3R5bGUgPSAwKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0NhbnZh c1N1cmZhY2UuY3BwIGIvV2ViQ29yZS9kb20vQ2FudmFzU3VyZmFjZS5jcHAKaW5kZXggZGM3ZTRl MS4uOTcxZTgyOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vQ2FudmFzU3VyZmFjZS5jcHAKKysr IGIvV2ViQ29yZS9kb20vQ2FudmFzU3VyZmFjZS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNs dWRlICJDYW52YXNTdXJmYWNlLmgiCiAKICNpbmNsdWRlICJBZmZpbmVUcmFuc2Zvcm0uaCIKKyNp bmNsdWRlICJDU1NTdHlsZVNlbGVjdG9yLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgog I2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgpAQCAt MTc0LDcgKzE3NSw4IEBAIFJlbmRlclN0eWxlKiBDYW52YXNTdXJmYWNlOjpjb21wdXRlZFN0eWxl KCkKIAogQ1NTU3R5bGVTZWxlY3RvciogQ2FudmFzU3VyZmFjZTo6c3R5bGVTZWxlY3RvcigpCiB7 Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxDYW52YXNFbGVtZW50Kj4odGhpcyktPmRvY3Vt ZW50KCktPnN0eWxlU2VsZWN0b3IoKTsKKyAgICBEb2N1bWVudCogZG9jID0gc3RhdGljX2Nhc3Q8 SFRNTENhbnZhc0VsZW1lbnQqPih0aGlzKS0+ZG9jdW1lbnQoKTsKKyAgICByZXR1cm4gZG9jID8g ZG9jLT5zdHlsZVNlbGVjdG9yKCkgOiBuZXcgQ1NTU3R5bGVTZWxlY3RvcigpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg==