Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 78058 | Differences between
and this patch

Collapse All | Expand All

(-)./khtml/html/htmltokenizer.cpp (+4 lines)
Lines 1693-1695 Link Here
1693
    onHold = _onHold;
1693
    onHold = _onHold;
1694
}
1694
}
1695
1695
1696
bool HTMLTokenizer::isRunningScriptFromTokenizer() const
1697
{
1698
    return isExecutingScript();
1699
}
(-)./khtml/html/htmltokenizer.h.orig (+1 lines)
Lines 171-176 Link Here
171
171
172
    virtual bool isWaitingForScripts() const;
172
    virtual bool isWaitingForScripts() const;
173
    virtual bool isExecutingScript() const;
173
    virtual bool isExecutingScript() const;
174
    virtual bool isRunningScriptFromTokenizer() const;
174
protected:
175
protected:
175
    // Internal buffers
176
    // Internal buffers
176
    ///////////////////
177
    ///////////////////
(-)./khtml/xml/dom_docimpl.cpp.orig (-1 / +1 lines)
Lines 1181-1187 Link Here
1181
    // on an explicit document.close(), the tokenizer might still be waiting on scripts,
1181
    // on an explicit document.close(), the tokenizer might still be waiting on scripts,
1182
    // and in that case we don't want to destroy it because that will prevent the
1182
    // and in that case we don't want to destroy it because that will prevent the
1183
    // scripts from getting processed.
1183
    // scripts from getting processed.
1184
    if (m_tokenizer && !m_tokenizer->isWaitingForScripts()) {
1184
    if (m_tokenizer && !m_tokenizer->isWaitingForScripts() && !m_tokenizer->isRunningScriptFromTokenizer()) {
1185
        delete m_tokenizer;
1185
        delete m_tokenizer;
1186
        m_tokenizer = 0;
1186
        m_tokenizer = 0;
1187
    }
1187
    }
(-)./khtml/xml/xml_tokenizer.h.orig (+1 lines)
Lines 122-127 Link Here
122
    virtual void finish() = 0;
122
    virtual void finish() = 0;
123
    virtual void setOnHold(bool /*_onHold*/) {}
123
    virtual void setOnHold(bool /*_onHold*/) {}
124
    virtual bool isWaitingForScripts() const = 0;
124
    virtual bool isWaitingForScripts() const = 0;
125
    virtual bool isRunningScriptFromTokenizer() const { return false; }
125
126
126
signals:
127
signals:
127
    void finishedParsing();
128
    void finishedParsing();

Return to bug 78058