57996 2011-04-06 16:11:12 -0700 Some minor style resolution optimizations 2011-04-06 16:39:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 380942 0 simon.fraser 2011-04-06 16:11:12 -0700 Some minor style resolution optimizations 380944 1 88539 simon.fraser 2011-04-06 16:13:15 -0700 Created attachment 88539 Patch 380963 2 simon.fraser 2011-04-06 16:39:46 -0700 http://trac.webkit.org/changeset/83119 88539 2011-04-06 16:13:15 -0700 2011-04-06 16:15:39 -0700 Patch bug-57996-20110406161313.patch text/plain 6859 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODMxMTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYTI4OGU4OTE1ODBiZDFm N2IwZTQ4MjU4MWM4M2E2MjUxNjkxNDNkLi4xNTcxOTVlNDQ4MGEwZmVhMTg1OTE2YTMwZjljYTVj YjVjOTgwOGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMDYgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBtaW5vciBzdHlsZSByZXNvbHV0aW9uIG9w dGltaXphdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU3OTk2CisKKyAgICAgICAgQSBjb3VwbGUgb2YgbWlub3Igb3B0aW1pemF0aW9ucyB0byBz dHlsZS1yZWxhdGVkIGNvZGUuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVj bGFyYXRpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNDU1NQcm9wZXJ0eU5hbWUp OgorICAgICAgICAoV2ViQ29yZTo6SlNDU1NTdHlsZURlY2xhcmF0aW9uOjpwdXREZWxlZ2F0ZSk6 CisgICAgICAgIEF2b2lkIGNhbGxpbmcgY3NzUHJvcGVydHlOYW1lKCkgdHdpY2Ugd2hlbiBzZXR0 aW5nIHN0eWxlIG9uIGFuIGVsZW1lbnQuCisgICAgICAgIAorICAgICAgICAqIGNzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVzZVNWR1pvb21SdWxlcyk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAg QXZvaWQgY2FsbGluZyBpc1NWR0VsZW1lbnQoKSBmb3IgZXZlcnkgcHJvcGVydHksIHNpbmNlIG9u bHkgYSB0d28gcHJvcGVydGllcworICAgICAgICBjYXJlIGFib3V0IGl0LgorCiAyMDExLTA0LTA2 ICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDU1NTdHlsZURlY2xhcmF0aW9uQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ1NTU3R5bGVEZWNsYXJhdGlvbkN1c3RvbS5jcHAKaW5kZXggODY3MGFjNWY3YTI4 OTZjMWExYTZiZWY5YjE1N2Y0OWQ0OGQ2OGY2NC4uYzQxYzE1YmQzNjM0ZDQ4YjQ5ZjM0ZjUyNGFm Yjc1YWNlNjU2M2EyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlND U1NTdHlsZURlY2xhcmF0aW9uQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0b20uY3BwCkBAIC0xMzMsMTEgKzEzMywxMSBA QCBzdGF0aWMgU3RyaW5nIGNzc1Byb3BlcnR5TmFtZShjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0 eU5hbWUsIGJvb2wqIGhhZFBpeGVsT3JQbwogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7 CiB9CiAKLXN0YXRpYyBib29sIGlzQ1NTUHJvcGVydHlOYW1lKGNvbnN0IElkZW50aWZpZXImIHBy b3BlcnR5TmFtZSkKK3N0YXRpYyBib29sIGlzQ1NTUHJvcGVydHlOYW1lKGNvbnN0IElkZW50aWZp ZXImIHByb3BlcnR5SWRlbnRpZmllcikKIHsKICAgICAvLyBGSVhNRTogVGhpcyBtYWxsb2NzIGEg c3RyaW5nIGZvciB0aGUgcHJvcGVydHkgbmFtZSBhbmQgdGhlbiB0aHJvd3MgaXQKICAgICAvLyBh d2F5LiAgVGhpcyBzaG93cyB1cCBvbiBwZWFjZWtlZXBlcidzIGRvbUR5bmFtaWNDcmVhdGlvbkNy ZWF0ZUVsZW1lbnQuCi0gICAgcmV0dXJuIENTU1N0eWxlRGVjbGFyYXRpb246OmlzUHJvcGVydHlO YW1lKGNzc1Byb3BlcnR5TmFtZShwcm9wZXJ0eU5hbWUpKTsKKyAgICByZXR1cm4gQ1NTU3R5bGVE ZWNsYXJhdGlvbjo6aXNQcm9wZXJ0eU5hbWUoY3NzUHJvcGVydHlOYW1lKHByb3BlcnR5SWRlbnRp ZmllcikpOwogfQogCiBib29sIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbjo6Y2FuR2V0SXRlbXNGb3JO YW1lKEV4ZWNTdGF0ZSosIENTU1N0eWxlRGVjbGFyYXRpb24qLCBjb25zdCBJZGVudGlmaWVyJiBw cm9wZXJ0eU5hbWUpCkBAIC0xNzgsMTEgKzE3OCwxMSBAQCBKU1ZhbHVlIEpTQ1NTU3R5bGVEZWNs YXJhdGlvbjo6bmFtZUdldHRlcihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNv bgogCiBib29sIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbjo6cHV0RGVsZWdhdGUoRXhlY1N0YXRlKiBl eGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFBy b3BlcnR5U2xvdCYpCiB7Ci0gICAgaWYgKCFpc0NTU1Byb3BlcnR5TmFtZShwcm9wZXJ0eU5hbWUp KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBib29sIHBpeGVsT3JQb3M7CiAgICAgU3Ry aW5nIHByb3AgPSBjc3NQcm9wZXJ0eU5hbWUocHJvcGVydHlOYW1lLCAmcGl4ZWxPclBvcyk7Cisg ICAgaWYgKCFDU1NTdHlsZURlY2xhcmF0aW9uOjppc1Byb3BlcnR5TmFtZShwcm9wKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCiAgICAgU3RyaW5nIHByb3BWYWx1ZSA9IHZhbHVlVG9TdHJpbmdX aXRoTnVsbENoZWNrKGV4ZWMsIHZhbHVlKTsKICAgICBpZiAocGl4ZWxPclBvcykKICAgICAgICAg cHJvcFZhbHVlICs9ICJweCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAK aW5kZXggMzFlMGIzY2YwNTlkNmRhNjc0OTFlNTliMzZkZmI4NWEzMDIyODRkYi4uODZmM2JhMzBi ZWQyZWQ5NGEzYmI0YzFiMGYyYzYyN2MwYzA5MjBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcApAQCAtMzU5Niw2ICszNTk2LDE5IEBAIGlubGluZSBib29sIGlzVmFs aWRWaXNpdGVkTGlua1Byb3BlcnR5KGludCBpZCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKKy8v IFNWRyBoYW5kbGVzIHpvb21pbmcgaW4gYSBkaWZmZXJlbnQgd2F5IGNvbXBhcmVkIHRvIENTUy4g VGhlIHdob2xlIGRvY3VtZW50IGlzIHNjYWxlZCBpbnN0ZWFkCisvLyBvZiBlYWNoIGluZGl2aWR1 YWwgbGVuZ3RoIHZhbHVlIGluIHRoZSByZW5kZXIgc3R5bGUgLyB0cmVlLiBDU1NQcmltaXRpdmVW YWx1ZTo6Y29tcHV0ZUxlbmd0aCooKQorLy8gbXVsdGlwbGllcyBlYWNoIHJlc29sdmVkIGxlbmd0 aCB3aXRoIHRoZSB6b29tIG11bHRpcGxpZXIgLSBzbyBmb3IgU1ZHIHdlIG5lZWQgdG8gZGlzYWJs ZSB0aGF0LgorLy8gVGhvdWdoIGFsbCBDU1MgdmFsdWVzIHRoYXQgY2FuIGJlIGFwcGxpZWQgdG8g b3V0ZXJtb3N0IDxzdmc+IGVsZW1lbnRzICh3aWR0aC9oZWlnaHQvYm9yZGVyL3BhZGRpbmcuLi4p CisvLyBuZWVkIHRvIHJlc3BlY3QgdGhlIHNjYWxpbmcuIFJlbmRlckJveCAodGhlIHBhcmVudCBj bGFzcyBvZiBSZW5kZXJTVkdSb290KSBncmFicyB2YWx1ZXMgbGlrZQorLy8gd2lkdGgvaGVpZ2h0 L2JvcmRlci9wYWRkaW5nLy4uLiBmcm9tIHRoZSBSZW5kZXJTdHlsZSAtPiBmb3IgU1ZHIHRoZXNl IHZhbHVlcyB3b3VsZCBuZXZlciBzY2FsZSwKKy8vIGlmIHdlJ2QgcGFzcyBhIDEuMCB6b29tIGZh Y3RvciBldmVyeWh3ZXJlLiBTbyB3ZSBvbmx5IHBhc3MgYSB6b29tIGZhY3RvciBvZiAxLjAgZm9y IHNwZWNpZmljCisvLyBwcm9wZXJ0aWVzIHRoYXQgYXJlIE5PVCBhbGxvd2VkIHRvIHNjYWxlIHdp dGhpbiBhIHpvb21lZCBTVkcgZG9jdW1lbnQgKGxldHRlci93b3JkLXNwYWNpbmcvZm9udC1zaXpl KS4KK3N0YXRpYyBpbmxpbmUgYm9vbCB1c2VTVkdab29tUnVsZXMoY29uc3QgRWxlbWVudCogZSkK K3sKKyAgICByZXR1cm4gZSAmJiBlLT5pc1NWR0VsZW1lbnQoKTsKK30KKwogdm9pZCBDU1NTdHls ZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludCBpZCwgQ1NTVmFsdWUgKnZhbHVlKQogewogICAg IENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IDA7CkBAIC0zNjA0LDE2ICszNjE3 LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludCBpZCwgQ1NTVmFs dWUgKnZhbHVlKQogCiAgICAgZmxvYXQgem9vbUZhY3RvciA9IG1fc3R5bGUtPmVmZmVjdGl2ZVpv b20oKTsKIAotICAgIC8vIFNWRyBoYW5kbGVzIHpvb21pbmcgaW4gYSBkaWZmZXJlbnQgd2F5IGNv bXBhcmVkIHRvIENTUy4gVGhlIHdob2xlIGRvY3VtZW50IGlzIHNjYWxlZCBpbnN0ZWFkCi0gICAg Ly8gb2YgZWFjaCBpbmRpdmlkdWFsIGxlbmd0aCB2YWx1ZSBpbiB0aGUgcmVuZGVyIHN0eWxlIC8g dHJlZS4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgqKCkKLSAgICAvLyBtdWx0aXBs aWVzIGVhY2ggcmVzb2x2ZWQgbGVuZ3RoIHdpdGggdGhlIHpvb20gbXVsdGlwbGllciAtIHNvIGZv ciBTVkcgd2UgbmVlZCB0byBkaXNhYmxlIHRoYXQuCi0gICAgLy8gVGhvdWdoIGFsbCBDU1MgdmFs dWVzIHRoYXQgY2FuIGJlIGFwcGxpZWQgdG8gb3V0ZXJtb3N0IDxzdmc+IGVsZW1lbnRzICh3aWR0 aC9oZWlnaHQvYm9yZGVyL3BhZGRpbmcuLi4pCi0gICAgLy8gbmVlZCB0byByZXNwZWN0IHRoZSBz Y2FsaW5nLiBSZW5kZXJCb3ggKHRoZSBwYXJlbnQgY2xhc3Mgb2YgUmVuZGVyU1ZHUm9vdCkgZ3Jh YnMgdmFsdWVzIGxpa2UKLSAgICAvLyB3aWR0aC9oZWlnaHQvYm9yZGVyL3BhZGRpbmcvLi4uIGZy b20gdGhlIFJlbmRlclN0eWxlIC0+IGZvciBTVkcgdGhlc2UgdmFsdWVzIHdvdWxkIG5ldmVyIHNj YWxlLAotICAgIC8vIGlmIHdlJ2QgcGFzcyBhIDEuMCB6b29tIGZhY3RvciBldmVyeWh3ZXJlLiBT byB3ZSBvbmx5IHBhc3MgYSB6b29tIGZhY3RvciBvZiAxLjAgZm9yIHNwZWNpZmljCi0gICAgLy8g cHJvcGVydGllcyB0aGF0IGFyZSBOT1QgYWxsb3dlZCB0byBzY2FsZSB3aXRoaW4gYSB6b29tZWQg U1ZHIGRvY3VtZW50IChsZXR0ZXIvd29yZC1zcGFjaW5nL2ZvbnQtc2l6ZSkuCi0gICAgYm9vbCB1 c2VTVkdab29tUnVsZXMgPSBtX2VsZW1lbnQgJiYgbV9lbGVtZW50LT5pc1NWR0VsZW1lbnQoKTsK LQogICAgIExlbmd0aCBsOwogICAgIGJvb2wgYXBwbHkgPSBmYWxzZTsKIApAQCAtNDE3MCw3ICs0 MTczLDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludCBpZCwgQ1NT VmFsdWUgKnZhbHVlKQogICAgIGNhc2UgQ1NTUHJvcGVydHlMZXR0ZXJTcGFjaW5nOgogICAgIGNh c2UgQ1NTUHJvcGVydHlXb3JkU3BhY2luZzoKICAgICB7Ci0gICAgICAgIAogICAgICAgICBpZiAo aXNJbmhlcml0KSB7CiAgICAgICAgICAgICBIQU5ETEVfSU5IRVJJVF9DT05EKENTU1Byb3BlcnR5 TGV0dGVyU3BhY2luZywgbGV0dGVyU3BhY2luZywgTGV0dGVyU3BhY2luZykKICAgICAgICAgICAg IEhBTkRMRV9JTkhFUklUX0NPTkQoQ1NTUHJvcGVydHlXb3JkU3BhY2luZywgd29yZFNwYWNpbmcs IFdvcmRTcGFjaW5nKQpAQCAtNDE4OCw3ICs0MTkwLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjphcHBseVByb3BlcnR5KGludCBpZCwgQ1NTVmFsdWUgKnZhbHVlKQogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKICAgICAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgICAgICB3aWR0aCA9IHByaW1pdGl2ZVZhbHVlLT5jb21wdXRlTGVuZ3RoSW50 KHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHlsZSwgdXNlU1ZHWm9vbVJ1bGVzID8gMS4wZiA6IHpv b21GYWN0b3IpOworICAgICAgICAgICAgd2lkdGggPSBwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxl bmd0aEludChzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHVzZVNWR1pvb21SdWxlcyhtX2Vs ZW1lbnQpID8gMS4wZiA6IHpvb21GYWN0b3IpOwogICAgICAgICB9CiAgICAgICAgIHN3aXRjaCAo aWQpIHsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUxldHRlclNwYWNpbmc6CkBAIC01MTQwLDcg KzUxNDIsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50IGlkLCBD U1NWYWx1ZSAqdmFsdWUpCiAgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFVzZVBy aW50ZXJGb250KG1fY2hlY2tlci5tX2RvY3VtZW50LT5wcmludGluZygpKTsKICAgICAgICAgICAg CiAgICAgICAgICAgICAgICAgLy8gSGFuZGxlIHRoZSB6b29tIGZhY3Rvci4KLSAgICAgICAgICAg ICAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKGdldENvbXB1dGVkU2l6ZUZyb21T cGVjaWZpZWRTaXplKG1fY2hlY2tlci5tX2RvY3VtZW50LCBtX3N0eWxlLmdldCgpLCBmb250RGVz Y3JpcHRpb24uaXNBYnNvbHV0ZVNpemUoKSwgZm9udERlc2NyaXB0aW9uLnNwZWNpZmllZFNpemUo KSwgdXNlU1ZHWm9vbVJ1bGVzKSk7CisgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNl dENvbXB1dGVkU2l6ZShnZXRDb21wdXRlZFNpemVGcm9tU3BlY2lmaWVkU2l6ZShtX2NoZWNrZXIu bV9kb2N1bWVudCwgbV9zdHlsZS5nZXQoKSwgZm9udERlc2NyaXB0aW9uLmlzQWJzb2x1dGVTaXpl KCksIGZvbnREZXNjcmlwdGlvbi5zcGVjaWZpZWRTaXplKCksIHVzZVNWR1pvb21SdWxlcyhtX2Vs ZW1lbnQpKSk7CiAgICAgICAgICAgICAgICAgaWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlv bihmb250RGVzY3JpcHRpb24pKQogICAgICAgICAgICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRy dWU7CiAgICAgICAgICAgICB9Cg==