diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:37:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:38:52 +0200 |
| commit | 89e2486a48b739f8d771d69ede5a6a1b244a10fc (patch) | |
| tree | 503b1a7812cf97d93704c32437eb5f62dc1a1ff9 /Source/WebCore/dom/Document.cpp | |
| parent | 625f028249cb37c55bbbd153f3902afd0b0756d9 (diff) | |
Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)
New snapshot with prospective Mountain Lion build fix
Diffstat (limited to 'Source/WebCore/dom/Document.cpp')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index f0b0b65cd..169d8a5a0 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -222,6 +222,10 @@ #include "TextAutosizer.h" #endif +#if ENABLE(CSP_NEXT) +#include "DOMSecurityPolicy.h" +#endif + using namespace std; using namespace WTF; using namespace Unicode; @@ -662,7 +666,7 @@ Document::~Document() #if ENABLE(UNDO_MANAGER) if (m_undoManager) - m_undoManager->undoScopeHostDestroyed(); + m_undoManager->disconnect(); #endif // We must call clearRareData() here since a Document class inherits TreeScope @@ -1643,6 +1647,15 @@ void Document::dispatchVisibilityStateChangeEvent() } #endif +#if ENABLE(CSP_NEXT) +DOMSecurityPolicy* Document::securityPolicy() +{ + if (!m_domSecurityPolicy) + m_domSecurityPolicy = DOMSecurityPolicy::create(this); + return m_domSecurityPolicy.get(); +} +#endif + String Document::nodeName() const { return "#document"; @@ -6075,6 +6088,7 @@ void Document::setContextFeatures(PassRefPtr<ContextFeatures> features) void Document::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { MemoryClassInfo<Document> info(memoryObjectInfo, this, MemoryInstrumentation::DOM); + info.addInstrumentedMember(m_styleResolver); info.visitBaseClass<ContainerNode>(this); info.addVector(m_customFonts); info.addString(m_documentURI); |