OLD | NEW |
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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
18 */ | 18 */ |
19 | 19 |
20 #include "config.h" | 20 #include "config.h" |
21 #include "core/layout/line/InlineBox.h" | 21 #include "core/layout/line/InlineBox.h" |
22 | 22 |
23 #include "core/layout/HitTestLocation.h" | 23 #include "core/layout/HitTestLocation.h" |
24 #include "core/layout/LayoutBlockFlow.h" | 24 #include "core/layout/LayoutBlockFlow.h" |
25 #include "core/layout/LayoutObject.h" | 25 #include "core/layout/LayoutObject.h" |
26 #include "core/layout/PaintInfo.h" | 26 #include "core/layout/PaintInfo.h" |
27 #include "core/layout/line/InlineFlowBox.h" | 27 #include "core/layout/line/InlineFlowBox.h" |
28 #include "core/layout/line/RootInlineBox.h" | 28 #include "core/layout/line/RootInlineBox.h" |
29 #include "core/paint/BlockPainter.h" | 29 #include "core/paint/BlockPainter.h" |
30 #include "platform/Partitions.h" | |
31 #include "platform/fonts/FontMetrics.h" | 30 #include "platform/fonts/FontMetrics.h" |
| 31 #include "wtf/Partitions.h" |
32 | 32 |
33 #ifndef NDEBUG | 33 #ifndef NDEBUG |
34 #include <stdio.h> | 34 #include <stdio.h> |
35 #endif | 35 #endif |
36 | 36 |
37 namespace blink { | 37 namespace blink { |
38 | 38 |
39 struct SameSizeAsInlineBox { | 39 struct SameSizeAsInlineBox { |
40 virtual ~SameSizeAsInlineBox() { } | 40 virtual ~SameSizeAsInlineBox() { } |
41 void* a[4]; | 41 void* a[4]; |
(...skipping 24 matching lines...) Expand all Loading... |
66 } | 66 } |
67 | 67 |
68 void InlineBox::remove(MarkLineBoxes markLineBoxes) | 68 void InlineBox::remove(MarkLineBoxes markLineBoxes) |
69 { | 69 { |
70 if (parent()) | 70 if (parent()) |
71 parent()->removeChild(this, markLineBoxes); | 71 parent()->removeChild(this, markLineBoxes); |
72 } | 72 } |
73 | 73 |
74 void* InlineBox::operator new(size_t sz) | 74 void* InlineBox::operator new(size_t sz) |
75 { | 75 { |
76 return partitionAlloc(Partitions::getRenderingPartition(), sz); | 76 return partitionAlloc(WTF::Partitions::getRenderingPartition(), sz); |
77 } | 77 } |
78 | 78 |
79 void InlineBox::operator delete(void* ptr) | 79 void InlineBox::operator delete(void* ptr) |
80 { | 80 { |
81 partitionFree(ptr); | 81 partitionFree(ptr); |
82 } | 82 } |
83 | 83 |
84 const char* InlineBox::boxName() const | 84 const char* InlineBox::boxName() const |
85 { | 85 { |
86 return "InlineBox"; | 86 return "InlineBox"; |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 b->showTreeForThis(); | 393 b->showTreeForThis(); |
394 } | 394 } |
395 | 395 |
396 void showLineTree(const blink::InlineBox* b) | 396 void showLineTree(const blink::InlineBox* b) |
397 { | 397 { |
398 if (b) | 398 if (b) |
399 b->showLineTreeForThis(); | 399 b->showLineTreeForThis(); |
400 } | 400 } |
401 | 401 |
402 #endif | 402 #endif |
OLD | NEW |