diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 17:40:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 12:10:53 +0100 |
| commit | 92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9 (patch) | |
| tree | 9fc2c5312ac733f5b86a6d4d8373c8715db5e3bf /WebCore/loader/CachedCSSStyleSheet.cpp | |
| parent | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (diff) | |
| download | external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.zip external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.tar.gz external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.tar.bz2 | |
Merge WebKit at r59636: Fix conflicts
Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
Diffstat (limited to 'WebCore/loader/CachedCSSStyleSheet.cpp')
| -rw-r--r-- | WebCore/loader/CachedCSSStyleSheet.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/loader/CachedCSSStyleSheet.cpp b/WebCore/loader/CachedCSSStyleSheet.cpp index 0a0dcbe..08f3712 100644 --- a/WebCore/loader/CachedCSSStyleSheet.cpp +++ b/WebCore/loader/CachedCSSStyleSheet.cpp @@ -52,11 +52,7 @@ CachedCSSStyleSheet::~CachedCSSStyleSheet() void CachedCSSStyleSheet::didAddClient(CachedResourceClient *c) { -<<<<<<< HEAD - if (!m_loading) { -======= - if (!isLoading()) ->>>>>>> webkit.org at r59636 + if (!isLoading()) { c->setCSSStyleSheet(m_url, m_response.url(), m_decoder->encoding().name(), this); c->notifyFinished(this); } |