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

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

Issue 16988003: Revert "Extract ContextLifecycleNotifier from ScriptExecutionContext." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/ContextLifecycleNotifier.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 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 void setTemplateDocumentHost(Document* templateDocumentHost) { m_templateDoc umentHost = templateDocumentHost; } 1069 void setTemplateDocumentHost(Document* templateDocumentHost) { m_templateDoc umentHost = templateDocumentHost; }
1070 Document* templateDocumentHost() { return m_templateDocumentHost; } 1070 Document* templateDocumentHost() { return m_templateDocumentHost; }
1071 1071
1072 void didAssociateFormControl(Element*); 1072 void didAssociateFormControl(Element*);
1073 1073
1074 virtual void addConsoleMessage(MessageSource, MessageLevel, const String& me ssage, unsigned long requestIdentifier = 0); 1074 virtual void addConsoleMessage(MessageSource, MessageLevel, const String& me ssage, unsigned long requestIdentifier = 0);
1075 1075
1076 virtual const SecurityOrigin* topOrigin() const OVERRIDE; 1076 virtual const SecurityOrigin* topOrigin() const OVERRIDE;
1077 1077
1078 PassRefPtr<FontLoader> fontloader(); 1078 PassRefPtr<FontLoader> fontloader();
1079 DocumentLifecycleNotifier* lifecycleNotifier(); 1079
1080 void addLifecycleObserver(DocumentLifecycleObserver*);
1080 1081
1081 protected: 1082 protected:
1082 Document(Frame*, const KURL&, DocumentClassFlags = DefaultDocumentClass); 1083 Document(Frame*, const KURL&, DocumentClassFlags = DefaultDocumentClass);
1083 1084
1084 virtual void didUpdateSecurityOrigin() OVERRIDE; 1085 virtual void didUpdateSecurityOrigin() OVERRIDE;
1085 1086
1086 void clearXMLVersion() { m_xmlVersion = String(); } 1087 void clearXMLVersion() { m_xmlVersion = String(); }
1087 1088
1088 private: 1089 private:
1089 friend class Node; 1090 friend class Node;
(...skipping 10 matching lines...) Expand all
1100 1101
1101 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0); 1102 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0);
1102 1103
1103 virtual String nodeName() const; 1104 virtual String nodeName() const;
1104 virtual NodeType nodeType() const; 1105 virtual NodeType nodeType() const;
1105 virtual bool childTypeAllowed(NodeType) const; 1106 virtual bool childTypeAllowed(NodeType) const;
1106 virtual PassRefPtr<Node> cloneNode(bool deep); 1107 virtual PassRefPtr<Node> cloneNode(bool deep);
1107 1108
1108 virtual void refScriptExecutionContext() { ref(); } 1109 virtual void refScriptExecutionContext() { ref(); }
1109 virtual void derefScriptExecutionContext() { deref(); } 1110 virtual void derefScriptExecutionContext() { deref(); }
1110 virtual PassOwnPtr<ContextLifecycleNotifier> createLifecycleNotifier() OVERR IDE;
1111 1111
1112 virtual const KURL& virtualURL() const; // Same as url(), but needed for Scr iptExecutionContext to implement it without a performance loss for direct calls. 1112 virtual const KURL& virtualURL() const; // Same as url(), but needed for Scr iptExecutionContext to implement it without a performance loss for direct calls.
1113 virtual KURL virtualCompleteURL(const String&) const; // Same as completeURL () for the same reason as above. 1113 virtual KURL virtualCompleteURL(const String&) const; // Same as completeURL () for the same reason as above.
1114 1114
1115 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, Scrip tState* = 0, unsigned long requestIdentifier = 0); 1115 virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, Scrip tState* = 0, unsigned long requestIdentifier = 0);
1116 1116
1117 virtual double timerAlignmentInterval() const; 1117 virtual double timerAlignmentInterval() const;
1118 1118
1119 void updateTitle(const StringWithDirection&); 1119 void updateTitle(const StringWithDirection&);
1120 void updateFocusAppearanceTimerFired(Timer<Document>*); 1120 void updateFocusAppearanceTimerFired(Timer<Document>*);
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 1393
1394 RefPtr<DocumentTimeline> m_timeline; 1394 RefPtr<DocumentTimeline> m_timeline;
1395 1395
1396 RefPtr<Document> m_templateDocument; 1396 RefPtr<Document> m_templateDocument;
1397 Document* m_templateDocumentHost; // Manually managed weakref (backpointer f rom m_templateDocument). 1397 Document* m_templateDocumentHost; // Manually managed weakref (backpointer f rom m_templateDocument).
1398 1398
1399 RefPtr<FontLoader> m_fontloader; 1399 RefPtr<FontLoader> m_fontloader;
1400 1400
1401 Timer<Document> m_didAssociateFormControlsTimer; 1401 Timer<Document> m_didAssociateFormControlsTimer;
1402 HashSet<RefPtr<Element> > m_associatedFormControls; 1402 HashSet<RefPtr<Element> > m_associatedFormControls;
1403
1404 OwnPtr<DocumentLifecycleNotifier> m_lifecycleNotifier;
1403 }; 1405 };
1404 1406
1405 inline void Document::notifyRemovePendingSheetIfNeeded() 1407 inline void Document::notifyRemovePendingSheetIfNeeded()
1406 { 1408 {
1407 if (m_needsNotifyRemoveAllPendingStylesheet) 1409 if (m_needsNotifyRemoveAllPendingStylesheet)
1408 didRemoveAllPendingStylesheet(); 1410 didRemoveAllPendingStylesheet();
1409 } 1411 }
1410 1412
1411 inline const Document* Document::templateDocument() const 1413 inline const Document* Document::templateDocument() const
1412 { 1414 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 inline bool Node::isDocumentNode() const 1451 inline bool Node::isDocumentNode() const
1450 { 1452 {
1451 return this == documentInternal(); 1453 return this == documentInternal();
1452 } 1454 }
1453 1455
1454 Node* eventTargetNodeForDocument(Document*); 1456 Node* eventTargetNodeForDocument(Document*);
1455 1457
1456 } // namespace WebCore 1458 } // namespace WebCore
1457 1459
1458 #endif // Document_h 1460 #endif // Document_h
OLDNEW
« no previous file with comments | « Source/core/dom/ContextLifecycleNotifier.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698