70150 2011-10-14 14:44:42 -0700 CSSParser: Remove StyleBase usage. 2011-10-14 14:59:45 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling koivisto oldest_to_newest 484315 0 kling 2011-10-14 14:44:42 -0700 Let's kill CSSParser::m_parsedStyleObjects and explicitly store CSSRules and MediaLists instead. 484316 1 111082 kling 2011-10-14 14:45:31 -0700 Created attachment 111082 Proposed patch 484326 2 111082 kling 2011-10-14 14:59:36 -0700 Comment on attachment 111082 Proposed patch Clearing flags on attachment: 111082 Committed r97511: <http://trac.webkit.org/changeset/97511> 484327 3 kling 2011-10-14 14:59:45 -0700 All reviewed patches have been landed. Closing bug. 111082 2011-10-14 14:45:31 -0700 2011-10-14 14:59:36 -0700 Proposed patch bug-70150.diff text/plain 5613 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNTUxNGFlLi5lMzM5YmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTEtMTAtMTQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCisgICAg ICAgIENTU1BhcnNlcjogUmVtb3ZlIFN0eWxlQmFzZSB1c2FnZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMTUwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3BsaXQgQ1NTUGFyc2VyOjptX3BhcnNlZFN0 eWxlT2JqZWN0cyBpbnRvIHR3byB2ZWN0b3JzIG9mCisgICAgICAgIENTU1J1bGVzIGFuZCBNZWRp YUxpc3RzLgorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQYXJzZXI6OmNyZWF0ZU1lZGlhTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJz ZXI6OmNyZWF0ZUNoYXJzZXRSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6Y3Jl YXRlSW1wb3J0UnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZU1lZGlh UnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lc1J1bGUp OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpjcmVhdGVGb250RmFjZVJ1bGUpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUGFyc2VyOjpjcmVhdGVQYWdlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ YXJzZXI6OmNyZWF0ZUtleWZyYW1lUnVsZSk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgor CisyMDExLTEwLTE0ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKwogICAgICAg ICBJbnNwZWN0b3I6IFJlbW92ZSBTdHlsZUJhc2UgdXNhZ2UuCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDEzOAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCmluZGV4IDdlZjI2YjIuLmUyZmY4NmNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAK QEAgLTcxNDYsNyArNzE0Niw3IEBAIE1lZGlhTGlzdCogQ1NTUGFyc2VyOjpjcmVhdGVNZWRpYUxp c3QoKQogewogICAgIFJlZlB0cjxNZWRpYUxpc3Q+IGxpc3QgPSBNZWRpYUxpc3Q6OmNyZWF0ZSgp OwogICAgIE1lZGlhTGlzdCogcmVzdWx0ID0gbGlzdC5nZXQoKTsKLSAgICBtX3BhcnNlZFN0eWxl T2JqZWN0cy5hcHBlbmQobGlzdC5yZWxlYXNlKCkpOworICAgIG1fcGFyc2VkTWVkaWFMaXN0cy5h cHBlbmQobGlzdC5yZWxlYXNlKCkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTcxNTYs NyArNzE1Niw3IEBAIENTU1J1bGUqIENTU1BhcnNlcjo6Y3JlYXRlQ2hhcnNldFJ1bGUoY29uc3Qg Q1NTUGFyc2VyU3RyaW5nJiBjaGFyc2V0KQogICAgICAgICByZXR1cm4gMDsKICAgICBSZWZQdHI8 Q1NTQ2hhcnNldFJ1bGU+IHJ1bGUgPSBDU1NDaGFyc2V0UnVsZTo6Y3JlYXRlKG1fc3R5bGVTaGVl dCwgY2hhcnNldCk7CiAgICAgQ1NTQ2hhcnNldFJ1bGUqIHJlc3VsdCA9IHJ1bGUuZ2V0KCk7Ci0g ICAgbV9wYXJzZWRTdHlsZU9iamVjdHMuYXBwZW5kKHJ1bGUucmVsZWFzZSgpKTsKKyAgICBtX3Bh cnNlZFJ1bGVzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K IApAQCAtNzE2Niw3ICs3MTY2LDcgQEAgQ1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVJbXBvcnRS dWxlKGNvbnN0IENTU1BhcnNlclN0cmluZyYgdXJsLCBNZWRpYUxpc3QqIG1lZGkKICAgICAgICAg cmV0dXJuIDA7CiAgICAgUmVmUHRyPENTU0ltcG9ydFJ1bGU+IHJ1bGUgPSBDU1NJbXBvcnRSdWxl OjpjcmVhdGUobV9zdHlsZVNoZWV0LCB1cmwsIG1lZGlhKTsKICAgICBDU1NJbXBvcnRSdWxlKiBy ZXN1bHQgPSBydWxlLmdldCgpOwotICAgIG1fcGFyc2VkU3R5bGVPYmplY3RzLmFwcGVuZChydWxl LnJlbGVhc2UoKSk7CisgICAgbV9wYXJzZWRSdWxlcy5hcHBlbmQocnVsZS5yZWxlYXNlKCkpOwog ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTcxNzcsNyArNzE3Nyw3IEBAIENTU1J1bGUqIENT U1BhcnNlcjo6Y3JlYXRlTWVkaWFSdWxlKE1lZGlhTGlzdCogbWVkaWEsIENTU1J1bGVMaXN0KiBy dWxlcykKICAgICBtX2FsbG93SW1wb3J0UnVsZXMgPSBtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRp b25zID0gZmFsc2U7CiAgICAgUmVmUHRyPENTU01lZGlhUnVsZT4gcnVsZSA9IENTU01lZGlhUnVs ZTo6Y3JlYXRlKG1fc3R5bGVTaGVldCwgbWVkaWEsIHJ1bGVzKTsKICAgICBDU1NNZWRpYVJ1bGUq IHJlc3VsdCA9IHJ1bGUuZ2V0KCk7Ci0gICAgbV9wYXJzZWRTdHlsZU9iamVjdHMuYXBwZW5kKHJ1 bGUucmVsZWFzZSgpKTsKKyAgICBtX3BhcnNlZFJ1bGVzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7 CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNzE5NSw3ICs3MTk1LDcgQEAgV2ViS2l0Q1NT S2V5ZnJhbWVzUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVLZXlmcmFtZXNSdWxlKCkKICAgICBtX2Fs bG93SW1wb3J0UnVsZXMgPSBtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zID0gZmFsc2U7CiAg ICAgUmVmUHRyPFdlYktpdENTU0tleWZyYW1lc1J1bGU+IHJ1bGUgPSBXZWJLaXRDU1NLZXlmcmFt ZXNSdWxlOjpjcmVhdGUobV9zdHlsZVNoZWV0KTsKICAgICBXZWJLaXRDU1NLZXlmcmFtZXNSdWxl KiBydWxlUHRyID0gcnVsZS5nZXQoKTsKLSAgICBtX3BhcnNlZFN0eWxlT2JqZWN0cy5hcHBlbmQo cnVsZS5yZWxlYXNlKCkpOworICAgIG1fcGFyc2VkUnVsZXMuYXBwZW5kKHJ1bGUucmVsZWFzZSgp KTsKICAgICByZXR1cm4gcnVsZVB0cjsKIH0KIApAQCAtNzIxMSw3ICs3MjExLDcgQEAgQ1NTUnVs ZSogQ1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUoVmVjdG9yPE93blB0cjxDU1NQYXJzZXJTZWxl Y3Rvcj4gPiogc2VsZWN0b3IKICAgICAgICAgICAgIGRlbGV0ZUZvbnRGYWNlT25seVZhbHVlcygp OwogICAgICAgICBydWxlLT5zZXREZWNsYXJhdGlvbihDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv bjo6Y3JlYXRlKHJ1bGUuZ2V0KCksIG1fcGFyc2VkUHJvcGVydGllcywgbV9udW1QYXJzZWRQcm9w ZXJ0aWVzKSk7CiAgICAgICAgIHJlc3VsdCA9IHJ1bGUuZ2V0KCk7Ci0gICAgICAgIG1fcGFyc2Vk U3R5bGVPYmplY3RzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7CisgICAgICAgIG1fcGFyc2VkUnVs ZXMuYXBwZW5kKHJ1bGUucmVsZWFzZSgpKTsKICAgICAgICAgaWYgKG1fcnVsZVJhbmdlTWFwKSB7 CiAgICAgICAgICAgICBBU1NFUlQobV9jdXJyZW50UnVsZURhdGEpOwogICAgICAgICAgICAgbV9j dXJyZW50UnVsZURhdGEtPnN0eWxlU291cmNlRGF0YS0+c3R5bGVCb2R5UmFuZ2UgPSBtX3J1bGVC b2R5UmFuZ2U7CkBAIC03MjUxLDcgKzcyNTEsNyBAQCBDU1NSdWxlKiBDU1NQYXJzZXI6OmNyZWF0 ZUZvbnRGYWNlUnVsZSgpCiAgICAgcnVsZS0+c2V0RGVjbGFyYXRpb24oQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb246OmNyZWF0ZShydWxlLmdldCgpLCBtX3BhcnNlZFByb3BlcnRpZXMsIG1fbnVt UGFyc2VkUHJvcGVydGllcykpOwogICAgIGNsZWFyUHJvcGVydGllcygpOwogICAgIENTU0ZvbnRG YWNlUnVsZSogcmVzdWx0ID0gcnVsZS5nZXQoKTsKLSAgICBtX3BhcnNlZFN0eWxlT2JqZWN0cy5h cHBlbmQocnVsZS5yZWxlYXNlKCkpOworICAgIG1fcGFyc2VkUnVsZXMuYXBwZW5kKHJ1bGUucmVs ZWFzZSgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC03MzI0LDcgKzczMjQsNyBAQCBD U1NSdWxlKiBDU1NQYXJzZXI6OmNyZWF0ZVBhZ2VSdWxlKFBhc3NPd25QdHI8Q1NTUGFyc2VyU2Vs ZWN0b3I+IHBhZ2VTZWxlY3RvcikKICAgICAgICAgcnVsZS0+YWRvcHRTZWxlY3RvclZlY3Rvcihz ZWxlY3RvclZlY3Rvcik7CiAgICAgICAgIHJ1bGUtPnNldERlY2xhcmF0aW9uKENTU011dGFibGVT dHlsZURlY2xhcmF0aW9uOjpjcmVhdGUocnVsZS5nZXQoKSwgbV9wYXJzZWRQcm9wZXJ0aWVzLCBt X251bVBhcnNlZFByb3BlcnRpZXMpKTsKICAgICAgICAgcGFnZVJ1bGUgPSBydWxlLmdldCgpOwot ICAgICAgICBtX3BhcnNlZFN0eWxlT2JqZWN0cy5hcHBlbmQocnVsZS5yZWxlYXNlKCkpOworICAg ICAgICBtX3BhcnNlZFJ1bGVzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7CiAgICAgfQogICAgIGNs ZWFyUHJvcGVydGllcygpOwogICAgIHJldHVybiBwYWdlUnVsZTsKQEAgLTczOTAsNyArNzM5MCw3 IEBAIFdlYktpdENTU0tleWZyYW1lUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVLZXlmcmFtZVJ1bGUo Q1NTUGFyc2VyVmFsdWVMaXN0KiBrZXlzKQogICAgIGNsZWFyUHJvcGVydGllcygpOwogCiAgICAg V2ViS2l0Q1NTS2V5ZnJhbWVSdWxlKiBrZXlmcmFtZVB0ciA9IGtleWZyYW1lLmdldCgpOwotICAg IG1fcGFyc2VkU3R5bGVPYmplY3RzLmFwcGVuZChrZXlmcmFtZS5yZWxlYXNlKCkpOworICAgIG1f cGFyc2VkUnVsZXMuYXBwZW5kKGtleWZyYW1lLnJlbGVhc2UoKSk7CiAgICAgcmV0dXJuIGtleWZy YW1lUHRyOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKaW5kZXggZGNjNGQ5My4uZTA1YjRjZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaApAQCAtNTMsNyArNTMsNiBAQCBjbGFzcyBDU1NWYWx1ZUxp c3Q7CiBjbGFzcyBEb2N1bWVudDsKIGNsYXNzIE1lZGlhTGlzdDsKIGNsYXNzIE1lZGlhUXVlcnlF eHA7Ci1jbGFzcyBTdHlsZUJhc2U7CiBjbGFzcyBXZWJLaXRDU1NLZXlmcmFtZVJ1bGU7CiBjbGFz cyBXZWJLaXRDU1NLZXlmcmFtZXNSdWxlOwogY2xhc3MgQ1NTV3JhcFNoYXBlOwpAQCAtMzQ0LDcg KzM0Myw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2FsbG93SW1wb3J0UnVsZXM7CiAgICAgYm9v bCBtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zOwogCi0gICAgVmVjdG9yPFJlZlB0cjxTdHls ZUJhc2U+ID4gbV9wYXJzZWRTdHlsZU9iamVjdHM7CisgICAgVmVjdG9yPFJlZlB0cjxDU1NSdWxl PiA+IG1fcGFyc2VkUnVsZXM7CisgICAgVmVjdG9yPFJlZlB0cjxNZWRpYUxpc3Q+ID4gbV9wYXJz ZWRNZWRpYUxpc3RzOwogICAgIFZlY3RvcjxSZWZQdHI8Q1NTUnVsZUxpc3Q+ID4gbV9wYXJzZWRS dWxlTGlzdHM7CiAgICAgSGFzaFNldDxDU1NQYXJzZXJTZWxlY3Rvcio+IG1fZmxvYXRpbmdTZWxl Y3RvcnM7CiAgICAgSGFzaFNldDxWZWN0b3I8T3duUHRyPENTU1BhcnNlclNlbGVjdG9yPiA+Kj4g bV9mbG9hdGluZ1NlbGVjdG9yVmVjdG9yczsK