diff options
Diffstat (limited to 'WebCore/loader/CachedCSSStyleSheet.cpp')
| -rw-r--r-- | WebCore/loader/CachedCSSStyleSheet.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/WebCore/loader/CachedCSSStyleSheet.cpp b/WebCore/loader/CachedCSSStyleSheet.cpp index 245d944..0a0dcbe 100644 --- a/WebCore/loader/CachedCSSStyleSheet.cpp +++ b/WebCore/loader/CachedCSSStyleSheet.cpp @@ -52,7 +52,11 @@ CachedCSSStyleSheet::~CachedCSSStyleSheet() void CachedCSSStyleSheet::didAddClient(CachedResourceClient *c) { +<<<<<<< HEAD if (!m_loading) { +======= + if (!isLoading()) +>>>>>>> webkit.org at r59636 c->setCSSStyleSheet(m_url, m_response.url(), m_decoder->encoding().name(), this); c->notifyFinished(this); } @@ -102,7 +106,7 @@ void CachedCSSStyleSheet::data(PassRefPtr<SharedBuffer> data, bool allDataReceiv m_decodedSheetText = m_decoder->decode(m_data->data(), m_data->size()); m_decodedSheetText += m_decoder->flush(); } - m_loading = false; + setLoading(false); checkNotify(); // Clear the decoded text as it is unlikely to be needed immediately again and is cheap to regenerate. m_decodedSheetText = String(); @@ -114,7 +118,7 @@ void CachedCSSStyleSheet::data(PassRefPtr<SharedBuffer> data, bool allDataReceiv void CachedCSSStyleSheet::checkNotify() { - if (m_loading) + if (isLoading()) return; CachedResourceClientWalker w(m_clients); @@ -124,8 +128,8 @@ void CachedCSSStyleSheet::checkNotify() void CachedCSSStyleSheet::error() { - m_loading = false; - m_errorOccurred = true; + setLoading(false); + setErrorOccurred(true); checkNotify(); } |