For some reason the declaration is parented to the element which adds bunch of unnecessary special case code.
Created attachment 124702 [details]
Attachment 124702 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9
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...
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
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.
Comment on attachment 124702 [details]
View in context: https://bugs.webkit.org/attachment.cgi?id=124702&action=review
> - // 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.
I put back the null test. While that shouldn't really happen, that change is better done separately.