Bug 84882 – Remove owner node pointer from StyleSheetInternal

• Status: RESOLVED
• Resolution: FIXED
• Component: CSS

[Antti Koivisto]

To make sharing between multiple nodes possible, StyleSheetInternal should not have a Node pointer.

[Antti Koivisto]

Created attachment 138875 [details]
patch

[Andreas Kling]

Comment on attachment 138875 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=138875&action=review

r=me with the Node reffing change we discussed.

> Source/WebCore/css/CSSImportRule.cpp:67
> +    CSSParserContext context = m_parentStyleSheet ? m_parentStyleSheet->parserContext() : CSSStrictMode;

Not a huge fan of this construction syntax. But NABD.

> Source/WebCore/css/CSSStyleSheet.cpp:326
> -    RefPtr<Node> owner = ownerNode();
> -    if (!owner)
> +    StyleSheetInternal* parentSheet = parentStyleSheet();
> +    if (parentSheet) {
> +        parentSheet->checkLoaded();
> +        m_loadCompleted = true;
> +        return;
> +    }
> +    Node* ownerNode = singleOwnerNode();
> +    if (!ownerNode) {
>          m_loadCompleted = true;
> -    else {
> -        m_loadCompleted = owner->sheetLoaded();
> -        if (m_loadCompleted)
> -            owner->notifyLoadedSheetAndAllCriticalSubresources(m_didLoadErrorOccur);
> +        return;
>      }
> +    // This may run javascript and kill the node.
> +    m_loadCompleted = ownerNode->sheetLoaded();
> +    // Get the node again.
> +    ownerNode = singleOwnerNode();
> +    if (m_loadCompleted && ownerNode)
> +        ownerNode->notifyLoadedSheetAndAllCriticalSubresources(m_didLoadErrorOccur);

We should hold a ref on the owner Node throughout the sheetLoaded() call to prevent it from disappearing under us. (Like the old code did.)

> Source/WebCore/dom/Document.cpp:2626
> +        // Element sheet is a silly. It never contains anything.

I agree. :)
I have an occasional daydream where we remove it. Someday..

[Antti Koivisto]

http://trac.webkit.org/changeset/115250