| Index: Source/core/dom/Document.cpp
|
| diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
|
| index 6f0e65b65d5f8070dafac6d173eb755a75ec4c26..72e935e22c7b6f8654d2133ac90ba3445c3a2fb6 100644
|
| --- a/Source/core/dom/Document.cpp
|
| +++ b/Source/core/dom/Document.cpp
|
| @@ -173,7 +173,6 @@
|
| #include "core/rendering/FlowThreadController.h"
|
| #include "core/rendering/HitTestRequest.h"
|
| #include "core/rendering/HitTestResult.h"
|
| -#include "core/rendering/RenderArena.h"
|
| #include "core/rendering/RenderLayerCompositor.h"
|
| #include "core/rendering/RenderNamedFlowThread.h"
|
| #include "core/rendering/RenderTextControl.h"
|
| @@ -570,8 +569,6 @@ Document::~Document()
|
| ASSERT(!m_parser || m_parser->refCount() == 1);
|
| detachParser();
|
|
|
| - m_renderArena.clear();
|
| -
|
| if (this == topDocument())
|
| clearAXObjectCache();
|
|
|
| @@ -1707,8 +1704,7 @@ void Document::recalcStyle(StyleChange change)
|
| frameView->beginDeferredRepaints();
|
| }
|
|
|
| - ASSERT(!renderer() || renderArena());
|
| - if (!renderer() || !renderArena())
|
| + if (!renderer())
|
| goto bailOut;
|
|
|
| if (m_pendingStyleRecalcShouldForce)
|
| @@ -1928,11 +1924,8 @@ void Document::attach(const AttachContext& context)
|
| ASSERT(!attached());
|
| ASSERT(!m_axObjectCache || this != topDocument());
|
|
|
| - if (!m_renderArena)
|
| - m_renderArena = RenderArena::create();
|
| -
|
| // Create the rendering tree
|
| - setRenderer(new (m_renderArena.get()) RenderView(this));
|
| + setRenderer(new RenderView(this));
|
| renderView()->setIsInWindow(true);
|
|
|
| recalcStyle(Force);
|
| @@ -1997,7 +1990,6 @@ void Document::detach(const AttachContext& context)
|
| // or this setting of the frame to 0 could be made explicit in each of the
|
| // callers of Document::detach().
|
| m_frame = 0;
|
| - m_renderArena.clear();
|
|
|
| if (m_mediaQueryMatcher)
|
| m_mediaQueryMatcher->documentDestroyed();
|
| @@ -5131,7 +5123,6 @@ void Document::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
|
| info.addMember(m_visitedLinkState, "visitedLinkState");
|
| info.addMember(m_styleRecalcTimer, "styleRecalcTimer");
|
| info.addMember(m_titleElement, "titleElement");
|
| - info.ignoreMember(m_renderArena);
|
| info.addMember(m_axObjectCache, "axObjectCache");
|
| info.addMember(m_markers, "markers");
|
| info.addMember(m_cssTarget, "cssTarget");
|
|
|