diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/dom/XMLDocumentParserScope.cpp | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/dom/XMLDocumentParserScope.cpp')
| -rw-r--r-- | WebCore/dom/XMLDocumentParserScope.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/WebCore/dom/XMLDocumentParserScope.cpp b/WebCore/dom/XMLDocumentParserScope.cpp index 8afe49d..0a473ed 100644 --- a/WebCore/dom/XMLDocumentParserScope.cpp +++ b/WebCore/dom/XMLDocumentParserScope.cpp @@ -28,27 +28,27 @@ namespace WebCore { -DocLoader* XMLDocumentParserScope::currentDocLoader = 0; +CachedResourceLoader* XMLDocumentParserScope::currentCachedResourceLoader = 0; -XMLDocumentParserScope::XMLDocumentParserScope(DocLoader* docLoader) - : m_oldDocLoader(currentDocLoader) +XMLDocumentParserScope::XMLDocumentParserScope(CachedResourceLoader* cachedResourceLoader) + : m_oldCachedResourceLoader(currentCachedResourceLoader) #if ENABLE(XSLT) , m_oldGenericErrorFunc(xmlGenericError) , m_oldStructuredErrorFunc(xmlStructuredError) , m_oldErrorContext(xmlGenericErrorContext) #endif { - currentDocLoader = docLoader; + currentCachedResourceLoader = cachedResourceLoader; } #if ENABLE(XSLT) -XMLDocumentParserScope::XMLDocumentParserScope(DocLoader* docLoader, xmlGenericErrorFunc genericErrorFunc, xmlStructuredErrorFunc structuredErrorFunc, void* errorContext) - : m_oldDocLoader(currentDocLoader) +XMLDocumentParserScope::XMLDocumentParserScope(CachedResourceLoader* cachedResourceLoader, xmlGenericErrorFunc genericErrorFunc, xmlStructuredErrorFunc structuredErrorFunc, void* errorContext) + : m_oldCachedResourceLoader(currentCachedResourceLoader) , m_oldGenericErrorFunc(xmlGenericError) , m_oldStructuredErrorFunc(xmlStructuredError) , m_oldErrorContext(xmlGenericErrorContext) { - currentDocLoader = docLoader; + currentCachedResourceLoader = cachedResourceLoader; if (genericErrorFunc) xmlSetGenericErrorFunc(errorContext, genericErrorFunc); if (structuredErrorFunc) @@ -58,7 +58,7 @@ XMLDocumentParserScope::XMLDocumentParserScope(DocLoader* docLoader, xmlGenericE XMLDocumentParserScope::~XMLDocumentParserScope() { - currentDocLoader = m_oldDocLoader; + currentCachedResourceLoader = m_oldCachedResourceLoader; #if ENABLE(XSLT) xmlSetGenericErrorFunc(m_oldErrorContext, m_oldGenericErrorFunc); xmlSetStructuredErrorFunc(m_oldErrorContext, m_oldStructuredErrorFunc); |