77421 2012-01-31 03:34:49 -0800 Parent SVGFontFaceElements style declaration to the rule 2012-02-03 09:39:39 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77745 1 koivisto webkit-unassigned webkit.review.bot oldest_to_newest 545915 0 koivisto 2012-01-31 03:34:49 -0800 For some reason the declaration is parented to the element which adds bunch of unnecessary special case code. 545922 1 124702 koivisto 2012-01-31 03:43:20 -0800 Created attachment 124702 patch 545923 2 webkit.review.bot 2012-01-31 03:45:30 -0800 Attachment 124702 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 546007 3 124702 aroben 2012-01-31 06:52:28 -0800 Comment on attachment 124702 patch View in context: https://bugs.webkit.org/attachment.cgi?id=124702&action=review > Source/WebCore/css/CSSFontFaceRule.cpp:36 > - // FIXME: SVGFontFaceElement's style declaration should probably be parented to the rule too. > - if (m_style && !m_style->isElementStyleDeclaration()) > - m_style->clearParentRule(); > + m_style->clearParentRule(); Why do we now know m_style cannot be null? You should explain in the ChangeLog. 546018 4 koivisto 2012-01-31 07:00:03 -0800 http://trac.webkit.org/changeset/106358 I put back the null test. While that shouldn't really happen, that change is better done separately. 124702 2012-01-31 03:43:20 -0800 2012-01-31 06:52:28 -0800 patch svgfontface-declaration.patch text/plain 5814 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjM1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAxLTMxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBQYXJlbnQgU1ZHRm9udEZhY2VF bGVtZW50cyBzdHlsZSBkZWNsYXJhdGlvbiB0byB0aGUgcnVsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc0MjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Igc29tZSByZWFzb24gdGhlIGRlY2xhcmF0 aW9uIGlzIHBhcmVudGVkIHRvIHRoZSBlbGVtZW50IHdoaWNoIGFkZHMgYSBidW5jaCBvZiB1bm5l Y2Vzc2FyeSBzcGVjaWFsIGNhc2UgY29kZS4KKyAgICAgICAgVGhlIGludmFsaWRhdGlvbiBvbiBt dXRhdGlvbiBpcyBkb25lIGV4cGxpY2l0bHkgYnkgU1ZHRm9udEZhY2VFbGVtZW50IHNvIHRoYXQg aXMgbm90IGFmZmVjdGVkLiBUaGUgZGVjbGFyYXRpb24KKyAgICAgICAgaXMgbm90IGV4cG9zZWQg c28gdGhlIGNoYW5nZSBpcyBub3Qgb2JzZXJ2YWJsZSB3aXRoIGEgdGVzdC4KKworICAgICAgICAq IGNzcy9DU1NGb250RmFjZVJ1bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2VS dWxlOjp+Q1NTRm9udEZhY2VSdWxlKToKKyAgICAgICAgKiBjc3MvQ1NTTXV0YWJsZVN0eWxlRGVj bGFyYXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9u OjpjcmVhdGVJbmxpbmUpOgorICAgICAgICAqIHN2Zy9TVkdGb250RmFjZUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U1ZHRm9udEZhY2VFbGVtZW50OjpTVkdGb250RmFjZUVsZW1lbnQp OgorICAgICAgICAoV2ViQ29yZTo6U1ZHRm9udEZhY2VFbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJp YnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdGb250RmFjZUVsZW1lbnQ6OmZvbnRGYW1pbHkp OgorICAgICAgICAoV2ViQ29yZTo6U1ZHRm9udEZhY2VFbGVtZW50OjpyZWJ1aWxkRm9udEZhY2Up OgorICAgICAgICAqIHN2Zy9TVkdGb250RmFjZUVsZW1lbnQuaDoKKyAgICAgICAgCisgICAgICAg ICAgICBSZW1vdmUgdGhlIHVubmVjZXNzYXJ5IG1fc3R5bGVEZWNsYXJhdGlvbiBmaWVsZCwgYWNj ZXNzIHRocm91Z2ggbV9mb250RmFjZVJ1bGUgaW5zdGVhZC4KKwogMjAxMi0wMS0zMSAgUm9sYW5k IFN0ZWluZXIgIDxyb2xhbmRzdGVpbmVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICA8c3R5bGUg c2NvcGVkPjogSW1wcm92ZSBzaG9ydGN1dCBjb2RlIGZvciBjYXNlcyB3aGVyZSA8c3R5bGUgc2Nv cGVkPiBpc24ndCB1c2VkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VSdWxl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VSdWxlLmNw cAkocmV2aXNpb24gMTA2MzQxKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlUnVs ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDkgKzMzLDcgQEAgQ1NTRm9udEZhY2VSdWxlOjpD U1NGb250RmFjZVJ1bGUoQ1NTU3R5bAogCiBDU1NGb250RmFjZVJ1bGU6On5DU1NGb250RmFjZVJ1 bGUoKQogewotICAgIC8vIEZJWE1FOiBTVkdGb250RmFjZUVsZW1lbnQncyBzdHlsZSBkZWNsYXJh dGlvbiBzaG91bGQgcHJvYmFibHkgYmUgcGFyZW50ZWQgdG8gdGhlIHJ1bGUgdG9vLgotICAgIGlm IChtX3N0eWxlICYmICFtX3N0eWxlLT5pc0VsZW1lbnRTdHlsZURlY2xhcmF0aW9uKCkpCi0gICAg ICAgIG1fc3R5bGUtPmNsZWFyUGFyZW50UnVsZSgpOworICAgIG1fc3R5bGUtPmNsZWFyUGFyZW50 UnVsZSgpOwogfQogCiBTdHJpbmcgQ1NTRm9udEZhY2VSdWxlOjpjc3NUZXh0KCkgY29uc3QKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5o CShyZXZpc2lvbiAxMDYzNDEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTAgKzU3LDYgQEAgcHVibGljOgog ICAgIHsgCiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ1NTTXV0YWJsZVN0eWxlRGVjbGFy YXRpb24oZWxlbWVudCwgdHJ1ZSkpOwogICAgIH0KLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NN dXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gY3JlYXRlRm9yU1ZHRm9udEZhY2VFbGVtZW50KFN0eWxl ZEVsZW1lbnQqIGVsZW1lbnQpIAotICAgIHsgCi0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24oZWxlbWVudCwgZmFsc2UpKTsKLSAgICB9CiAKICAg ICB1bnNpZ25lZCBwcm9wZXJ0eUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9wZXJ0aWVzLnNp emUoKTsgfQogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvcGVydGllcy5p c0VtcHR5KCk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQu Y3BwCShyZXZpc2lvbiAxMDYzNDEpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VF bGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksMTEgKzQ5LDExIEBAIHVzaW5nIG5hbWVz cGFjZSBTVkdOYW1lczsKIGlubGluZSBTVkdGb250RmFjZUVsZW1lbnQ6OlNWR0ZvbnRGYWNlRWxl bWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCogZG9jdW1lbnQpCiAg ICAgOiBTVkdFbGVtZW50KHRhZ05hbWUsIGRvY3VtZW50KQogICAgICwgbV9mb250RmFjZVJ1bGUo Q1NTRm9udEZhY2VSdWxlOjpjcmVhdGUoKSkKLSAgICAsIG1fc3R5bGVEZWNsYXJhdGlvbihDU1NN dXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Y3JlYXRlRm9yU1ZHRm9udEZhY2VFbGVtZW50KHRoaXMp KQogewogICAgIEFTU0VSVChoYXNUYWdOYW1lKGZvbnRfZmFjZVRhZykpOwotICAgIG1fc3R5bGVE ZWNsYXJhdGlvbi0+c2V0U3RyaWN0UGFyc2luZyh0cnVlKTsKLSAgICBtX2ZvbnRGYWNlUnVsZS0+ c2V0RGVjbGFyYXRpb24obV9zdHlsZURlY2xhcmF0aW9uLmdldCgpKTsKKyAgICBSZWZQdHI8Q1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IHN0eWxlRGVjbGFyYXRpb24gPSBDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbjo6Y3JlYXRlKG1fZm9udEZhY2VSdWxlLmdldCgpKTsKKyAgICBzdHlsZURl Y2xhcmF0aW9uLT5zZXRTdHJpY3RQYXJzaW5nKHRydWUpOworICAgIG1fZm9udEZhY2VSdWxlLT5z ZXREZWNsYXJhdGlvbihzdHlsZURlY2xhcmF0aW9uLnJlbGVhc2UoKSk7CiB9CiAKIFBhc3NSZWZQ dHI8U1ZHRm9udEZhY2VFbGVtZW50PiBTVkdGb250RmFjZUVsZW1lbnQ6OmNyZWF0ZShjb25zdCBR dWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCogZG9jdW1lbnQpCkBAIC0xMTMsNyArMTEz LDcgQEAgdm9pZCBTVkdGb250RmFjZUVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cgogeyAgICAKICAg ICBpbnQgcHJvcElkID0gY3NzUHJvcGVydHlJZEZvclNWR0F0dHJpYnV0ZU5hbWUoYXR0ci0+bmFt ZSgpKTsKICAgICBpZiAocHJvcElkID4gMCkgewotICAgICAgICBtX3N0eWxlRGVjbGFyYXRpb24t PnNldFByb3BlcnR5KHByb3BJZCwgYXR0ci0+dmFsdWUoKSwgZmFsc2UpOworICAgICAgICBtX2Zv bnRGYWNlUnVsZS0+c3R5bGUoKS0+c2V0UHJvcGVydHkocHJvcElkLCBhdHRyLT52YWx1ZSgpLCBm YWxzZSk7CiAgICAgICAgIHJlYnVpbGRGb250RmFjZSgpOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMjU4LDcgKzI1OCw3IEBAIGludCBTVkdGb250RmFjZUVsZW1lbnQ6OmRlc2NlbnQoKSBj b25zdAogCiBTdHJpbmcgU1ZHRm9udEZhY2VFbGVtZW50Ojpmb250RmFtaWx5KCkgY29uc3QKIHsK LSAgICByZXR1cm4gbV9zdHlsZURlY2xhcmF0aW9uLT5nZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3Bl cnR5Rm9udEZhbWlseSk7CisgICAgcmV0dXJuIG1fZm9udEZhY2VSdWxlLT5zdHlsZSgpLT5nZXRQ cm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5Rm9udEZhbWlseSk7CiB9CiAKIFNWR0ZvbnRFbGVtZW50 KiBTVkdGb250RmFjZUVsZW1lbnQ6OmFzc29jaWF0ZWRGb250RWxlbWVudCgpIGNvbnN0CkBAIC0y OTksMTEgKzI5OSwxMSBAQCB2b2lkIFNWR0ZvbnRGYWNlRWxlbWVudDo6cmVidWlsZEZvbnRGYWNl CiAgICAgLy8gUGFyc2UgaW4tbWVtb3J5IENTUyBydWxlcwogICAgIENTU1Byb3BlcnR5IHNyY1By b3BlcnR5KENTU1Byb3BlcnR5U3JjLCBsaXN0KTsKICAgICBjb25zdCBDU1NQcm9wZXJ0eSogc3Jj UHJvcGVydHlSZWYgPSAmc3JjUHJvcGVydHk7Ci0gICAgbV9zdHlsZURlY2xhcmF0aW9uLT5hZGRQ YXJzZWRQcm9wZXJ0aWVzKCZzcmNQcm9wZXJ0eVJlZiwgMSk7CisgICAgbV9mb250RmFjZVJ1bGUt PnN0eWxlKCktPmFkZFBhcnNlZFByb3BlcnRpZXMoJnNyY1Byb3BlcnR5UmVmLCAxKTsKIAogICAg IGlmIChkZXNjcmliZXNQYXJlbnRGb250KSB7ICAgIAogICAgICAgICAvLyBUcmF2ZXJzZSBwYXJz ZWQgQ1NTIHZhbHVlcyBhbmQgYXNzb2NpYXRlIENTU0ZvbnRGYWNlU3JjVmFsdWUgZWxlbWVudHMg d2l0aCBvdXJzZWx2ZXMuCi0gICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gc3JjID0gbV9zdHlsZURl Y2xhcmF0aW9uLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5U3JjKTsKKyAgICAgICAg UmVmUHRyPENTU1ZhbHVlPiBzcmMgPSBtX2ZvbnRGYWNlUnVsZS0+c3R5bGUoKS0+Z2V0UHJvcGVy dHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVNyYyk7CiAgICAgICAgIENTU1ZhbHVlTGlzdCogc3JjTGlz dCA9IHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KHNyYy5nZXQoKSk7CiAKICAgICAgICAgdW5z aWduZWQgc3JjTGVuZ3RoID0gc3JjTGlzdCA/IHNyY0xpc3QtPmxlbmd0aCgpIDogMDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmgJKHJldmlzaW9uIDEwNjM0MSkK KysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuaAkod29ya2luZyBjb3B5 KQpAQCAtNjEsOCArNjEsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVkRnJv bURvY3VtZW50KCk7CiAKICAgICBSZWZQdHI8Q1NTRm9udEZhY2VSdWxlPiBtX2ZvbnRGYWNlUnVs ZTsKLSAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IG1fc3R5bGVEZWNsYXJh dGlvbjsKLQogICAgIFJlZlB0cjxTVkdGb250RWxlbWVudD4gbV9mb250RWxlbWVudDsKIH07CiAK