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

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

Issue 375263002: Revert of HTMLParser should use current value of scriptEnabled flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@WebKit-ADD
Patch Set: Created 6 years, 5 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 | « Source/bindings/core/v8/ScriptController.cpp ('k') | 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 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 const SVGDocumentExtensions* svgExtensions(); 872 const SVGDocumentExtensions* svgExtensions();
873 SVGDocumentExtensions& accessSVGExtensions(); 873 SVGDocumentExtensions& accessSVGExtensions();
874 874
875 void initSecurityContext(); 875 void initSecurityContext();
876 void initSecurityContext(const DocumentInit&); 876 void initSecurityContext(const DocumentInit&);
877 void initContentSecurityPolicy(const ContentSecurityPolicyResponseHeaders&); 877 void initContentSecurityPolicy(const ContentSecurityPolicyResponseHeaders&);
878 878
879 bool allowInlineEventHandlers(Node*, EventListener*, const String& contextUR L, const WTF::OrdinalNumber& contextLine); 879 bool allowInlineEventHandlers(Node*, EventListener*, const String& contextUR L, const WTF::OrdinalNumber& contextLine);
880 bool allowExecutingScripts(Node*); 880 bool allowExecutingScripts(Node*);
881 881
882 bool scriptEnabled();
883
884 void statePopped(PassRefPtr<SerializedScriptValue>); 882 void statePopped(PassRefPtr<SerializedScriptValue>);
885 883
886 enum LoadEventProgress { 884 enum LoadEventProgress {
887 LoadEventNotRun, 885 LoadEventNotRun,
888 LoadEventTried, 886 LoadEventTried,
889 LoadEventInProgress, 887 LoadEventInProgress,
890 LoadEventCompleted, 888 LoadEventCompleted,
891 BeforeUnloadEventInProgress, 889 BeforeUnloadEventInProgress,
892 BeforeUnloadEventCompleted, 890 BeforeUnloadEventCompleted,
893 PageHideInProgress, 891 PageHideInProgress,
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 Timer<Document> m_updateFocusAppearanceTimer; 1262 Timer<Document> m_updateFocusAppearanceTimer;
1265 1263
1266 RawPtrWillBeMember<Element> m_cssTarget; 1264 RawPtrWillBeMember<Element> m_cssTarget;
1267 1265
1268 LoadEventProgress m_loadEventProgress; 1266 LoadEventProgress m_loadEventProgress;
1269 1267
1270 double m_startTime; 1268 double m_startTime;
1271 1269
1272 OwnPtrWillBeMember<ScriptRunner> m_scriptRunner; 1270 OwnPtrWillBeMember<ScriptRunner> m_scriptRunner;
1273 1271
1274 enum ScriptEnabledState {
1275 Uninitialized,
1276 Enabled,
1277 Disabled
1278 };
1279 ScriptEnabledState m_scriptEnabled;
1280
1281 WillBeHeapVector<RefPtrWillBeMember<HTMLScriptElement> > m_currentScriptStac k; 1272 WillBeHeapVector<RefPtrWillBeMember<HTMLScriptElement> > m_currentScriptStac k;
1282 1273
1283 OwnPtr<TransformSource> m_transformSource; 1274 OwnPtr<TransformSource> m_transformSource;
1284 RefPtrWillBeMember<Document> m_transformSourceDocument; 1275 RefPtrWillBeMember<Document> m_transformSourceDocument;
1285 1276
1286 String m_xmlEncoding; 1277 String m_xmlEncoding;
1287 String m_xmlVersion; 1278 String m_xmlVersion;
1288 unsigned m_xmlStandalone : 2; 1279 unsigned m_xmlStandalone : 2;
1289 unsigned m_hasXMLDeclaration : 1; 1280 unsigned m_hasXMLDeclaration : 1;
1290 1281
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 inline bool Node::isDocumentNode() const 1427 inline bool Node::isDocumentNode() const
1437 { 1428 {
1438 return this == document(); 1429 return this == document();
1439 } 1430 }
1440 1431
1441 Node* eventTargetNodeForDocument(Document*); 1432 Node* eventTargetNodeForDocument(Document*);
1442 1433
1443 } // namespace WebCore 1434 } // namespace WebCore
1444 1435
1445 #endif // Document_h 1436 #endif // Document_h
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698