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

Side by Side Diff: Source/core/dom/Document.h

Issue 1198963003: [NOCOMMIT] Apply cl/1194003004 on cl/1124153003 PS 10 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months 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
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 // do eventually load. 1176 // do eventually load.
1177 PendingSheetLayout m_pendingSheetLayout; 1177 PendingSheetLayout m_pendingSheetLayout;
1178 1178
1179 RawPtrWillBeMember<LocalFrame> m_frame; 1179 RawPtrWillBeMember<LocalFrame> m_frame;
1180 RawPtrWillBeMember<LocalDOMWindow> m_domWindow; 1180 RawPtrWillBeMember<LocalDOMWindow> m_domWindow;
1181 // FIXME: oilpan: when we get rid of the transition types change the 1181 // FIXME: oilpan: when we get rid of the transition types change the
1182 // HTMLImportsController to not be a DocumentSupplement since it is 1182 // HTMLImportsController to not be a DocumentSupplement since it is
1183 // redundant with oilpan. 1183 // redundant with oilpan.
1184 RawPtrWillBeMember<HTMLImportsController> m_importsController; 1184 RawPtrWillBeMember<HTMLImportsController> m_importsController;
1185 1185
1186 RefPtrWillBeMember<ResourceFetcher> m_fetcher; 1186 PersistentWillBeMember<ResourceFetcher> m_fetcher;
1187 RefPtrWillBeMember<DocumentParser> m_parser; 1187 RefPtrWillBeMember<DocumentParser> m_parser;
1188 unsigned m_activeParserCount; 1188 unsigned m_activeParserCount;
1189 RefPtrWillBeMember<ContextFeatures> m_contextFeatures; 1189 RefPtrWillBeMember<ContextFeatures> m_contextFeatures;
1190 1190
1191 bool m_wellFormed; 1191 bool m_wellFormed;
1192 1192
1193 // Document URLs. 1193 // Document URLs.
1194 KURL m_url; // Document.URL: The URL from which this document was retrieved. 1194 KURL m_url; // Document.URL: The URL from which this document was retrieved.
1195 KURL m_baseURL; // Node.baseURI: The URL to use when resolving relative URLs . 1195 KURL m_baseURL; // Node.baseURI: The URL to use when resolving relative URLs .
1196 KURL m_baseURLOverride; // An alternative base URL that takes precedence ove r m_baseURL (but not m_baseElementURL). 1196 KURL m_baseURLOverride; // An alternative base URL that takes precedence ove r m_baseURL (but not m_baseElementURL).
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1442 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1443 1443
1444 } // namespace blink 1444 } // namespace blink
1445 1445
1446 #ifndef NDEBUG 1446 #ifndef NDEBUG
1447 // Outside the WebCore namespace for ease of invocation from gdb. 1447 // Outside the WebCore namespace for ease of invocation from gdb.
1448 CORE_EXPORT void showLiveDocumentInstances(); 1448 CORE_EXPORT void showLiveDocumentInstances();
1449 #endif 1449 #endif
1450 1450
1451 #endif // Document_h 1451 #endif // Document_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698