73781 2011-12-04 14:50:46 -0800 Change CSSFontSelector to use HashMap<OwnPtr> 2013-05-07 08:57:58 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73757 1 darin darin macpherson webkit.review.bot oldest_to_newest 514770 0 darin 2011-12-04 14:50:46 -0800 Change CSSFontSelector to use HashMap<OwnPtr> 514771 1 117809 darin 2011-12-04 14:53:12 -0800 Created attachment 117809 Patch 515509 2 117809 webkit.review.bot 2011-12-05 17:04:10 -0800 Comment on attachment 117809 Patch Clearing flags on attachment: 117809 Committed r102071: <http://trac.webkit.org/changeset/102071> 515510 3 webkit.review.bot 2011-12-05 17:04:14 -0800 All reviewed patches have been landed. Closing bug. 117809 2011-12-04 14:53:12 -0800 2011-12-05 17:04:10 -0800 Patch bug-73781-20111204145311.patch text/plain 6618 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTk2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTA0ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBDaGFuZ2UgQ1NTRm9udFNlbGVjdG9y IHRvIHVzZSBIYXNoTWFwPE93blB0cj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTczNzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNTU0ZvbnRTZWxlY3Rvcjo6fkNTU0ZvbnRTZWxlY3Rvcik6IFJlbW92ZWQgY2FsbHMgdG8g ZGVsZXRlQWxsVmFsdWVzLgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjphZGRG b250RmFjZVJ1bGUpOiBVcGRhdGVkIHRvIHVzZSBPd25QdHIgaW5zdGVhZCBvZiByYXcKKyAgICAg ICAgcG9pbnRlciBmb3IgdGhlIGVudHJ5IGluIG1fZm9udEZhY2VzIGFuZCBtX2xvY2FsbHlJbnN0 YWxsZWRGb250RmFjZXMuCisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmdldEZv bnREYXRhKTogVXBkYXRlZCB0byB1c2UgT3duUHRyIGluc3RlYWQgb2YgcmF3CisgICAgICAgIHBv aW50ZXIgZm9yIHRoZSBlbnRyeSBpbiBtX2ZvbnRzLiBBbHNvIHJlbW92ZWQgYW4gdW5uZWVkZWQg c3RkOjogcHJlZml4LgorCisgICAgICAgICogY3NzL0NTU0ZvbnRTZWxlY3Rvci5oOiBNYWRlIG1f Zm9udEZhY2VzLCBtX2xvY2FsbHlJbnN0YWxsZWRGb250RmFjZXMsIGFuZCBtX2ZvbnRzCisgICAg ICAgIGJlIEhhc2hNYXA8T3duUHRyPi4KKwogMjAxMS0xMi0wNCAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBISUVSQVJDSFlfUkVRVUVTVF9FUlIgY2hlY2sgaW4g Y2hlY2tBY2NlcHRDaGlsZCBzaG91bGQgYmUgb3B0aW1pemVkIGZvciBuZXdDaGlsZCB3aXRob3V0 IGNoaWxkcmVuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAkocmV2 aXNpb24gMTAxOTY3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDggQEAKICNpbmNsdWRlICJTVkdOYW1lcy5oIgog I2VuZGlmCiAKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog Q1NTRm9udFNlbGVjdG9yOjpDU1NGb250U2VsZWN0b3IoRG9jdW1lbnQqIGRvY3VtZW50KQpAQCAt NzQsOSArNzYsNiBAQCBDU1NGb250U2VsZWN0b3I6On5DU1NGb250U2VsZWN0b3IoKQogewogICAg IGNsZWFyRG9jdW1lbnQoKTsKICAgICBmb250Q2FjaGUoKS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwot ICAgIGRlbGV0ZUFsbFZhbHVlcyhtX2ZvbnRGYWNlcyk7Ci0gICAgZGVsZXRlQWxsVmFsdWVzKG1f bG9jYWxseUluc3RhbGxlZEZvbnRGYWNlcyk7Ci0gICAgZGVsZXRlQWxsVmFsdWVzKG1fZm9udHMp OwogfQogCiBib29sIENTU0ZvbnRTZWxlY3Rvcjo6aXNFbXB0eSgpIGNvbnN0CkBAIC0zMjAsMjAg KzMxOSwxNiBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VSdWxlKGNvCiAgICAg ICAgIGlmIChmYW1pbHlOYW1lLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0g ICAgICAgIFZlY3RvcjxSZWZQdHI8Q1NTRm9udEZhY2U+ID4qIGZhbWlseUZvbnRGYWNlcyA9IG1f Zm9udEZhY2VzLmdldChmYW1pbHlOYW1lKTsKKyAgICAgICAgT3duUHRyPFZlY3RvcjxSZWZQdHI8 Q1NTRm9udEZhY2U+ID4gPiYgZmFtaWx5Rm9udEZhY2VzID0gbV9mb250RmFjZXMuYWRkKGZhbWls eU5hbWUsIG51bGxwdHIpLmZpcnN0LT5zZWNvbmQ7CiAgICAgICAgIGlmICghZmFtaWx5Rm9udEZh Y2VzKSB7Ci0gICAgICAgICAgICBmYW1pbHlGb250RmFjZXMgPSBuZXcgVmVjdG9yPFJlZlB0cjxD U1NGb250RmFjZT4gPjsKLSAgICAgICAgICAgIG1fZm9udEZhY2VzLnNldChmYW1pbHlOYW1lLCBm YW1pbHlGb250RmFjZXMpOworICAgICAgICAgICAgZmFtaWx5Rm9udEZhY2VzID0gYWRvcHRQdHIo bmV3IFZlY3RvcjxSZWZQdHI8Q1NTRm9udEZhY2U+ID4pOwogCiAgICAgICAgICAgICBBU1NFUlQo IW1fbG9jYWxseUluc3RhbGxlZEZvbnRGYWNlcy5jb250YWlucyhmYW1pbHlOYW1lKSk7Ci0gICAg ICAgICAgICBWZWN0b3I8UmVmUHRyPENTU0ZvbnRGYWNlPiA+KiBmYW1pbHlMb2NhbGx5SW5zdGFs bGVkRmFjZXM7CiAKICAgICAgICAgICAgIFZlY3Rvcjx1bnNpZ25lZD4gbG9jYWxseUluc3RhbGxl ZEZvbnRzVHJhaXRzTWFza3M7CiAgICAgICAgICAgICBmb250Q2FjaGUoKS0+Z2V0VHJhaXRzSW5G YW1pbHkoZmFtaWx5TmFtZSwgbG9jYWxseUluc3RhbGxlZEZvbnRzVHJhaXRzTWFza3MpOwotICAg ICAgICAgICAgdW5zaWduZWQgbnVtTG9jYWxseUluc3RhbGxlZEZhY2VzID0gbG9jYWxseUluc3Rh bGxlZEZvbnRzVHJhaXRzTWFza3Muc2l6ZSgpOwotICAgICAgICAgICAgaWYgKG51bUxvY2FsbHlJ bnN0YWxsZWRGYWNlcykgewotICAgICAgICAgICAgICAgIGZhbWlseUxvY2FsbHlJbnN0YWxsZWRG YWNlcyA9IG5ldyBWZWN0b3I8UmVmUHRyPENTU0ZvbnRGYWNlPiA+OwotICAgICAgICAgICAgICAg IG1fbG9jYWxseUluc3RhbGxlZEZvbnRGYWNlcy5zZXQoZmFtaWx5TmFtZSwgZmFtaWx5TG9jYWxs eUluc3RhbGxlZEZhY2VzKTsKKyAgICAgICAgICAgIGlmICh1bnNpZ25lZCBudW1Mb2NhbGx5SW5z dGFsbGVkRmFjZXMgPSBsb2NhbGx5SW5zdGFsbGVkRm9udHNUcmFpdHNNYXNrcy5zaXplKCkpIHsK KyAgICAgICAgICAgICAgICBPd25QdHI8VmVjdG9yPFJlZlB0cjxDU1NGb250RmFjZT4gPiA+IGZh bWlseUxvY2FsbHlJbnN0YWxsZWRGYWNlcyA9IGFkb3B0UHRyKG5ldyBWZWN0b3I8UmVmUHRyPENT U0ZvbnRGYWNlPiA+KTsKIAogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBudW1Mb2NhbGx5SW5zdGFsbGVkRmFjZXM7ICsraSkgewogICAgICAgICAgICAgICAgICAgICBS ZWZQdHI8Q1NTRm9udEZhY2U+IGxvY2FsbHlJbnN0YWxsZWRGb250RmFjZSA9IENTU0ZvbnRGYWNl OjpjcmVhdGUoc3RhdGljX2Nhc3Q8Rm9udFRyYWl0c01hc2s+KGxvY2FsbHlJbnN0YWxsZWRGb250 c1RyYWl0c01hc2tzW2ldKSwgdHJ1ZSk7CkBAIC0zNDEsNiArMzM2LDggQEAgdm9pZCBDU1NGb250 U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZShjbwogICAgICAgICAgICAgICAgICAgICBBU1NFUlQo bG9jYWxseUluc3RhbGxlZEZvbnRGYWNlLT5pc1ZhbGlkKCkpOwogICAgICAgICAgICAgICAgICAg ICBmYW1pbHlMb2NhbGx5SW5zdGFsbGVkRmFjZXMtPmFwcGVuZChsb2NhbGx5SW5zdGFsbGVkRm9u dEZhY2UpOwogICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIG1fbG9jYWxseUlu c3RhbGxlZEZvbnRGYWNlcy5zZXQoZmFtaWx5TmFtZSwgZmFtaWx5TG9jYWxseUluc3RhbGxlZEZh Y2VzLnJlbGVhc2UoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtNTIyLDE5ICs1 MTksMTYgQEAgRm9udERhdGEqIENTU0ZvbnRTZWxlY3Rvcjo6Z2V0Rm9udERhdGEoYwogICAgICAg ICByZXR1cm4gZm9udERhdGFGb3JHZW5lcmljRmFtaWx5KG1fZG9jdW1lbnQsIGZvbnREZXNjcmlw dGlvbiwgZmFtaWx5TmFtZSk7CiAgICAgfQogCi0gICAgSGFzaE1hcDx1bnNpZ25lZCwgUmVmUHRy PENTU1NlZ21lbnRlZEZvbnRGYWNlPiA+KiBzZWdtZW50ZWRGb250RmFjZUNhY2hlID0gbV9mb250 cy5nZXQoZmFtaWx5KTsKLSAgICBpZiAoIXNlZ21lbnRlZEZvbnRGYWNlQ2FjaGUpIHsKLSAgICAg ICAgc2VnbWVudGVkRm9udEZhY2VDYWNoZSA9IG5ldyBIYXNoTWFwPHVuc2lnbmVkLCBSZWZQdHI8 Q1NTU2VnbWVudGVkRm9udEZhY2U+ID47Ci0gICAgICAgIG1fZm9udHMuc2V0KGZhbWlseSwgc2Vn bWVudGVkRm9udEZhY2VDYWNoZSk7Ci0gICAgfQorICAgIE93blB0cjxIYXNoTWFwPHVuc2lnbmVk LCBSZWZQdHI8Q1NTU2VnbWVudGVkRm9udEZhY2U+ID4gPiYgc2VnbWVudGVkRm9udEZhY2VDYWNo ZSA9IG1fZm9udHMuYWRkKGZhbWlseSwgbnVsbHB0cikuZmlyc3QtPnNlY29uZDsKKyAgICBpZiAo IXNlZ21lbnRlZEZvbnRGYWNlQ2FjaGUpCisgICAgICAgIHNlZ21lbnRlZEZvbnRGYWNlQ2FjaGUg PSBhZG9wdFB0cihuZXcgSGFzaE1hcDx1bnNpZ25lZCwgUmVmUHRyPENTU1NlZ21lbnRlZEZvbnRG YWNlPiA+KTsKIAogICAgIEZvbnRUcmFpdHNNYXNrIHRyYWl0c01hc2sgPSBmb250RGVzY3JpcHRp b24udHJhaXRzTWFzaygpOwogCi0gICAgUmVmUHRyPENTU1NlZ21lbnRlZEZvbnRGYWNlPiBmYWNl ID0gc2VnbWVudGVkRm9udEZhY2VDYWNoZS0+Z2V0KHRyYWl0c01hc2spOwotCisgICAgUmVmUHRy PENTU1NlZ21lbnRlZEZvbnRGYWNlPiYgZmFjZSA9IHNlZ21lbnRlZEZvbnRGYWNlQ2FjaGUtPmFk ZCh0cmFpdHNNYXNrLCAwKS5maXJzdC0+c2Vjb25kOwogICAgIGlmICghZmFjZSkgewogICAgICAg ICBmYWNlID0gQ1NTU2VnbWVudGVkRm9udEZhY2U6OmNyZWF0ZSh0aGlzKTsKLSAgICAgICAgc2Vn bWVudGVkRm9udEZhY2VDYWNoZS0+c2V0KHRyYWl0c01hc2ssIGZhY2UpOworCiAgICAgICAgIC8v IENvbGxlY3QgYWxsIG1hdGNoaW5nIGZhY2VzIGFuZCBzb3J0IHRoZW0gaW4gb3JkZXIgb2YgcHJl ZmVyZW5jZS4KICAgICAgICAgVmVjdG9yPENTU0ZvbnRGYWNlKiwgMzI+IGNhbmRpZGF0ZUZvbnRG YWNlczsKICAgICAgICAgZm9yIChpbnQgaSA9IGZhbWlseUZvbnRGYWNlcy0+c2l6ZSgpIC0gMTsg aSA+PSAwOyAtLWkpIHsKQEAgLTU2Nyw3ICs1NjEsNyBAQCBGb250RGF0YSogQ1NTRm9udFNlbGVj dG9yOjpnZXRGb250RGF0YShjCiAgICAgICAgIH0KIAogICAgICAgICBkZXNpcmVkVHJhaXRzTWFz a0ZvckNvbXBhcmlzb24gPSB0cmFpdHNNYXNrOwotICAgICAgICBzdGQ6OnN0YWJsZV9zb3J0KGNh bmRpZGF0ZUZvbnRGYWNlcy5iZWdpbigpLCBjYW5kaWRhdGVGb250RmFjZXMuZW5kKCksIGNvbXBh cmVGb250RmFjZXMpOworICAgICAgICBzdGFibGVfc29ydChjYW5kaWRhdGVGb250RmFjZXMuYmVn aW4oKSwgY2FuZGlkYXRlRm9udEZhY2VzLmVuZCgpLCBjb21wYXJlRm9udEZhY2VzKTsKICAgICAg ICAgdW5zaWduZWQgbnVtQ2FuZGlkYXRlcyA9IGNhbmRpZGF0ZUZvbnRGYWNlcy5zaXplKCk7CiAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1DYW5kaWRhdGVzOyArK2kpCiAgICAg ICAgICAgICBmYWNlLT5hcHBlbmRGb250RmFjZShjYW5kaWRhdGVGb250RmFjZXNbaV0pOwpJbmRl eDogU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaAkocmV2aXNpb24gMTAxOTY3KQorKysg U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCSh3b3JraW5nIGNvcHkpCkBAIC03 OCw5ICs3OCw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBiZWdpbkxvYWRUaW1lckZpcmVkKFRpbWVy PENTU0ZvbnRTZWxlY3Rvcj4qKTsKIAogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwotICAgIEhh c2hNYXA8U3RyaW5nLCBWZWN0b3I8UmVmUHRyPENTU0ZvbnRGYWNlPiA+KiwgQ2FzZUZvbGRpbmdI YXNoPiBtX2ZvbnRGYWNlczsKLSAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFJlZlB0cjxDU1NG b250RmFjZT4gPiosIENhc2VGb2xkaW5nSGFzaD4gbV9sb2NhbGx5SW5zdGFsbGVkRm9udEZhY2Vz OwotICAgIEhhc2hNYXA8U3RyaW5nLCBIYXNoTWFwPHVuc2lnbmVkLCBSZWZQdHI8Q1NTU2VnbWVu dGVkRm9udEZhY2U+ID4qLCBDYXNlRm9sZGluZ0hhc2g+IG1fZm9udHM7CisgICAgSGFzaE1hcDxT dHJpbmcsIE93blB0cjxWZWN0b3I8UmVmUHRyPENTU0ZvbnRGYWNlPiA+ID4sIENhc2VGb2xkaW5n SGFzaD4gbV9mb250RmFjZXM7CisgICAgSGFzaE1hcDxTdHJpbmcsIE93blB0cjxWZWN0b3I8UmVm UHRyPENTU0ZvbnRGYWNlPiA+ID4sIENhc2VGb2xkaW5nSGFzaD4gbV9sb2NhbGx5SW5zdGFsbGVk Rm9udEZhY2VzOworICAgIEhhc2hNYXA8U3RyaW5nLCBPd25QdHI8SGFzaE1hcDx1bnNpZ25lZCwg UmVmUHRyPENTU1NlZ21lbnRlZEZvbnRGYWNlPiA+ID4sIENhc2VGb2xkaW5nSGFzaD4gbV9mb250 czsKICAgICBIYXNoU2V0PEZvbnRTZWxlY3RvckNsaWVudCo+IG1fY2xpZW50czsKIAogICAgIFZl Y3RvcjxDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRGb250PiA+IG1fZm9udHNUb0JlZ2luTG9h ZGluZzsK