summaryrefslogtreecommitdiff
path: root/Source/WebCore/css/CSSImportRule.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/css/CSSImportRule.cpp')
-rw-r--r--Source/WebCore/css/CSSImportRule.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebCore/css/CSSImportRule.cpp b/Source/WebCore/css/CSSImportRule.cpp
index f7e711ba2..772f36589 100644
--- a/Source/WebCore/css/CSSImportRule.cpp
+++ b/Source/WebCore/css/CSSImportRule.cpp
@@ -27,10 +27,10 @@
#include "CachedResourceLoader.h"
#include "Document.h"
#include "MediaList.h"
-#include "MemoryInstrumentation.h"
#include "SecurityOrigin.h"
#include "StyleRuleImport.h"
#include "StyleSheetContents.h"
+#include "WebCoreMemoryInstrumentation.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
@@ -79,13 +79,20 @@ String CSSImportRule::cssText() const
void CSSImportRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
- MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
+ MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
CSSRule::reportBaseClassMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_importRule);
info.addInstrumentedMember(m_mediaCSSOMWrapper);
info.addInstrumentedMember(m_styleSheetCSSOMWrapper);
}
+void CSSImportRule::reattachStyleSheetContents()
+{
+ ASSERT(m_styleSheetCSSOMWrapper);
+ ASSERT(!parentStyleSheet() || parentStyleSheet()->contents()->hasOneClient());
+ m_importRule->reattachStyleSheetContents(m_styleSheetCSSOMWrapper->contents());
+}
+
CSSStyleSheet* CSSImportRule::styleSheet() const
{
if (!m_importRule->styleSheet())