diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/dom/StyleElement.cpp | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/dom/StyleElement.cpp')
-rw-r--r-- | Source/WebCore/dom/StyleElement.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp index ff22fe9db..ca408735a 100644 --- a/Source/WebCore/dom/StyleElement.cpp +++ b/Source/WebCore/dom/StyleElement.cpp @@ -142,8 +142,7 @@ void StyleElement::process(Element* e) void StyleElement::clearSheet() { ASSERT(m_sheet); - m_sheet->clearOwnerNode(); - m_sheet = 0; + m_sheet.release()->clearOwnerNode(); } void StyleElement::createSheet(Element* e, WTF::OrdinalNumber startLineNumber, const String& text) @@ -175,7 +174,7 @@ void StyleElement::createSheet(Element* e, WTF::OrdinalNumber startLineNumber, c m_sheet = CSSStyleSheet::createInline(e, KURL(), document->inputEncoding()); m_sheet->setMediaQueries(mediaQueries.release()); m_sheet->setTitle(e->title()); - m_sheet->contents()->parseStringAtLine(text, startLineNumber.zeroBasedInt()); + m_sheet->contents()->parseStringAtLine(text, startLineNumber.zeroBasedInt(), m_createdByParser); m_loading = false; } |