79304 2012-02-22 16:47:47 -0800 Make parsing color presentation attributes do less pointless work. 2012-02-22 17:39:56 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78070 1 kling kling oldest_to_newest 562559 0 kling 2012-02-22 16:47:47 -0800 HTMLElement::addHTMLColorToStyle() already knows how to extract a color from the string it receives. We should create the CSSValue there instead of simply validating the string before sending it through CSSParser. 562579 1 128337 kling 2012-02-22 17:00:46 -0800 Created attachment 128337 Le Patch 562588 2 128337 koivisto 2012-02-22 17:07:10 -0800 Comment on attachment 128337 Le Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128337&action=review > Source/WebCore/ChangeLog:10 > + > + Let HTMLElement::addHTMLColorToStyle() construct the color CSSValue directly > + rather than passing a string that has to go through CSSParser. > + A word about performance? > Source/WebCore/css/StylePropertySet.h:74 > + // These expand shorthand properties into multiple properties. > + bool setProperty(int propertyID, const String& value, bool important = false, CSSStyleSheet* contextStyleSheet = 0); > + void setProperty(int propertyID, PassRefPtr<CSSValue>, bool important = false); > + > + // These do not. FIXME: This is too messy, we can do better. > bool setProperty(int propertyID, int value, bool important = false, CSSStyleSheet* contextStyleSheet = 0); > bool setProperty(int propertyID, double value, CSSPrimitiveValue::UnitTypes, bool important = false, CSSStyleSheet* contextStyleSheet = 0); > - bool setProperty(int propertyID, const String& value, bool important = false, CSSStyleSheet* contextStyleSheet = 0); > void setProperty(const CSSProperty&, CSSProperty* slot = 0); This really needs cleaning up. Oh well, you have the FIXME. 562627 3 128337 kling 2012-02-22 17:39:48 -0800 Comment on attachment 128337 Le Patch Clearing flags on attachment: 128337 Committed r108586: <http://trac.webkit.org/changeset/108586> 562628 4 kling 2012-02-22 17:39:56 -0800 All reviewed patches have been landed. Closing bug. 128337 2012-02-22 17:00:46 -0800 2012-02-22 17:39:48 -0800 Le Patch bug-79304.diff text/plain 6869 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNTU5NzNlLi45MDlhNmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDItMjIgIEFuZHJlYXMgS2xpbmcgIDxhd2Vzb21la2xpbmdAYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgcGFyc2luZyBjb2xvciBwcmVzZW50YXRpb24gYXR0cmlidXRlcyBkbyBs ZXNzIHBvaW50bGVzcyB3b3JrLgorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi83OTMwND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQgSFRN TEVsZW1lbnQ6OmFkZEhUTUxDb2xvclRvU3R5bGUoKSBjb25zdHJ1Y3QgdGhlIGNvbG9yIENTU1Zh bHVlIGRpcmVjdGx5CisgICAgICAgIHJhdGhlciB0aGFuIHBhc3NpbmcgYSBzdHJpbmcgdGhhdCBo YXMgdG8gZ28gdGhyb3VnaCBDU1NQYXJzZXIuCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0 eVNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnR5U2V0OjpzZXRQcm9wZXJ0 eSk6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuaDoKKworICAgICAgICAgICAgQWRk ZWQgYSBzZXRQcm9wZXJ0eShwcm9wZXJ0eUlELCBDU1NWYWx1ZSkgb3ZlcmxvYWQgdGhhdCBleHBh bmRzIHNob3J0aGFuZAorICAgICAgICAgICAgcHJvcGVydGllcyBpZiBuZWNlc3NhcnkuIEFsc28g YWRkZWQgYSBsaXR0bGUgY29tbWVudCBhYm91dCB0aGUgYmVoYXZpb3IKKyAgICAgICAgICAgIGRp ZmZlcmVuY2VzIGJldHdlZW4gc2V0UHJvcGVydHkoKSBvdmVybG9hZHMuCisKKyAgICAgICAgKiBo dG1sL0hUTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlQ29sb3JTdHJpbmdX aXRoQ3JhenlMZWdhY3lSdWxlcyk6CisKKyAgICAgICAgICAgIENoYW5nZWQgdGhpcyB0byByZXR1 cm4gYW4gUkdCQTMyLgorCisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudDo6YWRkSFRNTENv bG9yVG9TdHlsZSk6CisKKyAgICAgICAgICAgIEZpZ3VyZSBvdXQgdGhlIFJHQiB2YWx1ZSBhbmQg Y29uc3RydWN0IGEgKHBvb2xlZCkgQ1NTVmFsdWUgZGlyZWN0bHkuCisKIDIwMTItMDItMjEgIEx1 a2UgTWFjcGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbXBs ZW1lbnQgbWFueSBpbnN0YW5jZXMgb2YgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BS SU1JVElWRSBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ cm9wZXJ0eVNldC5jcHAKaW5kZXggMzkxMGYzMS4uZTkxNzE2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVByb3BlcnR5U2V0LmNwcApAQCAtNTgyLDYgKzU4MiwyMSBAQCBib29sIFN0eWxlUHJv cGVydHlTZXQ6OnNldFByb3BlcnR5KGludCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVl LCBib29sIGltcAogICAgIHJldHVybiBDU1NQYXJzZXI6OnBhcnNlVmFsdWUodGhpcywgcHJvcGVy dHlJRCwgdmFsdWUsIGltcG9ydGFudCwgdXNlU3RyaWN0UGFyc2luZygpLCBjb250ZXh0U3R5bGVT aGVldCk7CiB9CiAKK3ZvaWQgU3R5bGVQcm9wZXJ0eVNldDo6c2V0UHJvcGVydHkoaW50IHByb3Bl cnR5SUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBycFZhbHVlLCBib29sIGltcG9ydGFudCkKK3sK KyAgICBDU1NQcm9wZXJ0eUxvbmdoYW5kIGxvbmdoYW5kID0gbG9uZ2hhbmRGb3JQcm9wZXJ0eShw cm9wZXJ0eUlEKTsKKyAgICBpZiAoIWxvbmdoYW5kLmxlbmd0aCgpKSB7CisgICAgICAgIHNldFBy b3BlcnR5KENTU1Byb3BlcnR5KHByb3BlcnR5SUQsIHBycFZhbHVlLCBpbXBvcnRhbnQpKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHJlbW92ZVByb3BlcnRpZXNJblNldChsb25naGFu ZC5wcm9wZXJ0aWVzKCksIGxvbmdoYW5kLmxlbmd0aCgpKTsKKworICAgIFJlZlB0cjxDU1NWYWx1 ZT4gdmFsdWUgPSBwcnBWYWx1ZTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbG9uZ2hh bmQubGVuZ3RoKCk7ICsraSkKKyAgICAgICAgbV9wcm9wZXJ0aWVzLmFwcGVuZChDU1NQcm9wZXJ0 eShsb25naGFuZC5wcm9wZXJ0aWVzKClbaV0sIHZhbHVlLCBpbXBvcnRhbnQpKTsKK30KKwogdm9p ZCBTdHlsZVByb3BlcnR5U2V0OjpzZXRQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYgcHJvcGVy dHksIENTU1Byb3BlcnR5KiBzbG90KQogewogICAgIGlmICghcmVtb3ZlU2hvcnRoYW5kUHJvcGVy dHkocHJvcGVydHkuaWQoKSkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVByb3BlcnR5U2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5oCmlu ZGV4IGNlYjQ5MTUuLjJlMTA2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVByb3BlcnR5U2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQu aApAQCAtNjQsOSArNjQsMTMgQEAgcHVibGljOgogICAgIGludCBnZXRQcm9wZXJ0eVNob3J0aGFu ZChpbnQgcHJvcGVydHlJRCkgY29uc3Q7CiAgICAgYm9vbCBpc1Byb3BlcnR5SW1wbGljaXQoaW50 IHByb3BlcnR5SUQpIGNvbnN0OwogCisgICAgLy8gVGhlc2UgZXhwYW5kIHNob3J0aGFuZCBwcm9w ZXJ0aWVzIGludG8gbXVsdGlwbGUgcHJvcGVydGllcy4KKyAgICBib29sIHNldFByb3BlcnR5KGlu dCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sIGltcG9ydGFudCA9IGZhbHNl LCBDU1NTdHlsZVNoZWV0KiBjb250ZXh0U3R5bGVTaGVldCA9IDApOworICAgIHZvaWQgc2V0UHJv cGVydHkoaW50IHByb3BlcnR5SUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+LCBib29sIGltcG9ydGFu dCA9IGZhbHNlKTsKKworICAgIC8vIFRoZXNlIGRvIG5vdC4gRklYTUU6IFRoaXMgaXMgdG9vIG1l c3N5LCB3ZSBjYW4gZG8gYmV0dGVyLgogICAgIGJvb2wgc2V0UHJvcGVydHkoaW50IHByb3BlcnR5 SUQsIGludCB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSwgQ1NTU3R5bGVTaGVldCogY29u dGV4dFN0eWxlU2hlZXQgPSAwKTsKICAgICBib29sIHNldFByb3BlcnR5KGludCBwcm9wZXJ0eUlE LCBkb3VibGUgdmFsdWUsIENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMsIGJvb2wgaW1wb3J0 YW50ID0gZmFsc2UsIENTU1N0eWxlU2hlZXQqIGNvbnRleHRTdHlsZVNoZWV0ID0gMCk7Ci0gICAg Ym9vbCBzZXRQcm9wZXJ0eShpbnQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgYm9v bCBpbXBvcnRhbnQgPSBmYWxzZSwgQ1NTU3R5bGVTaGVldCogY29udGV4dFN0eWxlU2hlZXQgPSAw KTsKICAgICB2b2lkIHNldFByb3BlcnR5KGNvbnN0IENTU1Byb3BlcnR5JiwgQ1NTUHJvcGVydHkq IHNsb3QgPSAwKTsKICAgICAKICAgICBib29sIHJlbW92ZVByb3BlcnR5KGludCBwcm9wZXJ0eUlE LCBTdHJpbmcqIHJldHVyblRleHQgPSAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAK aW5kZXggZDA0MmI4MS4uMDkyYTc1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAK QEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJDU1NQYXJzZXIuaCIKICNpbmNsdWRlICJDU1NQ cm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgorI2luY2x1ZGUg IkNTU1ZhbHVlUG9vbC5oIgogI2luY2x1ZGUgIkNoaWxkTGlzdE11dGF0aW9uU2NvcGUuaCIKICNp bmNsdWRlICJEb2N1bWVudEZyYWdtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKQEAgLTExMDMs NyArMTEwNCw3IEBAIHZvaWQgSFRNTEVsZW1lbnQ6OmFkZEhUTUxMZW5ndGhUb1N0eWxlKFN0eWxl UHJvcGVydHlTZXQqIHN0eWxlLCBpbnQgcHJvcGVydHlJRCwKICAgICBhZGRQcm9wZXJ0eVRvQXR0 cmlidXRlU3R5bGUoc3R5bGUsIHByb3BlcnR5SUQsIHZhbHVlKTsKIH0KIAotc3RhdGljIFN0cmlu ZyBwYXJzZUNvbG9yU3RyaW5nV2l0aENyYXp5TGVnYWN5UnVsZXMoY29uc3QgU3RyaW5nJiBjb2xv clN0cmluZykKK3N0YXRpYyBSR0JBMzIgcGFyc2VDb2xvclN0cmluZ1dpdGhDcmF6eUxlZ2FjeVJ1 bGVzKGNvbnN0IFN0cmluZyYgY29sb3JTdHJpbmcpCiB7CiAgICAgLy8gUGVyIHNwZWMsIG9ubHkg bG9vayBhdCB0aGUgZmlyc3QgMTI4IGRpZ2l0cyBvZiB0aGUgc3RyaW5nLgogICAgIGNvbnN0IHNp emVfdCBtYXhDb2xvckxlbmd0aCA9IDEyODsKQEAgLTExMjUsMTQgKzExMjYsMTQgQEAgc3RhdGlj IFN0cmluZyBwYXJzZUNvbG9yU3RyaW5nV2l0aENyYXp5TGVnYWN5UnVsZXMoY29uc3QgU3RyaW5n JiBjb2xvclN0cmluZykKICAgICB9CiAKICAgICBpZiAoIWRpZ2l0QnVmZmVyLnNpemUoKSkKLSAg ICAgICAgcmV0dXJuICIjMDAwMDAwIjsKKyAgICAgICAgcmV0dXJuIENvbG9yOjpibGFjazsKIAog ICAgIC8vIFBhZCB0aGUgYnVmZmVyIG91dCB0byBhdCBsZWFzdCB0aGUgbmV4dCBtdWx0aXBsZSBv ZiB0aHJlZSBpbiBzaXplLgogICAgIGRpZ2l0QnVmZmVyLmFwcGVuZCgnMCcpOwogICAgIGRpZ2l0 QnVmZmVyLmFwcGVuZCgnMCcpOwogCiAgICAgaWYgKGRpZ2l0QnVmZmVyLnNpemUoKSA8IDYpCi0g ICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiIzAlYzAlYzAlYyIsIGRpZ2l0QnVmZmVyWzBd LCBkaWdpdEJ1ZmZlclsxXSwgZGlnaXRCdWZmZXJbMl0pOworICAgICAgICByZXR1cm4gbWFrZVJH Qih0b0FTQ0lJSGV4VmFsdWUoZGlnaXRCdWZmZXJbMF0pLCB0b0FTQ0lJSGV4VmFsdWUoZGlnaXRC dWZmZXJbMV0pLCB0b0FTQ0lJSGV4VmFsdWUoZGlnaXRCdWZmZXJbMl0pKTsKIAogICAgIC8vIFNw bGl0IHRoZSBkaWdpdHMgaW50byB0aHJlZSBjb21wb25lbnRzLCB0aGVuIHNlYXJjaCB0aGUgbGFz dCA4IGRpZ2l0cyBvZiBlYWNoIGNvbXBvbmVudC4KICAgICBBU1NFUlQoZGlnaXRCdWZmZXIuc2l6 ZSgpID49IDYpOwpAQCAtMTE1Miw3ICsxMTUzLDExIEBAIHN0YXRpYyBTdHJpbmcgcGFyc2VDb2xv clN0cmluZ1dpdGhDcmF6eUxlZ2FjeVJ1bGVzKGNvbnN0IFN0cmluZyYgY29sb3JTdHJpbmcpCiAg ICAgQVNTRVJUKGdyZWVuSW5kZXggKyAxIDwgY29tcG9uZW50TGVuZ3RoICogMik7CiAgICAgQVNT RVJUKGJsdWVJbmRleCA+PSBjb21wb25lbnRMZW5ndGggKiAyKTsKICAgICBBU1NFUlQoYmx1ZUlu ZGV4ICsgMSA8IGRpZ2l0QnVmZmVyLnNpemUoKSk7Ci0gICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0 KCIjJWMlYyVjJWMlYyVjIiwgZGlnaXRCdWZmZXJbcmVkSW5kZXhdLCBkaWdpdEJ1ZmZlcltyZWRJ bmRleCArIDFdLCBkaWdpdEJ1ZmZlcltncmVlbkluZGV4XSwgZGlnaXRCdWZmZXJbZ3JlZW5JbmRl eCArIDFdLCBkaWdpdEJ1ZmZlcltibHVlSW5kZXhdLCBkaWdpdEJ1ZmZlcltibHVlSW5kZXggKyAx XSk7CisKKyAgICBpbnQgcmVkVmFsdWUgPSB0b0FTQ0lJSGV4VmFsdWUoZGlnaXRCdWZmZXJbcmVk SW5kZXhdLCBkaWdpdEJ1ZmZlcltyZWRJbmRleCArIDFdKTsKKyAgICBpbnQgZ3JlZW5WYWx1ZSA9 IHRvQVNDSUlIZXhWYWx1ZShkaWdpdEJ1ZmZlcltncmVlbkluZGV4XSwgZGlnaXRCdWZmZXJbZ3Jl ZW5JbmRleCArIDFdKTsKKyAgICBpbnQgYmx1ZVZhbHVlID0gdG9BU0NJSUhleFZhbHVlKGRpZ2l0 QnVmZmVyW2JsdWVJbmRleF0sIGRpZ2l0QnVmZmVyW2JsdWVJbmRleCArIDFdKTsKKyAgICByZXR1 cm4gbWFrZVJHQihyZWRWYWx1ZSwgZ3JlZW5WYWx1ZSwgYmx1ZVZhbHVlKTsKIH0KIAogLy8gQ29s b3IgcGFyc2luZyB0aGF0IG1hdGNoZXMgSFRNTCdzICJydWxlcyBmb3IgcGFyc2luZyBhIGxlZ2Fj eSBjb2xvciB2YWx1ZSIKQEAgLTExNzAsMTIgKzExNzUsMTAgQEAgdm9pZCBIVE1MRWxlbWVudDo6 YWRkSFRNTENvbG9yVG9TdHlsZShTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSwgaW50IHByb3BlcnR5 SUQsIGMKIAogICAgIC8vIElmIHRoZSBzdHJpbmcgaXMgYSBuYW1lZCBDU1MgY29sb3Igb3IgYSAz LzYtZGlnaXQgaGV4IGNvbG9yLCB1c2UgdGhhdC4KICAgICBDb2xvciBwYXJzZWRDb2xvcihjb2xv clN0cmluZyk7Ci0gICAgaWYgKHBhcnNlZENvbG9yLmlzVmFsaWQoKSkgewotICAgICAgICBhZGRQ cm9wZXJ0eVRvQXR0cmlidXRlU3R5bGUoc3R5bGUsIHByb3BlcnR5SUQsIGNvbG9yU3RyaW5nKTsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBpZiAoIXBhcnNlZENvbG9yLmlzVmFsaWQoKSkK KyAgICAgICAgcGFyc2VkQ29sb3Iuc2V0UkdCKHBhcnNlQ29sb3JTdHJpbmdXaXRoQ3JhenlMZWdh Y3lSdWxlcyhjb2xvclN0cmluZykpOwogCi0gICAgYWRkUHJvcGVydHlUb0F0dHJpYnV0ZVN0eWxl KHN0eWxlLCBwcm9wZXJ0eUlELCBwYXJzZUNvbG9yU3RyaW5nV2l0aENyYXp5TGVnYWN5UnVsZXMo Y29sb3JTdHJpbmcpKTsKKyAgICBzdHlsZS0+c2V0UHJvcGVydHkocHJvcGVydHlJRCwgZG9jdW1l bnQoKS0+Y3NzVmFsdWVQb29sKCktPmNyZWF0ZUNvbG9yVmFsdWUocGFyc2VkQ29sb3IucmdiKCkp KTsKIH0KIAogdm9pZCBTdHlsZWRFbGVtZW50Ojpjb3B5Tm9uQXR0cmlidXRlUHJvcGVydGllcyhj b25zdCBFbGVtZW50KiBzb3VyY2VFbGVtZW50KQo=