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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineBox.cpp

Issue 2518253002: Move Partition Allocator into Chromium base. (Closed)
Patch Set: Move OOM_CRASH into its own, more specific header. Fixes Windows build. Created 4 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 if (parent()) 78 if (parent())
79 parent()->removeChild(this, markLineBoxes); 79 parent()->removeChild(this, markLineBoxes);
80 } 80 }
81 81
82 void* InlineBox::operator new(size_t sz) { 82 void* InlineBox::operator new(size_t sz) {
83 return partitionAlloc(WTF::Partitions::layoutPartition(), sz, 83 return partitionAlloc(WTF::Partitions::layoutPartition(), sz,
84 WTF_HEAP_PROFILER_TYPE_NAME(InlineBox)); 84 WTF_HEAP_PROFILER_TYPE_NAME(InlineBox));
85 } 85 }
86 86
87 void InlineBox::operator delete(void* ptr) { 87 void InlineBox::operator delete(void* ptr) {
88 partitionFree(ptr); 88 WTF::partitionFree(ptr);
89 } 89 }
90 90
91 const char* InlineBox::boxName() const { 91 const char* InlineBox::boxName() const {
92 return "InlineBox"; 92 return "InlineBox";
93 } 93 }
94 94
95 String InlineBox::debugName() const { 95 String InlineBox::debugName() const {
96 return boxName(); 96 return boxName();
97 } 97 }
98 98
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 } 400 }
401 401
402 void showLineTree(const blink::InlineBox* b) { 402 void showLineTree(const blink::InlineBox* b) {
403 if (b) 403 if (b)
404 b->showLineTreeForThis(); 404 b->showLineTreeForThis();
405 else 405 else
406 fprintf(stderr, "Cannot showLineTree for (nil) InlineBox.\n"); 406 fprintf(stderr, "Cannot showLineTree for (nil) InlineBox.\n");
407 } 407 }
408 408
409 #endif 409 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698