Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: third_party/WebKit/Source/core/xml/parser/XMLDocumentParserScope.cpp

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/xml/parser/XMLDocumentParserScope.h" 27 #include "core/xml/parser/XMLDocumentParserScope.h"
28 28
29 #include "core/dom/Document.h"
30
31 namespace blink { 29 namespace blink {
32 30
33 Document* XMLDocumentParserScope::currentDocument = 0; 31 Document* XMLDocumentParserScope::currentDocument = 0;
34 32
35 XMLDocumentParserScope::XMLDocumentParserScope(Document* document) 33 XMLDocumentParserScope::XMLDocumentParserScope(Document* document)
36 : m_oldDocument(currentDocument) 34 : m_oldDocument(currentDocument)
37 , m_oldGenericErrorFunc(xmlGenericError) 35 , m_oldGenericErrorFunc(xmlGenericError)
38 , m_oldStructuredErrorFunc(xmlStructuredError) 36 , m_oldStructuredErrorFunc(xmlStructuredError)
39 , m_oldErrorContext(xmlGenericErrorContext) 37 , m_oldErrorContext(xmlGenericErrorContext)
40 { 38 {
(...skipping 14 matching lines...) Expand all
55 } 53 }
56 54
57 XMLDocumentParserScope::~XMLDocumentParserScope() 55 XMLDocumentParserScope::~XMLDocumentParserScope()
58 { 56 {
59 currentDocument = m_oldDocument; 57 currentDocument = m_oldDocument;
60 xmlSetGenericErrorFunc(m_oldErrorContext, m_oldGenericErrorFunc); 58 xmlSetGenericErrorFunc(m_oldErrorContext, m_oldGenericErrorFunc);
61 xmlSetStructuredErrorFunc(m_oldErrorContext, m_oldStructuredErrorFunc); 59 xmlSetStructuredErrorFunc(m_oldErrorContext, m_oldStructuredErrorFunc);
62 } 60 }
63 61
64 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698