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

Unified Diff: Source/core/rendering/RootInlineBox.cpp

Issue 20231002: Replace RenderArena with PartitionAlloc (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RootInlineBox.h ('k') | Source/core/rendering/style/ContentData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RootInlineBox.cpp
diff --git a/Source/core/rendering/RootInlineBox.cpp b/Source/core/rendering/RootInlineBox.cpp
index fa1def21b84edbcd6d078e6d600c526788eb4073..bd816bbe7fa20d147856a93e4bb6bba5b2b252bd 100644
--- a/Source/core/rendering/RootInlineBox.cpp
+++ b/Source/core/rendering/RootInlineBox.cpp
@@ -31,7 +31,6 @@
#include "core/rendering/HitTestResult.h"
#include "core/rendering/InlineTextBox.h"
#include "core/rendering/PaintInfo.h"
-#include "core/rendering/RenderArena.h"
#include "core/rendering/RenderBlock.h"
#include "core/rendering/RenderFlowThread.h"
#include "core/rendering/RenderView.h"
@@ -65,18 +64,18 @@ RootInlineBox::RootInlineBox(RenderBlock* block)
}
-void RootInlineBox::destroy(RenderArena* arena)
+void RootInlineBox::destroy()
{
- detachEllipsisBox(arena);
- InlineFlowBox::destroy(arena);
+ detachEllipsisBox();
+ InlineFlowBox::destroy();
}
-void RootInlineBox::detachEllipsisBox(RenderArena* arena)
+void RootInlineBox::detachEllipsisBox()
{
if (hasEllipsisBox()) {
EllipsisBox* box = gEllipsisBoxMap->take(this);
box->setParent(0);
- box->destroy(arena);
+ box->destroy();
setHasEllipsisBox(false);
}
}
@@ -89,7 +88,7 @@ RenderLineBoxList* RootInlineBox::rendererLineBoxes() const
void RootInlineBox::clearTruncation()
{
if (hasEllipsisBox()) {
- detachEllipsisBox(renderer()->renderArena());
+ detachEllipsisBox();
InlineFlowBox::clearTruncation();
}
}
@@ -132,9 +131,9 @@ float RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, f
InlineBox* markupBox)
{
// Create an ellipsis box.
- EllipsisBox* ellipsisBox = new (renderer()->renderArena()) EllipsisBox(renderer(), ellipsisStr, this,
- ellipsisWidth - (markupBox ? markupBox->logicalWidth() : 0), logicalHeight(),
- y(), !prevRootBox(), isHorizontal(), markupBox);
+ EllipsisBox* ellipsisBox = new EllipsisBox(renderer(), ellipsisStr, this,
+ ellipsisWidth - (markupBox ? markupBox->logicalWidth() : 0), logicalHeight(),
+ y(), !prevRootBox(), isHorizontal(), markupBox);
if (!gEllipsisBoxMap)
gEllipsisBoxMap = new EllipsisBoxMap();
« no previous file with comments | « Source/core/rendering/RootInlineBox.h ('k') | Source/core/rendering/style/ContentData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698